diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 32f7b0be4..43e219fe8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -138,12 +138,7 @@ public class HomeController extends BaseController { } if(isLogin) { 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); if(menus != null) { @@ -222,12 +217,7 @@ public class HomeController extends BaseController { UseriFormallToken token = new UseriFormallToken(user.getUsername()); subject.login(token); 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); if(menus != null) { info.setMenus(menus); @@ -324,12 +314,7 @@ public class HomeController extends BaseController { UseriFormallToken token = new UseriFormallToken(user.getUsername()); subject.login(token); 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); if(menus != null) { info.setMenus(menus); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index f980b7d73..73a829591 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -298,7 +298,7 @@ public class MallUserInfoController extends BaseController { public ResultData getUserInfo() { logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); MallUserInfo info = getUser(); - info.setPassword("保密"); + info.protectInfos(); if (info.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { // isAdmin MallPermission q = new MallPermission(); PageInfo list = mallPermissionService.listAsPage(q, 1, 100); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index fa984f7bd..8e83ede7d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -145,11 +145,7 @@ public class WechatLoginController extends BaseController { } if(isLogin) { 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); if(menus != null) { info.setMenus(menus); @@ -284,11 +280,7 @@ public class WechatLoginController extends BaseController { UseriFormallToken token = new UseriFormallToken(userInfo.getUsername()); subject.login(token); 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); if(menus != null) { info.setMenus(menus); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index d48cf6bb5..503635402 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -261,6 +261,12 @@ public class MallUserInfo implements Serializable { this.webOpenId = webOpenId; } + public void protectInfos() { + setPassword(null); + setBopenId(null); + setWebOpenId(null); + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC")