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

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

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
8290e0ec49
2 измененных файлов: 6 добавлений и 1 удалений
  1. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java

+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java Просмотреть файл

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.iformall.interceptor.CurrentTenantInterceptor;
import com.iformall.interceptor.HttpServletRequestWrapperFilter; import com.iformall.interceptor.HttpServletRequestWrapperFilter;
import com.iformall.interceptor.RequestInterceptor; import com.iformall.interceptor.RequestInterceptor;
import com.iformall.service.MallResourceService; import com.iformall.service.MallResourceService;
@@ -44,6 +45,9 @@ public class WebConfig implements WebMvcConfigurer {


@Autowired @Autowired
private RequestInterceptor requestInterceptor; private RequestInterceptor requestInterceptor;
@Autowired
private CurrentTenantInterceptor tenantInterceptor;


@Autowired @Autowired
private MallResourceService mallResourceService; private MallResourceService mallResourceService;
@@ -87,6 +91,7 @@ public class WebConfig implements WebMvcConfigurer {
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(requestInterceptor).addPathPatterns("/**"); registry.addInterceptor(requestInterceptor).addPathPatterns("/**");
registry.addInterceptor(tenantInterceptor).addPathPatterns("/**");
} }


@Override @Override


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

@@ -29,7 +29,7 @@ public class TenantInfoImpl implements TenantInfo {
String parentTenantId = null; String parentTenantId = null;
try { try {
//parentTenantId = (String) SecurityUtils.getSubject().getSession().getAttribute(UserSession.parentTenantId); //parentTenantId = (String) SecurityUtils.getSubject().getSession().getAttribute(UserSession.parentTenantId);
parentTenantId = TenantThreadLocal.getTenantId();
parentTenantId = TenantThreadLocal.getParentTenantId();
} catch (InvalidSessionException e) { } catch (InvalidSessionException e) {
logger.error("InvalidSession: " + e.getMessage()); logger.error("InvalidSession: " + e.getMessage());
} }


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