map = RedisUtils.getClient().getMapCache(name);
- Cache cache = new RedissonCache(map, config, allowNullValues);
+ Cache cache = new PlusCacheWrapper(new RedissonCache(map, config, allowNullValues));
if (transactionAware) {
cache = new TransactionAwareCacheDecorator(cache);
}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
index b262d07f0..2cfc927c5 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
@@ -15,6 +15,8 @@ import java.util.concurrent.TimeUnit;
/**
* Sa-Token持久层接口(使用框架自带RedisUtils实现 协议统一)
+ *
+ * 采用 caffeine + redis 多级缓存 优化并发查询效率
*
* @author Lion Li
*/
@@ -22,7 +24,7 @@ public class PlusSaTokenDao implements SaTokenDao {
private static final Cache CAFFEINE = Caffeine.newBuilder()
// 设置最后一次写入或访问后经过固定时间过期
- .expireAfterWrite(10, TimeUnit.SECONDS)
+ .expireAfterWrite(5, TimeUnit.SECONDS)
// 初始的缓存空间大小
.initialCapacity(100)
// 缓存的最大条数
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
index 211cefa05..b9283e038 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
@@ -59,9 +59,6 @@ public class SecurityConfig implements WebMvcConfigurer {
StpUtil.getTokenValue());
}
- // 保存用户信息
-// ThreadLocalHolder.set(LoginHelper.LOGIN_USER_KEY, LoginHelper.getLoginUser());
-
// 有效率影响 用于临时测试
// if (log.isDebugEnabled()) {
// log.info("剩余有效时间: {}", StpUtil.getTokenTimeout());
@@ -69,14 +66,7 @@ public class SecurityConfig implements WebMvcConfigurer {
// }
});
- })
-// {
-// @Override
-// public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-// ThreadLocalHolder.clear();
-// }
-// }
- ).addPathPatterns("/**")
+ })).addPathPatterns("/**")
// 排除不需要拦截的路径
.excludePathPatterns(securityProperties.getExcludes());
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
index b20bf65c3..bc6663f0c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
@@ -6,9 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.dromara.common.core.constant.CacheConstants;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.CacheNames;
-import org.dromara.common.core.context.ThreadLocalHolder;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.DictService;
import org.dromara.common.core.utils.MapstructUtils;
@@ -26,7 +25,6 @@ import org.dromara.system.domain.vo.SysDictTypeVo;
import org.dromara.system.mapper.SysDictDataMapper;
import org.dromara.system.mapper.SysDictTypeMapper;
import org.dromara.system.service.ISysDictTypeService;
-import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@@ -217,16 +215,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
* @param separator 分隔符
* @return 字典标签
*/
- @SuppressWarnings("unchecked cast")
@Override
public String getDictLabel(String dictType, String dictValue, String separator) {
- // 优先从本地缓存获取
- List datas = ThreadLocalHolder.get(CacheConstants.SYS_DICT_KEY + dictType);
- if (ObjectUtil.isNull(datas)) {
- datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
- ThreadLocalHolder.set(CacheConstants.SYS_DICT_KEY + dictType, datas);
- }
-
+ List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel);
if (StringUtils.containsAny(dictValue, separator)) {
return Arrays.stream(dictValue.split(separator))
@@ -245,16 +236,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
* @param separator 分隔符
* @return 字典值
*/
- @SuppressWarnings("unchecked cast")
@Override
public String getDictValue(String dictType, String dictLabel, String separator) {
- // 优先从本地缓存获取
- List datas = ThreadLocalHolder.get(CacheConstants.SYS_DICT_KEY + dictType);
- if (ObjectUtil.isNull(datas)) {
- datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
- ThreadLocalHolder.set(CacheConstants.SYS_DICT_KEY + dictType, datas);
- }
-
+ List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue);
if (StringUtils.containsAny(dictLabel, separator)) {
return Arrays.stream(dictLabel.split(separator))
From e11b1bb2ecd08ca754af730dac44facffb61eb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Wed, 3 Jan 2024 17:45:02 +0800
Subject: [PATCH 016/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=A7=BB?=
=?UTF-8?q?=E9=99=A4ThreadLocalHolder(=E4=B8=8D=E5=8F=AF=E6=8E=A7=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E5=A4=AA=E5=A4=9A)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../core/context/ThreadLocalHolder.java | 57 -------------------
.../aspectj/RepeatSubmitAspect.java | 29 +++++-----
.../dromara/common/log/aspect/LogAspect.java | 27 +++++----
.../common/tenant/helper/TenantHelper.java | 19 ++++---
.../PlusWebInvokeTimeInterceptor.java | 17 +++---
5 files changed, 44 insertions(+), 105 deletions(-)
delete mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/context/ThreadLocalHolder.java
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/context/ThreadLocalHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/context/ThreadLocalHolder.java
deleted file mode 100644
index e527dab92..000000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/context/ThreadLocalHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.dromara.common.core.context;
-
-import com.alibaba.ttl.TransmittableThreadLocal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 线程持有类
- *
- * @author Michelle.Chung
- */
-public class ThreadLocalHolder {
-
- /**
- * 初始化 (支持异步)
- */
- private static final ThreadLocal> THREAD_LOCAL = TransmittableThreadLocal.withInitial(HashMap::new);
-
- /**
- * 设置值
- *
- * @param key 键
- * @param value 值
- */
- public static void set(String key, T value) {
- THREAD_LOCAL.get().put(key, value);
- }
-
- /**
- * 获取值
- *
- * @param key 键
- * @return 值
- */
- @SuppressWarnings("unchecked")
- public static T get(String key) {
- return (T) THREAD_LOCAL.get().get(key);
- }
-
- /**
- * 移除值
- *
- * @param key 键
- */
- public static void remove(String key) {
- THREAD_LOCAL.get().remove(key);
- }
-
- /**
- * 清空值
- */
- public static void clear() {
- THREAD_LOCAL.remove();
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java
index 553d0db6e..712b14179 100644
--- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java
+++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java
@@ -4,8 +4,14 @@ import cn.dev33.satoken.SaManager;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.SecureUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.context.ThreadLocalHolder;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MessageUtils;
@@ -14,13 +20,6 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.redis.utils.RedisUtils;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile;
@@ -37,7 +36,7 @@ import java.util.StringJoiner;
@Aspect
public class RepeatSubmitAspect {
- private static final String KEY_CACHE = "keyCache";
+ private static final ThreadLocal KEY_CACHE = new ThreadLocal<>();
@Before("@annotation(repeatSubmit)")
public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable {
@@ -60,7 +59,7 @@ public class RepeatSubmitAspect {
// 唯一标识（指定key + url + 消息头）
String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey;
if (RedisUtils.setObjectIfAbsent(cacheRepeatKey, "", Duration.ofMillis(interval))) {
- ThreadLocalHolder.set(KEY_CACHE, cacheRepeatKey);
+ KEY_CACHE.set(cacheRepeatKey);
} else {
String message = repeatSubmit.message();
if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) {
@@ -83,10 +82,9 @@ public class RepeatSubmitAspect {
if (r.getCode() == R.SUCCESS) {
return;
}
- String cacheKey = ThreadLocalHolder.get(KEY_CACHE);
- RedisUtils.deleteObject(cacheKey);
+ RedisUtils.deleteObject(KEY_CACHE.get());
} finally {
- ThreadLocalHolder.remove(KEY_CACHE);
+ KEY_CACHE.remove();
}
}
}
@@ -99,9 +97,8 @@ public class RepeatSubmitAspect {
*/
@AfterThrowing(value = "@annotation(repeatSubmit)", throwing = "e")
public void doAfterThrowing(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Exception e) {
- String cacheKey = ThreadLocalHolder.get(KEY_CACHE);
- RedisUtils.deleteObject(cacheKey);
- ThreadLocalHolder.remove(KEY_CACHE);
+ RedisUtils.deleteObject(KEY_CACHE.get());
+ KEY_CACHE.remove();
}
/**
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
index 5e6af1137..324ed1138 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
@@ -4,16 +4,6 @@ import cn.hutool.core.lang.Dict;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
-import org.dromara.common.core.context.ThreadLocalHolder;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.utils.ServletUtils;
-import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessStatus;
-import org.dromara.common.log.event.OperLogEvent;
-import org.dromara.common.satoken.utils.LoginHelper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +13,15 @@ import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessStatus;
+import org.dromara.common.log.event.OperLogEvent;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.http.HttpMethod;
import org.springframework.validation.BindingResult;
@@ -51,7 +50,7 @@ public class LogAspect {
/**
* 计时 key
*/
- private static final String LOG_STOP_WATCH_KEY = "logStopwatch";
+ private static final ThreadLocal KEY_CACHE = new ThreadLocal<>();
/**
* 处理请求前执行
@@ -59,7 +58,7 @@ public class LogAspect {
@Before(value = "@annotation(controllerLog)")
public void boBefore(JoinPoint joinPoint, Log controllerLog) {
StopWatch stopWatch = new StopWatch();
- ThreadLocalHolder.set(LOG_STOP_WATCH_KEY, stopWatch);
+ KEY_CACHE.set(stopWatch);
stopWatch.start();
}
@@ -112,7 +111,7 @@ public class LogAspect {
// 处理设置注解上的参数
getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
// 设置消耗时间
- StopWatch stopWatch = ThreadLocalHolder.get(LOG_STOP_WATCH_KEY);
+ StopWatch stopWatch = KEY_CACHE.get();
stopWatch.stop();
operLog.setCostTime(stopWatch.getTime());
// 发布事件保存数据库
@@ -122,7 +121,7 @@ public class LogAspect {
log.error("异常信息:{}", exp.getMessage());
exp.printStackTrace();
} finally {
- ThreadLocalHolder.remove(LOG_STOP_WATCH_KEY);
+ KEY_CACHE.remove();
}
}
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
index 7a3a431cc..e830c190a 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
@@ -1,14 +1,15 @@
package org.dromara.common.tenant.helper;
+import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert;
+import com.alibaba.ttl.TransmittableThreadLocal;
import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.context.ThreadLocalHolder;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.redis.utils.RedisUtils;
@@ -27,7 +28,7 @@ public class TenantHelper {
private static final String DYNAMIC_TENANT_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "dynamicTenant";
- private static final String TENANT_ID_KEY = "tempDynamicTenant";
+ private static final ThreadLocal TEMP_DYNAMIC_TENANT = new TransmittableThreadLocal<>();
/**
* 租户功能是否启用
@@ -88,12 +89,12 @@ public class TenantHelper {
return;
}
if (!isLogin()) {
- ThreadLocalHolder.set(TENANT_ID_KEY, tenantId);
+ TEMP_DYNAMIC_TENANT.set(tenantId);
return;
}
String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
RedisUtils.setCacheObject(cacheKey, tenantId);
- ThreadLocalHolder.set(cacheKey, tenantId);
+ SaHolder.getStorage().set(cacheKey, tenantId);
}
/**
@@ -106,15 +107,15 @@ public class TenantHelper {
return null;
}
if (!isLogin()) {
- return ThreadLocalHolder.get(TENANT_ID_KEY);
+ return TEMP_DYNAMIC_TENANT.get();
}
String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
- String tenantId = ThreadLocalHolder.get(cacheKey);
+ String tenantId = (String) SaHolder.getStorage().get(cacheKey);
if (StringUtils.isNotBlank(tenantId)) {
return tenantId;
}
tenantId = RedisUtils.getCacheObject(cacheKey);
- ThreadLocalHolder.set(cacheKey, tenantId);
+ SaHolder.getStorage().set(cacheKey, tenantId);
return tenantId;
}
@@ -126,12 +127,12 @@ public class TenantHelper {
return;
}
if (!isLogin()) {
- ThreadLocalHolder.remove(TENANT_ID_KEY);
+ TEMP_DYNAMIC_TENANT.remove();
return;
}
String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
RedisUtils.deleteObject(cacheKey);
- ThreadLocalHolder.remove(cacheKey);
+ SaHolder.getStorage().delete(cacheKey);
}
/**
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
index 4b93de654..12c808647 100644
--- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
@@ -2,15 +2,14 @@ package org.dromara.common.web.interceptor;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.map.MapUtil;
-import org.dromara.common.core.context.ThreadLocalHolder;
-import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.web.filter.RepeatedlyRequestWrapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.StopWatch;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.web.filter.RepeatedlyRequestWrapper;
import org.springframework.http.MediaType;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
@@ -30,7 +29,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
private final String prodProfile = "prod";
- private final String STOP_WATCH_KEY = "stopwatch";
+ private final static ThreadLocal KEY_CACHE = new ThreadLocal<>();
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -56,7 +55,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
}
StopWatch stopWatch = new StopWatch();
- ThreadLocalHolder.set(STOP_WATCH_KEY, stopWatch);
+ KEY_CACHE.set(stopWatch);
stopWatch.start();
}
return true;
@@ -70,10 +69,10 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
if (!prodProfile.equals(SpringUtils.getActiveProfile())) {
- StopWatch stopWatch = ThreadLocalHolder.get(STOP_WATCH_KEY);
+ StopWatch stopWatch = KEY_CACHE.get();
stopWatch.stop();
log.info("[PLUS]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
- ThreadLocalHolder.clear();
+ KEY_CACHE.remove();
}
}
From 3e2a6492f48ff0eedf66021d7baf2e4271ba566e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Wed, 3 Jan 2024 18:54:49 +0800
Subject: [PATCH 017/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index 8c520e1c9..a542b4752 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
> 前端项目地址: [plus-ui](https://gitee.com/JavaLionLi/plus-ui)
-> 文档地址: [plus-doc](https://plus-doc.dromara.org) - [plus-doc(国内备用)](https://dromara.gitee.io/plus-doc)
+> 文档地址: [plus-doc](https://plus-doc.dromara.org)
## 赞助商
@@ -121,13 +121,12 @@ CCFlow - https://gitee.com/opencc/RuoYi-JFlow
>
>[部署项目 必看](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy)
>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy)
->
+>
+>[如何加群](https://plus-doc.dromara.org/#/common/add_group)
+>>[https://plus-doc.dromara.org/#/common/add_group](https://plus-doc.dromara.org/#/common/add_group)
+>
>[参考文档 Wiki](https://plus-doc.dromara.org)
>>[https://plus-doc.dromara.org](https://plus-doc.dromara.org)
->
->[参考文档(国内备份)](https://dromara.gitee.io/plus-doc)
->>[https://dromara.gitee.io/plus-doc](https://dromara.gitee.io/plus-doc)
-
## 软件架构图
@@ -137,18 +136,6 @@ CCFlow - https://gitee.com/opencc/RuoYi-JFlow
[参与贡献的方式 https://plus-doc.dromara.org/#/common/contribution](https://plus-doc.dromara.org/#/common/contribution)
-### 其他
-
-* 定期同步升级 RuoYi-Vue 有用的更新
-* GitHub 地址 [RuoYi-Vue-Plus](https://github.com/dromara/RuoYi-Vue-Plus)
-* 微服务 分支 [RuoYi-Cloud-Plus](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
-* 前端项目 地址 [plus-ui](https://gitee.com/JavaLionLi/plus-ui)
-* 用户扩展项目 [扩展项目列表](https://plus-doc.dromara.org/#/ruoyi-vue-plus/extend-project/list)
-
-## 加群与捐献
->[加群与捐献](https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat)
->>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat](https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat)
-
## 捐献作者
作者为兼职做开源,平时还需要工作,如果帮到了您可以请作者吃个盒饭
From 3035eb4a54b91e810a5ffd32ce8a446b393679eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 4 Jan 2024 09:54:03 +0800
Subject: [PATCH 018/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=85=A8?=
=?UTF-8?q?=E5=B1=80=E5=88=9B=E5=BB=BA=20caffeine=20=E5=AE=9E=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/redis/config/CacheConfig.java | 45 +++++++++++++++++++
.../common/redis/config/RedisConfig.java | 12 -----
.../redis/manager/PlusCacheWrapper.java | 13 ++----
...ot.autoconfigure.AutoConfiguration.imports | 1 +
4 files changed, 49 insertions(+), 22 deletions(-)
create mode 100644 ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java
new file mode 100644
index 000000000..d57ba4e65
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java
@@ -0,0 +1,45 @@
+package org.dromara.common.redis.config;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.dromara.common.redis.manager.PlusSpringCacheManager;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 缓存配置
+ *
+ * @author Lion Li
+ */
+@AutoConfiguration
+@EnableCaching
+public class CacheConfig {
+
+ /**
+ * caffeine 本地缓存处理器
+ */
+ @Bean
+ public Cache caffeine() {
+ return Caffeine.newBuilder()
+ // 设置最后一次写入或访问后经过固定时间过期
+ .expireAfterWrite(30, TimeUnit.SECONDS)
+ // 初始的缓存空间大小
+ .initialCapacity(100)
+ // 缓存的最大条数
+ .maximumSize(1000)
+ .build();
+ }
+
+ /**
+ * 自定义缓存管理器 整合spring-cache
+ */
+ @Bean
+ public CacheManager cacheManager() {
+ return new PlusSpringCacheManager();
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java
index 7999f2b34..0833d2b52 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java
@@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.redis.config.properties.RedissonProperties;
import org.dromara.common.redis.handler.KeyPrefixHandler;
-import org.dromara.common.redis.manager.PlusSpringCacheManager;
import org.redisson.client.codec.StringCodec;
import org.redisson.codec.CompositeCodec;
import org.redisson.codec.TypedJsonJacksonCodec;
@@ -16,8 +15,6 @@ import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
/**
@@ -27,7 +24,6 @@ import org.springframework.context.annotation.Bean;
*/
@Slf4j
@AutoConfiguration
-@EnableCaching
@EnableConfigurationProperties(RedissonProperties.class)
public class RedisConfig {
@@ -86,14 +82,6 @@ public class RedisConfig {
};
}
- /**
- * 自定义缓存管理器 整合spring-cache
- */
- @Bean
- public CacheManager cacheManager() {
- return new PlusSpringCacheManager();
- }
-
/**
* redis集群配置 yml
*
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java
index 65a3e89f6..8ba47199c 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java
@@ -1,11 +1,10 @@
package org.dromara.common.redis.manager;
import cn.hutool.core.lang.Console;
-import com.github.benmanes.caffeine.cache.Caffeine;
+import org.dromara.common.core.utils.SpringUtils;
import org.springframework.cache.Cache;
import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
/**
* Cache 装饰器(用于扩展一级缓存)
@@ -14,14 +13,8 @@ import java.util.concurrent.TimeUnit;
*/
public class PlusCacheWrapper implements Cache {
- private static final com.github.benmanes.caffeine.cache.Cache CAFFEINE = Caffeine.newBuilder()
- // 设置最后一次写入或访问后经过固定时间过期
- .expireAfterWrite(30, TimeUnit.SECONDS)
- // 初始的缓存空间大小
- .initialCapacity(100)
- // 缓存的最大条数
- .maximumSize(1000)
- .build();
+ private static final com.github.benmanes.caffeine.cache.Cache
+ CAFFEINE = SpringUtils.getBean("caffeine");
private final Cache cache;
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 59192c5ce..0475b19f4 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1,2 @@
org.dromara.common.redis.config.RedisConfig
+org.dromara.common.redis.config.CacheConfig
From 5cf84980e8ac0ea8a20c8e6927eb228a21a1fa14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 4 Jan 2024 10:28:03 +0800
Subject: [PATCH 019/237] update revision 5.2.0-SNAPSHOT
---
.run/ruoyi-monitor-admin.run.xml | 2 +-
.run/ruoyi-powerjob-server.run.xml | 2 +-
.run/ruoyi-server.run.xml | 2 +-
README.md | 2 +-
pom.xml | 2 +-
ruoyi-common/ruoyi-common-bom/pom.xml | 2 +-
script/docker/docker-compose.yml | 8 ++++----
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml
index 4837d6a42..095b3d7cb 100644
--- a/.run/ruoyi-monitor-admin.run.xml
+++ b/.run/ruoyi-monitor-admin.run.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/.run/ruoyi-powerjob-server.run.xml b/.run/ruoyi-powerjob-server.run.xml
index 77a4af095..e36e2acf3 100644
--- a/.run/ruoyi-powerjob-server.run.xml
+++ b/.run/ruoyi-powerjob-server.run.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml
index a29ff2a7f..0463c3439 100644
--- a/.run/ruoyi-server.run.xml
+++ b/.run/ruoyi-server.run.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/README.md b/README.md
index a542b4752..e617bc81c 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
[](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE)
[](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[](https://gitee.com/dromara/RuoYi-Vue-Plus)
+[](https://gitee.com/dromara/RuoYi-Vue-Plus)
[]()
[]()
[]()
diff --git a/pom.xml b/pom.xml
index 6441d6a7b..ce9235f8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
RuoYi-Vue-Plus多租户管理系统
- 5.1.2
+ 5.2.0-SNAPSHOT
3.1.7
UTF-8
UTF-8
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index 004b035de..4a2dc1ceb 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -14,7 +14,7 @@
- 5.1.2
+ 5.2.0-SNAPSHOT
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 63d819e0c..503d2e131 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -100,7 +100,7 @@ services:
network_mode: "host"
ruoyi-server1:
- image: ruoyi/ruoyi-server:5.1.2
+ image: ruoyi/ruoyi-server:5.2.0
container_name: ruoyi-server1
environment:
# 时区上海
@@ -115,7 +115,7 @@ services:
network_mode: "host"
ruoyi-server2:
- image: ruoyi/ruoyi-server:5.1.2
+ image: ruoyi/ruoyi-server:5.2.0
container_name: ruoyi-server2
environment:
# 时区上海
@@ -130,7 +130,7 @@ services:
network_mode: "host"
ruoyi-monitor-admin:
- image: ruoyi/ruoyi-monitor-admin:5.1.2
+ image: ruoyi/ruoyi-monitor-admin:5.2.0
container_name: ruoyi-monitor-admin
environment:
# 时区上海
@@ -142,7 +142,7 @@ services:
network_mode: "host"
ruoyi-powerjob-server:
- image: ruoyi/ruoyi-powerjob-server:5.1.2
+ image: ruoyi/ruoyi-powerjob-server:5.2.0
container_name: ruoyi-powerjob-server
environment:
# 时区上海
From 30d7651322cf24470e432f2827e06ae5578d3212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 4 Jan 2024 16:33:40 +0800
Subject: [PATCH 020/237] =?UTF-8?q?update=20springboot=203.1.7=20=3D>=203.?=
=?UTF-8?q?2.1=20=E5=85=A8=E9=9D=A2=E6=94=AF=E6=8C=81=E8=99=9A=E6=8B=9F?=
=?UTF-8?q?=E7=BA=BF=E7=A8=8B=20update=20springboot-admin=203.1.8=20=3D>?=
=?UTF-8?q?=203.2.0=20update=20springdoc=202.2.0=20=3D>=202.3.0=20update?=
=?UTF-8?q?=20redisson=203.24.3=20=3D>=203.25.2=20update=20hutool=205.8.22?=
=?UTF-8?q?=20=3D>=205.8.24=20update=20dynamic-ds=204.2.0=20=3D>=204.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 14 +++++++-------
ruoyi-admin/src/main/resources/application.yml | 5 +++++
ruoyi-common/ruoyi-common-mybatis/pom.xml | 2 +-
ruoyi-common/ruoyi-common-web/pom.xml | 12 ++++++++++++
.../dromara/common/web/config/UndertowConfig.java | 4 ++++
5 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce9235f8c..1a5add9bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,12 @@
5.2.0-SNAPSHOT
- 3.1.7
+ 3.2.1
UTF-8
UTF-8
17
3.0.3
- 2.2.0
+ 2.3.0
0.15.0
5.2.3
3.3.3
@@ -27,12 +27,12 @@
1.37.0
3.5.5
3.9.1
- 5.8.22
+ 5.8.24
4.10.0
- 3.1.8
- 3.24.3
+ 3.2.0
+ 3.25.2
2.2.5
- 4.2.0
+ 4.3.0
2.14.4
4.3.6
1.3.5
@@ -212,7 +212,7 @@
com.baomidou
- mybatis-plus-boot-starter
+ mybatis-plus-spring-boot3-starter
${mybatis-plus.version}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 3f54f649b..265e1ef1b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -61,6 +61,11 @@ user:
spring:
application:
name: ${ruoyi.name}
+ threads:
+ # 开启虚拟线程 仅jdk21可用
+ # 开启后还需更改 UndertowConfig 虚拟线程配置
+ virtual:
+ enabled: false
# 资源信息
messages:
# 国际化资源文件路径
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index 2088b5439..16d8d5cf1 100644
--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -39,7 +39,7 @@
com.baomidou
- mybatis-plus-boot-starter
+ mybatis-plus-spring-boot3-starter
org.mybatis
diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml
index b250fa9d0..fa9b8e8e8 100644
--- a/ruoyi-common/ruoyi-common-web/pom.xml
+++ b/ruoyi-common/ruoyi-common-web/pom.xml
@@ -7,6 +7,18 @@
ruoyi-common
${revision}
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 21
+ 21
+
+
+
+
4.0.0
ruoyi-common-web
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
index 421ce6d14..282f1bf40 100644
--- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
@@ -24,6 +24,10 @@ public class UndertowConfig implements WebServerFactoryCustomizer
Date: Fri, 5 Jan 2024 09:48:58 +0800
Subject: [PATCH 021/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E6=8F=90=E4=BA=A4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-common/ruoyi-common-web/pom.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml
index fa9b8e8e8..b250fa9d0 100644
--- a/ruoyi-common/ruoyi-common-web/pom.xml
+++ b/ruoyi-common/ruoyi-common-web/pom.xml
@@ -7,18 +7,6 @@
ruoyi-common
${revision}
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 21
- 21
-
-
-
-
4.0.0
ruoyi-common-web
From 63374ee876ca68714183a336989f601139efb954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Fri, 5 Jan 2024 19:10:37 +0800
Subject: [PATCH 022/237] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=B8=80?=
=?UTF-8?q?=E7=BA=A7=E7=BC=93=E5=AD=98=E5=B8=A6=E6=9D=A5=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dromara/web/listener/UserActionListener.java | 16 ++++++++++------
.../common/redis/manager/PlusCacheWrapper.java | 1 -
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java
index b3afea4c0..a4724043b 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java
@@ -17,6 +17,7 @@ import org.dromara.common.core.utils.ip.AddressUtils;
import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.web.service.SysLoginService;
import org.springframework.stereotype.Component;
@@ -50,18 +51,21 @@ public class UserActionListener implements SaTokenListener {
dto.setLoginTime(System.currentTimeMillis());
dto.setTokenId(tokenValue);
String username = (String) loginModel.getExtra(LoginHelper.USER_NAME_KEY);
+ String tenantId = (String) loginModel.getExtra(LoginHelper.TENANT_KEY);
dto.setUserName(username);
dto.setClientKey((String) loginModel.getExtra(LoginHelper.CLIENT_KEY));
dto.setDeviceType(loginModel.getDevice());
dto.setDeptName((String) loginModel.getExtra(LoginHelper.DEPT_NAME_KEY));
- if(tokenConfig.getTimeout() == -1) {
- RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
- } else {
- RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(tokenConfig.getTimeout()));
- }
+ TenantHelper.dynamic(tenantId, () -> {
+ if(tokenConfig.getTimeout() == -1) {
+ RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+ } else {
+ RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(tokenConfig.getTimeout()));
+ }
+ });
// 记录登录日志
LogininforEvent logininforEvent = new LogininforEvent();
- logininforEvent.setTenantId((String) loginModel.getExtra(LoginHelper.TENANT_KEY));
+ logininforEvent.setTenantId(tenantId);
logininforEvent.setUsername(username);
logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
logininforEvent.setMessage(MessageUtils.message("user.login.success"));
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java
index 8ba47199c..2e25e9dcb 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java
@@ -49,7 +49,6 @@ public class PlusCacheWrapper implements Cache {
@Override
public void put(Object key, Object value) {
cache.put(key, value);
- CAFFEINE.put(key, value);
}
public ValueWrapper putIfAbsent(Object key, Object value) {
From 339f85741f8e060a1fcb050830494d43bb9d8317 Mon Sep 17 00:00:00 2001
From: Simple <2424585654@qq.com>
Date: Sat, 6 Jan 2024 18:20:21 +0800
Subject: [PATCH 023/237] =?UTF-8?q?fix:=20LoginHelper=E7=B1=BB=20login?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=20=E5=AD=98=E5=9C=A8=20=E9=87=8D=E5=A4=8D?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/dromara/common/satoken/utils/LoginHelper.java | 5 ++---
1 file changed, 2 insertions(+), 3 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 db80f083a..058dee769 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
@@ -49,10 +49,9 @@ public class LoginHelper {
StpUtil.login(loginUser.getLoginId(),
model.setExtra(TENANT_KEY, loginUser.getTenantId())
.setExtra(USER_KEY, loginUser.getUserId())
- .setExtra(DEPT_KEY, loginUser.getDeptId())
- .setExtra(TENANT_KEY, loginUser.getTenantId())
- .setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
.setExtra(USER_NAME_KEY, loginUser.getUsername())
+ .setExtra(DEPT_KEY, loginUser.getDeptId())
+ .setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
);
SaSession tokenSession = StpUtil.getTokenSession();
tokenSession.updateTimeout(model.getTimeout());
From e7ca94bab1ef85efe4786a38669e2cca97ac406d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Sat, 6 Jan 2024 20:47:05 +0800
Subject: [PATCH 024/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BD=BF?=
=?UTF-8?q?=E7=94=A8=E7=BF=BB=E8=AF=91=E6=B3=A8=E8=A7=A3=E7=AE=80=E5=8C=96?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=20=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
update 优化 使用翻译注解简化用户查询 调整用户查询逻辑
---
.../dromara/web/service/SysLoginService.java | 8 +++-----
.../system/SysProfileController.java | 2 --
.../controller/system/SysUserController.java | 6 ++----
.../system/domain/vo/SysUserExportVo.java | 3 ---
.../dromara/system/domain/vo/SysUserVo.java | 5 +++--
.../dromara/system/mapper/SysUserMapper.java | 5 +++--
.../system/service/ISysUserService.java | 3 ++-
.../service/impl/SysRoleServiceImpl.java | 1 -
.../service/impl/SysUserServiceImpl.java | 12 +++++++++---
.../resources/mapper/system/SysUserMapper.xml | 18 ++++--------------
10 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index a269d380f..f9b7f2c69 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -57,7 +57,7 @@ public class SysLoginService {
private final ISysPermissionService permissionService;
private final ISysSocialService sysSocialService;
private final ISysRoleService roleService;
- private final SysDeptMapper deptMapper;
+ private final ISysDeptService deptService;
private final SysUserMapper userMapper;
@@ -145,11 +145,9 @@ public class SysLoginService {
loginUser.setUserType(user.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
- SysDeptVo dept = deptMapper.selectVoById(user.getDeptId());
+ SysDeptVo dept = deptService.selectDeptById(user.getDeptId());
loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName());
- List roles = DataPermissionHelper.ignore(() -> {
- return roleService.selectRolesByUserId(user.getUserId());
- });
+ List roles = roleService.selectRolesByUserId(user.getUserId());
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
return loginUser;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
index ccba0cf02..0cdb67548 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
@@ -41,7 +41,6 @@ import java.util.Arrays;
public class SysProfileController extends BaseController {
private final ISysUserService userService;
- private final ISysRoleService roleService;
private final ISysOssService ossService;
/**
@@ -50,7 +49,6 @@ public class SysProfileController extends BaseController {
@GetMapping
public R profile() {
SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
- user.setRoles(roleService.selectRolesByUserId(user.getUserId()));
ProfileVo profileVo = new ProfileVo();
profileVo.setUser(user);
profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId()));
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
index 41319c182..9ab25e71e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -72,9 +72,8 @@ public class SysUserController extends BaseController {
@SaCheckPermission("system:user:export")
@PostMapping("/export")
public void export(SysUserBo user, HttpServletResponse response) {
- List list = userService.selectUserList(user);
- List listVo = MapstructUtils.convert(list, SysUserExportVo.class);
- ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
+ List list = userService.selectUserExportList(user);
+ ExcelUtil.exportExcel(list, "用户数据", SysUserExportVo.class, response);
}
/**
@@ -116,7 +115,6 @@ public class SysUserController extends BaseController {
if (ObjectUtil.isNull(user)) {
return R.fail("没有权限访问用户数据!");
}
- user.setRoles(roleService.selectRolesByUserId(user.getUserId()));
userInfoVo.setUser(user);
userInfoVo.setPermissions(loginUser.getMenuPermission());
userInfoVo.setRoles(loginUser.getRolePermission());
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
index 3cc5186c8..37ec6b709 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
@@ -20,7 +20,6 @@ import java.util.Date;
@Data
@NoArgsConstructor
-@AutoMapper(target = SysUserVo.class, convertGenerate = false)
public class SysUserExportVo implements Serializable {
@Serial
@@ -85,14 +84,12 @@ public class SysUserExportVo implements Serializable {
/**
* 部门名称
*/
- @ReverseAutoMapping(target = "deptName", source = "dept.deptName")
@ExcelProperty(value = "部门名称")
private String deptName;
/**
* 负责人
*/
- @ReverseAutoMapping(target = "leaderName", source = "dept.leaderName")
@ExcelProperty(value = "部门负责人")
private String leaderName;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
index 7db91d180..d1f405919 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
@@ -114,9 +114,10 @@ public class SysUserVo implements Serializable {
private Date createTime;
/**
- * 部门对象
+ * 部门名
*/
- private SysDeptVo dept;
+ @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
+ private String deptName;
/**
* 角色对象
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
index d349832dc..d226d9976 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
@@ -8,6 +8,7 @@ import org.dromara.common.mybatis.annotation.DataColumn;
import org.dromara.common.mybatis.annotation.DataPermission;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysUserExportVo;
import org.dromara.system.domain.vo.SysUserVo;
import java.util.List;
@@ -20,7 +21,7 @@ import java.util.List;
public interface SysUserMapper extends BaseMapperPlus {
@DataPermission({
- @DataColumn(key = "deptName", value = "d.dept_id"),
+ @DataColumn(key = "deptName", value = "u.dept_id"),
@DataColumn(key = "userName", value = "u.user_id")
})
Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper);
@@ -35,7 +36,7 @@ public interface SysUserMapper extends BaseMapperPlus {
@DataColumn(key = "deptName", value = "d.dept_id"),
@DataColumn(key = "userName", value = "u.user_id")
})
- List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper);
+ List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper);
/**
* 根据条件分页查询已配用户角色列表
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 6c7323c2b..a5a28cbec 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
@@ -3,6 +3,7 @@ package org.dromara.system.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysUserExportVo;
import org.dromara.system.domain.vo.SysUserVo;
import java.util.List;
@@ -23,7 +24,7 @@ public interface ISysUserService {
* @param user 用户信息
* @return 用户信息集合信息
*/
- List selectUserList(SysUserBo user);
+ List selectUserExportList(SysUserBo user);
/**
* 根据条件分页查询已分配用户角色列表
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
index a831f7e95..191dc98dd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
@@ -80,7 +80,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
.between(params.get("beginTime") != null && params.get("endTime") != null,
"r.create_time", params.get("beginTime"), params.get("endTime"))
.orderByAsc("r.role_sort").orderByAsc("r.create_time");
- ;
return wrapper;
}
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 bde624407..5dcd683e5 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
@@ -29,6 +29,7 @@ import org.dromara.system.domain.SysUserRole;
import org.dromara.system.domain.bo.SysUserBo;
import org.dromara.system.domain.vo.SysPostVo;
import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.domain.vo.SysUserExportVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.*;
import org.dromara.system.service.ISysUserService;
@@ -69,8 +70,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
* @return 用户信息集合信息
*/
@Override
- public List selectUserList(SysUserBo user) {
- return baseMapper.selectUserList(this.buildQueryWrapper(user));
+ public List selectUserExportList(SysUserBo user) {
+ return baseMapper.selectUserExportList(this.buildQueryWrapper(user));
}
private Wrapper buildQueryWrapper(SysUserBo user) {
@@ -163,7 +164,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
*/
@Override
public SysUserVo selectUserById(Long userId) {
- return baseMapper.selectVoById(userId);
+ SysUserVo user = baseMapper.selectVoById(userId);
+ if (ObjectUtil.isNull(user)) {
+ return user;
+ }
+ user.setRoles(roleMapper.selectRolesByUserId(user.getUserId()));
+ return user;
}
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index ce1c0d625..8f94866d6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,31 +4,21 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
-
-
-
-
-
-
-
+
+
-
+
- com.amazonaws
- aws-java-sdk-s3
- ${aws-java-sdk-s3.version}
+ software.amazon.awssdk
+ s3
+ ${aws.sdk.version}
+
+
+
+ software.amazon.awssdk.crt
+ aws-crt
+ ${aws.crt.version}
+
+
+
+ software.amazon.awssdk
+ s3-transfer-manager
+ ${aws.sdk.version}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java
index 5e4db50e3..dd6ebb119 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java
@@ -22,6 +22,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
public static final String SEPARATOR = ",";
+ public static final String SLASH = "/";
+
/**
* 获取参数不为空值
*
diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/ruoyi-common/ruoyi-common-oss/pom.xml
index 8e7affff4..18d004f57 100644
--- a/ruoyi-common/ruoyi-common-oss/pom.xml
+++ b/ruoyi-common/ruoyi-common-oss/pom.xml
@@ -26,10 +26,46 @@
ruoyi-common-redis
+
- com.amazonaws
- aws-java-sdk-s3
+ software.amazon.awssdk
+ s3
+
+
+
+ software.amazon.awssdk
+ netty-nio-client
+
+
+
+ software.amazon.awssdk
+ aws-crt-client
+
+
+
+ software.amazon.awssdk
+ apache-client
+
+
+
+ software.amazon.awssdk
+ url-connection-client
+
+
+
+
+
+ software.amazon.awssdk.crt
+ aws-crt
+
+
+
+
+ software.amazon.awssdk
+ s3-transfer-manager
+
+
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
index 53e05c927..6c402dc39 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
@@ -2,73 +2,115 @@ package org.dromara.common.oss.core;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.HttpMethod;
-import com.amazonaws.Protocol;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.*;
+import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUtils;
import org.dromara.common.oss.constant.OssConstant;
import org.dromara.common.oss.entity.UploadResult;
import org.dromara.common.oss.enumd.AccessPolicyType;
import org.dromara.common.oss.enumd.PolicyType;
import org.dromara.common.oss.exception.OssException;
import org.dromara.common.oss.properties.OssProperties;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.core.async.BlockingInputStreamAsyncRequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.transfer.s3.S3TransferManager;
+import software.amazon.awssdk.transfer.s3.model.*;
+import software.amazon.awssdk.transfer.s3.progress.LoggingTransferListener;
import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import java.net.URL;
-import java.util.Date;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
/**
* S3 存储协议 所有兼容S3协议的云厂商均支持
* 阿里云 腾讯云 七牛云 minio
*
- * @author Lion Li
+ * @author AprilWind
*/
public class OssClient {
+ /**
+ * 服务商
+ */
private final String configKey;
+ /**
+ * 配置属性
+ */
private final OssProperties properties;
- private final AmazonS3 client;
+ /**
+ * Amazon S3 异步客户端
+ */
+ private final S3AsyncClient client;
+ /**
+ * 用于管理 S3 数据传输的高级工具
+ */
+ private final S3TransferManager transferManager;
+
+ /**
+ * AWS S3 预签名 URL 的生成器
+ */
+ private final S3Presigner presigner;
+
+ /**
+ * 构造方法
+ *
+ * @param configKey 配置键
+ * @param ossProperties Oss配置属性
+ */
public OssClient(String configKey, OssProperties ossProperties) {
this.configKey = configKey;
this.properties = ossProperties;
try {
- AwsClientBuilder.EndpointConfiguration endpointConfig =
- new AwsClientBuilder.EndpointConfiguration(properties.getEndpoint(), properties.getRegion());
+ // 创建 AWS 认证信息
+ StaticCredentialsProvider credentialsProvider = StaticCredentialsProvider.create(
+ AwsBasicCredentials.create(properties.getAccessKey(), properties.getSecretKey()));
- AWSCredentials credentials = new BasicAWSCredentials(properties.getAccessKey(), properties.getSecretKey());
- AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials);
- ClientConfiguration clientConfig = new ClientConfiguration();
- if (OssConstant.IS_HTTPS.equals(properties.getIsHttps())) {
- clientConfig.setProtocol(Protocol.HTTPS);
- } else {
- clientConfig.setProtocol(Protocol.HTTP);
- }
- AmazonS3ClientBuilder build = AmazonS3Client.builder()
- .withEndpointConfiguration(endpointConfig)
- .withClientConfiguration(clientConfig)
- .withCredentials(credentialsProvider)
- .disableChunkedEncoding();
- if (!StringUtils.containsAny(properties.getEndpoint(), OssConstant.CLOUD_SERVICE)) {
+ //创建AWS基于 CRT 的 S3 客户端
+ this.client = S3AsyncClient.crtBuilder()
+ .credentialsProvider(credentialsProvider)
+ .endpointOverride(URI.create(getEndpoint()))
+ .region(of())
+ .targetThroughputInGbps(20.0)
+ .minimumPartSizeInBytes(10 * 1025 * 1024L)
+ .checksumValidationEnabled(false)
+ .build();
+
+ //AWS基于 CRT 的 S3 AsyncClient 实例用作 S3 传输管理器的底层客户端
+ this.transferManager = S3TransferManager.builder().s3Client(this.client).build();
+
+ // 检查是否连接到 MinIO，MinIO 使用 HTTPS 限制使用域名访问，需要启用路径样式访问
+ S3Configuration config = S3Configuration.builder().chunkedEncodingEnabled(false)
// minio 使用https限制使用域名访问 需要此配置 站点填域名
- build.enablePathStyleAccess();
- }
- this.client = build.build();
+ .pathStyleAccessEnabled(!StringUtils.containsAny(properties.getEndpoint(), OssConstant.CLOUD_SERVICE)).build();
+ // 创建 预签名 URL 的生成器 实例，用于生成 S3 预签名 URL
+ this.presigner = S3Presigner.builder()
+ .region(of())
+ .credentialsProvider(credentialsProvider)
+ .endpointOverride(URI.create(getDomain()))
+ .serviceConfiguration(config)
+ .build();
+
+ // 创建存储桶
createBucket();
} catch (Exception e) {
if (e instanceof OssException) {
@@ -78,126 +120,161 @@ public class OssClient {
}
}
+ /**
+ * 同步创建存储桶
+ * 如果存储桶不存在，会进行创建；如果存储桶存在，不执行任何操作
+ *
+ * @throws OssException 当创建存储桶时发生异常时抛出
+ */
public void createBucket() {
+ String bucketName = properties.getBucketName();
try {
- String bucketName = properties.getBucketName();
- if (client.doesBucketExistV2(bucketName)) {
- return;
+ // 尝试获取存储桶的信息
+ client.headBucket(
+ x -> x.bucket(bucketName)
+ .build())
+ .join();
+ } catch (Exception ex) {
+ if (ex.getCause() instanceof NoSuchBucketException) {
+ try {
+ // 存储桶不存在，尝试创建存储桶
+ client.createBucket(
+ x -> x.bucket(bucketName))
+ .join();
+
+ // 设置存储桶的访问策略（Bucket Policy）
+ client.putBucketPolicy(
+ x -> x.bucket(bucketName)
+ .policy(getPolicy(bucketName, getAccessPolicy().getPolicyType())))
+ .join();
+ } catch (S3Exception e) {
+ // 存储桶创建或策略设置失败
+ throw new OssException("创建Bucket失败, 请核对配置信息:[" + e.getMessage() + "]");
+ }
+ } else {
+ throw new OssException("判断Bucket是否存在失败，请核对配置信息:[" + ex.getMessage() + "]");
}
- CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
- AccessPolicyType accessPolicy = getAccessPolicy();
- createBucketRequest.setCannedAcl(accessPolicy.getAcl());
- client.createBucket(createBucketRequest);
- client.setBucketPolicy(bucketName, getPolicy(bucketName, accessPolicy.getPolicyType()));
- } catch (Exception e) {
- throw new OssException("创建Bucket失败, 请核对配置信息:[" + e.getMessage() + "]");
}
}
- public UploadResult upload(byte[] data, String path, String contentType) {
- return upload(new ByteArrayInputStream(data), path, contentType);
+ /**
+ * 上传文件到 Amazon S3，并返回上传结果
+ *
+ * @param filePath 本地文件路径
+ * @param key 在 Amazon S3 中的对象键
+ * @param md5Digest 本地文件的 MD5 哈希值（可选）
+ * @return UploadResult 包含上传后的文件信息
+ * @throws OssException 如果上传失败，抛出自定义异常
+ */
+ public UploadResult upload(Path filePath, String key, String md5Digest) {
+ try {
+ // 构建上传请求对象
+ FileUpload fileUpload = transferManager.uploadFile(
+ x -> x.putObjectRequest(
+ y -> y.bucket(properties.getBucketName())
+ .key(key)
+ .contentMD5(StringUtils.isNotEmpty(md5Digest) ? md5Digest : null)
+ .build())
+ .addTransferListener(LoggingTransferListener.create())
+ .source(filePath).build());
+
+ // 等待上传完成并获取上传结果
+ CompletedFileUpload uploadResult = fileUpload.completionFuture().join();
+ String eTag = uploadResult.response().eTag();
+
+ // 提取上传结果中的 ETag，并构建一个自定义的 UploadResult 对象
+ return UploadResult.builder().url(getUrl() + StringUtils.SLASH + key).filename(key).eTag(eTag).build();
+ } catch (Exception e) {
+ // 捕获异常并抛出自定义异常
+ throw new OssException("上传文件失败，请检查配置信息:[" + e.getMessage() + "]");
+ } finally {
+ // 无论上传是否成功，最终都会删除临时文件
+ FileUtils.del(filePath);
+ }
}
- public UploadResult upload(InputStream inputStream, String path, String contentType) {
+ /**
+ * 上传 InputStream 到 Amazon S3
+ *
+ * @param inputStream 要上传的输入流
+ * @param key 在 Amazon S3 中的对象键
+ * @param length 输入流的长度
+ * @return UploadResult 包含上传后的文件信息
+ * @throws OssException 如果上传失败，抛出自定义异常
+ */
+ public UploadResult upload(InputStream inputStream, String key, Long length) {
+ // 如果输入流不是 ByteArrayInputStream，则将其读取为字节数组再创建 ByteArrayInputStream
if (!(inputStream instanceof ByteArrayInputStream)) {
inputStream = new ByteArrayInputStream(IoUtil.readBytes(inputStream));
}
try {
- ObjectMetadata metadata = new ObjectMetadata();
- metadata.setContentType(contentType);
- metadata.setContentLength(inputStream.available());
- PutObjectRequest putObjectRequest = new PutObjectRequest(properties.getBucketName(), path, inputStream, metadata);
- // 设置上传对象的 Acl 为公共读
- putObjectRequest.setCannedAcl(getAccessPolicy().getAcl());
- client.putObject(putObjectRequest);
+ // 创建异步请求体（length如果为空会报错）
+ BlockingInputStreamAsyncRequestBody body = AsyncRequestBody.forBlockingInputStream(length);
+
+ // 使用 transferManager 进行上传
+ Upload upload = transferManager.upload(
+ x -> x.requestBody(body)
+ .putObjectRequest(
+ y -> y.bucket(properties.getBucketName())
+ .key(key)
+ .build())
+ .build());
+
+ // 将输入流写入请求体
+ body.writeInputStream(inputStream);
+
+ // 等待文件上传操作完成
+ CompletedUpload uploadResult = upload.completionFuture().join();
+ String eTag = uploadResult.response().eTag();
+
+ // 提取上传结果中的 ETag，并构建一个自定义的 UploadResult 对象
+ return UploadResult.builder().url(getUrl() + StringUtils.SLASH + key).filename(key).eTag(eTag).build();
} catch (Exception e) {
throw new OssException("上传文件失败，请检查配置信息:[" + e.getMessage() + "]");
}
- return UploadResult.builder().url(getUrl() + "/" + path).filename(path).build();
- }
-
- public UploadResult upload(File file, String path) {
- try {
- PutObjectRequest putObjectRequest = new PutObjectRequest(properties.getBucketName(), path, file);
- // 设置上传对象的 Acl 为公共读
- putObjectRequest.setCannedAcl(getAccessPolicy().getAcl());
- client.putObject(putObjectRequest);
- } catch (Exception e) {
- throw new OssException("上传文件失败，请检查配置信息:[" + e.getMessage() + "]");
- }
- return UploadResult.builder().url(getUrl() + "/" + path).filename(path).build();
- }
-
- public void delete(String path) {
- path = path.replace(getUrl() + "/", "");
- try {
- client.deleteObject(properties.getBucketName(), path);
- } catch (Exception e) {
- throw new OssException("删除文件失败，请检查配置信息:[" + e.getMessage() + "]");
- }
- }
-
- public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
- return upload(data, getPath(properties.getPrefix(), suffix), contentType);
- }
-
- public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
- return upload(inputStream, getPath(properties.getPrefix(), suffix), contentType);
- }
-
- public UploadResult uploadSuffix(File file, String suffix) {
- return upload(file, getPath(properties.getPrefix(), suffix));
}
/**
- * 获取文件元数据
+ * 下载文件从 Amazon S3 到临时目录
*
- * @param path 完整文件路径
+ * @param path 文件在 Amazon S3 中的对象键
+ * @return 下载后的文件在本地的临时路径
+ * @throws OssException 如果下载失败，抛出自定义异常
*/
- public ObjectMetadata getObjectMetadata(String path) {
- path = path.replace(getUrl() + "/", "");
- S3Object object = client.getObject(properties.getBucketName(), path);
- return object.getObjectMetadata();
+ public Path fileDownload(String path) {
+ // 从路径中移除 URL 前缀
+ String url = removeBaseUrl(path);
+
+ // 构建临时文件路径 文件名必须是唯一不存在的，路径必须是存在的
+ Path tempFilePath = Paths.get(extractFileName(url));
+ // 使用 S3TransferManager 下载文件
+ FileDownload downloadFile = transferManager.downloadFile(
+ x -> x.getObjectRequest(
+ y -> y.bucket(properties.getBucketName())
+ .key(url)
+ .build())
+ .addTransferListener(LoggingTransferListener.create())
+ .destination(tempFilePath)
+ .build());
+ // 等待文件下载操作完成
+ downloadFile.completionFuture().join();
+ return tempFilePath;
}
- public InputStream getObjectContent(String path) {
- path = path.replace(getUrl() + "/", "");
- S3Object object = client.getObject(properties.getBucketName(), path);
- return object.getObjectContent();
- }
-
- public String getUrl() {
- String domain = properties.getDomain();
- String endpoint = properties.getEndpoint();
- String header = OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? "https://" : "http://";
- // 云服务商直接返回
- if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)) {
- if (StringUtils.isNotBlank(domain)) {
- return header + domain;
- }
- return header + properties.getBucketName() + "." + endpoint;
+ /**
+ * 删除云存储服务中指定路径下文件
+ *
+ * @param path 指定路径
+ */
+ public void delete(String path) {
+ try {
+ client.deleteObject(
+ x -> x.bucket(properties.getBucketName())
+ .key(removeBaseUrl(path))
+ .build());
+ } catch (Exception e) {
+ throw new OssException("删除文件失败，请检查配置信息:[" + e.getMessage() + "]");
}
- // minio 单独处理
- if (StringUtils.isNotBlank(domain)) {
- return header + domain + "/" + properties.getBucketName();
- }
- return header + endpoint + "/" + properties.getBucketName();
- }
-
- public String getPath(String prefix, String suffix) {
- // 生成uuid
- String uuid = IdUtil.fastSimpleUUID();
- // 文件路径
- String path = DateUtils.datePath() + "/" + uuid;
- if (StringUtils.isNotBlank(prefix)) {
- path = prefix + "/" + path;
- }
- return path + suffix;
- }
-
-
- public String getConfigKey() {
- return configKey;
}
/**
@@ -207,14 +284,199 @@ public class OssClient {
* @param second 授权时间
*/
public String getPrivateUrl(String objectKey, Integer second) {
- GeneratePresignedUrlRequest generatePresignedUrlRequest =
- new GeneratePresignedUrlRequest(properties.getBucketName(), objectKey)
- .withMethod(HttpMethod.GET)
- .withExpiration(new Date(System.currentTimeMillis() + 1000L * second));
- URL url = client.generatePresignedUrl(generatePresignedUrlRequest);
+ // 使用 AWS S3 预签名 URL 的生成器 获取对象的预签名 URL
+ URL url = presigner.presignGetObject(
+ x -> x.signatureDuration(Duration.ofSeconds(second))
+ .getObjectRequest(
+ y -> y.bucket(properties.getBucketName())
+ .key(objectKey)
+ .build())
+ .build())
+ .url();
return url.toString();
}
+ /**
+ * 上传 byte[] 数据到 Amazon S3，使用指定的后缀构造对象键。
+ *
+ * @param data 要上传的 byte[] 数据
+ * @param suffix 对象键的后缀
+ * @return UploadResult 包含上传后的文件信息
+ * @throws OssException 如果上传失败，抛出自定义异常
+ */
+ public UploadResult uploadSuffix(byte[] data, String suffix) {
+ return upload(new ByteArrayInputStream(data), getPath(properties.getPrefix(), suffix), Long.valueOf(data.length));
+ }
+
+ /**
+ * 上传 InputStream 到 Amazon S3，使用指定的后缀构造对象键。
+ *
+ * @param inputStream 要上传的输入流
+ * @param suffix 对象键的后缀
+ * @param length 输入流的长度
+ * @return UploadResult 包含上传后的文件信息
+ * @throws OssException 如果上传失败，抛出自定义异常
+ */
+ public UploadResult uploadSuffix(InputStream inputStream, String suffix, Long length) {
+ return upload(inputStream, getPath(properties.getPrefix(), suffix), length);
+ }
+
+ /**
+ * 上传文件到 Amazon S3，使用指定的后缀构造对象键
+ *
+ * @param file 要上传的文件
+ * @param suffix 对象键的后缀
+ * @return UploadResult 包含上传后的文件信息
+ * @throws OssException 如果上传失败，抛出自定义异常
+ */
+ public UploadResult uploadSuffix(File file, String suffix) {
+ return upload(file.toPath(), getPath(properties.getPrefix(), suffix), null);
+ }
+
+ /**
+ * 获取文件输入流
+ *
+ * @param path 完整文件路径
+ * @return 输入流
+ */
+ public InputStream getObjectContent(String path) throws IOException {
+ // 下载文件到临时目录
+ Path tempFilePath = fileDownload(path);
+ // 创建输入流
+ InputStream inputStream = Files.newInputStream(tempFilePath);
+ // 删除临时文件
+ FileUtils.del(tempFilePath);
+ // 返回对象内容的输入流
+ return inputStream;
+ }
+
+ /**
+ * 获取 S3 客户端的终端点 URL
+ *
+ * @return 终端点 URL
+ */
+ public String getEndpoint() {
+ // 根据配置文件中的是否使用 HTTPS，设置协议头部
+ String header = getIsHttps();
+ // 拼接协议头部和终端点，得到完整的终端点 URL
+ return header + properties.getEndpoint();
+ }
+
+ /**
+ * 获取 S3 客户端的终端点 URL（自定义域名）
+ *
+ * @return 终端点 URL
+ */
+ public String getDomain() {
+ // 从配置中获取域名、终端点、是否使用 HTTPS 等信息
+ String domain = properties.getDomain();
+ String endpoint = properties.getEndpoint();
+ String header = getIsHttps();
+
+ // 如果是云服务商，直接返回域名或终端点
+ if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)) {
+ return StringUtils.isNotEmpty(domain) ? header + domain : header + endpoint;
+ }
+
+ // 如果是 MinIO，处理域名并返回
+ if (StringUtils.isNotEmpty(domain)) {
+ return domain.startsWith(Constants.HTTPS) || domain.startsWith(Constants.HTTP) ? domain : header + domain;
+ }
+
+ // 返回终端点
+ return header + endpoint;
+ }
+
+ /**
+ * 根据传入的 region 参数返回相应的 AWS 区域
+ * 如果 region 参数非空，使用 Region.of 方法创建并返回对应的 AWS 区域对象
+ * 如果 region 参数为空，返回一个默认的 AWS 区域（例如，us-east-1），作为广泛支持的区域
+ *
+ * @return 对应的 AWS 区域对象，或者默认的广泛支持的区域（us-east-1）
+ */
+ public Region of() {
+ //AWS 区域字符串
+ String region = properties.getRegion();
+ // 如果 region 参数非空，使用 Region.of 方法创建对应的 AWS 区域对象，否则返回默认区域
+ return StringUtils.isNotEmpty(region) ? Region.of(region) : Region.US_EAST_1;
+ }
+
+ /**
+ * 获取云存储服务的URL
+ *
+ * @return 文件路径
+ */
+ public String getUrl() {
+ String domain = properties.getDomain();
+ String endpoint = properties.getEndpoint();
+ String header = getIsHttps();
+ // 云服务商直接返回
+ if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)) {
+ return header + (StringUtils.isNotEmpty(domain) ? domain : properties.getBucketName() + "." + endpoint);
+ }
+ // MinIO 单独处理
+ if (StringUtils.isNotEmpty(domain)) {
+ // 如果 domain 以 "https://" 或 "http://" 开头
+ return (domain.startsWith(Constants.HTTPS) || domain.startsWith(Constants.HTTP)) ?
+ domain + StringUtils.SLASH + properties.getBucketName() : header + domain + StringUtils.SLASH + properties.getBucketName();
+ }
+ return header + endpoint + StringUtils.SLASH + properties.getBucketName();
+ }
+
+ /**
+ * 生成一个符合特定规则的、唯一的文件路径。通过使用日期、UUID、前缀和后缀等元素的组合，确保了文件路径的独一无二性
+ *
+ * @param prefix 前缀
+ * @param suffix 后缀
+ * @return 文件路径
+ */
+ public String getPath(String prefix, String suffix) {
+ // 生成uuid
+ String uuid = IdUtil.fastSimpleUUID();
+ // 生成日期路径
+ String datePath = DateUtils.datePath();
+ // 拼接路径
+ String path = StringUtils.isNotEmpty(prefix) ?
+ prefix + StringUtils.SLASH + datePath + StringUtils.SLASH + uuid : datePath + StringUtils.SLASH + uuid;
+ return path + suffix;
+ }
+
+ /**
+ * 移除路径中的基础URL部分，得到相对路径
+ *
+ * @param path 完整的路径，包括基础URL和相对路径
+ * @return 去除基础URL后的相对路径
+ */
+ public String removeBaseUrl(String path) {
+ return path.replace(getUrl() + StringUtils.SLASH, "");
+ }
+
+ /**
+ * 从文件路径中提取文件名
+ *
+ * @param path 文件路径
+ * @return 提取的文件名或默认文件名
+ */
+ public String extractFileName(String path) {
+ return FileUtils.getTmpDir() + StringUtils.SLASH + Paths.get(path).getFileName().toString();
+ }
+
+ /**
+ * 服务商
+ */
+ public String getConfigKey() {
+ return configKey;
+ }
+
+ /**
+ * 获取是否使用 HTTPS 的配置，并返回相应的协议头部。
+ *
+ * @return 协议头部，根据是否使用 HTTPS 返回 "https://" 或 "http://"
+ */
+ public String getIsHttps() {
+ return OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? Constants.HTTPS : Constants.HTTP;
+ }
+
/**
* 检查配置是否相同
*/
@@ -231,32 +493,77 @@ public class OssClient {
return AccessPolicyType.getByType(properties.getAccessPolicy());
}
+ /**
+ * 生成 AWS S3 存储桶访问策略
+ *
+ * @param bucketName 存储桶
+ * @param policyType 桶策略类型
+ * @return 符合 AWS S3 存储桶访问策略格式的字符串
+ */
private static String getPolicy(String bucketName, PolicyType policyType) {
- StringBuilder builder = new StringBuilder();
- builder.append("{\n\"Statement\": [\n{\n\"Action\": [\n");
- builder.append(switch (policyType) {
- case WRITE -> "\"s3:GetBucketLocation\",\n\"s3:ListBucketMultipartUploads\"\n";
- case READ_WRITE -> "\"s3:GetBucketLocation\",\n\"s3:ListBucket\",\n\"s3:ListBucketMultipartUploads\"\n";
- default -> "\"s3:GetBucketLocation\"\n";
- });
- builder.append("],\n\"Effect\": \"Allow\",\n\"Principal\": \"*\",\n\"Resource\": \"arn:aws:s3:::");
- builder.append(bucketName);
- builder.append("\"\n},\n");
- if (policyType == PolicyType.READ) {
- builder.append("{\n\"Action\": [\n\"s3:ListBucket\"\n],\n\"Effect\": \"Deny\",\n\"Principal\": \"*\",\n\"Resource\": \"arn:aws:s3:::");
- builder.append(bucketName);
- builder.append("\"\n},\n");
- }
- builder.append("{\n\"Action\": ");
- builder.append(switch (policyType) {
- case WRITE -> "[\n\"s3:AbortMultipartUpload\",\n\"s3:DeleteObject\",\n\"s3:ListMultipartUploadParts\",\n\"s3:PutObject\"\n],\n";
- case READ_WRITE -> "[\n\"s3:AbortMultipartUpload\",\n\"s3:DeleteObject\",\n\"s3:GetObject\",\n\"s3:ListMultipartUploadParts\",\n\"s3:PutObject\"\n],\n";
- default -> "\"s3:GetObject\",\n";
- });
- builder.append("\"Effect\": \"Allow\",\n\"Principal\": \"*\",\n\"Resource\": \"arn:aws:s3:::");
- builder.append(bucketName);
- builder.append("/*\"\n}\n],\n\"Version\": \"2012-10-17\"\n}\n");
- return builder.toString();
+ String policy = switch (policyType) {
+ case WRITE -> """
+ {
+ "Version": "2012-10-17",
+ "Statement": []
+ }
+ """;
+ case READ_WRITE -> """
+ {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Effect": "Allow",
+ "Principal": "*",
+ "Action": [
+ "s3:GetBucketLocation",
+ "s3:ListBucket",
+ "s3:ListBucketMultipartUploads"
+ ],
+ "Resource": "arn:aws:s3:::bucketName"
+ },
+ {
+ "Effect": "Allow",
+ "Principal": "*",
+ "Action": [
+ "s3:AbortMultipartUpload",
+ "s3:DeleteObject",
+ "s3:GetObject",
+ "s3:ListMultipartUploadParts",
+ "s3:PutObject"
+ ],
+ "Resource": "arn:aws:s3:::bucketName/*"
+ }
+ ]
+ }
+ """;
+ case READ -> """
+ {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Effect": "Allow",
+ "Principal": "*",
+ "Action": ["s3:GetBucketLocation"],
+ "Resource": "arn:aws:s3:::bucketName"
+ },
+ {
+ "Effect": "Deny",
+ "Principal": "*",
+ "Action": ["s3:ListBucket"],
+ "Resource": "arn:aws:s3:::bucketName"
+ },
+ {
+ "Effect": "Allow",
+ "Principal": "*",
+ "Action": "s3:GetObject",
+ "Resource": "arn:aws:s3:::bucketName/*"
+ }
+ ]
+ }
+ """;
+ };
+ return policy.replaceAll("bucketName", bucketName);
}
}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java
index a6f57e5ad..81a18e62a 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java
@@ -21,4 +21,10 @@ public class UploadResult {
* 文件名
*/
private String filename;
+
+ /**
+ * 已上传对象的实体标记（用来校验文件）
+ */
+ private String eTag;
+
}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java
index 9074d72de..6d39133d5 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java
@@ -1,8 +1,9 @@
package org.dromara.common.oss.enumd;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
import lombok.AllArgsConstructor;
import lombok.Getter;
+import software.amazon.awssdk.services.s3.model.BucketCannedACL;
+import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
/**
* 桶访问策略配置
@@ -16,27 +17,32 @@ public enum AccessPolicyType {
/**
* private
*/
- PRIVATE("0", CannedAccessControlList.Private, PolicyType.WRITE),
+ PRIVATE("0", BucketCannedACL.PRIVATE, ObjectCannedACL.PRIVATE, PolicyType.WRITE),
/**
* public
*/
- PUBLIC("1", CannedAccessControlList.PublicRead, PolicyType.READ),
+ PUBLIC("1", BucketCannedACL.PUBLIC_READ_WRITE, ObjectCannedACL.PUBLIC_READ_WRITE, PolicyType.READ_WRITE),
/**
* custom
*/
- CUSTOM("2",CannedAccessControlList.PublicRead, PolicyType.READ);
+ CUSTOM("2", BucketCannedACL.PUBLIC_READ, ObjectCannedACL.PUBLIC_READ, PolicyType.READ);
/**
- * 桶 权限类型
+ * 桶 权限类型（数据库值）
*/
private final String type;
+ /**
+ * 桶 权限类型
+ */
+ private final BucketCannedACL bucketCannedACL;
+
/**
* 文件对象 权限类型
*/
- private final CannedAccessControlList acl;
+ private final ObjectCannedACL objectCannedACL;
/**
* 桶策略类型
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index c7d47191d..565995dd1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -138,7 +138,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
OssClient storage = OssFactory.instance();
UploadResult uploadResult;
try {
- uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
+ uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
} catch (IOException e) {
throw new ServiceException(e.getMessage());
}
From e115f5f2f4064abf3507178b6afd85b0425427bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Sun, 14 Jan 2024 22:45:42 +0800
Subject: [PATCH 038/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=9B=BF?=
=?UTF-8?q?=E6=8D=A2=E8=BF=87=E6=9C=9F=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dromara/web/service/SysRegisterService.java | 2 +-
.../monitor/admin/config/AdminServerConfig.java | 4 ++--
.../dromara/generator/domain/GenTableColumn.java | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
index f38d074e3..14fa0cc27 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -82,7 +82,7 @@ public class SysRegisterService {
* @param uuid 唯一标识
*/
public void validateCaptcha(String tenantId, String username, String code, String uuid) {
- String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
+ String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
String captcha = RedisUtils.getCacheObject(verifyKey);
RedisUtils.deleteObject(verifyKey);
if (captcha == null) {
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java
index 1f70c75f7..53d248e39 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java
@@ -3,7 +3,7 @@ package org.dromara.monitor.admin.config;
import de.codecentric.boot.admin.server.config.EnableAdminServer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
-import org.springframework.boot.task.TaskExecutorBuilder;
+import org.springframework.boot.task.ThreadPoolTaskExecutorBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
@@ -23,7 +23,7 @@ public class AdminServerConfig {
@Lazy
@Bean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME)
@ConditionalOnMissingBean(Executor.class)
- public ThreadPoolTaskExecutor applicationTaskExecutor(TaskExecutorBuilder builder) {
+ public ThreadPoolTaskExecutor applicationTaskExecutor(ThreadPoolTaskExecutorBuilder builder) {
return builder.build();
}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java
index 5ce7ad043..ebdb9930c 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java
@@ -42,7 +42,7 @@ public class GenTableColumn extends BaseEntity {
/**
* 列描述
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String columnComment;
/**
@@ -64,43 +64,43 @@ public class GenTableColumn extends BaseEntity {
/**
* 是否主键（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isPk;
/**
* 是否自增（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isIncrement;
/**
* 是否必填（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isRequired;
/**
* 是否为插入字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isInsert;
/**
* 是否编辑字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isEdit;
/**
* 是否列表字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isList;
/**
* 是否查询字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isQuery;
/**
From 13e60a60488e71b28bb947bd15acb6de01366a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Mon, 15 Jan 2024 09:36:55 +0800
Subject: [PATCH 039/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20oss=20?=
=?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BD=BF=E7=94=A8=E4=B8=B4=E6=97=B6=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E9=81=BF=E5=85=8D=E7=BA=BF=E7=A8=8B=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dromara/common/oss/core/OssClient.java | 20 +++----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
index 6c402dc39..eb1656c06 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
@@ -34,7 +34,6 @@ import java.net.URI;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.time.Duration;
/**
@@ -242,16 +241,13 @@ public class OssClient {
* @throws OssException 如果下载失败，抛出自定义异常
*/
public Path fileDownload(String path) {
- // 从路径中移除 URL 前缀
- String url = removeBaseUrl(path);
-
- // 构建临时文件路径 文件名必须是唯一不存在的，路径必须是存在的
- Path tempFilePath = Paths.get(extractFileName(url));
+ // 构建临时文件
+ Path tempFilePath = FileUtils.createTempFile().toPath();
// 使用 S3TransferManager 下载文件
FileDownload downloadFile = transferManager.downloadFile(
x -> x.getObjectRequest(
y -> y.bucket(properties.getBucketName())
- .key(url)
+ .key(removeBaseUrl(path))
.build())
.addTransferListener(LoggingTransferListener.create())
.destination(tempFilePath)
@@ -451,16 +447,6 @@ public class OssClient {
return path.replace(getUrl() + StringUtils.SLASH, "");
}
- /**
- * 从文件路径中提取文件名
- *
- * @param path 文件路径
- * @return 提取的文件名或默认文件名
- */
- public String extractFileName(String path) {
- return FileUtils.getTmpDir() + StringUtils.SLASH + Paths.get(path).getFileName().toString();
- }
-
/**
* 服务商
*/
From cad250f02a66237258d1e96addd4704a1fdefb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=5F=E8=80=81=E9=A9=AC=5F?=
Date: Wed, 17 Jan 2024 05:47:44 +0000
Subject: [PATCH 040/237] =?UTF-8?q?!479=20update=20=E4=BC=98=E5=8C=96=20?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A2=84=E6=89=AB=E6=8F=8F=E5=AE=9E=E4=BD=93?=
=?UTF-8?q?=E7=B1=BB=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E6=80=A7=E8=83=BD?=
=?UTF-8?q?=20*=20=E4=BC=98=E5=8C=96=E4=BA=86=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8A=A0=E8=A7=A3=E5=AF=86=E7=9A=84=E7=BC=93?=
=?UTF-8?q?=E5=AD=98=E6=9C=BA=E5=88=B6.=E5=9C=A8=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=90=AF=E5=8A=A8=E6=97=B6,?=
=?UTF-8?q?=E5=B0=B1=E6=8A=8A=E6=9C=89=E5=8A=A0=E5=AF=86=E6=B3=A8=E8=A7=A3?=
=?UTF-8?q?=E7=9A=84=E7=B1=BB=E8=BF=9B=E8=A1=8C=E7=BC=93=E5=AD=98,?=
=?UTF-8?q?=E4=BB=A5=E6=8F=90=E9=AB=98=E9=80=9F=E5=BA=A6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-common/ruoyi-common-encrypt/pom.xml | 11 +++
.../config/EncryptorAutoConfiguration.java | 76 ++++++++++++++++++-
.../common/encrypt/core/EncryptorManager.java | 36 +++++----
.../MybatisDecryptInterceptor.java | 4 +
.../MybatisEncryptInterceptor.java | 4 +
5 files changed, 110 insertions(+), 21 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/ruoyi-common/ruoyi-common-encrypt/pom.xml
index df3222bee..baa59319a 100644
--- a/ruoyi-common/ruoyi-common-encrypt/pom.xml
+++ b/ruoyi-common/ruoyi-common-encrypt/pom.xml
@@ -42,6 +42,17 @@
spring-webmvc
+
+ com.baomidou
+ mybatis-plus-spring-boot3-starter
+
+
+ org.mybatis
+ mybatis-spring
+
+
+
+
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
index e988a3a2c..a0e86a6a6 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
@@ -1,5 +1,11 @@
package org.dromara.common.encrypt.config;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.io.Resources;
+import org.dromara.common.encrypt.annotation.EncryptField;
import org.dromara.common.encrypt.core.EncryptorManager;
import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor;
import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor;
@@ -8,7 +14,20 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.ClassMetadata;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.util.ClassUtils;
+
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.springframework.util.StringUtils.tokenizeToStringArray;
/**
* 加解密配置
@@ -16,17 +35,66 @@ import org.springframework.context.annotation.Bean;
* @author 老马
* @version 4.6.0
*/
-@AutoConfiguration
+@AutoConfiguration(after = MybatisPlusAutoConfiguration.class)
@EnableConfigurationProperties(EncryptorProperties.class)
@ConditionalOnProperty(value = "mybatis-encryptor.enable", havingValue = "true")
+@Slf4j
public class EncryptorAutoConfiguration {
@Autowired
private EncryptorProperties properties;
+ @Autowired
+ private MybatisPlusProperties mybatisPlusProperties;
@Bean
public EncryptorManager encryptorManager() {
- return new EncryptorManager();
+ Map, Set> fieldCache = scanEncryptClasses(mybatisPlusProperties.getTypeAliasesPackage());
+ return new EncryptorManager(fieldCache);
+ }
+
+ // 通过typeAliasesPackage设置的扫描包,来确定哪些实体类进行缓存
+ private Map, Set> scanEncryptClasses(String typeAliasesPackage) {
+ Map, Set> fieldCache = new HashMap<>();
+ try {
+ String[] packagePatternArray = tokenizeToStringArray(typeAliasesPackage,
+ ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
+ for (String packagePattern : packagePatternArray) {
+ Resource[] resources = new PathMatchingResourcePatternResolver().getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+ + ClassUtils.convertClassNameToResourcePath(packagePattern) + "/**/*.class");
+ for (Resource resource : resources) {
+ ClassMetadata classMetadata = new CachingMetadataReaderFactory().getMetadataReader(resource).getClassMetadata();
+ Class clazz = Resources.classForName(classMetadata.getClassName());
+ Set encryptFieldSet = getEncryptFieldSetFromClazz(clazz);
+ if(CollectionUtil.isNotEmpty(encryptFieldSet)) {
+ fieldCache.put(clazz, encryptFieldSet);
+ }
+ }
+ }
+ }catch (Exception e) {
+ log.error("初始化数据安全缓存时出错:{}", e.getMessage());
+ }
+ return fieldCache;
+ }
+
+ // 获得一个类的加密字段集合
+ private Set getEncryptFieldSetFromClazz(Class clazz) {
+ Set fieldSet = new HashSet<>();
+ // 判断clazz如果是接口,内部类,匿名类就直接返回
+ if (clazz.isInterface() || clazz.isMemberClass() || clazz.isAnonymousClass()) {
+ return fieldSet;
+ }
+ while (clazz != null) {
+ Field[] fields = clazz.getDeclaredFields();
+ fieldSet.addAll(Arrays.asList(fields));
+ clazz = clazz.getSuperclass();
+ }
+ fieldSet = fieldSet.stream().filter(field ->
+ field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class)
+ .collect(Collectors.toSet());
+ for (Field field : fieldSet) {
+ field.setAccessible(true);
+ }
+ return fieldSet;
}
@Bean
@@ -38,4 +106,8 @@ public class EncryptorAutoConfiguration {
public MybatisDecryptInterceptor mybatisDecryptInterceptor(EncryptorManager encryptorManager) {
return new MybatisDecryptInterceptor(encryptorManager, properties);
}
+
}
+
+
+
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
index 498b4b85b..c2b9cae50 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
@@ -1,16 +1,14 @@
package org.dromara.common.encrypt.core;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.encrypt.annotation.EncryptField;
import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
/**
* 加密管理类
@@ -19,6 +17,7 @@ import java.util.stream.Collectors;
* @version 4.6.0
*/
@Slf4j
+@NoArgsConstructor
public class EncryptorManager {
/**
@@ -31,25 +30,24 @@ public class EncryptorManager {
*/
Map, Set> fieldCache = new ConcurrentHashMap<>();
+ /**
+ * 构造方法传入类加密字段缓存
+ *
+ * @param fieldCache 类加密字段缓存
+ */
+ public EncryptorManager(Map, Set> fieldCache) {
+ this.fieldCache = fieldCache;
+ }
+
+
/**
* 获取类加密字段缓存
*/
public Set getFieldCache(Class sourceClazz) {
- return fieldCache.computeIfAbsent(sourceClazz, clazz -> {
- Set fieldSet = new HashSet<>();
- while (clazz != null) {
- Field[] fields = clazz.getDeclaredFields();
- fieldSet.addAll(Arrays.asList(fields));
- clazz = clazz.getSuperclass();
- }
- fieldSet = fieldSet.stream().filter(field ->
- field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class)
- .collect(Collectors.toSet());
- for (Field field : fieldSet) {
- field.setAccessible(true);
- }
- return fieldSet;
- });
+ if(ObjectUtil.isNotNull(fieldCache)) {
+ return fieldCache.get(sourceClazz);
+ }
+ return null;
}
/**
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
index 7c2508f86..460aa360e 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
@@ -73,7 +73,11 @@ public class MybatisDecryptInterceptor implements Interceptor {
list.forEach(this::decryptHandler);
return;
}
+ // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错)
Set fields = encryptorManager.getFieldCache(sourceObject.getClass());
+ if(ObjectUtil.isNull(fields)){
+ return;
+ }
try {
for (Field field : fields) {
field.set(sourceObject, this.decryptField(Convert.toStr(field.get(sourceObject)), field));
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
index 152f7db40..bcc2f4c9f 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
@@ -82,7 +82,11 @@ public class MybatisEncryptInterceptor implements Interceptor {
list.forEach(this::encryptHandler);
return;
}
+ // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错)
Set fields = encryptorManager.getFieldCache(sourceObject.getClass());
+ if(ObjectUtil.isNull(fields)){
+ return;
+ }
try {
for (Field field : fields) {
field.set(sourceObject, this.encryptField(Convert.toStr(field.get(sourceObject)), field));
From f1eeb08d906502b3f31e99d0b4afafad6b8276e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Wed, 17 Jan 2024 21:20:29 +0800
Subject: [PATCH 041/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20!pr479=20?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=88=E7=8E=87=E4=B8=8E=E4=B9=A6=E5=86=99?=
=?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../config/EncryptorAutoConfiguration.java | 68 +----------------
.../common/encrypt/core/EncryptorManager.java | 74 +++++++++++++++++--
2 files changed, 70 insertions(+), 72 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
index a0e86a6a6..fbc4e52de 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
@@ -1,11 +1,8 @@
package org.dromara.common.encrypt.config;
-import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.io.Resources;
-import org.dromara.common.encrypt.annotation.EncryptField;
import org.dromara.common.encrypt.core.EncryptorManager;
import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor;
import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor;
@@ -14,20 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.ClassMetadata;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.springframework.util.StringUtils.tokenizeToStringArray;
/**
* 加解密配置
@@ -43,58 +27,10 @@ public class EncryptorAutoConfiguration {
@Autowired
private EncryptorProperties properties;
- @Autowired
- private MybatisPlusProperties mybatisPlusProperties;
@Bean
- public EncryptorManager encryptorManager() {
- Map, Set> fieldCache = scanEncryptClasses(mybatisPlusProperties.getTypeAliasesPackage());
- return new EncryptorManager(fieldCache);
- }
-
- // 通过typeAliasesPackage设置的扫描包,来确定哪些实体类进行缓存
- private Map, Set> scanEncryptClasses(String typeAliasesPackage) {
- Map, Set> fieldCache = new HashMap<>();
- try {
- String[] packagePatternArray = tokenizeToStringArray(typeAliasesPackage,
- ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
- for (String packagePattern : packagePatternArray) {
- Resource[] resources = new PathMatchingResourcePatternResolver().getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
- + ClassUtils.convertClassNameToResourcePath(packagePattern) + "/**/*.class");
- for (Resource resource : resources) {
- ClassMetadata classMetadata = new CachingMetadataReaderFactory().getMetadataReader(resource).getClassMetadata();
- Class clazz = Resources.classForName(classMetadata.getClassName());
- Set encryptFieldSet = getEncryptFieldSetFromClazz(clazz);
- if(CollectionUtil.isNotEmpty(encryptFieldSet)) {
- fieldCache.put(clazz, encryptFieldSet);
- }
- }
- }
- }catch (Exception e) {
- log.error("初始化数据安全缓存时出错:{}", e.getMessage());
- }
- return fieldCache;
- }
-
- // 获得一个类的加密字段集合
- private Set getEncryptFieldSetFromClazz(Class clazz) {
- Set fieldSet = new HashSet<>();
- // 判断clazz如果是接口,内部类,匿名类就直接返回
- if (clazz.isInterface() || clazz.isMemberClass() || clazz.isAnonymousClass()) {
- return fieldSet;
- }
- while (clazz != null) {
- Field[] fields = clazz.getDeclaredFields();
- fieldSet.addAll(Arrays.asList(fields));
- clazz = clazz.getSuperclass();
- }
- fieldSet = fieldSet.stream().filter(field ->
- field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class)
- .collect(Collectors.toSet());
- for (Field field : fieldSet) {
- field.setAccessible(true);
- }
- return fieldSet;
+ public EncryptorManager encryptorManager(MybatisPlusProperties mybatisPlusProperties) {
+ return new EncryptorManager(mybatisPlusProperties.getTypeAliasesPackage());
}
@Bean
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
index c2b9cae50..356b0436e 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
@@ -1,14 +1,25 @@
package org.dromara.common.encrypt.core;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.io.Resources;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.ClassMetadata;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.util.ClassUtils;
import java.lang.reflect.Field;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
/**
* 加密管理类
@@ -33,10 +44,10 @@ public class EncryptorManager {
/**
* 构造方法传入类加密字段缓存
*
- * @param fieldCache 类加密字段缓存
+ * @param typeAliasesPackage 实体类包
*/
- public EncryptorManager(Map, Set> fieldCache) {
- this.fieldCache = fieldCache;
+ public EncryptorManager(String typeAliasesPackage) {
+ this.fieldCache = scanEncryptClasses(typeAliasesPackage);
}
@@ -44,7 +55,7 @@ public class EncryptorManager {
* 获取类加密字段缓存
*/
public Set getFieldCache(Class sourceClazz) {
- if(ObjectUtil.isNotNull(fieldCache)) {
+ if (ObjectUtil.isNotNull(fieldCache)) {
return fieldCache.get(sourceClazz);
}
return null;
@@ -95,4 +106,55 @@ public class EncryptorManager {
return encryptor.decrypt(value);
}
+ /**
+ * 通过 typeAliasesPackage 设置的扫描包 扫描缓存实体
+ */
+ private Map, Set> scanEncryptClasses(String typeAliasesPackage) {
+ Map, Set> fieldCache = new HashMap<>();
+ PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+ CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory();
+ String[] packagePatternArray = StringUtils.splitPreserveAllTokens(typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
+ String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
+ try {
+ for (String packagePattern : packagePatternArray) {
+ String path = ClassUtils.convertClassNameToResourcePath(packagePattern);
+ Resource[] resources = resolver.getResources(classpath + path + "/*.class");
+ for (Resource resource : resources) {
+ ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata();
+ Class clazz = Resources.classForName(classMetadata.getClassName());
+ Set encryptFieldSet = getEncryptFieldSetFromClazz(clazz);
+ if (CollUtil.isNotEmpty(encryptFieldSet)) {
+ fieldCache.put(clazz, encryptFieldSet);
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("初始化数据安全缓存时出错:{}", e.getMessage());
+ }
+ return fieldCache;
+ }
+
+ /**
+ * 获得一个类的加密字段集合
+ */
+ private Set getEncryptFieldSetFromClazz(Class clazz) {
+ Set fieldSet = new HashSet<>();
+ // 判断clazz如果是接口,内部类,匿名类就直接返回
+ if (clazz.isInterface() || clazz.isMemberClass() || clazz.isAnonymousClass()) {
+ return fieldSet;
+ }
+ while (clazz != null) {
+ Field[] fields = clazz.getDeclaredFields();
+ fieldSet.addAll(Arrays.asList(fields));
+ clazz = clazz.getSuperclass();
+ }
+ fieldSet = fieldSet.stream().filter(field ->
+ field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class)
+ .collect(Collectors.toSet());
+ for (Field field : fieldSet) {
+ field.setAccessible(true);
+ }
+ return fieldSet;
+ }
+
}
From 8c3462079bf1d850d36a9bfc797d54018208a6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Wed, 17 Jan 2024 23:05:21 +0800
Subject: [PATCH 042/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=20=E4=BD=BF=E7=94=A8=E9=A2=84?=
=?UTF-8?q?=E6=89=AB=E6=8F=8Fmapper=E6=B3=A8=E8=A7=A3=E6=8F=90=E5=8D=87?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/encrypt/core/EncryptorManager.java | 6 +-
.../mybatis/config/MybatisPlusConfig.java | 3 +-
.../handler/PlusDataPermissionHandler.java | 83 +++++++++++++------
.../PlusDataPermissionInterceptor.java | 32 +++----
4 files changed, 73 insertions(+), 51 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
index 356b0436e..a6d3cf9ce 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
@@ -47,7 +47,7 @@ public class EncryptorManager {
* @param typeAliasesPackage 实体类包
*/
public EncryptorManager(String typeAliasesPackage) {
- this.fieldCache = scanEncryptClasses(typeAliasesPackage);
+ scanEncryptClasses(typeAliasesPackage);
}
@@ -109,8 +109,7 @@ public class EncryptorManager {
/**
* 通过 typeAliasesPackage 设置的扫描包 扫描缓存实体
*/
- private Map, Set> scanEncryptClasses(String typeAliasesPackage) {
- Map, Set> fieldCache = new HashMap<>();
+ private void scanEncryptClasses(String typeAliasesPackage) {
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory();
String[] packagePatternArray = StringUtils.splitPreserveAllTokens(typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
@@ -131,7 +130,6 @@ public class EncryptorManager {
} catch (Exception e) {
log.error("初始化数据安全缓存时出错:{}", e.getMessage());
}
- return fieldCache;
}
/**
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java
index 1791b2b99..c465c2a4b 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.dromara.common.core.factory.YmlPropertySourceFactory;
+import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler;
import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor;
import org.mybatis.spring.annotation.MapperScan;
@@ -41,7 +42,7 @@ public class MybatisPlusConfig {
* 数据权限拦截器
*/
public PlusDataPermissionInterceptor dataPermissionInterceptor() {
- return new PlusDataPermissionInterceptor();
+ return new PlusDataPermissionInterceptor(SpringUtils.getProperty("mybatis-plus.mapperPackage"));
}
/**
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
index 6ddaa243c..7d7fd84a9 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
@@ -2,7 +2,6 @@ package org.dromara.common.mybatis.handler;
import cn.hutool.core.annotation.AnnotationUtil;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.JSQLParserException;
@@ -10,6 +9,7 @@ import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.Parenthesis;
import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import org.apache.ibatis.io.Resources;
import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.exception.ServiceException;
@@ -21,16 +21,26 @@ import org.dromara.common.mybatis.annotation.DataPermission;
import org.dromara.common.mybatis.enums.DataScopeType;
import org.dromara.common.mybatis.helper.DataPermissionHelper;
import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.ClassMetadata;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
import org.springframework.expression.BeanResolver;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.ParserContext;
import org.springframework.expression.common.TemplateParserContext;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.ClassUtils;
import java.lang.reflect.Method;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
@@ -58,9 +68,13 @@ public class PlusDataPermissionHandler {
*/
private final BeanResolver beanResolver = new BeanFactoryResolver(SpringUtils.getBeanFactory());
+ public PlusDataPermissionHandler(String mapperPackage) {
+ scanMapperClasses(mapperPackage);
+ }
+
public Expression getSqlSegment(Expression where, String mappedStatementId, boolean isSelect) {
- DataColumn[] dataColumns = findAnnotation(mappedStatementId);
+ DataPermission dataPermission = getDataPermission(mappedStatementId);
LoginUser currentUser = DataPermissionHelper.getVariable("user");
if (ObjectUtil.isNull(currentUser)) {
currentUser = LoginHelper.getLoginUser();
@@ -70,7 +84,7 @@ public class PlusDataPermissionHandler {
if (LoginHelper.isSuperAdmin() || LoginHelper.isTenantAdmin()) {
return where;
}
- String dataFilterSql = buildDataFilter(dataColumns, isSelect);
+ String dataFilterSql = buildDataFilter(dataPermission.value(), isSelect);
if (StringUtils.isBlank(dataFilterSql)) {
return where;
}
@@ -144,43 +158,64 @@ public class PlusDataPermissionHandler {
return "";
}
- public DataColumn[] findAnnotation(String mappedStatementId) {
- StringBuilder sb = new StringBuilder(mappedStatementId);
- int index = sb.lastIndexOf(".");
- String clazzName = sb.substring(0, index);
- String methodName = sb.substring(index + 1, sb.length());
- Class clazz;
+ /**
+ * 通过 mapperPackage 设置的扫描包 扫描缓存有注解的方法与类
+ */
+ private void scanMapperClasses(String mapperPackage) {
+ PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+ CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory();
+ String[] packagePatternArray = StringUtils.splitPreserveAllTokens(mapperPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
+ String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
try {
- clazz = ClassUtil.loadClass(clazzName);
+ for (String packagePattern : packagePatternArray) {
+ String path = ClassUtils.convertClassNameToResourcePath(packagePattern);
+ Resource[] resources = resolver.getResources(classpath + path + "/*.class");
+ for (Resource resource : resources) {
+ ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata();
+ Class clazz = Resources.classForName(classMetadata.getClassName());
+ findAnnotation(clazz);
+ }
+ }
} catch (Exception e) {
- return null;
+ log.error("初始化数据安全缓存时出错:{}", e.getMessage());
}
- List methods = Arrays.stream(ClassUtil.getDeclaredMethods(clazz))
- .filter(method -> method.getName().equals(methodName)).toList();
+ }
+
+ private void findAnnotation(Class clazz) {
DataPermission dataPermission;
// 获取方法注解
- for (Method method : methods) {
- dataPermission = dataPermissionCacheMap.get(mappedStatementId);
- if (ObjectUtil.isNotNull(dataPermission)) {
- return dataPermission.value();
+ for (Method method : clazz.getMethods()) {
+ if (method.isDefault() || method.isVarArgs()) {
+ continue;
}
+ String mappedStatementId = clazz.getName() + "." + method.getName();
if (AnnotationUtil.hasAnnotation(method, DataPermission.class)) {
dataPermission = AnnotationUtil.getAnnotation(method, DataPermission.class);
dataPermissionCacheMap.put(mappedStatementId, dataPermission);
- return dataPermission.value();
}
}
- dataPermission = dataPermissionCacheMap.get(clazz.getName());
- if (ObjectUtil.isNotNull(dataPermission)) {
- return dataPermission.value();
- }
// 获取类注解
if (AnnotationUtil.hasAnnotation(clazz, DataPermission.class)) {
dataPermission = AnnotationUtil.getAnnotation(clazz, DataPermission.class);
dataPermissionCacheMap.put(clazz.getName(), dataPermission);
- return dataPermission.value();
+ }
+ }
+
+ public DataPermission getDataPermission(String mapperId) {
+ if (dataPermissionCacheMap.containsKey(mapperId)) {
+ return dataPermissionCacheMap.get(mapperId);
+ }
+ String clazzName = mapperId.substring(0, mapperId.lastIndexOf("."));
+ if (dataPermissionCacheMap.containsKey(clazzName)) {
+ return dataPermissionCacheMap.get(clazzName);
}
return null;
}
+ /**
+ * 是否无效
+ */
+ public boolean invalid(String mapperId) {
+ return getDataPermission(mapperId) == null;
+ }
}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
index 0ab0c1139..f287846ce 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
@@ -1,13 +1,10 @@
package org.dromara.common.mybatis.interceptor;
-import cn.hutool.core.collection.ConcurrentHashSet;
-import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import org.dromara.common.mybatis.annotation.DataColumn;
-import org.dromara.common.mybatis.handler.PlusDataPermissionHandler;
+import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.statement.delete.Delete;
import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -22,11 +19,11 @@ import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlCommandType;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;
+import org.dromara.common.mybatis.handler.PlusDataPermissionHandler;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
-import java.util.Set;
/**
* 数据权限拦截器
@@ -34,13 +31,14 @@ import java.util.Set;
* @author Lion Li
* @version 3.5.0
*/
+@Slf4j
public class PlusDataPermissionInterceptor extends JsqlParserSupport implements InnerInterceptor {
- private final PlusDataPermissionHandler dataPermissionHandler = new PlusDataPermissionHandler();
- /**
- * 无效注解方法缓存用于快速返回
- */
- private final Set invalidCacheSet = new ConcurrentHashSet<>();
+ private final PlusDataPermissionHandler dataPermissionHandler;
+
+ public PlusDataPermissionInterceptor(String mapperPackage) {
+ this.dataPermissionHandler = new PlusDataPermissionHandler(mapperPackage);
+ }
@Override
public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
@@ -49,12 +47,7 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements
return;
}
// 检查是否无效 无数据权限注解
- if (invalidCacheSet.contains(ms.getId())) {
- return;
- }
- DataColumn[] dataColumns = dataPermissionHandler.findAnnotation(ms.getId());
- if (ArrayUtil.isEmpty(dataColumns)) {
- invalidCacheSet.add(ms.getId());
+ if (dataPermissionHandler.invalid(ms.getId())) {
return;
}
// 解析 sql 分配对应方法
@@ -72,12 +65,7 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements
return;
}
// 检查是否无效 无数据权限注解
- if (invalidCacheSet.contains(ms.getId())) {
- return;
- }
- DataColumn[] dataColumns = dataPermissionHandler.findAnnotation(ms.getId());
- if (ArrayUtil.isEmpty(dataColumns)) {
- invalidCacheSet.add(ms.getId());
+ if (dataPermissionHandler.invalid(ms.getId())) {
return;
}
PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
From afa8a1f29816622d18e7d0020ec7e9dc172ecdba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 18 Jan 2024 10:32:53 +0800
Subject: [PATCH 043/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=B6=88?=
=?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=20mapper=20=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-admin/src/main/resources/application.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 37e073463..0f116d921 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -47,6 +47,7 @@ logging:
org.dromara: @logging.level@
org.springframework: warn
tech.powerjob.worker.background: warn
+ org.mybatis.spring.mapper: error
config: classpath:logback-plus.xml
# 用户配置
From 6cff0375fb69fd249385635ca9617370700b91e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 18 Jan 2024 12:17:18 +0800
Subject: [PATCH 044/237] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E6=B6=88=E6=81=AF=20=E6=94=AF=E6=8C=81=E9=9B=86?=
=?UTF-8?q?=E7=BE=A4=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/dromara/web/controller/AuthController.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index a18ab50fe..43e689be3 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -23,8 +23,8 @@ import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
import org.dromara.common.websocket.utils.WebSocketUtils;
-import org.dromara.system.domain.SysClient;
import org.dromara.system.domain.bo.SysTenantBo;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysTenantVo;
@@ -97,7 +97,10 @@ public class AuthController {
Long userId = LoginHelper.getUserId();
scheduledExecutorService.schedule(() -> {
- WebSocketUtils.sendMessage(userId, "欢迎登录RuoYi-Vue-Plus后台管理系统");
+ WebSocketMessageDto dto = new WebSocketMessageDto();
+ dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");
+ dto.setSessionKeys(List.of(userId));
+ WebSocketUtils.publishMessage(dto);
}, 3, TimeUnit.SECONDS);
return R.ok(loginVo);
}
From e5089dc1264b982b7e4f3c372e3aac056c8bef7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 18 Jan 2024 17:31:52 +0800
Subject: [PATCH 045/237] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20=E8=B5=9E?=
=?UTF-8?q?=E5=8A=A9=E5=95=86=20=E6=95=B0=E9=A9=BC=E7=A7=91=E6=8A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index e617bc81c..b1a8ad7b2 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,9 @@
## 赞助商
-MaxKey - https://gitee.com/dromara/MaxKey
-CCFlow - https://gitee.com/opencc/RuoYi-JFlow
+MaxKey 业界领先单点登录产品 - https://gitee.com/dromara/MaxKey
+CCFlow 驰聘低代码-流程-表单 - https://gitee.com/opencc/RuoYi-JFlow
+数驼科技 软件定制开发APP小程序等 - http://www.shuduokeji.com/
[如何成为赞助商 加群联系作者详谈](https://plus-doc.dromara.org/#/common/add_group)
# 本框架与RuoYi的功能差异
From 928e418f3f7884048ae3368bce88acd3c106f13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 18 Jan 2024 17:48:07 +0800
Subject: [PATCH 046/237] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20=E8=B5=9E?=
=?UTF-8?q?=E5=8A=A9=E5=95=86=20=E6=95=B0=E9=A9=BC=E7=A7=91=E6=8A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b1a8ad7b2..47c8c3b6f 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
MaxKey 业界领先单点登录产品 - https://gitee.com/dromara/MaxKey
CCFlow 驰聘低代码-流程-表单 - https://gitee.com/opencc/RuoYi-JFlow
-数驼科技 软件定制开发APP小程序等 - http://www.shuduokeji.com/
+数舵科技 软件定制开发APP小程序等 - http://www.shuduokeji.com/
[如何成为赞助商 加群联系作者详谈](https://plus-doc.dromara.org/#/common/add_group)
# 本框架与RuoYi的功能差异
From b628c9b0271b33f68f6e743ef415ce5fbc47f6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Thu, 18 Jan 2024 18:33:47 +0800
Subject: [PATCH 047/237] =?UTF-8?q?update=20sms4j=202.2.0=20=3D>=203.1.1?=
=?UTF-8?q?=20=E5=A4=A7=E5=8D=87=E7=BA=A7=20=E6=94=AF=E6=8C=81=E8=87=AA?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AEkey=20=E5=8F=AF=E7=94=A8?=
=?UTF-8?q?=E4=BA=8E=E5=A4=9A=E5=8E=82=E5=95=86=E5=A4=9A=E7=A7=9F=E6=88=B7?=
=?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
.../web/controller/CaptchaController.java | 13 ++--
.../src/main/resources/application-dev.yml | 53 +++++++-------
.../src/main/resources/application-prod.yml | 53 +++++++-------
ruoyi-common/ruoyi-common-sms/pom.xml | 13 ++--
.../sms/config/SmsAutoConfiguration.java | 18 +++--
.../common/sms/core/dao/PlusSmsDao.java | 72 +++++++++++++++++++
.../demo/controller/SmsController.java | 32 +++++++--
8 files changed, 185 insertions(+), 71 deletions(-)
create mode 100644 ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java
diff --git a/pom.xml b/pom.xml
index 931097c97..c7d86f0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
2.23.0
0.29.6
- 2.2.0
+ 3.1.1
1.2.83
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
index ef33f5b6f..87844ddaf 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
@@ -5,6 +5,9 @@ import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
+import jakarta.validation.constraints.NotBlank;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.domain.R;
@@ -21,11 +24,7 @@ import org.dromara.common.web.enums.CaptchaType;
import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.core.factory.SmsFactory;
-import org.dromara.sms4j.provider.enumerate.SupplierType;
import org.dromara.web.domain.vo.CaptchaVo;
-import jakarta.validation.constraints.NotBlank;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -66,11 +65,11 @@ public class CaptchaController {
String templateId = "";
LinkedHashMap map = new LinkedHashMap<>(1);
map.put("code", code);
- SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
+ SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
- if (!"OK".equals(smsResponse.getCode())) {
+ if (!smsResponse.isSuccess()) {
log.error("验证码短信发送异常 => {}", smsResponse);
- return R.fail(smsResponse.getMessage());
+ return R.fail(smsResponse.getData().toString());
}
return R.ok();
}
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 4929c1be5..b33943af6 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -149,31 +149,36 @@ mail:
connectionTimeout: 0
--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
-# https://wind.kim/doc/start 文档地址 各个厂商可同时使用
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用
sms:
- # 阿里云 dysmsapi.aliyuncs.com
- alibaba:
- #请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置
- requestUrl: dysmsapi.aliyuncs.com
- #阿里云的accessKey
- accessKeyId: xxxxxxx
- #阿里云的accessKeySecret
- accessKeySecret: xxxxxxx
- #短信签名
- signature: 测试
- tencent:
- #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置
- requestUrl: sms.tencentcloudapi.com
- #腾讯云的accessKey
- accessKeyId: xxxxxxx
- #腾讯云的accessKeySecret
- accessKeySecret: xxxxxxx
- #短信签名
- signature: 测试
- #短信sdkAppId
- sdkAppId: appid
- #地域信息默认为 ap-guangzhou 如无特殊改变可不用设置
- territory: ap-guangzhou
+ # 配置源类型用于标定配置来源(interface,yaml)
+ config-type: yaml
+ # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
+ restricted: true
+ # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
+ minute-max: 1
+ # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
+ account-max: 30
+ # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
+ blends:
+ # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+ # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户
+ config1:
+ # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+ supplier: alibaba
+ # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
+ access-key-id: 您的accessKey
+ # 称为accessSecret有些称之为apiSecret
+ access-key-secret: 您的accessKeySecret
+ signature: 您的短信签名
+ sdk-app-id: 您的sdkAppId
+ config2:
+ # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+ supplier: tencent
+ access-key-id: 您的accessKey
+ access-key-secret: 您的accessKeySecret
+ signature: 您的短信签名
+ sdk-app-id: 您的sdkAppId
--- # 三方授权
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 782a680a1..faecb7608 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -152,31 +152,36 @@ mail:
connectionTimeout: 0
--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
-# https://wind.kim/doc/start 文档地址 各个厂商可同时使用
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用
sms:
- # 阿里云 dysmsapi.aliyuncs.com
- alibaba:
- #请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置
- requestUrl: dysmsapi.aliyuncs.com
- #阿里云的accessKey
- accessKeyId: xxxxxxx
- #阿里云的accessKeySecret
- accessKeySecret: xxxxxxx
- #短信签名
- signature: 测试
- tencent:
- #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置
- requestUrl: sms.tencentcloudapi.com
- #腾讯云的accessKey
- accessKeyId: xxxxxxx
- #腾讯云的accessKeySecret
- accessKeySecret: xxxxxxx
- #短信签名
- signature: 测试
- #短信sdkAppId
- sdkAppId: appid
- #地域信息默认为 ap-guangzhou 如无特殊改变可不用设置
- territory: ap-guangzhou
+ # 配置源类型用于标定配置来源(interface,yaml)
+ config-type: yaml
+ # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
+ restricted: true
+ # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
+ minute-max: 1
+ # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
+ account-max: 30
+ # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
+ blends:
+ # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+ # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户
+ config1:
+ # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+ supplier: alibaba
+ # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
+ access-key-id: 您的accessKey
+ # 称为accessSecret有些称之为apiSecret
+ access-key-secret: 您的accessKeySecret
+ signature: 您的短信签名
+ sdk-app-id: 您的sdkAppId
+ config2:
+ # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+ supplier: tencent
+ access-key-id: 您的accessKey
+ access-key-secret: 您的accessKeySecret
+ signature: 您的短信签名
+ sdk-app-id: 您的sdkAppId
--- # 三方授权
justauth:
diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/ruoyi-common/ruoyi-common-sms/pom.xml
index c50f222ac..932cb9d52 100644
--- a/ruoyi-common/ruoyi-common-sms/pom.xml
+++ b/ruoyi-common/ruoyi-common-sms/pom.xml
@@ -20,13 +20,12 @@
org.dromara.sms4j
sms4j-spring-boot-starter
-
-
-
- com.alibaba
- fastjson
-
-
+
+
+
+
+ org.dromara
+ ruoyi-common-redis
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
index 29f60fc50..1e88407e8 100644
--- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
@@ -1,14 +1,24 @@
package org.dromara.common.sms.config;
+import org.dromara.common.sms.core.dao.PlusSmsDao;
+import org.dromara.sms4j.api.dao.SmsDao;
import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
/**
- * 短信配置类(暂时没用 预留扩展)
+ * 短信配置类
*
- * @author Lion Li
- * @version 4.2.0
+ * @author Feng
*/
-@AutoConfiguration
+@AutoConfiguration(after = {RedisAutoConfiguration.class})
public class SmsAutoConfiguration {
+ @Primary
+ @Bean
+ public SmsDao smsDao() {
+ return new PlusSmsDao();
+ }
+
}
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java
new file mode 100644
index 000000000..91d8d243a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java
@@ -0,0 +1,72 @@
+package org.dromara.common.sms.core.dao;
+
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.sms4j.api.dao.SmsDao;
+
+import java.time.Duration;
+
+/**
+ * SmsDao缓存配置 (使用框架自带RedisUtils实现 协议统一)
+ * 主要用于短信重试和拦截的缓存
+ *
+ * @author Feng
+ */
+public class PlusSmsDao implements SmsDao {
+
+ /**
+ * 存储
+ *
+ * @param key 键
+ * @param value 值
+ * @param cacheTime 缓存时间（单位：秒)
+ */
+ @Override
+ public void set(String key, Object value, long cacheTime) {
+ RedisUtils.setCacheObject(GlobalConstants.GLOBAL_REDIS_KEY + key, value, Duration.ofSeconds(cacheTime));
+ }
+
+ /**
+ * 存储
+ *
+ * @param key 键
+ * @param value 值
+ */
+ @Override
+ public void set(String key, Object value) {
+ RedisUtils.setCacheObject(GlobalConstants.GLOBAL_REDIS_KEY + key, value, true);
+ }
+
+ /**
+ * 读取
+ *
+ * @param key 键
+ * @return 值
+ */
+ @Override
+ public Object get(String key) {
+ return RedisUtils.getCacheObject(GlobalConstants.GLOBAL_REDIS_KEY + key);
+ }
+
+ /**
+ * remove
+ *
根据key移除缓存
+ *
+ * @param key 缓存键
+ * @return 被删除的value
+ * @author :Wind
+ */
+ @Override
+ public Object remove(String key) {
+ return RedisUtils.deleteObject(GlobalConstants.GLOBAL_REDIS_KEY + key);
+ }
+
+ /**
+ * 清空
+ */
+ @Override
+ public void clean() {
+ RedisUtils.deleteObject(GlobalConstants.GLOBAL_REDIS_KEY + "sms:");
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java
index fb1973148..d28586d4d 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java
@@ -1,11 +1,11 @@
package org.dromara.demo.controller;
+import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms4j.core.factory.SmsFactory;
-import org.dromara.sms4j.provider.enumerate.SupplierType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,12 +20,12 @@ import java.util.LinkedHashMap;
* @author Lion Li
* @version 4.2.0
*/
+@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/sms")
public class SmsController {
-
/**
* 发送短信Aliyun
*
@@ -36,7 +36,7 @@ public class SmsController {
public R