ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/context/ThreadLocalHolder.java
ÎļþÒÑɾ³ý ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java
@@ -4,8 +4,14 @@ 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.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 @@ @Aspect public class RepeatSubmitAspect { private static final String KEY_CACHE = "keyCache"; private static final ThreadLocal<String> KEY_CACHE = new ThreadLocal<>(); @Before("@annotation(repeatSubmit)") public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable { @@ -60,7 +59,7 @@ // å¯ä¸æ è¯ï¼æå®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 @@ 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 @@ */ @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(); } /** ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
@@ -4,16 +4,6 @@ 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.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 @@ /** * è®¡æ¶ key */ private static final String LOG_STOP_WATCH_KEY = "logStopwatch"; private static final ThreadLocal<StopWatch> KEY_CACHE = new ThreadLocal<>(); /** * å¤ç请æ±åæ§è¡ @@ -59,7 +58,7 @@ @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 @@ // å¤ç设置注解ä¸çåæ° 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 @@ log.error("å¼å¸¸ä¿¡æ¯:{}", exp.getMessage()); exp.printStackTrace(); } finally { ThreadLocalHolder.remove(LOG_STOP_WATCH_KEY); KEY_CACHE.remove(); } }
@@ -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 @@ private static final String DYNAMIC_TENANT_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "dynamicTenant"; private static final String TENANT_ID_KEY = "tempDynamicTenant"; private static final ThreadLocal<String> TEMP_DYNAMIC_TENANT = new TransmittableThreadLocal<>(); /** * ç§æ·åè½æ¯å¦å¯ç¨ @@ -88,12 +89,12 @@ 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 @@ 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 @@ 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); } /** ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
@@ -2,15 +2,14 @@ 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 @@ private final String prodProfile = "prod"; private final String STOP_WATCH_KEY = "stopwatch"; private final static ThreadLocal<StopWatch> KEY_CACHE = new ThreadLocal<>(); @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { @@ -56,7 +55,7 @@ } StopWatch stopWatch = new StopWatch(); ThreadLocalHolder.set(STOP_WATCH_KEY, stopWatch); KEY_CACHE.set(stopWatch); stopWatch.start(); } return true; @@ -70,10 +69,10 @@ @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(); } }
