Bladeren bron

测试。。

release_toaliyun_real
xhxu 4 jaren geleden
bovenliggende
commit
db3d5598ad
2 gewijzigde bestanden met toevoegingen van 5 en 4 verwijderingen
  1. +5
    -3
      mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  2. +0
    -1
      mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java

+ 5
- 3
mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Bestand weergeven

@@ -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)) {


+ 0
- 1
mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Bestand weergeven

@@ -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());


Laden…
Annuleren
Opslaan