Merge branch 'feature/admin' into preview

mcwl-admin/src/main/resources/application-dev.yml

@@ -87,7 +87,7 @@ spring:
     # 密码
     password: MuYu_Cloud@Redis
     # 连接超时时间
-    timeout: 6000ms
+    timeout: 20s
     lettuce:
       pool:
         # 连接池中的最小空闲连接

mcwl-admin/src/main/resources/application.yml

@@ -13,6 +13,10 @@ mcwl:
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
 
+  user:
+    avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png
+    backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png
+
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java

@@ -57,7 +57,7 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
 
         if (userId.equals(SecurityUtils.getUserId())) {
 
-            return R.ok("不能对自己操作");
+            return R.fail("不能对自己操作");
         }
 
         //查看是否已关注
@@ -166,6 +166,7 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
 
             if (sysUser != null) {
                 sysUser.setAttention(selectAttention(sysUser.getUserId()));
+
             }
 
 

mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java

@@ -28,6 +28,7 @@ import com.mcwl.system.service.ISysUserThirdAccountService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -80,6 +81,12 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     private ISysUserThirdAccountService iSysUserThirdAccountService;
 
+    @Value("${mcwl.user.avatar}")
+    private String avatar;
+
+    @Value("${mcwl.user.backgroundImg}")
+    private String backgroundImg;
+
     private static final String UPPER_CASE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     private static final String LOWER_CASE_LETTERS = "abcdefghijklmnopqrstuvwxyz";
     private static final String DIGITS = "0123456789";
@@ -582,11 +589,13 @@ public class SysUserServiceImpl implements ISysUserService
 
         //初始化一个用户信息
         SysUser sysUser = new SysUser();
-        sysUser.setUserName("默认用户:"+ generateRandomPassword(8));
+        sysUser.setUserName(generateRandomPassword(8));
         sysUser.setNickName("用户:" + generateRandomPassword(8));
         sysUser.setPassword(SecurityUtils.encryptPassword(generateRandomPassword(10)));
         sysUser.setPhonenumber(phone);
         sysUser.setRoleIds(new Long[]{2L});
+        sysUser.setAvatar(avatar);
+        sysUser.setBackgroundImg(backgroundImg);
 
         //新增用户
         insertUser(sysUser);
@@ -654,6 +663,11 @@ public class SysUserServiceImpl implements ISysUserService
 
             return AjaxResult.error(jsonObject.getString("msg"));
         }
+        JSONObject data = jsonObject.getJSONObject("data");
+        String desc = data.getString("desc");
+        if (desc.equals("不一致")){
+            return AjaxResult.error("请填写正确信息");
+        }
         log.info("实名认证校验的结果:{}",s1);
         //修改数据库
         userMapper.updateIdCard(sysUser);

mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -170,7 +170,7 @@
     <select id="selectUserPage" resultType="com.mcwl.common.core.domain.entity.SysUser">
 		select u.user_id,nick_name,avatar FROM sys_user_attention as a
 		LEFT JOIN sys_user as u
-		on a.user_id = u.user_id
+		on a.to_user_id = u.user_id
 		WHERE a.user_id = #{userId}
 	</select>