From 2eb9ec8526b825f045d8fe2491c4f1492da4ea96 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 19 Jan 2024 17:43:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=81=87=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/CaptchaController.java | 1 - .../common/satoken/utils/LoginHelper.java | 29 +------------------ .../gateway/filter/GlobalCorsFilter.java | 2 +- .../gateway/filter/GlobalLogFilter.java | 1 - 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java b/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java index f13b55ac..1537cb5f 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java @@ -59,7 +59,6 @@ public class CaptchaController { // 生成验证码 CaptchaType captchaType = captchaProperties.getType(); boolean isMath = CaptchaType.MATH == captchaType; - //如果是则拿取数字验证码位数，如果不是则拿取字符验证码长度 Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength(); CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length); AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz()); diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java index 35a06108..4d601d38 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java @@ -29,40 +29,13 @@ import java.util.Set; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class LoginHelper { - /** - * 用户信息 - */ public static final String LOGIN_USER_KEY = "loginUser"; - - /** - * 租户ID - */ public static final String TENANT_KEY = "tenantId"; - - /** - * 用户ID - */ public static final String USER_KEY = "userId"; - - /** - * 用户名 - */ public static final String USER_NAME_KEY = "userName"; - - /** - * 部门ID - */ public static final String DEPT_KEY = "deptId"; - - /** - * 部门名称 - */ public static final String DEPT_NAME_KEY = "deptName"; - - /** - * 客户端ID - */ - public static final String CLIENT_KEY = "clientId"; + public static final String CLIENT_KEY = "clientid"; /** * 登录系统 基于 设备类型 diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java index e08ddbb6..fb736e1c 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java @@ -25,7 +25,7 @@ public class GlobalCorsFilter implements WebFilter, Ordered { /** * 这里为支持的请求头，如果有自定义的header字段请自己添加 */ - private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Language, Content-Type, Authorization, clientId, credential, X-XSRF-TOKEN, isToken, token, Admin-Token, App-Token"; + private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Language, Content-Type, Authorization, clientid, credential, X-XSRF-TOKEN, isToken, token, Admin-Token, App-Token"; /** * 允许的请求方法 diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java index 461536a8..2c776513 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java @@ -48,7 +48,6 @@ public class GlobalLogFilter implements GlobalFilter, Ordered { if (WebFluxUtils.isJsonRequest(exchange)) { if (apiDecryptProperties.getEnabled() && ObjectUtil.isNotNull(request.getHeaders().getFirst(apiDecryptProperties.getHeaderFlag()))) { - //加密开启并且请求标识不能为空 log.info("[PLUS]开始请求 => URL[{}],参数类型[encrypt]", url); } else { String jsonParam = WebFluxUtils.resolveBodyFromCacheRequest(exchange);