调整 ws 包结构, OkHttpClient 初始化时添加 pingInterval, 定时发送心跳消息

agent/src/main/java/cn/reghao/devops/agent/AgentApp.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.agent;
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
-import cn.reghao.devops.agent.event.ws.WsClient;
+import cn.reghao.devops.agent.ws.WsClient;
 import cn.reghao.devops.agent.config.ConfigFile;
 import cn.reghao.devops.agent.config.DagentConfig;
 import cn.reghao.devops.agent.task.ImageCleanTask;

agent/src/main/java/cn/reghao/devops/agent/event/ws/WebSocketListenerImpl.java → agent/src/main/java/cn/reghao/devops/agent/ws/WebSocketListenerImpl.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.agent.event.ws;
+package cn.reghao.devops.agent.ws;
 
-import cn.reghao.devops.agent.event.EventCenter;
+import cn.reghao.devops.agent.ws.event.EventCenter;
 import cn.reghao.devops.common.agent.machine.MachineEvent;
 import cn.reghao.jutil.jdk.serializer.JdkSerializer;
 import cn.reghao.jutil.jdk.event.message.EventMessage;

agent/src/main/java/cn/reghao/devops/agent/event/ws/WsClient.java → agent/src/main/java/cn/reghao/devops/agent/ws/WsClient.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.agent.event.ws;
+package cn.reghao.devops.agent.ws;
 
 import cn.reghao.devops.agent.config.DagentConfig;
-import cn.reghao.devops.agent.event.EventCenter;
+import cn.reghao.devops.agent.ws.event.EventCenter;
 import cn.reghao.devops.common.agent.app.iface.AppDeploy;
 import cn.reghao.devops.common.agent.app.iface.AppStat;
 import cn.reghao.devops.common.agent.machine.MachineEvent;
@@ -68,6 +68,7 @@ public class WsClient implements MessageSender {
                 .build();
 
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .pingInterval(30, TimeUnit.SECONDS)
                 .connectTimeout(60, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)

agent/src/main/java/cn/reghao/devops/agent/event/EventCenter.java → agent/src/main/java/cn/reghao/devops/agent/ws/event/EventCenter.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.agent.event;
+package cn.reghao.devops.agent.ws.event;
 
-import cn.reghao.devops.agent.event.handler.EvtAppDeployHandler;
-import cn.reghao.devops.agent.event.handler.EvtAppStatHandler;
+import cn.reghao.devops.agent.ws.event.handler.EvtAppDeployHandler;
+import cn.reghao.devops.agent.ws.event.handler.EvtAppStatHandler;
 import cn.reghao.devops.common.agent.app.iface.AppDeploy;
 import cn.reghao.devops.common.agent.app.iface.AppStat;
 import cn.reghao.devops.common.msg.MessageSender;

agent/src/main/java/cn/reghao/devops/agent/event/handler/EvtAppDeployHandler.java → agent/src/main/java/cn/reghao/devops/agent/ws/event/handler/EvtAppDeployHandler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.agent.event.handler;
+package cn.reghao.devops.agent.ws.event.handler;
 
 import cn.reghao.devops.common.agent.app.iface.AppDeploy;
 import cn.reghao.devops.common.machine.Machine;

agent/src/main/java/cn/reghao/devops/agent/event/handler/EvtAppStatHandler.java → agent/src/main/java/cn/reghao/devops/agent/ws/event/handler/EvtAppStatHandler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.agent.event.handler;
+package cn.reghao.devops.agent.ws.event.handler;
 
 import cn.reghao.devops.common.agent.app.iface.AppStat;
 import cn.reghao.devops.common.machine.Machine;