diff --git a/mcwl-admin/src/main/resources/application-dev.yml b/mcwl-admin/src/main/resources/application-dev.yml index a4eeab8..ae0e51f 100644 --- a/mcwl-admin/src/main/resources/application-dev.yml +++ b/mcwl-admin/src/main/resources/application-dev.yml @@ -87,7 +87,7 @@ spring: # 密码 password: MuYu_Cloud@Redis # 连接超时时间 - timeout: 6000ms + timeout: 20s lettuce: pool: # 连接池中的最小空闲连接 diff --git a/mcwl-admin/src/main/resources/application.yml b/mcwl-admin/src/main/resources/application.yml index 311a165..b99549a 100644 --- a/mcwl-admin/src/main/resources/application.yml +++ b/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 diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java index c300c52..c68115a 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java @@ -55,9 +55,9 @@ public class SysUserAttentionServiceImpl extends ServiceImpl 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}