clean code

austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java

@@ -25,6 +25,7 @@ public class AnchorInfo {
 
     /**
      * 具体点位
+     *
      * @see com.java3y.austin.common.enums.AnchorState
      */
     private int state;

austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/LinTongSmsAccount.java

@@ -1,10 +1,6 @@
 package com.java3y.austin.common.dto.account.sms;
 
-import lombok.AllArgsConstructor;
+import lombok.*;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 /**
  * <span>Form File</span>
@@ -22,7 +18,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class LinTongSmsAccount extends SmsAccount{
+public class LinTongSmsAccount extends SmsAccount {
     /**
      * api相关
      */

austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java

@@ -4,11 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * 去重类型枚举
  *

austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java

@@ -5,6 +5,10 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+/**
+ * @author kyw7
+ * 枚举工具类（获取枚举的描述、获取枚举的code、获取枚举的code列表）
+ */
 public class EnumUtil {
 
     private EnumUtil() {

austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java

@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 
-import java.util.Arrays;
-import java.util.Objects;
-
 /**
  * 发送的消息类型
  *

austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java

@@ -1,9 +1,23 @@
 package com.java3y.austin.common.enums;
 
-public interface PowerfulEnum {
+/**
+ * @author kyw7
+ * 枚举接口
+ */
+interface PowerfulEnum {
 
+    /**
+     * 获取枚举的code
+     *
+     * @return
+     */
     Integer getCode();
 
+    /**
+     * 获取枚举的描述
+     *
+     * @return
+     */
     String getDescription();
 
 }

austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java

@@ -12,7 +12,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @AllArgsConstructor
-public enum SmsStatus  implements PowerfulEnum{
+public enum SmsStatus implements PowerfulEnum {
 
     /**
      * 调用渠道接口发送成功

austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java

@@ -32,7 +32,7 @@ public class LinTongSendResult {
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
-    public class DataDTO{
+    public class DataDTO {
         Integer code;
         String message;
         Long msgId;

austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java

@@ -25,7 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
 
 /**
  * 短信发送处理

austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java

@@ -21,11 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <span>Form File</span>
@@ -58,13 +54,13 @@ public class LinTongSmsScript implements SmsScript {
             LinTongSmsAccount linTongSmsAccount = accountUtils.getSmsAccountByScriptName(smsParam.getScriptName(), LinTongSmsAccount.class);
             String request = assembleReq(smsParam, linTongSmsAccount);
             String response = HttpRequest.post(linTongSmsAccount.getUrl()).body(request)
-                    .header(Header.ACCEPT.getValue(),"application/json")
+                    .header(Header.ACCEPT.getValue(), "application/json")
-                    .header(Header.CONTENT_TYPE.getValue(),"application/json;charset=utf-8")
+                    .header(Header.CONTENT_TYPE.getValue(), "application/json;charset=utf-8")
                     .timeout(2000)
                     .execute().body();
             LinTongSendResult linTongSendResult = JSON.parseObject(response, LinTongSendResult.class);
             return assembleSmsRecord(smsParam, linTongSendResult, linTongSmsAccount);
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("LinTongSmsAccount#send fail:{},params:{}", Throwables.getStackTraceAsString(e), JSON.toJSONString(smsParam));
             return null;
         }
@@ -83,15 +79,13 @@ public class LinTongSmsScript implements SmsScript {
     }
 
 
-
-
     /**
      * 组装发送短信参数
      */
     private String assembleReq(SmsParam smsParam, LinTongSmsAccount account) {
         Map<String, Object> map = new HashMap<>(5);
         final long time = DateUtil.date().getTime();
-        String sign = SecureUtil.md5( account.getUserName()+time+SecureUtil.md5(account.getPassword()));
+        String sign = SecureUtil.md5(account.getUserName() + time + SecureUtil.md5(account.getPassword()));
         map.put("userName", account.getUserName());
         //获取当前时间戳
         map.put("timestamp", time);
@@ -121,7 +115,7 @@ public class LinTongSmsScript implements SmsScript {
                     .msgContent(smsParam.getContent())
                     .seriesId(datum.getMsgId().toString())
                     .chargingNum(1)
-                    .status(datum.getCode()==0 ? SmsStatus.SEND_SUCCESS.getCode() : SmsStatus.SEND_FAIL.getCode())
+                    .status(datum.getCode() == 0 ? SmsStatus.SEND_SUCCESS.getCode() : SmsStatus.SEND_FAIL.getCode())
                     .reportContent(datum.getMessage())
                     .created(Math.toIntExact(DateUtil.currentSeconds()))
                     .updated(Math.toIntExact(DateUtil.currentSeconds()))

austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java

@@ -39,7 +39,7 @@ public class GroupIdMappingUtils {
      */
     public static String getGroupIdByTaskInfo(TaskInfo taskInfo) {
         String channelCodeEn = EnumUtil.getEnumByCode(taskInfo.getSendChannel(), ChannelType.class).getCodeEn();
-        String msgCodeEn = EnumUtil.getEnumByCode(taskInfo.getMsgType(),MessageType.class).getCodeEn();
+        String msgCodeEn = EnumUtil.getEnumByCode(taskInfo.getMsgType(), MessageType.class).getCodeEn();
         return channelCodeEn + "." + msgCodeEn;
     }
 }

austin-web/src/main/java/com/java3y/austin/web/annotation/AustinAspect.java

@@ -1,10 +1,6 @@
 package com.java3y.austin.web.annotation;
 
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 /**
  * @author kl

austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java

@@ -390,7 +390,7 @@ public class Convert4Amis {
         if (CollUtil.isNotEmpty(anchorResult)) {
             anchorResult = MapUtil.sort(anchorResult);
             for (Map.Entry<Object, Object> entry : anchorResult.entrySet()) {
-                String description = EnumUtil.getDescriptionByCode((Integer) entry.getKey(),AnchorState.class);
+                String description = EnumUtil.getDescriptionByCode((Integer) entry.getKey(), AnchorState.class);
                 xAxisList.add(description);
                 actualData.add(Integer.valueOf(String.valueOf(entry.getValue())));
             }
@@ -427,10 +427,10 @@ public class Convert4Amis {
                 if (smsRecord.getMessageTemplateId() > 0) {
                     itemsVO.setBusinessId(String.valueOf(smsRecord.getMessageTemplateId()));
                     itemsVO.setContent(smsRecord.getMsgContent());
-                    itemsVO.setSendType(EnumUtil.getDescriptionByCode(smsRecord.getStatus(),SmsStatus.class));
+                    itemsVO.setSendType(EnumUtil.getDescriptionByCode(smsRecord.getStatus(), SmsStatus.class));
                     itemsVO.setSendTime(DateUtil.format(new Date(Long.valueOf(smsRecord.getCreated() * 1000L)), DatePattern.NORM_DATETIME_PATTERN));
                 } else {
-                    itemsVO.setReceiveType(EnumUtil.getDescriptionByCode(smsRecord.getStatus(),SmsStatus.class));
+                    itemsVO.setReceiveType(EnumUtil.getDescriptionByCode(smsRecord.getStatus(), SmsStatus.class));
                     itemsVO.setReceiveContent(smsRecord.getReportContent());
                     itemsVO.setReceiveTime(DateUtil.format(new Date(Long.valueOf(smsRecord.getUpdated() * 1000L)), DatePattern.NORM_DATETIME_PATTERN));
                 }

austin-web/src/test/java/com/java3y/austin/BaseTestController.java

@@ -18,8 +18,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import java.nio.charset.StandardCharsets;
 
 /**
- * @description: 测试基类,主要用于前置处理和后置处理
+ * @description: 测试基类, 主要用于前置处理和后置处理
- *
  * @date: 2023/3/9 9:40
  * @author: pendj
  */

austin-web/src/test/java/com/java3y/austin/MiniProgramTestController.java

@@ -19,7 +19,7 @@ public class MiniProgramTestController extends BaseTestController {
                 MockMvcRequestBuilders
                         .get(BASE_URL + "/template/list")
                         .headers(headers)
-                        .param("id","1")
+                        .param("id", "1")
         );
     }