From 2a8ba1c4c8650661c7c2645247157c8e3d3ae6c2 Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Fri, 21 Jun 2024 16:01:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api/api_list.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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": "操作成功" } ``` From 9ed69dea269e90e0352e85d1e3856ac971120043 Mon Sep 17 00:00:00 2001 From: houwei Date: Fri, 21 Jun 2024 16:03:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwarning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- das/src/main/java/com/das/common/captcha/CaptchaUtil.java | 5 +---- .../common/interceptor/DecryptingOncePerRequestFilter.java | 2 +- .../interceptor/TokenUpdatingHttpServletRequestWrapper.java | 4 ++-- das/src/main/java/com/das/common/log/MdcExecutor.java | 2 +- das/src/main/java/com/das/common/utils/JsonUtils.java | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) 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 da984f54..e5d20db5 100644 --- a/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java +++ b/das/src/main/java/com/das/common/interceptor/DecryptingOncePerRequestFilter.java @@ -30,7 +30,7 @@ import static org.springframework.http.HttpMethod.POST; public class DecryptingOncePerRequestFilter extends OncePerRequestFilter { - private String aesKey; + private final String aesKey; public DecryptingOncePerRequestFilter(String aesKey) { this.aesKey = aesKey; } 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; From 7f15b7cfd12ec670ba5be97ba91d307f1e072987 Mon Sep 17 00:00:00 2001 From: houwei Date: Fri, 21 Jun 2024 16:16:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85=E5=BC=95?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=B4=9E=E9=9A=90?= =?UTF-8?q?=E6=82=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- das/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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