|
|
|
@@ -32,29 +32,32 @@ public class CurrentTenantInterceptor extends HandlerInterceptorAdapter { |
|
|
|
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { |
|
|
|
|
|
|
|
//集团版中针对某一商场的业务需要传递mallTenantId |
|
|
|
String mallTenantId = request.getHeader("mallTenantId"); |
|
|
|
if(StringUtils.isBlank(mallTenantId)){ |
|
|
|
mallTenantId = request.getParameter("mallTenantId"); |
|
|
|
} |
|
|
|
if(StringUtils.isBlank(mallTenantId)){ |
|
|
|
try{ |
|
|
|
String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); |
|
|
|
mallTenantId = JSONObject.parseObject(body).getString("mallTenantId"); |
|
|
|
}catch(Exception e){} |
|
|
|
} |
|
|
|
// String mallTenantId = request.getHeader("mallTenantId"); |
|
|
|
// if(StringUtils.isBlank(mallTenantId)){ |
|
|
|
// mallTenantId = request.getParameter("mallTenantId"); |
|
|
|
// } |
|
|
|
// if(StringUtils.isBlank(mallTenantId)){ |
|
|
|
// try{ |
|
|
|
// String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); |
|
|
|
// mallTenantId = JSONObject.parseObject(body).getString("mallTenantId"); |
|
|
|
// }catch(Exception e){} |
|
|
|
// } |
|
|
|
// |
|
|
|
// String tenantId = null; |
|
|
|
// String parenTenantId = null; |
|
|
|
// if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){ |
|
|
|
// tenantId = mallTenantId; |
|
|
|
// WxMall mall = wxMallService.getByTenantId(tenantId); |
|
|
|
// if(StringUtils.isNotBlank(mall.getParentTenantId())){ |
|
|
|
// parenTenantId = mall.getParentTenantId(); |
|
|
|
// } |
|
|
|
// }else{ |
|
|
|
// tenantId = (String)request.getSession().getAttribute(UserSession.tenantId); |
|
|
|
// parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId); |
|
|
|
// } |
|
|
|
|
|
|
|
String tenantId = null; |
|
|
|
String parenTenantId = null; |
|
|
|
if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){ |
|
|
|
tenantId = mallTenantId; |
|
|
|
WxMall mall = wxMallService.getByTenantId(tenantId); |
|
|
|
if(StringUtils.isNotBlank(mall.getParentTenantId())){ |
|
|
|
parenTenantId = mall.getParentTenantId(); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
tenantId = (String)request.getSession().getAttribute(UserSession.tenantId); |
|
|
|
parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId); |
|
|
|
} |
|
|
|
String tenantId = (String)request.getSession().getAttribute(UserSession.tenantId); |
|
|
|
String parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId); |
|
|
|
|
|
|
|
TenantThreadLocal.setCurrentThreadTenant(tenantId, parenTenantId); |
|
|
|
|
|
|
|
|