diff --git a/das/pom.xml b/das/pom.xml index abe9b329..35dddaae 100644 --- a/das/pom.xml +++ b/das/pom.xml @@ -21,9 +21,9 @@ 3.8.1 2.3.2 3.5.5 - 5.8.18 + 5.8.25 - 42.2.24 + 42.7.3 1.38.0 diff --git a/das/src/main/java/com/das/common/captcha/CaptchaUtil.java b/das/src/main/java/com/das/common/captcha/CaptchaUtil.java index 1f3d94d4..ef1083dc 100644 --- a/das/src/main/java/com/das/common/captcha/CaptchaUtil.java +++ b/das/src/main/java/com/das/common/captcha/CaptchaUtil.java @@ -31,10 +31,7 @@ public class CaptchaUtil { public static boolean checkVerificationCode(String uuid, String codeAnswer, AdminRedisTemplate adminRedisTemplate){ String verifyKey = AdminConstant.CAPTCHA_CODE_KEY + uuid; String answer = adminRedisTemplate.get(verifyKey); - if (StrUtil.isNotEmpty(codeAnswer) && answer != null && answer.equals(codeAnswer)){ - return true; - } - return false; + return StrUtil.isNotEmpty(codeAnswer) && answer != null && answer.equals(codeAnswer); } /** diff --git a/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java b/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java index 9201cfbb..afff17fe 100644 --- a/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java +++ b/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java @@ -122,7 +122,7 @@ public class DecryptingOncePerRequestFilter extends OncePerRequestFilter { @Override public Enumeration getHeaders(String name) { - Set set = new HashSet<>(); + Set set = new HashSet<>(8); if (TOKEN_ATTR_NAME.equals(name) && StrUtil.isNotBlank(token)){ set.add(token); } @@ -136,7 +136,7 @@ public class DecryptingOncePerRequestFilter extends OncePerRequestFilter { @Override public Enumeration getHeaderNames() { - Set set = new HashSet<>(); + Set set = new HashSet<>(8); Enumeration e = super.getHeaderNames(); while (e.hasMoreElements()) { String n = e.nextElement(); diff --git a/das/src/main/java/com/das/common/interceptor/TokenUpdatingHttpServletRequestWrapper.java b/das/src/main/java/com/das/common/interceptor/TokenUpdatingHttpServletRequestWrapper.java index 2f7a3262..446b1868 100644 --- a/das/src/main/java/com/das/common/interceptor/TokenUpdatingHttpServletRequestWrapper.java +++ b/das/src/main/java/com/das/common/interceptor/TokenUpdatingHttpServletRequestWrapper.java @@ -8,7 +8,7 @@ import java.util.Enumeration; public class TokenUpdatingHttpServletRequestWrapper extends HttpServletRequestWrapper { - private String newTokenValue; + private final String newTokenValue; public TokenUpdatingHttpServletRequestWrapper(HttpServletRequest request, String newTokenValue) { super(request); @@ -31,4 +31,4 @@ public class TokenUpdatingHttpServletRequestWrapper extends HttpServletRequestWr return super.getHeaders(name); // 对于其他header,委托给父类处理 } -} \ No newline at end of file +} diff --git a/das/src/main/java/com/das/common/log/MdcExecutor.java b/das/src/main/java/com/das/common/log/MdcExecutor.java index 5e1a0143..00cd9cc2 100644 --- a/das/src/main/java/com/das/common/log/MdcExecutor.java +++ b/das/src/main/java/com/das/common/log/MdcExecutor.java @@ -12,7 +12,7 @@ import java.util.concurrent.Executor; @Slf4j public class MdcExecutor implements Executor { - private Executor executor; + private final Executor executor; public MdcExecutor(Executor executor) { this.executor = executor; diff --git a/das/src/main/java/com/das/common/utils/JsonUtils.java b/das/src/main/java/com/das/common/utils/JsonUtils.java index dd00b764..636457c0 100644 --- a/das/src/main/java/com/das/common/utils/JsonUtils.java +++ b/das/src/main/java/com/das/common/utils/JsonUtils.java @@ -21,7 +21,7 @@ import java.util.List; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class JsonUtils { - private static ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class); + private static final ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class); public static ObjectMapper getObjectMapper() { return OBJECT_MAPPER; diff --git a/docs/api/api_list.md b/docs/api/api_list.md index b9ae6fbd..1ff202e0 100644 --- a/docs/api/api_list.md +++ b/docs/api/api_list.md @@ -87,10 +87,17 @@ ```json { "code": 200, - "msg": "操作成功", + "success": true, "data": { - "token": "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImMyNjg3ZGI4LWJkNmItNGE3OC05MTI0LWMyNDk2NzNlNTZkOSJ9.NXnDQyHdJcz8md95DLkETJqY91048X2X_yPcCRRejLRf0p0Nz1cC4kNti0RAE5PdX477O3d27a35S4C2_VM54Q" - } + "sysUser": { + "id": 1, + "account": "admin", + "userName": "admin" + }, + "refreshToken": "6dfa2fe87b0d44538e26481c01c02d16", + "token": "85487b052fd34c36a0482be56e8532f0" + }, + "msg": "操作成功" } ```