Browse Source

Merge remote-tracking branch 'origin/release_toaliyun_real_202208' into release_toaliyun_real_202208

release_toaliyun_real
xhxu 3 years ago
parent
commit
1e46119c21
3 changed files with 3 additions and 0 deletions
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
  3. +1
    -0
      mallinkTTCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java View File

@@ -61,6 +61,7 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer
if (null == appInfo) {
throw new MallinkException(ErrorCode.USER_APPINFO_NOT_EXIST.getCode(), "当前token查询不到APP");
}
entity.setAppinfo(appInfo);
entity.setRealUser(ttBuser);
return entity;
}


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java View File

@@ -75,6 +75,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer
if (null == appInfo) {
throw new MallinkException(ErrorCode.USER_APPINFO_NOT_EXIST.getCode(), "当前token查询不到APP");
}
entity.setAppinfo(appInfo);
entity.setRealUser(ttCUser);
return entity;
}


+ 1
- 0
mallinkTTCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java View File

@@ -67,6 +67,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
//设置userId到request里,后续根据userId,获取用户信息
request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId());
request.setAttribute(Constant.TENANT_ID, cUser.getTenantId());
request.setAttribute(Constant.APP_INFO,cUser.getAppinfo());
if (StringUtils.isNotBlank(cUser.getParentTenantId())) {
request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId());
}


Loading…
Cancel
Save