admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 RepeatSubmitAspect 逻辑避免并发请求问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2023-06-26 23:37:37 +08:00
parent cd6bfb2a3a
commit 19da4f7522
2 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java
View File

@ -1,6 +1,7 @@
package org.dromara.common.idempotent.aspectj; package org.dromara.common.idempotent.aspectj;
import cn.dev33.satoken.SaManager; import cn.dev33.satoken.SaManager;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.constant.GlobalConstants;
@ -25,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.time.Duration; import java.time.Duration;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner;
/** /**
* 防止重复提交(参考美团GTIS防重系统) * 防止重复提交(参考美团GTIS防重系统)
@ -39,10 +41,8 @@ public class RepeatSubmitAspect {
@Before("@annotation(repeatSubmit)") @Before("@annotation(repeatSubmit)")
public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable { public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable {
// 如果注解不为0 则使用注解数值 // 如果注解不为0 则使用注解数值
long interval = 0; long interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval());
if (repeatSubmit.interval() > 0) {
interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval());
}
if (interval < 1000) { if (interval < 1000) {
throw new ServiceException("重复提交间隔时间不能小于'1'秒"); throw new ServiceException("重复提交间隔时间不能小于'1'秒");
} }
@ -58,9 +58,7 @@ public class RepeatSubmitAspect {
submitKey = SecureUtil.md5(submitKey + ":" + nowParams); submitKey = SecureUtil.md5(submitKey + ":" + nowParams);
// 唯一标识（指定key + url + 消息头） // 唯一标识（指定key + url + 消息头）
String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey; String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey;
String key = RedisUtils.getCacheObject(cacheRepeatKey); if (RedisUtils.setObjectIfAbsent(cacheRepeatKey, "", Duration.ofMillis(interval))) {
if (key == null) {
RedisUtils.setCacheObject(cacheRepeatKey, "", Duration.ofMillis(interval));
KEY_CACHE.set(cacheRepeatKey); KEY_CACHE.set(cacheRepeatKey);
} else { } else {
String message = repeatSubmit.message(); String message = repeatSubmit.message();
@ -78,7 +76,7 @@ public class RepeatSubmitAspect {
*/ */
@AfterReturning(pointcut = "@annotation(repeatSubmit)", returning = "jsonResult") @AfterReturning(pointcut = "@annotation(repeatSubmit)", returning = "jsonResult")
public void doAfterReturning(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Object jsonResult) { public void doAfterReturning(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Object jsonResult) {
if (jsonResult instanceof R r) { if (jsonResult instanceof R<?> r) {
try { try {
// 成功则不删除redis数据 保证在有效时间内无法重复提交 // 成功则不删除redis数据 保证在有效时间内无法重复提交
if (r.getCode() == R.SUCCESS) { if (r.getCode() == R.SUCCESS) {
@ -107,19 +105,16 @@ public class RepeatSubmitAspect {
* 参数拼装 * 参数拼装
*/ */
private String argsArrayToString(Object[] paramsArray) { private String argsArrayToString(Object[] paramsArray) {
StringBuilder params = new StringBuilder(); StringJoiner params = new StringJoiner(" ");
if (paramsArray != null && paramsArray.length > 0) { if (ArrayUtil.isEmpty(paramsArray)) {
for (Object o : paramsArray) { return params.toString();
if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) { }
try { for (Object o : paramsArray) {
params.append(JsonUtils.toJsonString(o)).append(" "); if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) {
} catch (Exception e) { params.add(JsonUtils.toJsonString(o));
e.printStackTrace();
}
}
} }
} }
return params.toString().trim(); return params.toString();
} }
/** /**
@ -140,13 +135,12 @@ public class RepeatSubmitAspect {
} }
} else if (Map.class.isAssignableFrom(clazz)) { } else if (Map.class.isAssignableFrom(clazz)) {
Map map = (Map) o; Map map = (Map) o;
for (Object value : map.entrySet()) { for (Object value : map.values()) {
Map.Entry entry = (Map.Entry) value; return value instanceof MultipartFile;
return entry.getValue() instanceof MultipartFile;
} }
} }
return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
|| o instanceof BindingResult; || o instanceof BindingResult;
} }
} }

40
ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
View File

@ -2,6 +2,7 @@ package org.dromara.common.log.aspect;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.ttl.TransmittableThreadLocal; import com.alibaba.ttl.TransmittableThreadLocal;
import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.ServletUtils;
@ -28,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner;
/** /**
* 操作日志记录处理 * 操作日志记录处理
@ -170,26 +172,23 @@ public class LogAspect {
* 参数拼装 * 参数拼装
*/ */
private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) { private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) {
StringBuilder params = new StringBuilder(); StringJoiner params = new StringJoiner(" ");
if (paramsArray != null && paramsArray.length > 0) { if (ArrayUtil.isEmpty(paramsArray)) {
for (Object o : paramsArray) { return params.toString();
if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) { }
try { for (Object o : paramsArray) {
String str = JsonUtils.toJsonString(o); if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) {
Dict dict = JsonUtils.parseMap(str); String str = JsonUtils.toJsonString(o);
if (MapUtil.isNotEmpty(dict)) { Dict dict = JsonUtils.parseMap(str);
MapUtil.removeAny(dict, EXCLUDE_PROPERTIES); if (MapUtil.isNotEmpty(dict)) {
MapUtil.removeAny(dict, excludeParamNames); MapUtil.removeAny(dict, EXCLUDE_PROPERTIES);
str = JsonUtils.toJsonString(dict); MapUtil.removeAny(dict, excludeParamNames);
} str = JsonUtils.toJsonString(dict);
params.append(str).append(" ");
} catch (Exception e) {
e.printStackTrace();
}
} }
params.add(str);
} }
} }
return params.toString().trim(); return params.toString();
} }
/** /**
@ -210,12 +209,11 @@ public class LogAspect {
} }
} else if (Map.class.isAssignableFrom(clazz)) { } else if (Map.class.isAssignableFrom(clazz)) {
Map map = (Map) o; Map map = (Map) o;
for (Object value : map.entrySet()) { for (Object value : map.values()) {
Map.Entry entry = (Map.Entry) value; return value instanceof MultipartFile;
return entry.getValue() instanceof MultipartFile;
} }
} }
return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
|| o instanceof BindingResult; || o instanceof BindingResult;
} }
} }