From ef83f06f2be1acddb1d8dd0818eb3f224d6cd9ad Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 19 Jan 2024 16:57:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96api,gateway,auth?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/RemoteDataScopeService.java | 6 ++ .../dromara/system/api/RemoteDictService.java | 1 + .../dromara/system/api/RemoteLogService.java | 1 + .../system/api/RemoteSocialService.java | 12 +++- .../system/api/RemoteTenantService.java | 2 + .../dromara/system/api/RemoteUserService.java | 16 +++++ .../system/api/domain/SysUserOnline.java | 1 - .../api/domain/bo/RemoteLogininforBo.java | 1 - .../system/api/domain/bo/RemoteOperLogBo.java | 1 - .../system/api/domain/bo/RemoteUserBo.java | 1 - .../system/api/domain/vo/RemoteClientVo.java | 1 - .../auth/controller/CaptchaController.java | 2 + .../dromara/auth/domain/vo/TenantListVo.java | 9 +++ .../org/dromara/auth/form/EmailLoginBody.java | 1 - .../org/dromara/auth/form/RegisterBody.java | 3 + .../org/dromara/auth/form/SmsLoginBody.java | 1 - .../dromara/auth/form/SocialLoginBody.java | 1 - .../org/dromara/auth/form/XcxLoginBody.java | 1 - .../auth/properties/CaptchaProperties.java | 1 + .../dromara/auth/service/IAuthStrategy.java | 9 +++ .../common/log/event/LogEventListener.java | 17 ++++- .../properties/IgnoreWhiteProperties.java | 1 + .../config/properties/XssProperties.java | 1 + .../gateway/filter/GlobalCorsFilter.java | 27 +++++++- .../gateway/filter/GlobalLogFilter.java | 1 + .../dromara/resource/domain/SysOssConfig.java | 1 + .../resource/domain/bo/SysOssConfigBo.java | 2 - .../dromara/resource/mapper/SysOssMapper.java | 1 + .../service/ISysOssConfigService.java | 6 +- .../resource/service/ISysOssService.java | 59 ++++++++++++++++- .../service/impl/SysOssServiceImpl.java | 64 ++++++++++++++++++- .../system/dubbo/RemoteUserServiceImpl.java | 34 ++++++++++ .../system/service/ISysUserService.java | 20 +++++- .../service/impl/SysClientServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 42 +++++++++++- 35 files changed, 320 insertions(+), 29 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java index ceac940b..d6a40056 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java @@ -9,11 +9,17 @@ public interface RemoteDataScopeService { /** * 获取角色自定义权限语句 + * + * @param roleId 角色ID + * @return 返回角色的自定义权限语句，如果没有找到则返回 null */ String getRoleCustom(Long roleId); /** * 获取部门和下级权限语句 + * + * @param deptId 部门ID + * @return 返回部门及其下级的权限语句，如果没有找到则返回 null */ String getDeptAndChild(Long deptId); diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java index 142dc45f..69fc30c8 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java @@ -18,4 +18,5 @@ public interface RemoteDictService { * @return 字典数据集合信息 */ List selectDictDataByType(String dictType); + } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java index af084a29..6b35118d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java @@ -23,4 +23,5 @@ public interface RemoteLogService { * @param sysLogininfor 访问实体 */ void saveLogininfor(RemoteLogininforBo sysLogininfor); + } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java index ff61c12b..91c0d94a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java @@ -13,22 +13,32 @@ import java.util.List; public interface RemoteSocialService { /** - * 根据 authId 查询用户信息 + * 根据 authId 查询用户授权信息 + * + * @param authId 认证id + * @return 授权信息 */ List selectByAuthId(String authId); /** * 保存社会化关系 + * + * @param bo 社会化关系业务对象 */ void insertByBo(RemoteSocialBo bo); /** * 更新社会化关系 + * + * @param bo 社会化关系业务对象 */ void updateByBo(RemoteSocialBo bo); /** * 删除社会化关系 + * + * @param socialId 社会化关系ID + * @return 结果 */ Boolean deleteWithValidById(Long socialId); diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java index 5cfcc056..2626abed 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java @@ -6,6 +6,8 @@ import org.dromara.system.api.domain.vo.RemoteTenantVo; import java.util.List; /** + * 租户服务 + * * @author zhujie */ public interface RemoteTenantService { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java index 8401e610..8c1de9d1 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java @@ -81,6 +81,22 @@ public interface RemoteUserService { */ String selectNicknameById(Long userId); + /** + * 通过用户ID查询用户手机号 + * + * @param userId 用户id + * @return 用户手机号 + */ + String selectPhonenumberById(Long userId); + + /** + * 通过用户ID查询用户邮箱 + * + * @param userId 用户id + * @return 用户邮箱 + */ + String selectEmailById(Long userId); + /** * 更新用户信息 * diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java index 4ad3c06c..25c985ad 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java @@ -11,7 +11,6 @@ import java.io.Serializable; * * @author Lion Li */ - @Data @NoArgsConstructor public class SysUserOnline implements Serializable { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java index ac2c4115..d8c48a92 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java @@ -14,7 +14,6 @@ import java.util.Map; * * @author Lion Li */ - @Data @NoArgsConstructor public class RemoteLogininforBo implements Serializable { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java index aad49f65..5ed441b8 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java @@ -14,7 +14,6 @@ import java.util.Map; * * @author Lion Li */ - @Data @NoArgsConstructor public class RemoteOperLogBo implements Serializable { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java index 5d21b09a..0306b224 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java @@ -19,7 +19,6 @@ import java.util.Date; * * @author Michelle.Chung */ - @Data @NoArgsConstructor public class RemoteUserBo implements Serializable { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java index 400f56b7..e141f2b6 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java @@ -67,5 +67,4 @@ public class RemoteClientVo implements Serializable { */ private String status; - } 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 63d002cf..f13b55ac 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,11 +59,13 @@ 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()); captcha.setGenerator(codeGenerator); captcha.createCode(); + // 如果是数学验证码，使用SpEL表达式处理验证码结果 String code = captcha.getCode(); if (isMath) { ExpressionParser parser = new SpelExpressionParser(); diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java b/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java index b993b37a..523e0f8e 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java @@ -10,10 +10,19 @@ import lombok.Data; @Data public class TenantListVo { + /** + * 租户编号 + */ private String tenantId; + /** + * 企业名称 + */ private String companyName; + /** + * 域名 + */ private String domain; } diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java b/ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java index 931e2364..5c4fc724 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java @@ -11,7 +11,6 @@ import org.dromara.common.core.domain.model.LoginBody; * * @author Lion Li */ - @Data @EqualsAndHashCode(callSuper = true) public class EmailLoginBody extends LoginBody { diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java b/ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java index 386c0fc7..dc620766 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java @@ -31,6 +31,9 @@ public class RegisterBody extends LoginBody { @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") private String password; + /** + * 用户类型 + */ private String userType; } diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java b/ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java index 48e262f3..7271b638 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java @@ -10,7 +10,6 @@ import org.dromara.common.core.domain.model.LoginBody; * * @author Lion Li */ - @Data @EqualsAndHashCode(callSuper = true) public class SmsLoginBody extends LoginBody { diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java b/ruoyi-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java index cbd61c93..faf8aa6d 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java @@ -10,7 +10,6 @@ import org.dromara.common.core.domain.model.LoginBody; * * @author Lion Li */ - @Data @EqualsAndHashCode(callSuper = true) public class SocialLoginBody extends LoginBody { diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java b/ruoyi-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java index c68306c1..3c8a7f53 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java @@ -10,7 +10,6 @@ import org.dromara.common.core.domain.model.LoginBody; * * @author Lion Li */ - @Data @EqualsAndHashCode(callSuper = true) public class XcxLoginBody extends LoginBody { diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java b/ruoyi-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java index 1cd70982..3f05d9ba 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java @@ -17,6 +17,7 @@ import org.springframework.context.annotation.Configuration; @RefreshScope @ConfigurationProperties(prefix = "security.captcha") public class CaptchaProperties { + /** * 验证码类型 */ diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java b/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java index 0bc36577..28307c38 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java @@ -16,6 +16,11 @@ public interface IAuthStrategy { /** * 登录 + * + * @param body 登录对象 + * @param client 授权管理视图对象 + * @param grantType 授权类型 + * @return 登录验证信息 */ static LoginVo login(String body, RemoteClientVo client, String grantType) { // 授权类型和客户端id @@ -29,6 +34,10 @@ public interface IAuthStrategy { /** * 登录 + * + * @param body 登录对象 + * @param client 授权管理视图对象 + * @return 登录验证信息 */ LoginVo login(String body, RemoteClientVo client); diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java index 3697e585..d139b949 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java @@ -45,6 +45,9 @@ public class LogEventListener { remoteLogService.saveLog(sysOperLog); } + /** + * 保存系统访问记录 + */ @Async @EventListener public void saveLogininfor(LogininforEvent logininforEvent) { @@ -52,10 +55,10 @@ public class LogEventListener { final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent")); final String ip = ServletUtils.getClientIP(request); // 客户端信息 - String clientid = request.getHeader(LoginHelper.CLIENT_KEY); + String clientId = request.getHeader(LoginHelper.CLIENT_KEY); RemoteClientVo clientVo = null; - if (StringUtils.isNotBlank(clientid)) { - clientVo = remoteClientService.queryByClientId(clientid); + if (StringUtils.isNotBlank(clientId)) { + clientVo = remoteClientService.queryByClientId(clientId); } String address = AddressUtils.getRealAddressByIP(ip); @@ -93,7 +96,15 @@ public class LogEventListener { remoteLogService.saveLogininfor(logininfor); } + /** + * 将传入的对象转换为带方括号的字符串表示形式 + * 如果传入对象为 null，则返回空字符串表示的方括号 + * + * @param msg 要转换的对象，可以是任何类型 + * @return 包含方括号的字符串表示形式 + */ private String getBlock(Object msg) { + // 如果传入对象为 null，则将其替换为空字符串 if (msg == null) { msg = ""; } diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java index bf27ed61..50d4799e 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java @@ -21,6 +21,7 @@ import java.util.List; @RefreshScope @ConfigurationProperties(prefix = "security.ignore") public class IgnoreWhiteProperties { + /** * 放行白名单配置，网关不校验此处的白名单 */ diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/XssProperties.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/XssProperties.java index d75b0240..ce77b1ed 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/XssProperties.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/XssProperties.java @@ -18,6 +18,7 @@ import java.util.List; @RefreshScope @ConfigurationProperties(prefix = "security.xss") public class XssProperties { + /** * Xss开关 */ 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 9f990aa8..e08ddbb6 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,15 +25,39 @@ 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"; + + /** + * 允许的请求方法 + */ private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD"; + + /** + * 允许的请求来源，使用 * 表示允许任何来源 + */ private static final String ALLOWED_ORIGIN = "*"; + + /** + * 允许前端访问的响应头，使用 * 表示允许任何响应头 + */ private static final String ALLOWED_EXPOSE = "*"; + + /** + * 预检请求的缓存时间，单位为秒（此处设置为 5 小时） + */ private static final String MAX_AGE = "18000L"; + /** + * 实现跨域配置的 Web 过滤器 + * + * @param exchange ServerWebExchange 对象，表示一次 Web 交换 + * @param chain WebFilterChain 对象，表示一组 Web 过滤器链 + * @return Mono 表示异步的过滤器链处理结果 + */ @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { ServerHttpRequest request = exchange.getRequest(); + // 判断请求是否为跨域请求 if (CorsUtils.isCorsRequest(request)) { ServerHttpResponse response = exchange.getResponse(); HttpHeaders headers = response.getHeaders(); @@ -43,6 +67,7 @@ public class GlobalCorsFilter implements WebFilter, Ordered { headers.add("Access-Control-Expose-Headers", ALLOWED_EXPOSE); headers.add("Access-Control-Max-Age", MAX_AGE); headers.add("Access-Control-Allow-Credentials", "true"); + // 处理预检请求的 OPTIONS 方法，直接返回成功状态码 if (request.getMethod() == HttpMethod.OPTIONS) { response.setStatusCode(HttpStatus.OK); return Mono.empty(); 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 2c776513..461536a8 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,6 +48,7 @@ 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); diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java index aebc56e3..e4fa78aa 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java @@ -87,4 +87,5 @@ public class SysOssConfig extends BaseEntity { * 桶权限类型(0private 1public 2custom) */ private String accessPolicy; + } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java index d3aa8015..c65013ee 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java @@ -19,7 +19,6 @@ import jakarta.validation.constraints.Size; * @author 孤舟烟雨 * @date 2021-08-13 */ - @Data @EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false) @@ -107,5 +106,4 @@ public class SysOssConfigBo extends BaseEntity { @NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class}) private String accessPolicy; - } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java index 629ad200..bbd0cf27 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java @@ -10,4 +10,5 @@ import org.dromara.resource.domain.vo.SysOssVo; * @author Lion Li */ public interface SysOssMapper extends BaseMapperPlus { + } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java index 96b6e290..3626edd8 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java @@ -37,7 +37,7 @@ public interface ISysOssConfigService { * 根据新增业务对象插入对象存储配置 * * @param bo 对象存储配置新增业务对象 - * @return + * @return 结果 */ Boolean insertByBo(SysOssConfigBo bo); @@ -45,7 +45,7 @@ public interface ISysOssConfigService { * 根据编辑业务对象修改对象存储配置 * * @param bo 对象存储配置编辑业务对象 - * @return + * @return 结果 */ Boolean updateByBo(SysOssConfigBo bo); @@ -54,7 +54,7 @@ public interface ISysOssConfigService { * * @param ids 主键集合 * @param isValid 是否校验,true-删除前校验,false-不校验 - * @return + * @return 结果 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java index ce3622ad..c756cc4d 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java @@ -1,13 +1,12 @@ package org.dromara.resource.service; +import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.resource.domain.bo.SysOssBo; import org.dromara.resource.domain.vo.SysOssVo; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; - import java.io.File; import java.io.IOException; import java.util.Collection; @@ -20,21 +19,77 @@ import java.util.List; */ public interface ISysOssService { + /** + * 查询OSS对象存储列表 + * + * @param sysOss OSS对象存储分页查询对象 + * @param pageQuery 分页查询实体类 + * @return 结果 + */ TableDataInfo queryPageList(SysOssBo sysOss, PageQuery pageQuery); + /** + * 根据一组 ossIds 获取对应的 SysOssVo 列表 + * + * @param ossIds 一组文件在数据库中的唯一标识集合 + * @return 包含 SysOssVo 对象的列表 + */ List listByIds(Collection ossIds); + /** + * 根据一组 ossIds 获取对应文件的 URL 列表 + * + * @param ossIds 以逗号分隔的 ossId 字符串 + * @return 以逗号分隔的文件 URL 字符串 + */ String selectUrlByIds(String ossIds); + /** + * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 + * + * @param ossId 文件在数据库中的唯一标识 + * @return SysOssVo 对象，包含文件信息 + */ SysOssVo getById(Long ossId); + /** + * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 + * + * @param file 要上传的 MultipartFile 对象 + * @return 上传成功后的 SysOssVo 对象，包含文件信息 + */ SysOssVo upload(MultipartFile file); + /** + * 上传文件到对象存储服务，并保存文件信息到数据库 + * + * @param file 要上传的文件对象 + * @return 上传成功后的 SysOssVo 对象，包含文件信息 + */ SysOssVo upload(File file); + /** + * 新增OSS对象存储 + * + * @param bo SysOssBo 对象，包含待插入的数据 + * @return 插入操作是否成功的布尔值 + */ Boolean insertByBo(SysOssBo bo); + /** + * 文件下载方法，支持一次性下载完整文件 + * + * @param ossId OSS对象ID + * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 + */ void download(Long ossId, HttpServletResponse response) throws IOException; + /** + * 删除OSS对象存储 + * + * @param ids OSS对象ID串 + * @param isValid 判断是否需要校验 + * @return 结果 + */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java index 22ad153a..87d71f17 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java @@ -51,6 +51,13 @@ public class SysOssServiceImpl implements ISysOssService { private final SysOssMapper baseMapper; + /** + * 查询OSS对象存储列表 + * + * @param bo OSS对象存储分页查询对象 + * @param pageQuery 分页查询实体类 + * @return 结果 + */ @Override public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); @@ -60,6 +67,12 @@ public class SysOssServiceImpl implements ISysOssService { return TableDataInfo.build(result); } + /** + * 根据一组 ossIds 获取对应的 SysOssVo 列表 + * + * @param ossIds 一组文件在数据库中的唯一标识集合 + * @return 包含 SysOssVo 对象的列表 + */ @Override public List listByIds(Collection ossIds) { List list = new ArrayList<>(); @@ -71,11 +84,18 @@ public class SysOssServiceImpl implements ISysOssService { } catch (Exception ignored) { // 如果oss异常无法连接则将数据直接返回 list.add(vo); - } } + } + } } return list; } + /** + * 根据一组 ossIds 获取对应文件的 URL 列表 + * + * @param ossIds 以逗号分隔的 ossId 字符串 + * @return 以逗号分隔的文件 URL 字符串 + */ @Override public String selectUrlByIds(String ossIds) { List list = new ArrayList<>(); @@ -108,12 +128,24 @@ public class SysOssServiceImpl implements ISysOssService { return lqw; } + /** + * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 + * + * @param ossId 文件在数据库中的唯一标识 + * @return SysOssVo 对象，包含文件信息 + */ @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId") @Override public SysOssVo getById(Long ossId) { return baseMapper.selectVoById(ossId); } + /** + * 文件下载方法，支持一次性下载完整文件 + * + * @param ossId OSS对象ID + * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 + */ @Override public void download(Long ossId, HttpServletResponse response) throws IOException { SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); @@ -123,7 +155,7 @@ public class SysOssServiceImpl implements ISysOssService { FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); OssClient storage = OssFactory.instance(sysOss.getService()); - try(InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) { + try (InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) { int available = inputStream.available(); IoUtil.copy(inputStream, response.getOutputStream(), available); response.setContentLength(available); @@ -132,6 +164,13 @@ public class SysOssServiceImpl implements ISysOssService { } } + /** + * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 + * + * @param file 要上传的 MultipartFile 对象 + * @return 上传成功后的 SysOssVo 对象，包含文件信息 + * @throws ServiceException 如果上传过程中发生异常，则抛出 ServiceException 异常 + */ @Override public SysOssVo upload(MultipartFile file) { String originalfileName = file.getOriginalFilename(); @@ -147,6 +186,12 @@ public class SysOssServiceImpl implements ISysOssService { return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult); } + /** + * 上传文件到对象存储服务，并保存文件信息到数据库 + * + * @param file 要上传的文件对象 + * @return 上传成功后的 SysOssVo 对象，包含文件信息 + */ @Override public SysOssVo upload(File file) { String originalfileName = file.getName(); @@ -169,6 +214,12 @@ public class SysOssServiceImpl implements ISysOssService { return this.matchingUrl(sysOssVo); } + /** + * 新增OSS对象存储 + * + * @param bo SysOssBo 对象，包含待插入的数据 + * @return 插入操作是否成功的布尔值 + */ @Override public Boolean insertByBo(SysOssBo bo) { SysOss oss = BeanUtil.toBean(bo, SysOss.class); @@ -179,6 +230,13 @@ public class SysOssServiceImpl implements ISysOssService { return flag; } + /** + * 删除OSS对象存储 + * + * @param ids OSS对象ID串 + * @param isValid 判断是否需要校验 + * @return 结果 + */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { @@ -193,7 +251,7 @@ public class SysOssServiceImpl implements ISysOssService { } /** - * 匹配Url + * 桶类型为 private 的URL 修改为临时URL时长为120s * * @param oss OSS对象 * @return oss 匹配Url的OSS对象 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java index 0b5e515a..b0133429 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java @@ -148,16 +148,50 @@ public class RemoteUserServiceImpl implements RemoteUserService { return userService.registerUser(sysUserBo, remoteUserBo.getTenantId()); } + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户账户 + */ @Override public String selectUserNameById(Long userId) { return userService.selectUserNameById(userId); } + /** + * 通过用户ID查询用户昵称 + * + * @param userId 用户ID + * @return 用户昵称 + */ @Override public String selectNicknameById(Long userId) { return userService.selectNicknameById(userId); } + /** + * 通过用户ID查询用户手机号 + * + * @param userId 用户id + * @return 用户手机号 + */ + @Override + public String selectPhonenumberById(Long userId) { + return userService.selectPhonenumberById(userId); + } + + /** + * 通过用户ID查询用户邮箱 + * + * @param userId 用户id + * @return 用户邮箱 + */ + @Override + public String selectEmailById(Long userId) { + return userService.selectEmailById(userId); + } + /** * 构建登录用户 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index c428a1f3..eda4cde5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -219,11 +219,27 @@ public interface ISysUserService { */ String selectNicknameById(Long userId); + /** + * 通过用户ID查询用户手机号 + * + * @param userId 用户id + * @return 用户手机号 + */ + String selectPhonenumberById(Long userId); + + /** + * 通过用户ID查询用户邮箱 + * + * @param userId 用户id + * @return 用户邮箱 + */ + String selectEmailById(Long userId); + /** * 通过部门id查询当前部门所有用户 * - * @param deptId - * @return + * @param deptId 部门id + * @return 结果 */ List selectUserListByDept(Long deptId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java index 1833e024..7b4e11ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java @@ -94,7 +94,7 @@ public class SysClientServiceImpl implements ISysClientService { SysClient add = MapstructUtils.convert(bo, SysClient.class); validEntityBeforeSave(add); add.setGrantType(String.join(",", bo.getGrantTypeList())); - // 生成clientid + // 生成clientId String clientKey = bo.getClientKey(); String clientSecret = bo.getClientSecret(); add.setClientId(SecureUtil.md5(clientKey + clientSecret)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 8cd183e4..c55b984c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -523,8 +523,8 @@ public class SysUserServiceImpl implements ISysUserService { /** * 通过部门id查询当前部门所有用户 * - * @param deptId - * @return + * @param deptId 部门ID + * @return 用户信息集合信息 */ @Override public List selectUserListByDept(Long deptId) { @@ -534,6 +534,12 @@ public class SysUserServiceImpl implements ISysUserService { return baseMapper.selectVoList(lqw); } + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户账户 + */ @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId") @Override public String selectUserNameById(Long userId) { @@ -542,6 +548,12 @@ public class SysUserServiceImpl implements ISysUserService { return ObjectUtil.isNull(sysUser) ? null : sysUser.getUserName(); } + /** + * 通过用户ID查询用户昵称 + * + * @param userId 用户ID + * @return 用户昵称 + */ @Override @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") public String selectNicknameById(Long userId) { @@ -550,4 +562,30 @@ public class SysUserServiceImpl implements ISysUserService { return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName(); } + /** + * 通过用户ID查询用户手机号 + * + * @param userId 用户id + * @return 用户手机号 + */ + @Override + public String selectPhonenumberById(Long userId) { + SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId)); + return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber(); + } + + /** + * 通过用户ID查询用户邮箱 + * + * @param userId 用户id + * @return 用户邮箱 + */ + @Override + public String selectEmailById(Long userId) { + SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getEmail).eq(SysUser::getUserId, userId)); + return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail(); + } + } From ad80e575bd6bfbb501cd432d7f04e10d9973a825 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 19 Jan 2024 16:58:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20LoginHelper=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/satoken/utils/LoginHelper.java | 52 ++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-) 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 ce224b87..35a06108 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,13 +29,40 @@ 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"; - public static final String CLIENT_KEY = "clientid"; + + /** + * 客户端ID + */ + public static final String CLIENT_KEY = "clientId"; /** * 登录系统 基于 设备类型 @@ -101,6 +128,12 @@ public class LoginHelper { return Convert.toLong(getExtra(DEPT_KEY)); } + /** + * 获取当前 Token 的扩展信息 + * + * @param key 键值 + * @return 对应的扩展数据 + */ private static Object getExtra(String key) { try { return StpUtil.getExtra(key); @@ -135,12 +168,17 @@ public class LoginHelper { return UserConstants.SUPER_ADMIN_ID.equals(userId); } + /** + * 是否为超级管理员 + * + * @return 结果 + */ public static boolean isSuperAdmin() { return isSuperAdmin(getUserId()); } /** - * 是否为超级管理员 + * 是否为租户管理员 * * @param rolePermission 角色权限标识组 * @return 结果 @@ -149,10 +187,20 @@ public class LoginHelper { return rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY); } + /** + * 是否为租户管理员 + * + * @return 结果 + */ public static boolean isTenantAdmin() { return Convert.toBool(isTenantAdmin(getLoginUser().getRolePermission())); } + /** + * 检查当前用户是否已登录 + * + * @return 结果 + */ public static boolean isLogin() { return getLoginUser() != null; } 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 3/4] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=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); From c5bb1029f680fe65485d37c469f44e7fad5c24ef Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 19 Jan 2024 17:48:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E5=81=87=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/common/log/event/LogEventListener.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java index d139b949..4c3e8e3e 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java @@ -95,16 +95,8 @@ public class LogEventListener { } remoteLogService.saveLogininfor(logininfor); } - - /** - * 将传入的对象转换为带方括号的字符串表示形式 - * 如果传入对象为 null，则返回空字符串表示的方括号 - * - * @param msg 要转换的对象，可以是任何类型 - * @return 包含方括号的字符串表示形式 - */ + private String getBlock(Object msg) { - // 如果传入对象为 null，则将其替换为空字符串 if (msg == null) { msg = ""; }