From d7b7b8f9bdf291bf7eafb1a0298c63ac3d870408 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 5 Mar 2019 14:34:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E4=BF=9D=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/HomeController.java | 1 + .../controller/MallUserInfoController.java | 15 +++++++- .../controller/WechatLoginController.java | 8 +++- .../com/iformall/domain/po/MallUserInfo.java | 10 ++++- .../com/iformall/enums/EnumUserWechat.java | 38 +++++++++++++++++++ .../service/impl/WxFlowServiceImpl.java | 5 +++ .../resources/mapper/MallUserInfoMapper.xml | 14 ++++--- .../iformall/controller/HomeController.java | 4 +- 8 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumUserWechat.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index a33a5f01d..7d3b1b1fe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumMsgModel; +import com.iformall.enums.EnumUserWechat; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.shiro.UserSession; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index 08cdd9f03..a2f12bee9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -9,6 +9,7 @@ import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumFlowPermissionType; +import com.iformall.enums.EnumUserWechat; import com.iformall.service.*; import com.iformall.shiro.PasswordHelper; import com.iformall.shiro.UserSession; @@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; +import javax.print.DocFlavor; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -82,7 +84,12 @@ public class MallUserInfoController extends BaseController { u.setRoleId(role.getId()); } } - u.setPassword(null);//不返回密码 + // 保密 + u.setPassword(null); + u.setBopenId(null); + if(StringUtils.isNotBlank(u.getWebOpenId())) { + u.setWebOpenId("保密"); + } } return new ResultData(page); } @@ -92,6 +99,12 @@ public class MallUserInfoController extends BaseController { public ResultData detail(Long id) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::detail"); final MallUserInfo user = userInfoService.getById(id); + user.setPassword(null); + user.setBopenId(null); + if(StringUtils.isNotBlank(user.getWebOpenId())) { + user.setWebOpenId("保密"); + } + return new ResultData(user); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index bb9fc4b30..7283750ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -103,7 +103,9 @@ public class WechatLoginController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); info.setBopenId("保密"); - info.setWebOpenId("保密"); + if(StringUtils.isNotBlank(info.getWebOpenId())) { + info.setWebOpenId("保密"); + } String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus); @@ -185,7 +187,9 @@ public class WechatLoginController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); info.setBopenId("保密"); - info.setWebOpenId("保密"); + if(StringUtils.isNotBlank(info.getWebOpenId())) { + info.setWebOpenId("保密"); + } 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 de2651e97..33ab0c92e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; +import com.iformall.enums.EnumUserWechat; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import javax.persistence.Id; import javax.persistence.Table; @@ -81,6 +83,7 @@ public class MallUserInfo implements Serializable { private String webOpenId; @io.swagger.annotations.ApiModelProperty(value="1 未绑定wechat,0 绑定微信",name="withWechat") + @Transient private Integer withWechat; @Transient @@ -218,7 +221,12 @@ public class MallUserInfo implements Serializable { } public Integer getWithWechat() { - return withWechat; + if(StringUtils.isNotBlank(this.webOpenId)) { + this.withWechat = EnumUserWechat.HAD.getCode(); + } else { + this.withWechat = EnumUserWechat.NO.getCode(); + } + return this.withWechat; } public void setWithWechat(Integer withWechat) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumUserWechat.java b/mallinkService/src/main/java/com/iformall/enums/EnumUserWechat.java new file mode 100644 index 000000000..f2f4c2d48 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumUserWechat.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumUserWechat { + + // 微信第三方web登录 0-已绑定,1-未绑定 + + HAD(0, "已绑定"), + NO(1, "未绑定") + ; + + public static EnumUserWechat getEnum(Integer code) { + for (EnumUserWechat value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumUserWechat(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 4114aa313..97c8e9cf3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -659,6 +659,11 @@ public class WxFlowServiceImpl implements WxFlowService { List userIdList = getTaskCandidateUserId(task.getId()); for (String userId:userIdList) { MallUserInfo mallUserInfo = this.mallUserInfoService.getById(Long.parseLong(userId)); + mallUserInfo.setPassword(null); + mallUserInfo.setBopenId(null); + if(StringUtils.isNotBlank(mallUserInfo.getWebOpenId())) { + mallUserInfo.setWebOpenId("保密"); + } result.add(mallUserInfo); } } diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 2c9c37635..dc94dd8f3 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -18,16 +18,18 @@ <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> [移动塔台登录][修改]:移动塔台登录修改 ======= >>>>>>> [微信第三方登录][修改]:是否绑定微信号 +======= +>>>>>>> [微信第三方登录][修改]:账户保护 - `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`, - isnull(`web_open_id`) with_wechat + `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`,`web_open_id` @@ -39,12 +41,16 @@ >>>>>>> [移动塔台登录][修改]:移动塔台登录修改 ======= `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`, +<<<<<<< HEAD <<<<<<< HEAD `bopen_id`,`web_open_id`,isnull(`web_open_id`) has_wechat >>>>>>> [微信第三方登录][修改]:是否绑定微信号 ======= `bopen_id`,`web_open_id`,isnull(`web_open_id`) with_wechat >>>>>>> [微信第三方登录][修改]:with_chat修改 +======= + `bopen_id`,`web_open_id` +>>>>>>> [微信第三方登录][修改]:账户保护 @@ -239,7 +245,6 @@ - @@ -250,13 +255,12 @@ u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`, - isnull(u.`web_open_id`) with_wechat, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h` u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`, - u.`bopen_id`,u.`web_open_id`,isnull(u.`web_open_id`) with_wechat + u.`bopen_id`,u.`web_open_id`, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h` diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java index ba999eaac..b6379567a 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java @@ -95,7 +95,9 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); info.setBopenId("保密"); - info.setWebOpenId("保密"); + if(StringUtils.isNotBlank(info.getWebOpenId())) { + info.setWebOpenId("保密"); + } String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus);