Просмотр исходного кода

//undefined

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
af7cd42dce
3 измененных файлов: 3 добавлений и 3 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java Просмотреть файл

@@ -45,7 +45,7 @@ public class CurrentTenantInterceptor extends HandlerInterceptorAdapter {


String tenantId = null; String tenantId = null;
String parenTenantId = null; String parenTenantId = null;
if(StringUtils.isNotBlank(mallTenantId)){
if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){
tenantId = mallTenantId; tenantId = mallTenantId;
WxMall mall = wxMallService.getByTenantId(tenantId); WxMall mall = wxMallService.getByTenantId(tenantId);
if(StringUtils.isNotBlank(mall.getParentTenantId())){ if(StringUtils.isNotBlank(mall.getParentTenantId())){


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Просмотреть файл

@@ -102,7 +102,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录"); throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录");
} }


if(StringUtils.isNotBlank(mallTenantId)){
if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){
tenantId = mallTenantId; tenantId = mallTenantId;
WxMall mall = wxMallService.getByTenantId(tenantId); WxMall mall = wxMallService.getByTenantId(tenantId);
if(StringUtils.isNotBlank(mall.getParentTenantId())){ if(StringUtils.isNotBlank(mall.getParentTenantId())){


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Просмотреть файл

@@ -87,7 +87,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
String parenTenantId = null; String parenTenantId = null;
//设置userId到request里,后续根据userId,获取用户信息 //设置userId到request里,后续根据userId,获取用户信息
request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId()); request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId());
if(StringUtils.isNotBlank(mallTenantId)){
if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){
tenantId = mallTenantId; tenantId = mallTenantId;
WxMall mall = wxMallService.getByTenantId(tenantId); WxMall mall = wxMallService.getByTenantId(tenantId);
if(StringUtils.isNotBlank(mall.getParentTenantId())){ if(StringUtils.isNotBlank(mall.getParentTenantId())){


Загрузка…
Отмена
Сохранить