删除无用代码

common/src/main/java/cn/reghao/devops/common/ws/MessageDispatcher.java

@@ -1,18 +0,0 @@
-package cn.reghao.devops.common.ws;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @author reghao
- * @date 2023-11-01 14:34:19
- */
-@Slf4j
-public class MessageDispatcher {
-    public void dispatch(String text) {
-        log.info("text message from server");
-    }
-
-    public void dispatch(Object object) {
-        log.info("binary message from server");
-    }
-}

common/src/main/java/cn/reghao/devops/common/ws/WebSocketListenerImpl.java

@@ -18,7 +18,6 @@ import java.net.ProtocolException;
 @Slf4j
 public class WebSocketListenerImpl extends WebSocketListener {
     private final WsClient wsClient;
-    private MessageDispatcher dispatcher;
 
     public WebSocketListenerImpl(WsClient wsClient) {
         this.wsClient = wsClient;
@@ -82,12 +81,10 @@ public class WebSocketListenerImpl extends WebSocketListener {
 
     @Override
     public void onMessage(WebSocket webSocket, String text) {
-        dispatcher.dispatch(text);
     }
 
     @Override
     public void onMessage(WebSocket webSocket, ByteString bytes) {
         Object object = JdkSerializer.deserialize(bytes.toByteArray());
-        dispatcher.dispatch(object);
     }
 }

web/src/main/java/cn/reghao/devops/web/mgr/app/service/bd/impl/AppStatImpl.java

@@ -7,8 +7,8 @@ import cn.reghao.devops.web.mgr.app.db.repository.config.AppConfigRepository;
 import cn.reghao.devops.web.mgr.app.model.po.config.AppConfig;
 import cn.reghao.devops.web.mgr.app.service.PermissionCheck;
 import cn.reghao.devops.web.mgr.app.service.bd.AppStat;
-import cn.reghao.devops.web.ws.MessageSenders;
 import cn.reghao.devops.web.mgr.machine.service.MachineService;
+import cn.reghao.devops.web.ws.WsSender;
 import cn.reghao.jutil.jdk.event.message.EventMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -25,13 +25,13 @@ import java.util.List;
 @Slf4j
 @Service
 public class AppStatImpl implements AppStat {
-    private final MessageSenders messageSenders;
+    private final WsSender wsSender;
     private final AppConfigRepository appConfigRepository;
     private final MachineService machineService;
 
-    public AppStatImpl(MessageSenders messageSenders, AppConfigRepository appConfigRepository,
+    public AppStatImpl(WsSender wsSender, AppConfigRepository appConfigRepository,
                        MachineService machineService) {
-        this.messageSenders = messageSenders;
+        this.wsSender = wsSender;
         this.appConfigRepository = appConfigRepository;
         this.machineService = machineService;
     }
@@ -76,7 +76,7 @@ public class AppStatImpl implements AppStat {
         }
 
         try {
-            messageSenders.send(machineId, evtMsg);
+            wsSender.send(machineId, evtMsg);
         } catch (IOException e) {
             e.printStackTrace();
         }

web/src/main/java/cn/reghao/devops/web/mgr/app/service/bd/impl/DeployAppImpl.java

@@ -12,9 +12,9 @@ import cn.reghao.devops.web.mgr.app.model.po.log.BuildLog;
 import cn.reghao.devops.web.mgr.app.service.bd.DeployApp;
 import cn.reghao.devops.web.mgr.app.service.bd.DeployStat;
 import cn.reghao.devops.web.mgr.machine.service.MachineService;
-import cn.reghao.devops.web.ws.MessageSenders;
 import cn.reghao.devops.common.msg.event.EvtAppDeploy;
 import cn.reghao.devops.common.msg.event.EvtAppStatResult;
+import cn.reghao.devops.web.ws.WsSender;
 import cn.reghao.jutil.jdk.event.message.EventMessage;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
@@ -32,14 +32,14 @@ import java.util.List;
 @Service
 public class DeployAppImpl implements DeployApp {
     private final MachineService machineService;
-    private final MessageSenders messageSenders;
+    private final WsSender wsSender;
     private final DeployStat deployStat;
     private final BuildLogRepository buildLogRepository;
     private final AppDeployConfigQuery appDeployConfigQuery;
 
-    public DeployAppImpl(MachineService machineService, MessageSenders messageSenders, DeployStat deployStat,
+    public DeployAppImpl(MachineService machineService, WsSender wsSender, DeployStat deployStat,
                          BuildLogRepository buildLogRepository, AppDeployConfigQuery appDeployConfigQuery) {
-        this.messageSenders = messageSenders;
+        this.wsSender = wsSender;
         this.deployStat = deployStat;
         this.buildLogRepository = buildLogRepository;
         this.appDeployConfigQuery = appDeployConfigQuery;
@@ -107,7 +107,7 @@ public class DeployAppImpl implements DeployApp {
         deployStat.beforeDeploy(appBuilding, machineId, deployBy);
         EventMessage evtMsg = EventMessage.evt(deployParam);
         try {
-            messageSenders.send(machineId, evtMsg);
+            wsSender.send(machineId, evtMsg);
         } catch (IOException e) {
             e.printStackTrace();
             EvtAppStatResult statResult = new EvtAppStatResult(appId, machineId);

web/src/main/java/cn/reghao/devops/web/mgr/log/Appenders.java

@@ -6,7 +6,6 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.FileAppender;
-import cn.reghao.devops.web.ws.PushAppender;
 import cn.reghao.devops.web.ws.handler.LogHandler;
 import org.slf4j.LoggerFactory;
 

web/src/main/java/cn/reghao/devops/web/ws/PushAppender.java → web/src/main/java/cn/reghao/devops/web/mgr/log/PushAppender.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.web.ws;
+package cn.reghao.devops.web.mgr.log;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;

web/src/main/java/cn/reghao/devops/web/ws/MessageDispatcher.java

@@ -1,79 +0,0 @@
-package cn.reghao.devops.web.ws;
-
-import cn.reghao.devops.web.ws.model.EventType;
-import cn.reghao.devops.web.ws.model.resp.EventMessageResp;
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import com.google.gson.JsonObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketSession;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2022-04-21 10:32:37
- */
-@Slf4j
-@Component
-public class MessageDispatcher {
-    private final Map<String, WebSocketSession> userSessions = new HashMap<>();
-    private final Map<String, String> sessionUsers = new HashMap<>();
-
-    public void addUserSession(String userId, WebSocketSession webSocketSession) {
-        String sessionId = webSocketSession.getId();
-        userSessions.put(userId, webSocketSession);
-        sessionUsers.put(sessionId, userId);
-    }
-
-    public void removeUserSession(WebSocketSession webSocketSession) {
-        String sessionId = webSocketSession.getId();
-        String userId = sessionUsers.get(sessionId);
-        userSessions.remove(userId);
-        sessionUsers.remove(userId);
-    }
-
-    public String getUserId(String sessionId) {
-        return sessionUsers.get(sessionId);
-    }
-
-    public void dispatch(WebSocketSession session, String payload) throws IOException {
-        JsonObject jsonObject = JsonConverter.jsonToJsonElement(payload).getAsJsonObject();
-        String event = jsonObject.get("event").getAsString();
-        String payload1 = jsonObject.get("payload").getAsString();
-        switch (EventType.valueOf(event)) {
-            case heartbeat:
-                EventMessageResp<String> resp = new EventMessageResp<>(EventType.heartbeat, "pong");
-                sendMessage(session, resp);
-                break;
-            case event_error:
-                log.info("error event");
-                break;
-            case event_content:
-                log.info(payload1);
-                EventMessageResp<String> resp1 = new EventMessageResp<>(EventType.event_content, "hahahahaha");
-                sendMessage(session, resp1);
-                break;
-            case event_sync:
-
-                break;
-            default:
-        }
-    }
-
-    public void sendMessage(String userId, Object payload) throws IOException {
-        WebSocketSession session = userSessions.get(userId);
-        if (session != null) {
-            TextMessage textMessage = new TextMessage(JsonConverter.objectToJson(payload));
-            session.sendMessage(textMessage);
-        }
-    }
-
-    public void sendMessage(WebSocketSession session, Object payload) throws IOException {
-        TextMessage textMessage = new TextMessage(JsonConverter.objectToJson(payload));
-        session.sendMessage(textMessage);
-    }
-}

web/src/main/java/cn/reghao/devops/web/ws/MessageSenders.java

@@ -1,31 +0,0 @@
-package cn.reghao.devops.web.ws;
-
-import cn.reghao.devops.common.msg.MessageSender;
-import cn.reghao.devops.common.msg.constant.Protocol;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2023-03-01 14:19:11
- */
-@Component
-public class MessageSenders {
-    private final static Map<String, MessageSender> map = new HashMap<>();
-
-    public MessageSenders(MessageSender wsSender) {
-        map.put(Protocol.ws.name(), wsSender);
-    }
-
-    public MessageSender getMessageSender(String protocol) {
-        return map.get(protocol);
-    }
-
-    public void send(String machineId, Object message) throws IOException {
-        MessageSender messageSender = getMessageSender(Protocol.ws.name());
-        messageSender.send(machineId, message);
-    }
-}

web/src/main/java/cn/reghao/devops/web/ws/WsSender.java

@@ -1,6 +1,5 @@
 package cn.reghao.devops.web.ws;
 
-import cn.reghao.devops.common.msg.MessageSender;
 import cn.reghao.jutil.jdk.serializer.JdkSerializer;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.BinaryMessage;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @date 2023-03-01 11:03:31
  */
 @Component
-public class WsSender implements MessageSender {
+public class WsSender {
     private final static Map<String, WebSocketSession> sessionMap = new HashMap<>();
 
     public void addSession(String machineId, WebSocketSession session) {
@@ -26,16 +25,6 @@ public class WsSender implements MessageSender {
         sessionMap.remove(machineId);
     }
 
-    @Override
-    public void setConnected(boolean status) {
-    }
-
-    @Override
-    public boolean isConnected() {
-        return true;
-    }
-
-    @Override
     public void send(String dest, Object message) throws IOException {
         WebSocketSession session = sessionMap.get(dest);
         byte[] bytes = JdkSerializer.serialize(message);

web/src/main/java/cn/reghao/devops/web/ws/config/WebSocketConfig.java

@@ -17,16 +17,13 @@ public class WebSocketConfig implements WebSocketConfigurer {
     private final WebSocketHandler sshWebSocketHandler;
     private final WebSocketHandler agentWebSocketHandler;
     private final WebSocketHandler logHandler;
-    private final WebSocketHandler messageHandler;
 
     public WebSocketConfig(WebSocketInterceptor webSocketInterceptor, WebSocketHandler sshWebSocketHandler, 
-                           WebSocketHandler agentWebSocketHandler, WebSocketHandler logHandler,
-                           WebSocketHandler messageHandler) {
+                           WebSocketHandler agentWebSocketHandler, WebSocketHandler logHandler) {
         this.webSocketInterceptor = webSocketInterceptor;
         this.sshWebSocketHandler = sshWebSocketHandler;
         this.agentWebSocketHandler = agentWebSocketHandler;
         this.logHandler = logHandler;
-        this.messageHandler = messageHandler;
     }
 
     @Override
@@ -46,9 +43,5 @@ public class WebSocketConfig implements WebSocketConfigurer {
         registry.addHandler(logHandler, "/ws/log/pull")
                 .addInterceptors(webSocketInterceptor)
                 .setAllowedOrigins("*");
-
-        registry.addHandler(messageHandler, "/ws/message")
-                .addInterceptors(webSocketInterceptor)
-                .setAllowedOrigins("*");
     }
 }

web/src/main/java/cn/reghao/devops/web/ws/handler/MessageHandler.java

@@ -1,99 +0,0 @@
-package cn.reghao.devops.web.ws.handler;
-
-import cn.reghao.devops.web.ws.MessageDispatcher;
-import cn.reghao.devops.web.ws.model.EventType;
-import cn.reghao.jutil.jdk.serializer.JdkSerializer;
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import com.google.gson.JsonObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.socket.*;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author reghao
- * @date 2022-03-11 16:45:52
- */
-@Slf4j
-@Component
-public class MessageHandler implements WebSocketHandler {
-    private MessageDispatcher messageDispatcher;
-    private final Map<String, WebSocketSession> sessionMap = new ConcurrentHashMap<>();
-
-    public MessageHandler(MessageDispatcher messageDispatcher) {
-        this.messageDispatcher = messageDispatcher;
-    }
-
-    @Override
-    public void afterConnectionEstablished(WebSocketSession webSocketSession) throws IOException {
-        String sessionId = webSocketSession.getId();
-        sessionMap.put(sessionId, webSocketSession);
-        log.info("WebSocket 建立连接");
-    }
-
-    @Override
-    public void handleMessage(WebSocketSession webSocketSession, WebSocketMessage<?> webSocketMessage)
-            throws IOException {
-        if (webSocketMessage instanceof TextMessage) {
-            String payload = (String) webSocketMessage.getPayload();
-            JsonObject jsonObject = JsonConverter.jsonToJsonElement(payload).getAsJsonObject();
-            String event = jsonObject.get("event").getAsString();
-            String payload1 = jsonObject.get("payload").getAsString();
-            switch (EventType.valueOf(event)) {
-                case heartbeat:
-                    break;
-                case event_error:
-                    break;
-                case event_content:
-                    break;
-                case event_sync:
-                    break;
-                default:
-            }
-            /*log.info("接收到 WebSocket 文本消息");
-            TextMessage textMessage = (TextMessage) webSocketMessage;
-            JsonObject jsonObject = JsonConverter.jsonToJsonElement(textMessage.getPayload()).getAsJsonObject();
-            sessionMap.forEach((key, session) -> {
-                try {
-                    session.sendMessage(webSocketMessage);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            });*/
-        } else if (webSocketMessage instanceof BinaryMessage) {
-            log.info("接收到 WebSocket 二进制消息");
-            BinaryMessage binaryMessage = (BinaryMessage) webSocketMessage;
-            Object object = JdkSerializer.deserialize(binaryMessage.getPayload().array());
-        } else if (webSocketMessage instanceof PingMessage) {
-            log.info("接收到 WebSocket PingMessage");
-        } else if (webSocketMessage instanceof PongMessage) {
-            log.info("接收到 WebSocket PongMessage");
-        } else {
-            log.error("接收到未知类型的 WebSocket 消息");
-        }
-    }
-
-    @Override
-    public void handleTransportError(WebSocketSession webSocketSession, Throwable throwable) {
-        log.error("WebSocket 数据传输错误");
-        removeSession(webSocketSession);
-    }
-
-    @Override
-    public void afterConnectionClosed(WebSocketSession webSocketSession, CloseStatus closeStatus) {
-        log.info("WebSocket 断开连接");
-        removeSession(webSocketSession);
-    }
-
-    private void removeSession(WebSocketSession webSocketSession) {
-        sessionMap.remove(webSocketSession.getId());
-    }
-
-    @Override
-    public boolean supportsPartialMessages() {
-        return false;
-    }
-}

web/src/main/java/cn/reghao/devops/web/ws/model/EventType.java

@@ -1,9 +0,0 @@
-package cn.reghao.devops.web.ws.model;
-
-/**
- * @author reghao
- * @date 2022-04-19 12:22:51
- */
-public enum EventType {
-    heartbeat, event_error, event_content, event_sync
-}

web/src/main/java/cn/reghao/devops/web/ws/model/event/EvtHeartbeat.java

@@ -1,13 +0,0 @@
-package cn.reghao.devops.web.ws.model.event;
-
-import cn.reghao.jutil.jdk.event.message.Event;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-05-13 17:01:50
- */
-@Getter
-public class EvtHeartbeat extends Event {
-
-}

web/src/main/java/cn/reghao/devops/web/ws/model/req/EvtHeartbeatReq.java

@@ -1,12 +0,0 @@
-package cn.reghao.devops.web.ws.model.req;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2022-04-19 12:17:37
- */
-@Getter
-public class EvtHeartbeatReq {
-    private String content;
-}

web/src/main/java/cn/reghao/devops/web/ws/model/resp/EventMessageResp.java

@@ -1,21 +0,0 @@
-package cn.reghao.devops.web.ws.model.resp;
-
-import cn.reghao.devops.web.ws.model.EventType;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2022-04-21 11:05:56
- */
-@Getter
-@Setter
-public class EventMessageResp <T> {
-    private final String event;
-    private final T payload;
-
-    public EventMessageResp(EventType eventType, T payload) {
-        this.event = eventType.name();
-        this.payload = payload;
-    }
-}