| @@ -138,12 +138,7 @@ public class HomeController extends BaseController { | |||||
| } | } | ||||
| if(isLogin) { | if(isLogin) { | ||||
| MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | ||||
| info.setPassword("保密"); | |||||
| if(StringUtils.isNotBlank(info.getBopenId())) | |||||
| info.setBopenId("保密"); | |||||
| if(StringUtils.isNotBlank(info.getWebOpenId())) { | |||||
| info.setWebOpenId("保密"); | |||||
| } | |||||
| info.protectInfos(); | |||||
| String menus = mallUserRoleService.getPermissionsByUser(info); | String menus = mallUserRoleService.getPermissionsByUser(info); | ||||
| if(menus != null) { | if(menus != null) { | ||||
| @@ -222,12 +217,7 @@ public class HomeController extends BaseController { | |||||
| UseriFormallToken token = new UseriFormallToken(user.getUsername()); | UseriFormallToken token = new UseriFormallToken(user.getUsername()); | ||||
| subject.login(token); | subject.login(token); | ||||
| MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | ||||
| info.setPassword("保密"); | |||||
| if(StringUtils.isNotBlank(info.getBopenId())) | |||||
| info.setBopenId("保密"); | |||||
| if(StringUtils.isNotBlank(info.getWebOpenId())) { | |||||
| info.setWebOpenId("保密"); | |||||
| } | |||||
| info.protectInfos(); | |||||
| String menus = mallUserRoleService.getPermissionsByUser(info); | String menus = mallUserRoleService.getPermissionsByUser(info); | ||||
| if(menus != null) { | if(menus != null) { | ||||
| info.setMenus(menus); | info.setMenus(menus); | ||||
| @@ -324,12 +314,7 @@ public class HomeController extends BaseController { | |||||
| UseriFormallToken token = new UseriFormallToken(user.getUsername()); | UseriFormallToken token = new UseriFormallToken(user.getUsername()); | ||||
| subject.login(token); | subject.login(token); | ||||
| MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | ||||
| info.setPassword("保密"); | |||||
| if(StringUtils.isNotBlank(info.getBopenId())) | |||||
| info.setBopenId("保密"); | |||||
| if(StringUtils.isNotBlank(info.getWebOpenId())) { | |||||
| info.setWebOpenId("保密"); | |||||
| } | |||||
| info.protectInfos(); | |||||
| String menus = mallUserRoleService.getPermissionsByUser(info); | String menus = mallUserRoleService.getPermissionsByUser(info); | ||||
| if(menus != null) { | if(menus != null) { | ||||
| info.setMenus(menus); | info.setMenus(menus); | ||||
| @@ -298,7 +298,7 @@ public class MallUserInfoController extends BaseController { | |||||
| public ResultData getUserInfo() { | public ResultData getUserInfo() { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); | logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); | ||||
| MallUserInfo info = getUser(); | MallUserInfo info = getUser(); | ||||
| info.setPassword("保密"); | |||||
| info.protectInfos(); | |||||
| if (info.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { // isAdmin | if (info.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { // isAdmin | ||||
| MallPermission q = new MallPermission(); | MallPermission q = new MallPermission(); | ||||
| PageInfo<MallPermission> list = mallPermissionService.listAsPage(q, 1, 100); | PageInfo<MallPermission> list = mallPermissionService.listAsPage(q, 1, 100); | ||||
| @@ -145,11 +145,7 @@ public class WechatLoginController extends BaseController { | |||||
| } | } | ||||
| if(isLogin) { | if(isLogin) { | ||||
| MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | ||||
| info.setPassword("保密"); | |||||
| info.setBopenId("保密"); | |||||
| if(StringUtils.isNotBlank(info.getWebOpenId())) { | |||||
| info.setWebOpenId("保密"); | |||||
| } | |||||
| info.protectInfos(); | |||||
| String menus = mallUserRoleService.getPermissionsByUser(info); | String menus = mallUserRoleService.getPermissionsByUser(info); | ||||
| if(menus != null) { | if(menus != null) { | ||||
| info.setMenus(menus); | info.setMenus(menus); | ||||
| @@ -284,11 +280,7 @@ public class WechatLoginController extends BaseController { | |||||
| UseriFormallToken token = new UseriFormallToken(userInfo.getUsername()); | UseriFormallToken token = new UseriFormallToken(userInfo.getUsername()); | ||||
| subject.login(token); | subject.login(token); | ||||
| MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | ||||
| info.setPassword("保密"); | |||||
| info.setBopenId("保密"); | |||||
| if(StringUtils.isNotBlank(info.getWebOpenId())) { | |||||
| info.setWebOpenId("保密"); | |||||
| } | |||||
| info.protectInfos(); | |||||
| String menus = mallUserRoleService.getPermissionsByUser(info); | String menus = mallUserRoleService.getPermissionsByUser(info); | ||||
| if(menus != null) { | if(menus != null) { | ||||
| info.setMenus(menus); | info.setMenus(menus); | ||||
| @@ -261,6 +261,12 @@ public class MallUserInfo implements Serializable { | |||||
| this.webOpenId = webOpenId; | this.webOpenId = webOpenId; | ||||
| } | } | ||||
| public void protectInfos() { | |||||
| setPassword(null); | |||||
| setBopenId(null); | |||||
| setWebOpenId(null); | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||