From a0566a2adc8f957e71950047eb9f11b68e6f6567 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Tue, 24 Oct 2023 18:13:46 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/config/ShiroConfig.java | 4 ++-- .../iformall/controller/sys/HomeController.java | 1 - .../controller/sys/MallRoleController.java | 2 -- .../java/com/iformall/shiro/MyShiroRealm.java | 15 --------------- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 75223d8..7e8f60c 100644 --- a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -149,8 +149,8 @@ public class ShiroConfig { //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 filterChainDefinitionMap.put("/logout", "authc"); -// filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); - filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); +// filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index f7cb3c0..7f7b9a5 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -110,7 +110,6 @@ public class HomeController extends BaseController { } if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) { -// throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } // check user diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/suimangAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index e6178e8..3ad9ded 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -45,11 +45,9 @@ public class MallRoleController extends BaseController { @ApiOperation("角色列表") @GetMapping("list") - //@RequiresPermissions("sys:role:list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "用户管理-role列表") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); sysRole.updateTenantInfo(getTenantInfo()); diff --git a/suimangAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java b/suimangAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java index 2689cc3..3d98dc0 100644 --- a/suimangAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java +++ b/suimangAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java @@ -46,11 +46,6 @@ public class MyShiroRealm extends AuthorizingRealm { if(user == null) { throw new UnknownAccountException(ErrorCode.USER_IS_EMPTY.getMessage()); } - // 租户1为预留系统管理端 -// if(user.getTenantId().equals("1")) { -// // 只支持租户为1的用户 -// throw new UnknownAccountException("租户不支持"); -// } if(user.getStatus()==null || !EnumMallUserStatus.VALID.getCode().equals(user.getStatus())) {//用户被禁用 @@ -67,16 +62,6 @@ public class MyShiroRealm extends AuthorizingRealm { session.setAttribute(UserSession.userInfo, user); session.setAttribute(UserSession.userId, user.getId()); session.setAttribute(UserSession.tenantId, user.getTenantId()); - if (StringUtils.isNotBlank(user.getParentTenantId())) { - session.setAttribute(UserSession.parentTenantId, user.getParentTenantId()); - }else{ - session.setAttribute(UserSession.parentTenantId, null); -// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); -// if(StringUtils.isNotBlank(parentTenantId)){ -// session.removeAttribute(UserSession.parentTenantId); -// } - } - return authenticationInfo; }