From 0afb748eaec3d62d1c0d65b796e5f8492eede779 Mon Sep 17 00:00:00 2001 From: 3y Date: Tue, 11 Apr 2023 22:07:54 +0800 Subject: [PATCH] clean code --- .../austin/common/domain/AnchorInfo.java | 1 + .../dto/account/sms/LinTongSmsAccount.java | 8 ++------ .../dto/account/sms/TencentSmsAccount.java | 20 +++++++++---------- .../common/enums/DeduplicationType.java | 5 ----- .../java3y/austin/common/enums/EnumUtil.java | 4 ++++ .../austin/common/enums/MessageType.java | 3 --- .../austin/common/enums/PowerfulEnum.java | 20 ++++++++++++++++--- .../austin/common/enums/RespStatusEnum.java | 2 +- .../java3y/austin/common/enums/SmsStatus.java | 2 +- .../handler/domain/sms/LinTongSendResult.java | 2 +- .../handler/handler/impl/SmsHandler.java | 5 ++++- .../handler/script/impl/LinTongSmsScript.java | 18 ++++++----------- .../handler/utils/GroupIdMappingUtils.java | 2 +- .../austin/web/annotation/AustinAspect.java | 6 +----- .../java3y/austin/web/utils/Convert4Amis.java | 6 +++--- .../com/java3y/austin/BaseTestController.java | 3 +-- .../austin/MiniProgramTestController.java | 2 +- 17 files changed, 54 insertions(+), 55 deletions(-) diff --git a/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java b/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java index 9d07035..6b74a52 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/LinTongSmsAccount.java b/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/LinTongSmsAccount.java index 767b265..df9e11b 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/LinTongSmsAccount.java +++ b/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.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; /** * Form File @@ -22,7 +18,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -public class LinTongSmsAccount extends SmsAccount{ +public class LinTongSmsAccount extends SmsAccount { /** * api相关 */ diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java b/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java index 85b1524..bd62d54 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/account/sms/TencentSmsAccount.java @@ -9,16 +9,16 @@ import lombok.NoArgsConstructor; *

* 账号参数示例： * { - * "url": "sms.tencentcloudapi.com", - * "region": "ap-guangzhou", - * "secretId": "AKIDhDxxxxxxxx1WljQq", - * "secretKey": "B4hwww39yxxxrrrrgxyi", - * "smsSdkAppId": "1423123125", - * "templateId": "1182097", - * "signName": "Java3y公众号", - * "supplierId": 10, - * "supplierName": "腾讯云", - * "scriptName": "TencentSmsScript" + * "url": "sms.tencentcloudapi.com", + * "region": "ap-guangzhou", + * "secretId": "AKIDhDxxxxxxxx1WljQq", + * "secretKey": "B4hwww39yxxxrrrrgxyi", + * "smsSdkAppId": "1423123125", + * "templateId": "1182097", + * "signName": "Java3y公众号", + * "supplierId": 10, + * "supplierName": "腾讯云", + * "scriptName": "TencentSmsScript" * } * * @author 3y diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java index a57d162..f827102 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java +++ b/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; - /** * 去重类型枚举 * diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java b/austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java index 51dcb3e..a1f449e 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/EnumUtil.java +++ b/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() { diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java index 7b97462..7e69d7c 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java +++ b/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; - /** * 发送的消息类型 * diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java b/austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java index 6d9f8fa..f114561 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/PowerfulEnum.java +++ b/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 { - Integer getCode(); + /** + * 获取枚举的code + * + * @return + */ + Integer getCode(); - String getDescription(); + /** + * 获取枚举的描述 + * + * @return + */ + String getDescription(); } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java b/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java index 4830964..c745ba0 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java @@ -13,7 +13,7 @@ import lombok.ToString; @Getter @ToString @AllArgsConstructor -public enum RespStatusEnum { +public enum RespStatusEnum { /** * 错误 diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java index b3976ac..8e9eee2 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java +++ b/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 { /** * 调用渠道接口发送成功 diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java index 973be6d..8229f57 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java index 5197db8..9129922 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java +++ b/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; /** * 短信发送处理 diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java index 806ec5e..2eb20e6 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java +++ b/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.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Form File @@ -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.CONTENT_TYPE.getValue(),"application/json;charset=utf-8") + .header(Header.ACCEPT.getValue(), "application/json") + .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 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())) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java b/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java index 3a8802c..1665cb1 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java +++ b/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; } } diff --git a/austin-web/src/main/java/com/java3y/austin/web/annotation/AustinAspect.java b/austin-web/src/main/java/com/java3y/austin/web/annotation/AustinAspect.java index 9a7a879..10588ae 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/annotation/AustinAspect.java +++ b/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.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * @author kl diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java b/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java index d3a34e6..d25d338 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java +++ b/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 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)); } diff --git a/austin-web/src/test/java/com/java3y/austin/BaseTestController.java b/austin-web/src/test/java/com/java3y/austin/BaseTestController.java index 2b32186..a8b91d4 100644 --- a/austin-web/src/test/java/com/java3y/austin/BaseTestController.java +++ b/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 */ diff --git a/austin-web/src/test/java/com/java3y/austin/MiniProgramTestController.java b/austin-web/src/test/java/com/java3y/austin/MiniProgramTestController.java index c306e12..d72d2d6 100644 --- a/austin-web/src/test/java/com/java3y/austin/MiniProgramTestController.java +++ b/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") ); }