123

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;
  * <p>created on 2022/8/18 17:21</p>
  * @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

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());