From 2cfb50e28c0cafa6254901bf3a3faed13977f49b Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Tue, 6 Aug 2024 10:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=83=A8=E9=97=A8=E8=A7=A3?= =?UTF-8?q?=E5=AF=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/system/api/domain/SysLogsVo.java | 2 +- .../main/java/com/bonus/common/log/aspect/LogAspect.java | 2 +- .../com/bonus/common/security/service/TokenService.java | 4 ++-- .../src/main/java/com/bonus/gateway/filter/AuthFilter.java | 4 ++-- bonus-gateway/src/main/resources/bootstrap.yml | 4 ++-- bonus-modules/bonus-file/pom.xml | 7 +++++++ .../java/com/bonus/oss/service/impl/OssServiceImpl.java | 1 - 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java index 4ac396c..c7b02e7 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java @@ -138,7 +138,7 @@ public class SysLogsVo { vo.setOperaUserName(loginUser.getUsername()); } Long userId=loginUser.getUserid(); - if (userId!=null && userId!=0l) { + if (userId!=null && userId!=0L) { vo.setUserId(userId.toString()); } return vo; diff --git a/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java b/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java index 532369a..05e9841 100644 --- a/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java +++ b/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java @@ -133,7 +133,7 @@ public class LogAspect sysLogsVo.setOperaUserName(username); } Long userId = SecurityUtils.getUserId(); - if (userId!=null && userId!=0l) { + if (userId!=null && userId!=0L) { sysLogsVo.setUserId(userId.toString()); } sysLogsVo.setOperaUri(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java index d5a5a2e..7651d0b 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java @@ -66,8 +66,8 @@ public class TokenService rspMap.put("access_token", accessToken); rspMap.put("expires_in", expireTime); //对token和 进行混粗糙你存储 - redisService.setCacheObject(userName+":"+accessToken,userName, 120l, TimeUnit.MINUTES); - redisService.setCacheObject(userId+":"+accessToken,userId.toString(), 120l, TimeUnit.MINUTES); + redisService.setCacheObject(userName+":"+accessToken,userName, 120L, TimeUnit.MINUTES); + redisService.setCacheObject(userId+":"+accessToken,userId.toString(), 120L, TimeUnit.MINUTES); return rspMap; } diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java b/bonus-gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java index 5361d32..1184a9e 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java @@ -92,8 +92,8 @@ public class AuthFilter implements GlobalFilter, Ordered if (StringUtils.isEmpty(id) || !id.equals(userId)) { return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); } - redisService.setCacheObject(userName+":"+token,userName, 120l, TimeUnit.MINUTES); - redisService.setCacheObject(userId+":"+token,userId+"", 120l, TimeUnit.MINUTES); + redisService.setCacheObject(userName+":"+token,userName, 120L, TimeUnit.MINUTES); + redisService.setCacheObject(userId+":"+token,userId+"", 120L, TimeUnit.MINUTES); }catch (Exception e){ return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); } diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml index 01e2386..04e7a8e 100644 --- a/bonus-gateway/src/main/resources/bootstrap.yml +++ b/bonus-gateway/src/main/resources/bootstrap.yml @@ -48,8 +48,8 @@ spring: rule-type: gw-flow #系统 自动 加解密开关 system: - jia-enable: true - jie-enable: true + jia-enable: false + jie-enable: false #加密组件 jasypt: encryptor: diff --git a/bonus-modules/bonus-file/pom.xml b/bonus-modules/bonus-file/pom.xml index 6190a16..7479036 100644 --- a/bonus-modules/bonus-file/pom.xml +++ b/bonus-modules/bonus-file/pom.xml @@ -81,6 +81,13 @@ 24.6.0 compile + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + 3.0.2 + + diff --git a/bonus-modules/bonus-oss/src/main/java/com/bonus/oss/service/impl/OssServiceImpl.java b/bonus-modules/bonus-oss/src/main/java/com/bonus/oss/service/impl/OssServiceImpl.java index e28b04e..a2f624e 100644 --- a/bonus-modules/bonus-oss/src/main/java/com/bonus/oss/service/impl/OssServiceImpl.java +++ b/bonus-modules/bonus-oss/src/main/java/com/bonus/oss/service/impl/OssServiceImpl.java @@ -27,7 +27,6 @@ public class OssServiceImpl implements OssService { @Resource private OssUtils ossUtils; - private ExecutorService executor = Executors.newFixedThreadPool(5); // 限制并发线程数为5 /** * 文件上传