diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index ef970b8c9..ade0e2ae4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -94,8 +94,6 @@ public class ShiroConfig { //拦截器. Map filterChainDefinitionMap = new LinkedHashMap(); - //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 - filterChainDefinitionMap.put("/logout", "anon"); //filterChainDefinitionMap.put("/ue/**", "anon"); //filterChainDefinitionMap.put("/config.json", "anon"); // login @@ -139,6 +137,11 @@ public class ShiroConfig { filterChainDefinitionMap.put("/version", "anon"); // filterChainDefinitionMap.put("/role/**", "corsFilter,token"); + + + //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 + filterChainDefinitionMap.put("/logout", "authc"); + filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); // filterChainDefinitionMap.put("/**", "anon"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index acf553604..429605a67 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -58,9 +58,6 @@ public class HomeController extends BaseController { @Autowired private MallUserRoleService mallUserRoleService; - @Autowired - private MallRolePermissionService mallRolePermissionService; - @Autowired private WxAppinfoService appinfoService; diff --git a/mallinkWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java index 9c593b164..e41df9ae1 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java @@ -263,7 +263,7 @@ public class ShiroConfig { @Bean public SimpleCookie simpleCookie() { - SimpleCookie simpleCookie = new SimpleCookie("SSIDS"); + SimpleCookie simpleCookie = new SimpleCookie("SSID"); simpleCookie.setDomain(""); return simpleCookie; } diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java index eb21191ea..e15f065dc 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java @@ -1,16 +1,11 @@ package com.iformall.controller; -import com.github.pagehelper.PageInfo; import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.MallUserRole; import com.iformall.exception.MallinkException; -import com.iformall.service.MallRolePermissionService; -import com.iformall.service.MallUserInfoService; import com.iformall.service.MallUserRoleService; import com.iformall.shiro.UserSession; import com.iformall.utils.ShiroUtils; @@ -49,15 +44,9 @@ public class HomeController extends BaseController { @Autowired private Producer producer; - @Autowired - private MallUserInfoService mallUserInfoService; - @Autowired private MallUserRoleService mallUserRoleService; - @Autowired - private MallRolePermissionService mallRolePermissionService; - @GetMapping("/captcha.jpg") public void captcha(HttpServletResponse response)throws ServletException, IOException { @@ -81,6 +70,7 @@ public class HomeController extends BaseController { @PostMapping("/doLogin") public ResultData login(@RequestBody MallUserInfo user) { logger.debug("[" + getIpAddr() + "] HomeController::login"); + try { String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ @@ -111,7 +101,7 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); // System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); - String menus = getPermissionsByRole(info); + String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus); } @@ -122,28 +112,6 @@ public class HomeController extends BaseController { return data; } - private String getPermissionsByRole(MallUserInfo info) { - MallUserRole ur = new MallUserRole(); - ur.setUid(info.getId()); - PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); - if (page.getSize() > 0) { - Long roleId = page.getList().get(0).getRoleId(); - MallRolePermission p = new MallRolePermission(); - p.setRoleId(roleId); - p.setTenantId(info.getTenantId()); - PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); - String menus = ""; - for (MallRolePermission rp : listAsPage.getList()) { - menus += rp.getPermissionId() + ","; - } - if (menus.length() > 0) { - menus = menus.substring(0, menus.length() - 1); - } - return menus; - } - return null; - } - @ApiOperation("登出") @GetMapping("/logout") public ResultData logout() { diff --git a/mallinkWechatOpen/src/main/resources/application-dev.yml b/mallinkWechatOpen/src/main/resources/application-dev.yml index ed0040cc7..842eed229 100644 --- a/mallinkWechatOpen/src/main/resources/application-dev.yml +++ b/mallinkWechatOpen/src/main/resources/application-dev.yml @@ -30,7 +30,7 @@ spring: password: ENC(aYJ3Wr2UWtkORRQjjrWWpz2ZeTISsHOA) timeout: 3600 expire: 1800 #30分钟 - database: 1 + database: 10 defaultExpiration: 2592000 # 默认生命周期30天 jedis: pool: diff --git a/mallinkWechatOpen/src/main/resources/application.yml b/mallinkWechatOpen/src/main/resources/application.yml index 7b015c725..515f3613f 100644 --- a/mallinkWechatOpen/src/main/resources/application.yml +++ b/mallinkWechatOpen/src/main/resources/application.yml @@ -1,7 +1,7 @@ server: port: 6060 servlet: - context-path: /O + context-path: / spring: application: