mirror of
				https://github.com/dromara/RuoYi-Vue-Plus.git
				synced 2025-11-04 08:13:44 +08:00 
			
		
		
		
	!467 新增 ThreadLocalHolder 整合 SaHolder,ThreadLocal
* fix 修复 issue#I8RWB5 字段缺少问题 ; * add 新增 ThreadLocalHolder 替换 SaHolder ;
This commit is contained in:
		@@ -94,6 +94,11 @@
 | 
			
		||||
            <artifactId>ip2region</artifactId>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
        <dependency>
 | 
			
		||||
            <groupId>com.alibaba</groupId>
 | 
			
		||||
            <artifactId>transmittable-thread-local</artifactId>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
    </dependencies>
 | 
			
		||||
 | 
			
		||||
</project>
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,57 @@
 | 
			
		||||
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<Map<String, Object>> THREAD_LOCAL = TransmittableThreadLocal.withInitial(HashMap::new);
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 设置值
 | 
			
		||||
     *
 | 
			
		||||
     * @param key 键
 | 
			
		||||
     * @param value 值
 | 
			
		||||
     */
 | 
			
		||||
    public static <T> void set(String key, T value) {
 | 
			
		||||
        THREAD_LOCAL.get().put(key, value);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取值
 | 
			
		||||
     *
 | 
			
		||||
     * @param key 键
 | 
			
		||||
     * @return 值
 | 
			
		||||
     */
 | 
			
		||||
    @SuppressWarnings("unchecked")
 | 
			
		||||
    public static <T> 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();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ArrayUtil;
 | 
			
		||||
import cn.hutool.core.util.ObjectUtil;
 | 
			
		||||
import cn.hutool.crypto.SecureUtil;
 | 
			
		||||
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;
 | 
			
		||||
@@ -36,7 +37,7 @@ import java.util.StringJoiner;
 | 
			
		||||
@Aspect
 | 
			
		||||
public class RepeatSubmitAspect {
 | 
			
		||||
 | 
			
		||||
    private static final ThreadLocal<String> KEY_CACHE = new ThreadLocal<>();
 | 
			
		||||
    private static final String KEY_CACHE = "keyCache";
 | 
			
		||||
 | 
			
		||||
    @Before("@annotation(repeatSubmit)")
 | 
			
		||||
    public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable {
 | 
			
		||||
@@ -59,7 +60,7 @@ public class RepeatSubmitAspect {
 | 
			
		||||
        // 唯一标识(指定key + url + 消息头)
 | 
			
		||||
        String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey;
 | 
			
		||||
        if (RedisUtils.setObjectIfAbsent(cacheRepeatKey, "", Duration.ofMillis(interval))) {
 | 
			
		||||
            KEY_CACHE.set(cacheRepeatKey);
 | 
			
		||||
            ThreadLocalHolder.set(KEY_CACHE, cacheRepeatKey);
 | 
			
		||||
        } else {
 | 
			
		||||
            String message = repeatSubmit.message();
 | 
			
		||||
            if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) {
 | 
			
		||||
@@ -82,9 +83,10 @@ public class RepeatSubmitAspect {
 | 
			
		||||
                if (r.getCode() == R.SUCCESS) {
 | 
			
		||||
                    return;
 | 
			
		||||
                }
 | 
			
		||||
                RedisUtils.deleteObject(KEY_CACHE.get());
 | 
			
		||||
                String cacheKey = ThreadLocalHolder.get(KEY_CACHE);
 | 
			
		||||
                RedisUtils.deleteObject(cacheKey);
 | 
			
		||||
            } finally {
 | 
			
		||||
                KEY_CACHE.remove();
 | 
			
		||||
                ThreadLocalHolder.remove(KEY_CACHE);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
@@ -97,8 +99,9 @@ public class RepeatSubmitAspect {
 | 
			
		||||
     */
 | 
			
		||||
    @AfterThrowing(value = "@annotation(repeatSubmit)", throwing = "e")
 | 
			
		||||
    public void doAfterThrowing(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Exception e) {
 | 
			
		||||
        RedisUtils.deleteObject(KEY_CACHE.get());
 | 
			
		||||
        KEY_CACHE.remove();
 | 
			
		||||
        String cacheKey = ThreadLocalHolder.get(KEY_CACHE);
 | 
			
		||||
        RedisUtils.deleteObject(cacheKey);
 | 
			
		||||
        ThreadLocalHolder.remove(KEY_CACHE);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@ 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 com.alibaba.ttl.TransmittableThreadLocal;
 | 
			
		||||
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;
 | 
			
		||||
@@ -49,9 +49,9 @@ public class LogAspect {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 计算操作消耗时间
 | 
			
		||||
     * 计时 key
 | 
			
		||||
     */
 | 
			
		||||
    private static final ThreadLocal<StopWatch> TIME_THREADLOCAL = new TransmittableThreadLocal<>();
 | 
			
		||||
    private static final String LOG_STOP_WATCH_KEY = "logStopwatch";
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 处理请求前执行
 | 
			
		||||
@@ -59,7 +59,7 @@ public class LogAspect {
 | 
			
		||||
    @Before(value = "@annotation(controllerLog)")
 | 
			
		||||
    public void boBefore(JoinPoint joinPoint, Log controllerLog) {
 | 
			
		||||
        StopWatch stopWatch = new StopWatch();
 | 
			
		||||
        TIME_THREADLOCAL.set(stopWatch);
 | 
			
		||||
        ThreadLocalHolder.set(LOG_STOP_WATCH_KEY, stopWatch);
 | 
			
		||||
        stopWatch.start();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -112,7 +112,7 @@ public class LogAspect {
 | 
			
		||||
            // 处理设置注解上的参数
 | 
			
		||||
            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
 | 
			
		||||
            // 设置消耗时间
 | 
			
		||||
            StopWatch stopWatch = TIME_THREADLOCAL.get();
 | 
			
		||||
            StopWatch stopWatch = ThreadLocalHolder.get(LOG_STOP_WATCH_KEY);
 | 
			
		||||
            stopWatch.stop();
 | 
			
		||||
            operLog.setCostTime(stopWatch.getTime());
 | 
			
		||||
            // 发布事件保存数据库
 | 
			
		||||
@@ -122,7 +122,7 @@ public class LogAspect {
 | 
			
		||||
            log.error("异常信息:{}", exp.getMessage());
 | 
			
		||||
            exp.printStackTrace();
 | 
			
		||||
        } finally {
 | 
			
		||||
            TIME_THREADLOCAL.remove();
 | 
			
		||||
            ThreadLocalHolder.remove(LOG_STOP_WATCH_KEY);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
 | 
			
		||||
import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 | 
			
		||||
import lombok.AccessLevel;
 | 
			
		||||
import lombok.NoArgsConstructor;
 | 
			
		||||
import org.dromara.common.core.context.ThreadLocalHolder;
 | 
			
		||||
 | 
			
		||||
import java.util.HashMap;
 | 
			
		||||
import java.util.Map;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,5 @@
 | 
			
		||||
package org.dromara.common.satoken.utils;
 | 
			
		||||
 | 
			
		||||
import cn.dev33.satoken.context.SaHolder;
 | 
			
		||||
import cn.dev33.satoken.context.model.SaStorage;
 | 
			
		||||
import cn.dev33.satoken.session.SaSession;
 | 
			
		||||
import cn.dev33.satoken.stp.SaLoginModel;
 | 
			
		||||
import cn.dev33.satoken.stp.StpUtil;
 | 
			
		||||
@@ -11,6 +9,7 @@ import lombok.AccessLevel;
 | 
			
		||||
import lombok.NoArgsConstructor;
 | 
			
		||||
import org.dromara.common.core.constant.TenantConstants;
 | 
			
		||||
import org.dromara.common.core.constant.UserConstants;
 | 
			
		||||
import org.dromara.common.core.context.ThreadLocalHolder;
 | 
			
		||||
import org.dromara.common.core.domain.model.LoginUser;
 | 
			
		||||
import org.dromara.common.core.enums.UserType;
 | 
			
		||||
 | 
			
		||||
@@ -47,11 +46,10 @@ public class LoginHelper {
 | 
			
		||||
     * @param model     配置参数
 | 
			
		||||
     */
 | 
			
		||||
    public static void login(LoginUser loginUser, SaLoginModel model) {
 | 
			
		||||
        SaStorage storage = SaHolder.getStorage();
 | 
			
		||||
        storage.set(LOGIN_USER_KEY, loginUser);
 | 
			
		||||
        storage.set(TENANT_KEY, loginUser.getTenantId());
 | 
			
		||||
        storage.set(USER_KEY, loginUser.getUserId());
 | 
			
		||||
        storage.set(DEPT_KEY, loginUser.getDeptId());
 | 
			
		||||
        ThreadLocalHolder.set(LOGIN_USER_KEY, loginUser);
 | 
			
		||||
        ThreadLocalHolder.set(TENANT_KEY, loginUser.getTenantId());
 | 
			
		||||
        ThreadLocalHolder.set(USER_KEY, loginUser.getUserId());
 | 
			
		||||
        ThreadLocalHolder.set(DEPT_KEY, loginUser.getDeptId());
 | 
			
		||||
        model = ObjectUtil.defaultIfNull(model, new SaLoginModel());
 | 
			
		||||
        StpUtil.login(loginUser.getLoginId(),
 | 
			
		||||
            model.setExtra(TENANT_KEY, loginUser.getTenantId())
 | 
			
		||||
@@ -161,10 +159,10 @@ public class LoginHelper {
 | 
			
		||||
 | 
			
		||||
    public static Object getStorageIfAbsentSet(String key, Supplier<Object> handle) {
 | 
			
		||||
        try {
 | 
			
		||||
            Object obj = SaHolder.getStorage().get(key);
 | 
			
		||||
            Object obj = ThreadLocalHolder.get(key);
 | 
			
		||||
            if (ObjectUtil.isNull(obj)) {
 | 
			
		||||
                obj = handle.get();
 | 
			
		||||
                SaHolder.getStorage().set(key, obj);
 | 
			
		||||
                ThreadLocalHolder.set(key, obj);
 | 
			
		||||
            }
 | 
			
		||||
            return obj;
 | 
			
		||||
        } catch (Exception e) {
 | 
			
		||||
 
 | 
			
		||||
@@ -4,10 +4,13 @@ import cn.dev33.satoken.exception.NotLoginException;
 | 
			
		||||
import cn.dev33.satoken.interceptor.SaInterceptor;
 | 
			
		||||
import cn.dev33.satoken.router.SaRouter;
 | 
			
		||||
import cn.dev33.satoken.stp.StpUtil;
 | 
			
		||||
import jakarta.servlet.http.HttpServletRequest;
 | 
			
		||||
import jakarta.servlet.http.HttpServletResponse;
 | 
			
		||||
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.satoken.utils.LoginHelper;
 | 
			
		||||
import org.dromara.common.core.context.ThreadLocalHolder;
 | 
			
		||||
import org.dromara.common.security.config.properties.SecurityProperties;
 | 
			
		||||
import org.dromara.common.security.handler.AllUrlHandler;
 | 
			
		||||
import lombok.RequiredArgsConstructor;
 | 
			
		||||
@@ -59,6 +62,9 @@ public class SecurityConfig implements WebMvcConfigurer {
 | 
			
		||||
                                StpUtil.getTokenValue());
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                        // 保存用户信息
 | 
			
		||||
                        ThreadLocalHolder.set(LoginHelper.LOGIN_USER_KEY, LoginHelper.getLoginUser());
 | 
			
		||||
 | 
			
		||||
                        // 有效率影响 用于临时测试
 | 
			
		||||
                        // if (log.isDebugEnabled()) {
 | 
			
		||||
                        //     log.info("剩余有效时间: {}", StpUtil.getTokenTimeout());
 | 
			
		||||
@@ -66,7 +72,13 @@ public class SecurityConfig implements WebMvcConfigurer {
 | 
			
		||||
                        // }
 | 
			
		||||
 | 
			
		||||
                    });
 | 
			
		||||
        })).addPathPatterns("/**")
 | 
			
		||||
            })
 | 
			
		||||
            {
 | 
			
		||||
                @Override
 | 
			
		||||
                public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 | 
			
		||||
                    ThreadLocalHolder.remove(LoginHelper.LOGIN_USER_KEY);
 | 
			
		||||
                }
 | 
			
		||||
            }).addPathPatterns("/**")
 | 
			
		||||
            // 排除不需要拦截的路径
 | 
			
		||||
            .excludePathPatterns(securityProperties.getExcludes());
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,14 @@
 | 
			
		||||
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;
 | 
			
		||||
@@ -28,7 +27,7 @@ public class TenantHelper {
 | 
			
		||||
 | 
			
		||||
    private static final String DYNAMIC_TENANT_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "dynamicTenant";
 | 
			
		||||
 | 
			
		||||
    private static final ThreadLocal<String> TEMP_DYNAMIC_TENANT = new TransmittableThreadLocal<>();
 | 
			
		||||
    private static final String TENANT_ID_KEY = "tempDynamicTenant";
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 租户功能是否启用
 | 
			
		||||
@@ -89,12 +88,12 @@ public class TenantHelper {
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
        if (!isLogin()) {
 | 
			
		||||
            TEMP_DYNAMIC_TENANT.set(tenantId);
 | 
			
		||||
            ThreadLocalHolder.set(TENANT_ID_KEY, tenantId);
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
        String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
 | 
			
		||||
        RedisUtils.setCacheObject(cacheKey, tenantId);
 | 
			
		||||
        SaHolder.getStorage().set(cacheKey, tenantId);
 | 
			
		||||
        ThreadLocalHolder.set(cacheKey, tenantId);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -107,15 +106,15 @@ public class TenantHelper {
 | 
			
		||||
            return null;
 | 
			
		||||
        }
 | 
			
		||||
        if (!isLogin()) {
 | 
			
		||||
            return TEMP_DYNAMIC_TENANT.get();
 | 
			
		||||
            return ThreadLocalHolder.get(TENANT_ID_KEY);
 | 
			
		||||
        }
 | 
			
		||||
        String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
 | 
			
		||||
        String tenantId = (String) SaHolder.getStorage().get(cacheKey);
 | 
			
		||||
        String tenantId = ThreadLocalHolder.get(cacheKey);
 | 
			
		||||
        if (StringUtils.isNotBlank(tenantId)) {
 | 
			
		||||
            return tenantId;
 | 
			
		||||
        }
 | 
			
		||||
        tenantId = RedisUtils.getCacheObject(cacheKey);
 | 
			
		||||
        SaHolder.getStorage().set(cacheKey, tenantId);
 | 
			
		||||
        ThreadLocalHolder.set(cacheKey, tenantId);
 | 
			
		||||
        return tenantId;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -127,12 +126,12 @@ public class TenantHelper {
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
        if (!isLogin()) {
 | 
			
		||||
            TEMP_DYNAMIC_TENANT.remove();
 | 
			
		||||
            ThreadLocalHolder.remove(TENANT_ID_KEY);
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
        String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
 | 
			
		||||
        RedisUtils.deleteObject(cacheKey);
 | 
			
		||||
        SaHolder.getStorage().delete(cacheKey);
 | 
			
		||||
        ThreadLocalHolder.remove(cacheKey);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ package org.dromara.common.web.interceptor;
 | 
			
		||||
 | 
			
		||||
import cn.hutool.core.io.IoUtil;
 | 
			
		||||
import cn.hutool.core.map.MapUtil;
 | 
			
		||||
import com.alibaba.ttl.TransmittableThreadLocal;
 | 
			
		||||
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;
 | 
			
		||||
@@ -30,7 +30,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
 | 
			
		||||
 | 
			
		||||
    private final String prodProfile = "prod";
 | 
			
		||||
 | 
			
		||||
    private final TransmittableThreadLocal<StopWatch> invokeTimeTL = new TransmittableThreadLocal<>();
 | 
			
		||||
    private final String STOP_WATCH_KEY = "stopwatch";
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 | 
			
		||||
@@ -56,7 +56,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            StopWatch stopWatch = new StopWatch();
 | 
			
		||||
            invokeTimeTL.set(stopWatch);
 | 
			
		||||
            ThreadLocalHolder.set(STOP_WATCH_KEY, stopWatch);
 | 
			
		||||
            stopWatch.start();
 | 
			
		||||
        }
 | 
			
		||||
        return true;
 | 
			
		||||
@@ -70,10 +70,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 = invokeTimeTL.get();
 | 
			
		||||
            StopWatch stopWatch = ThreadLocalHolder.get(STOP_WATCH_KEY);
 | 
			
		||||
            stopWatch.stop();
 | 
			
		||||
            log.info("[PLUS]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
 | 
			
		||||
            invokeTimeTL.remove();
 | 
			
		||||
            ThreadLocalHolder.clear();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,5 @@
 | 
			
		||||
package org.dromara.system.service.impl;
 | 
			
		||||
 | 
			
		||||
import cn.dev33.satoken.context.SaHolder;
 | 
			
		||||
import cn.hutool.core.collection.CollUtil;
 | 
			
		||||
import cn.hutool.core.util.ObjectUtil;
 | 
			
		||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 | 
			
		||||
@@ -9,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 | 
			
		||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 | 
			
		||||
import org.dromara.common.core.constant.CacheConstants;
 | 
			
		||||
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;
 | 
			
		||||
@@ -221,10 +221,10 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
 | 
			
		||||
    @Override
 | 
			
		||||
    public String getDictLabel(String dictType, String dictValue, String separator) {
 | 
			
		||||
        // 优先从本地缓存获取
 | 
			
		||||
        List<SysDictDataVo> datas = (List<SysDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
 | 
			
		||||
        List<SysDictDataVo> datas = ThreadLocalHolder.get(CacheConstants.SYS_DICT_KEY + dictType);
 | 
			
		||||
        if (ObjectUtil.isNull(datas)) {
 | 
			
		||||
            datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
 | 
			
		||||
            SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
 | 
			
		||||
            ThreadLocalHolder.set(CacheConstants.SYS_DICT_KEY + dictType, datas);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        Map<String, String> map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel);
 | 
			
		||||
@@ -249,10 +249,10 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
 | 
			
		||||
    @Override
 | 
			
		||||
    public String getDictValue(String dictType, String dictLabel, String separator) {
 | 
			
		||||
        // 优先从本地缓存获取
 | 
			
		||||
        List<SysDictDataVo> datas = (List<SysDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
 | 
			
		||||
        List<SysDictDataVo> datas = ThreadLocalHolder.get(CacheConstants.SYS_DICT_KEY + dictType);
 | 
			
		||||
        if (ObjectUtil.isNull(datas)) {
 | 
			
		||||
            datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
 | 
			
		||||
            SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
 | 
			
		||||
            ThreadLocalHolder.set(CacheConstants.SYS_DICT_KEY + dictType, datas);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        Map<String, String> map = StreamUtils.toMap(datas, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue);
 | 
			
		||||
 
 | 
			
		||||
@@ -249,33 +249,33 @@ GO
 | 
			
		||||
INSERT sys_user VALUES (4, N'000000', 102, N'test1', N'仅本人 密码666666', N'sys_user', N'', N'', N'0', NULL, N'$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', N'0', N'0', N'127.0.0.1', getdate(), 103, 1, getdate(), 4, getdate(), NULL);
 | 
			
		||||
GO
 | 
			
		||||
 | 
			
		||||
INSERT sys_menu VALUES (5, N'测试菜单', 0, 5, N'demo', NULL, 1, 0, N'M', N'0', N'0', NULL, N'star', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (5, N'测试菜单', 0, 5, N'demo', NULL, N'', 1, 0, N'M', N'0', N'0', NULL, N'star', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
 | 
			
		||||
INSERT sys_menu VALUES (1500, N'测试单表', 5, 1, N'demo', N'demo/demo/index', 1, 0, N'C', N'0', N'0', N'demo:demo:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试单表菜单');
 | 
			
		||||
INSERT sys_menu VALUES (1500, N'测试单表', 5, 1, N'demo', N'demo/demo/index', N'', 1, 0, N'C', N'0', N'0', N'demo:demo:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试单表菜单');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1501, N'测试单表查询', 1500, 1, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1501, N'测试单表查询', 1500, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1502, N'测试单表新增', 1500, 2, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1502, N'测试单表新增', 1500, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1503, N'测试单表修改', 1500, 3, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1503, N'测试单表修改', 1500, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1504, N'测试单表删除', 1500, 4, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1504, N'测试单表删除', 1500, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1505, N'测试单表导出', 1500, 5, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:export', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1505, N'测试单表导出', 1500, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:export', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
 | 
			
		||||
INSERT sys_menu VALUES (1506, N'测试树表', 5, 1, N'tree', N'demo/tree/index', 1, 0, N'C', N'0', N'0', N'demo:tree:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试树表菜单');
 | 
			
		||||
INSERT sys_menu VALUES (1506, N'测试树表', 5, 1, N'tree', N'demo/tree/index', N'', 1, 0, N'C', N'0', N'0', N'demo:tree:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试树表菜单');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1507, N'测试树表查询', 1506, 1, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1507, N'测试树表查询', 1506, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1508, N'测试树表新增', 1506, 2, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1508, N'测试树表新增', 1506, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1509, N'测试树表修改', 1506, 3, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1509, N'测试树表修改', 1506, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1510, N'测试树表删除', 1506, 4, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1510, N'测试树表删除', 1506, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
INSERT sys_menu VALUES (1511, N'测试树表导出', 1506, 5, N'#', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:export', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
INSERT sys_menu VALUES (1511, N'测试树表导出', 1506, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:export', N'#', 103, 1, getdate(), NULL, NULL, N'');
 | 
			
		||||
GO
 | 
			
		||||
 | 
			
		||||
INSERT sys_role VALUES (3, N'000000', N'本部门及以下', N'test1', 3, N'4', 1, 1, N'0', N'0', 103, 1, getdate(), 1, NULL, NULL);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user