From db3d5598ad838a6eab5d0286c65e1d2300df3ccc Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 30 Nov 2021 16:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/interceptor/AuthorizationInterceptor.java | 8 +++++--- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index d3120bc12..ffbe4b2a1 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -79,11 +79,13 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录"); } + tenantId = user.getTenantId(); + parenTenantId = user.getParentTenantId(); request.setAttribute(Constant.LOGIN_USER_KEY, user.getId()); - request.setAttribute(Constant.TENANT_ID, user.getTenantId()); + request.setAttribute(Constant.TENANT_ID, tenantId); request.setAttribute(Constant.REQUEST_C_USER_KEY, user); - if (StringUtils.isNotBlank(user.getParentTenantId())) { - request.setAttribute(Constant.PARENT_TENANT_ID, user.getParentTenantId()); + if (StringUtils.isNotBlank(parenTenantId)) { + request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId); } }else if (!StringUtils.isBlank(bid)) { diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 20bde079d..b6db7ab07 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -84,7 +84,6 @@ public class TenantInfoImpl implements TenantInfo { //HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); //tenantId = (String) request.getAttribute(Constant.TENANT_ID); tenantId = TenantThreadLocal.getTenantId(); - logger.info("-------------------测试日志----------------"+tenantId); return tenantId; } catch (Exception e) { logger.error("getTenantId: " + e.getMessage());