Browse Source

fix bug

release_toaliyun_real
winter 3 years ago
parent
commit
19411afdba
2 changed files with 3 additions and 5 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +2
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java View File

@@ -162,7 +162,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/logout", "authc");


filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
filterChainDefinitionMap.put("/**", "anon");
// filterChainDefinitionMap.put("/**", "anon");




shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);


+ 2
- 4
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java View File

@@ -73,10 +73,8 @@ public class BaseController {
*/ */
public TenantEntity getTenantInfo(){ public TenantEntity getTenantInfo(){
Session session = SecurityUtils.getSubject().getSession(); Session session = SecurityUtils.getSubject().getSession();
// String tenantId = (String)session.getAttribute(UserSession.tenantId);
// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId);
String tenantId= "789";
String parentTenantId = null;
String tenantId = (String)session.getAttribute(UserSession.tenantId);
String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId);
TenantEntity tenantEntity = new TenantEntity(); TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId); tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId); tenantEntity.setParentTenantId(parentTenantId);


Loading…
Cancel
Save