Merge branch 'refs/heads/dev/dev' into dev/dev_xp

2024-11-19 17:09:36 +08:00
parent 4d756d5624 74e6d5a1da
commit 2ea19dcf03
18 changed files with 274 additions and 56 deletions
--- a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
+++ b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
@@ -51,7 +51,7 @@ public class AuthenticationFilter extends OncePerRequestFilter {
                    "/api/python/flush","/api/account/healthy","/api/ali-pay/trade/notify","/api/paypal/ipn/back","/api/alipay-hk/trade/notify",
                    "/api/portfolio/page", "/api/portfolio/detail", "/api/portfolio/commentPage", "/api/portfolio/viewsIncrease",
                    "/api/account/designWorksRegister","/api/account/questionnaire","/api/stripe/trade/notify",
-                    "/notification","/api/account/activateNewEmail"
+                    "/notification","/api/account/activateNewEmail","/api/third/party/auth/google_callback"
            );

    @Override
--- a/src/main/java/com/ai/da/common/task/AccountTask.java
+++ b/src/main/java/com/ai/da/common/task/AccountTask.java
@@ -19,7 +19,7 @@ public class AccountTask {
    /**
     * 每周日晚上刷新 年付用户、月付用户的积分
     */
-    @Scheduled(cron = "59 59 23 ? * SUN")
+//    @Scheduled(cron = "59 59 23 ? * SUN")
 //    @Scheduled(cron = "59 59 23 * * ?")
    public void refreshCreditsMonthly() {
        log.info("每周日晚11：59：59刷新付费用户积分为 6000");
@@ -33,7 +33,7 @@ public class AccountTask {
    }

    // 每天凌晨0点执行一次
-    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")
    public void cancelActivityBenefits() {
        // 1、查询当前所有参与了活动且过期的用户
        List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
@@ -46,7 +46,7 @@ public class AccountTask {
    }

    // 每天检测正式用户到期情况，每天凌晨0点执行
-    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")
    public void paidUserToVisitor() {
        // 1、查询当前已过期正式用户或试用用户
        List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
--- a/src/main/java/com/ai/da/common/websocket/NotificationConnection.java
+++ b/src/main/java/com/ai/da/common/websocket/NotificationConnection.java
@@ -1,7 +1,10 @@
 package com.ai.da.common.websocket;

+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;

 import javax.websocket.*;
 import javax.websocket.server.PathParam;
@@ -16,54 +19,55 @@ import java.util.concurrent.ConcurrentHashMap;
@Slf4j
 public class NotificationConnection {

-    static Map<String,Session> sessionMap = new ConcurrentHashMap<>();
+    //连接超时
+    public static final long MAX_TIME_OUT = 3 * 60 * 1000;

    private Session session;
+    private Long userId;
    // 这里用ConcurrentHashMap 因为他是一个线程安全的Map
    private static ConcurrentHashMap<Long, NotificationConnection> websockets = new ConcurrentHashMap<>();
-    //连接建立时执行的操作
-    /*@OnOpen
-    public void onOpen(Session session){
-        sessionMap.put(session.getId(),session);
-        log.info("websocket is open, sessionId: {}",session.getId());
-    }*/

    @OnOpen
    public void onOpen(Session session, @PathParam("id") String id) {  // 接收到前端传来的用户ID
        this.session = session;
+        this.userId = Long.valueOf(id);
+        this.session.setMaxIdleTimeout(MAX_TIME_OUT);
        websockets.put(Long.parseLong(id), this);  //将ID作为key，当前的对象作为Value
        log.info("【建立连接】 用户为：{}", this.session);
        log.info("【建立连接】 用户Id为：{}", id);
-        log.info("【建立连接】 总数为：{}", websockets.size());
+        log.info("【当前连接总数】 为：{}", websockets.size());
    }

    @OnClose
-    public void onClose() {
-        websockets.remove(this); // 将当前的对象从集合中删除
-        log.info("【连接断开】 用户为：{}", this.session);
-//        log.info("【连接断开】 总数为：{}", websockets.size());
+    public void onClose(CloseReason reason) {
+        log.info("【连接断开】 用户为：{}, sessionId: {}, 原因为{}", this.userId, this.session.getId(), reason);
+        log.info("【当前连接总数】 为：{}", websockets.size());
+        websockets.remove(this.userId); // 将当前的对象从集合中删除
+    }
+
+    /**
+     * 错误时调用
+     * @param throwable 异常
+     */
+    @OnError
+    public void onError(Throwable throwable) {
+        log.info("【连接异常】 用户为：{} ,  sessionId: {}", this.userId, this.session.getId(), throwable);
+        websockets.remove(this.userId); // 将当前的对象从集合中删除
+        log.info("【当前连接总数】 为：{}", websockets.size());
    }

    //收到了客户端消息执行的操作
    @OnMessage
-    public void onMessage(String text){
-        log.info("收到了一条消息："+text);
+    public void onMessage(@RequestParam String text){
+        Map<String, String> textMap = JSONObject.parseObject(text, Map.class);
+        log.info("收到了一条来自 {} 的消息：{}， sessionId：{}", this.userId, textMap.get("text"), this.session.getId());
 //        return "已收到你的消息";
-    }
-    /*//连接关闭的时候执行的操作
-    @OnClose
-    public void onClose(Session session){
-        sessionMap.remove(session.getId());
-        log.info("websocket is close, sessionId: {}",session.getId());
-    }
-
-    public void sendMsg(String message) throws IOException {
-        for(String key:sessionMap.keySet()){
-            sessionMap.get(key).getBasicRemote().sendText(message);
+        if (textMap.get("text").equals("PING")){
+            sendMsg(JSON.toJSONString("PONG"), this.userId);
        }
-    }*/
+    }

-    public void sendMsg(String message, Long userId) throws IOException {
+    public void sendMsg(String message, Long userId)  {
        if (userId == null) {  // 如果等于null则证明是群发
            // 获取当前Map的一个迭代器，遍历Map的方式有很多种，看着来
            // 这个就是遍历这个集合的过程....
@@ -73,7 +77,11 @@ public class NotificationConnection {
                NotificationConnection webSocket = entry.getValue();
                // 接下来就是遍历群发
                log.info("广播消息 【给用户】 ：{}发送消息【{}】", webSocket, message);
-                webSocket.session.getBasicRemote().sendText(message); // 发送！！！！！！！！！
+                try {
+                    webSocket.session.getBasicRemote().sendText(message); // 发送！！！！！！！！！
+                } catch (IOException e) {
+                    log.error("Failed to send message to session {}: {}", webSocket.session.getId(), e.getMessage());
+                }
            }
        } else {  // 如果不是群发，则判断ID，其余步骤一致
            // 获取当前Map的一个迭代器，遍历Map的方式有很多种，看着来
--- a/src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java
+++ b/src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java
@@ -6,8 +6,6 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;

 /**
 * Configuration of WebSocket
- *
- * @author db1995
 */
@Configuration
 public class WebSocketConfig {