From 08dcd03468c0c72e29c8c8d44f7e24365618d54a Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Sat, 28 Sep 2024 20:14:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/common/constant/CommonConstant.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/common/constant/CommonConstant.java b/src/main/java/com/ai/da/common/constant/CommonConstant.java
index ff539ec1..32b22f0c 100644
--- a/src/main/java/com/ai/da/common/constant/CommonConstant.java
+++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java
@@ -59,7 +59,8 @@ public class CommonConstant {
 
     public static final List<String> IS_SUBSCRIBE = Arrays.asList("yes", "no");
 
-    public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.jpg";
+//    public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.jpg";
+    public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.png";
 
     /* 截止至2024/08/26，在Code-Create DB中pmr_users表中最大的用户id */
     public static final Long MAXIMUM_USER_ID = 704L;

From aae1442a6f92275dfbef597e5bb5f006a30eb358 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Sun, 29 Sep 2024 15:55:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?websocket=E8=8E=B7=E5=8F=96=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=E6=95=B0=E4=B8=8E=E7=B2=89=E4=B8=9D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/service/MessageCenterService.java     |  2 ++
 .../da/service/impl/MessageCenterServiceImpl.java   | 13 ++++++++++++-
 .../ai/da/service/impl/PortfolioServiceImpl.java    |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/service/MessageCenterService.java b/src/main/java/com/ai/da/service/MessageCenterService.java
index 84bb9cd1..50b7574f 100644
--- a/src/main/java/com/ai/da/service/MessageCenterService.java
+++ b/src/main/java/com/ai/da/service/MessageCenterService.java
@@ -18,6 +18,8 @@ public interface MessageCenterService extends IService<Notification> {
 
     void prePushMessage(Notification notification);
 
+    void pushMessage(String type, Long receiverId);
+
     void cancelPushMessage(String type, Long senderId, Long receiverId, Long portfolioId, Long commentId);
 
     Boolean setReadStatus(List<Long> notificationIdList, String type);
diff --git a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
index ff53737e..463df6c0 100644
--- a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
@@ -168,6 +168,7 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
         ArrayList<Map<String, Object>> resp = new ArrayList<>();
         HashMap<String, Object> data = new HashMap<>();
         Long count;
+        Long accountId = UserContext.getUserHolder().getId();
         if (!type.equals("system")) {
             // 个人未读消息
             count = getUnreadCountByType(type, receiverId);
@@ -175,9 +176,19 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
             // 系统未读消息
             count = getUnreadSystemNotification();
         }
+        if (type.equals("follow")){
+            HashMap<String, Object> followee = new HashMap<>();
+            HashMap<String, Object> follower = new HashMap<>();
+            follower.put("followerCount",portfolioService.getFollowerCount(accountId));
+            followee.put("followeeCount",portfolioService.getFolloweeCount(accountId));
+            resp.add(followee);
+            resp.add(follower);
+        }
 
         data.put(type, count);
-        resp.add(data);
+        if (count != 0){
+            resp.add(data);
+        }
         String jsonString = JSON.toJSONString(resp);
         log.info("消息推送 ： {}", jsonString);
 
diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
index b59a7479..e3949f92 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -1081,6 +1081,8 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
         } else {
             throw new BusinessException("you.have.not.followed.the.current.user", 1);
         }
+        // 3、更新关注人数
+        messageCenterService.pushMessage("follow", accountId);
     }
 
     public Long getFolloweeCount(Long accountId) {