From 01a2787d437a454346788cb63aca5b1c76c494b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Thu, 4 Jan 2024 10:26:26 +0800 Subject: [PATCH] 123 --- .../cai/controller/admin/UserController.java | 9 +++++++ .../main/java/com/ruoyi/cai/domain/User.java | 3 +++ .../dto/admin/query/UpdateMobileAdminReq.java | 9 +++++++ .../dto/admin/query/UserUpdateAdminReq.java | 4 --- .../cai/dto/admin/vo/AccountAdminVo.java | 3 +++ .../cai/dto/admin/vo/AccountCashAdminVo.java | 3 +++ .../ruoyi/cai/dto/admin/vo/AnchorAdminVo.java | 3 +++ .../cai/dto/admin/vo/AnchorApplyAdminVo.java | 3 +++ .../cai/dto/admin/vo/DynamicAdminVo.java | 3 +++ .../dto/admin/vo/LowHeightRiskAdminVo.java | 3 +++ .../dto/admin/vo/RechargeOrderAdminVo.java | 3 +++ .../ruoyi/cai/dto/admin/vo/ReportAdminVo.java | 3 +++ .../ruoyi/cai/dto/admin/vo/UnionAdminVo.java | 3 +++ .../cai/dto/admin/vo/UnionUserAdminVo.java | 3 +++ .../cai/dto/admin/vo/UserAlbumAdminVo.java | 3 +++ .../dto/admin/vo/UserCameraAuditAdminVo.java | 3 +++ .../cai/dto/admin/vo/UserCountAdminVo.java | 3 +++ .../cai/dto/admin/vo/UserGreetAdminVo.java | 3 +++ .../cai/dto/admin/vo/UserInviteAdminVo.java | 4 +++ .../cai/dto/admin/vo/UserMemberAdminVo.java | 3 +++ .../cai/dto/admin/vo/VipOrderAdminVo.java | 3 +++ .../com/ruoyi/cai/enums/SystemConfigEnum.java | 1 + .../cai/manager/SystemConfigManager.java | 13 ++++++++-- .../ruoyi/cai/manager/UserAdminManager.java | 25 +++++++++++++------ .../main/resources/mapper/cai/UserMapper.xml | 3 +++ .../common/core/service/SensitiveService.java | 2 ++ .../service/impl/SysSensitiveServiceImpl.java | 13 ++++++++-- 27 files changed, 118 insertions(+), 16 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UpdateMobileAdminReq.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java index 96b13d2b..45c28bc2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserCodeGen; import com.ruoyi.cai.dto.admin.query.ResetPasswordReq; +import com.ruoyi.cai.dto.admin.query.UpdateMobileAdminReq; import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq; import com.ruoyi.cai.dto.admin.vo.UserAdminVo; import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo; @@ -113,6 +114,14 @@ public class UserController extends BaseController { return toAjax(userAdminManager.updateUser(bo)); } + @SaCheckPermission("cai:user:edit") + @Log(title = "修改用户手机", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/updateMobile") + public R updateMobile(@RequestBody UpdateMobileAdminReq bo) { + return toAjax(userAdminManager.updateMobileUser(bo)); + } + @PostMapping("/resetPwd") public R resetPwd(@RequestBody ResetPasswordReq req) { User user = userService.getById(req.getUserId()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java index 3d747038..11c2a159 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java @@ -3,6 +3,8 @@ package com.ruoyi.cai.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; import java.io.Serializable; @@ -49,6 +51,7 @@ public class User implements Serializable { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** * 头像 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UpdateMobileAdminReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UpdateMobileAdminReq.java new file mode 100644 index 00000000..41297a48 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UpdateMobileAdminReq.java @@ -0,0 +1,9 @@ +package com.ruoyi.cai.dto.admin.query; + +import lombok.Data; + +@Data +public class UpdateMobileAdminReq { + private Long id; + private String mobile; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UserUpdateAdminReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UserUpdateAdminReq.java index 9b3c854d..c5f84e03 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UserUpdateAdminReq.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/UserUpdateAdminReq.java @@ -14,10 +14,6 @@ public class UserUpdateAdminReq { * 性别 0 未知 1 女 2 男 */ private Integer gender; - /** - * 手机号 - */ - private String mobile; /** * 是否可发动态 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountAdminVo.java index 09e35318..0ca615f5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.Account; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -18,6 +20,7 @@ public class AccountAdminVo extends Account { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountCashAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountCashAdminVo.java index 45138aa3..99e7a793 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountCashAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AccountCashAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.AccountCash; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class AccountCashAdminVo extends AccountCash { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java index dfb66708..689de097 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -16,6 +18,7 @@ public class AnchorAdminVo extends Anchor { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** * 头像 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java index a7474067..ec402065 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.AnchorApply; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; import java.io.Serializable; @@ -19,6 +21,7 @@ public class AnchorApplyAdminVo extends AnchorApply implements Serializable { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/DynamicAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/DynamicAdminVo.java index b53072ef..4f9c36dd 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/DynamicAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/DynamicAdminVo.java @@ -2,6 +2,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.Dynamic; import com.ruoyi.cai.domain.DynamicImages; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; import java.util.List; @@ -20,6 +22,7 @@ public class DynamicAdminVo extends Dynamic { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java index f084c38b..6eb4d0e9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.LowHeightRisk; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -16,6 +18,7 @@ public class LowHeightRiskAdminVo extends LowHeightRisk { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** * 头像 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/RechargeOrderAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/RechargeOrderAdminVo.java index 0361571a..e07390d0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/RechargeOrderAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/RechargeOrderAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.RechargeOrder; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -18,6 +20,7 @@ public class RechargeOrderAdminVo extends RechargeOrder { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/ReportAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/ReportAdminVo.java index 59559c17..d92f8799 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/ReportAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/ReportAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.Report; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class ReportAdminVo extends Report { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java index c5c62067..08775db1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.Union; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; import lombok.EqualsAndHashCode; import org.bouncycastle.util.Integers; @@ -23,6 +25,7 @@ public class UnionAdminVo extends Union { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionUserAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionUserAdminVo.java index 464924c2..054c1fa3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionUserAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionUserAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.UnionUser; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class UnionUserAdminVo extends UnionUser { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAlbumAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAlbumAdminVo.java index 2dfa2e86..628f8017 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAlbumAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAlbumAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.UserAlbum; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class UserAlbumAdminVo extends UserAlbum { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCameraAuditAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCameraAuditAdminVo.java index 72994848..9d21deb7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCameraAuditAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCameraAuditAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.UserCameraAudit; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class UserCameraAuditAdminVo extends UserCameraAudit { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java index d6713645..defaa981 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.UserCount; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class UserCountAdminVo extends UserCount { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserGreetAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserGreetAdminVo.java index 024f6cae..c7e90bc7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserGreetAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserGreetAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.UserGreet; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class UserGreetAdminVo extends UserGreet { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInviteAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInviteAdminVo.java index e8bc77d8..07e51531 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInviteAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserInviteAdminVo.java @@ -1,13 +1,17 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.UserInvite; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data public class UserInviteAdminVo extends UserInvite { private String usercode; + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; private String inviteUsercode; + @Sensitive(strategy = SensitiveStrategy.PHONE) private String inviteMobile; private Integer inviteIsUnion; private String unionName; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java index 2a86f643..7f801d7e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.UserMember; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,6 +20,7 @@ public class UserMemberAdminVo extends UserMember { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** * 头像 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/VipOrderAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/VipOrderAdminVo.java index bce94e99..865aa256 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/VipOrderAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/VipOrderAdminVo.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.dto.admin.vo; import com.ruoyi.cai.domain.VipOrder; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data @@ -17,6 +19,7 @@ public class VipOrderAdminVo extends VipOrder { /** * 手机号 */ + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java index 98034ace..d1f6940f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java @@ -24,6 +24,7 @@ public enum SystemConfigEnum { DEFAULT_UNION_ONE_INCOME_RATE("0.07", "默认工会一级提成"), TODAY_GREET_MAX("100", "每日主播群打招呼次数"), GREET_INTERVAL_MIN("30", "群打招呼的间隔时间（分钟）"), + SENSITIVE_ENABLE("1", "是否开启手机号脱敏"), ; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java index 807a7d9c..be8e63ec 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java @@ -2,12 +2,14 @@ package com.ruoyi.cai.manager; import com.ruoyi.cai.constant.RedisConstant; import com.ruoyi.cai.enums.SystemConfigEnum; +import com.ruoyi.common.core.service.SensitiveService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -19,12 +21,19 @@ import java.util.stream.Stream; *

created on 2022/8/18 17:21

* @author ZL */ -@Service +@Component public class SystemConfigManager { @Autowired private StringRedisTemplate redisTemplate; + @Autowired + private SensitiveService sensitiveService; + @PostConstruct + public void initSensitive(){ + boolean config = getSystemConfigOfBool(SystemConfigEnum.SENSITIVE_ENABLE); + sensitiveService.setSensitive(config); + } /** * 获取配置信息返回boolean diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java index 852a79b4..9535d06e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserCount; import com.ruoyi.cai.domain.UserOnline; +import com.ruoyi.cai.dto.admin.query.UpdateMobileAdminReq; import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq; import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo; import com.ruoyi.cai.service.*; @@ -17,14 +18,11 @@ public class UserAdminManager { @Autowired private UserService userService; - public boolean updateUser(UserUpdateAdminReq userUpdateAdmin){ - User user = userService.getById(userUpdateAdmin.getId()); - if(!user.getGender().equals(userUpdateAdmin.getGender()) && user.getIsAnchor() == 1){ - throw new BaseException("主播不能修改性别"); - } - if(StringUtils.isNotEmpty(userUpdateAdmin.getMobile())){ + public boolean updateMobileUser(UpdateMobileAdminReq req){ + User user = userService.getById(req.getId()); + if(StringUtils.isNotEmpty(req.getMobile())){ long count = userService.count(Wrappers.lambdaQuery(User.class) - .eq(User::getMobile, userUpdateAdmin.getMobile()) + .eq(User::getMobile, req.getMobile()) .ne(User::getId, user.getId())); if(count > 0){ throw new BaseException("手机号已存在，无法修改"); @@ -32,7 +30,18 @@ public class UserAdminManager { } User update = new User(); update.setId(user.getId()); - update.setMobile(userUpdateAdmin.getMobile()); + update.setMobile(req.getMobile()); + userService.updateById(update); + return true; + } + + public boolean updateUser(UserUpdateAdminReq userUpdateAdmin){ + User user = userService.getById(userUpdateAdmin.getId()); + if(!user.getGender().equals(userUpdateAdmin.getGender()) && user.getIsAnchor() == 1){ + throw new BaseException("主播不能修改性别"); + } + User update = new User(); + update.setId(user.getId()); update.setNickname(userUpdateAdmin.getNickname()); update.setGender(userUpdateAdmin.getGender()); update.setSendDynamic(userUpdateAdmin.getSendDynamic()); diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml index fc52045d..b466a953 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml @@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.nickname like concat('%',#{query.nickname},'%') + + and t1.mobile = #{query.mobile} + and t1.usercode like concat('%',#{query.usercode},'%') diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java index 7b27bb45..85ce22fc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java @@ -10,6 +10,8 @@ package com.ruoyi.common.core.service; */ public interface SensitiveService { + void setSensitive(boolean sensitive); + /** * 是否脱敏 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java index fe142ca3..cbbb4277 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java @@ -1,7 +1,6 @@ package com.ruoyi.system.service.impl; import com.ruoyi.common.core.service.SensitiveService; -import com.ruoyi.common.helper.LoginHelper; import org.springframework.stereotype.Service; /** @@ -15,12 +14,22 @@ import org.springframework.stereotype.Service; @Service public class SysSensitiveServiceImpl implements SensitiveService { + private static volatile boolean SENSITIVE = false; + + @Override + public void setSensitive(boolean sensitive){ + SENSITIVE = sensitive; + } + /** * 是否脱敏 */ @Override public boolean isSensitive() { - return !LoginHelper.isAdmin(); + /*if(LoginHelper.isAdmin()){ + return false; + }*/ + return SENSITIVE; } }