diff --git a/config/application.yml b/config/application.yml index d37dfac7..bdfc11d5 100644 --- a/config/application.yml +++ b/config/application.yml @@ -235,7 +235,7 @@ lili: # 0:不做脱敏处理 # 1:管理端用户手机号等信息脱敏 # 2:商家端信息脱敏(为2时,表示管理端,商家端同时脱敏) - # sensitiveLevel: 2 + sensitiveLevel: 1 statistics: # 在线人数统计 X 小时。这里设置48,即统计过去48小时每小时在线人数 diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java index cf157d89..da37ff99 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java @@ -3,9 +3,12 @@ package cn.lili.modules.member.entity.vo; import cn.lili.common.enums.ClientTypeEnum; import cn.lili.common.security.sensitive.Sensitive; import cn.lili.common.security.sensitive.enums.SensitiveStrategy; +import cn.lili.common.utils.BeanUtil; +import cn.lili.modules.member.entity.dos.Member; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -16,6 +19,7 @@ import java.util.Date; * @since 2021/11/8 **/ @Data +@NoArgsConstructor public class MemberVO implements Serializable { private static final long serialVersionUID = 1810890757303309436L; @@ -27,6 +31,7 @@ public class MemberVO implements Serializable { private String username; @ApiModelProperty(value = "昵称") + @Sensitive(strategy = SensitiveStrategy.PHONE) private String nickName; @ApiModelProperty(value = "会员性别,1为男,0为女") @@ -89,4 +94,7 @@ public class MemberVO implements Serializable { @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; + public MemberVO(Member member) { + BeanUtil.copyProperties(member, this); + } } diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java index e83b670f..f79a123f 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java @@ -145,6 +145,7 @@ public interface MemberService extends IService { */ IPage getMemberPage(MemberSearchVO memberSearchVO, PageVO page); + /** * 一键注册会员 * @@ -235,4 +236,11 @@ public interface MemberService extends IService { * @return 是否更新成功 */ boolean updateMemberLoginTime(String memberId); + + /** + * 获取用户VO + * @param id + * @return + */ + MemberVO getMember(String id); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index e0fef231..6bc75846 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -611,6 +611,11 @@ public class MemberServiceImpl extends ServiceImpl impleme return this.update(updateWrapper); } + @Override + public MemberVO getMember(String id) { + return new MemberVO(this.getById(id)); + } + /** * 检测会员 * diff --git a/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java index 6568257c..b64308d7 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java @@ -45,9 +45,9 @@ public class MemberManagerController { @ApiOperation(value = "通过ID获取会员信息") @ApiImplicitParam(name = "id", value = "会员ID", required = true, dataType = "String", paramType = "path") @GetMapping(value = "/{id}") - public ResultMessage get(@PathVariable String id) { + public ResultMessage get(@PathVariable String id) { - return ResultUtil.data(memberService.getById(id)); + return ResultUtil.data(memberService.getMember(id)); } @ApiOperation(value = "添加会员") diff --git a/manager-api/src/main/resources/application.yml b/manager-api/src/main/resources/application.yml index d7a1c56a..397323ae 100644 --- a/manager-api/src/main/resources/application.yml +++ b/manager-api/src/main/resources/application.yml @@ -182,6 +182,11 @@ jasypt: lili: system: isDemoSite: true + # 脱敏级别: + # 0:不做脱敏处理 + # 1:管理端用户手机号等信息脱敏 + # 2:商家端信息脱敏(为2时,表示管理端,商家端同时脱敏) + sensitiveLevel: 1 statistics: # 在线人数统计 X 小时。这里设置48,即统计过去48小时每小时在线人数 onlineMember: 48