调整包结构和类名

common/src/main/java/cn/reghao/autodop/common/msg/pub/clazz/PubClazz.java

@@ -5,5 +5,5 @@ package cn.reghao.autodop.common.msg.pub.clazz;
  * @date 2021-09-15 11:51:17
  */
 public enum PubClazz {
-    NodePubClazz, MachinePubClazz
+    NodePubClazz,
 }

common/src/main/java/cn/reghao/autodop/common/msg/rpc/clazz/DockerRpcClazz.java

@@ -5,5 +5,5 @@ package cn.reghao.autodop.common.msg.rpc.clazz;
  * @date 2020-12-25 19:15:00
  */
 public enum DockerRpcClazz {
-    dockerImage,
+    dockerImage, dockerPs
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/AppConfig.java

@@ -84,6 +84,7 @@ public class AppConfig extends BaseEntity<Integer> implements Cloneable {
     @LazyCollection(LazyCollectionOption.FALSE)
     private List<DeployConfig> deployConfigs;
     /* 运行配置 */
+    @Embedded
     private RunningConfig runningConfig;
 
     @Override

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/rpc/AppRpcClazzResultService.java

@@ -0,0 +1,13 @@
+package cn.reghao.autodop.dmaster.app.service.rpc;
+
+import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
+
+/**
+ * @author reghao
+ * @date 2021-07-01 20:15:57
+ */
+public interface AppRpcClazzResultService {
+    void deployResult(DeployResult deployResult);
+    void statusResult(AppStatus appStatus);
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/AppOpsResultService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/rpc/AppRpcClazzResultServiceImpl.java

@@ -1,19 +1,19 @@
-package cn.reghao.autodop.dmaster.app.service;
+package cn.reghao.autodop.dmaster.app.service.rpc;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
 import cn.reghao.autodop.common.http.DefaultWebRequest;
 import cn.reghao.autodop.common.http.WebRequest;
+import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
+import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.log.BuildLogRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.log.DeployLogRepository;
 import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.model.po.log.DeployLog;
-import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
-import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
-import cn.reghao.autodop.dmaster.app.db.repository.log.BuildLogRepository;
-import cn.reghao.autodop.dmaster.app.db.repository.log.DeployLogRepository;
 import cn.reghao.autodop.dmaster.app.service.bd.DeployNotifyMsg;
 import cn.reghao.autodop.dmaster.monitor.service.MonitorService;
 import cn.reghao.autodop.dmaster.monitor.service.job.AppHealthCheckJob;
@@ -28,13 +28,11 @@ import java.util.List;
 import java.util.Optional;
 
 /**
- * 对 AppOps Result 部分的实现
- *
  * @author reghao
  * @date 2021-07-01 20:15:57
  */
 @Service
-public class AppOpsResultService {
+public class AppRpcClazzResultServiceImpl implements AppRpcClazzResultService {
     private MonitorService monitorService;
     private AppRunningRepository runningRepository;
     private NotifyService notifyService;
@@ -44,13 +42,13 @@ public class AppOpsResultService {
     private AppDeployingRepository deployingRepository;
     private AppConfigQuery appConfigQuery;
 
-    public AppOpsResultService(MonitorService monitorService,
-                               AppRunningRepository runningRepository,
-                               NotifyService notifyService,
-                               BuildLogRepository buildLogRepository,
-                               DeployLogRepository deployLogRepository,
-                               AppDeployingRepository deployingRepository,
-                               AppConfigQuery appConfigQuery) {
+    public AppRpcClazzResultServiceImpl(MonitorService monitorService,
+                                        AppRunningRepository runningRepository,
+                                        NotifyService notifyService,
+                                        BuildLogRepository buildLogRepository,
+                                        DeployLogRepository deployLogRepository,
+                                        AppDeployingRepository deployingRepository,
+                                        AppConfigQuery appConfigQuery) {
         this.monitorService = monitorService;
         this.runningRepository = runningRepository;
         this.notifyService = notifyService;
@@ -61,6 +59,7 @@ public class AppOpsResultService {
         this.appConfigQuery = appConfigQuery;
     }
 
+    @Override
     public void deployResult(DeployResult deployResult) {
         DeployLog deployLog = DeployLog.from(deployResult);
         deployLogRepository.save(deployLog);
@@ -115,11 +114,8 @@ public class AppOpsResultService {
         });
     }
 
+    @Override
     public void statusResult(AppStatus appStatus) {
-        processAppStatus(appStatus);
-    }
-
-    private void processAppStatus(AppStatus appStatus) {
         String appId = appStatus.getAppId();
         String machineId = appStatus.getMachineId();
         AppRunning appRunning = runningRepository.findByAppIdAndMachineId(appId, machineId);
@@ -129,15 +125,6 @@ public class AppOpsResultService {
         }
     }
 
-    public void restartResult(AppStatus appStatus) {
-    }
-
-    public void stopResult(AppStatus appStatus) {
-    }
-
-    public void startResult(AppStatus appStatus) {
-    }
-
     public void addMonitor(String appId, String machineId) {
         String jobClassName = AppHealthCheckJob.class.getSimpleName();
         String jobId = String.format("%s-%s-%s", appId, machineId, jobClassName);

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/MessageListener.java

@@ -8,10 +8,10 @@ import cn.reghao.autodop.common.msg.rpc.RpcPayload;
 import cn.reghao.autodop.common.msg.rpc.RpcMsg;
 import cn.reghao.autodop.common.msg.rpc.RpcResult;
 import cn.reghao.autodop.common.msg.rpc.clazz.RpcClazz;
-import cn.reghao.autodop.dmaster.mqttsub.rpcresult.AppClazzRpcResult;
+import cn.reghao.autodop.dmaster.mqttsub.rpcresult.AppRpcClazzResult;
 import cn.reghao.autodop.dmaster.mqttsub.impl.NodeClazzPubResult;
-import cn.reghao.autodop.dmaster.mqttsub.rpcresult.DockerClazzRpcResult;
-import cn.reghao.autodop.dmaster.mqttsub.rpcresult.MachineClazzRpcResult;
+import cn.reghao.autodop.dmaster.mqttsub.rpcresult.DockerRpcClazzResult;
+import cn.reghao.autodop.dmaster.mqttsub.rpcresult.MachineRpcClazzResult;
 import cn.reghao.jdkutil.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
@@ -29,18 +29,18 @@ import org.springframework.stereotype.Component;
 @Component
 public class MessageListener implements MqttCallback {
     private final NodeClazzPubResult nodeClazzPubResult;
-    private final MachineClazzRpcResult machineClazzRpcResult;
-    private final AppClazzRpcResult appClazzRpcResult;
-    private final DockerClazzRpcResult dockerClazzRpcResult;
+    private final MachineRpcClazzResult machineRpcClazzResult;
+    private final AppRpcClazzResult appRpcClazzResult;
+    private final DockerRpcClazzResult dockerRpcClazzResult;
 
     public MessageListener(NodeClazzPubResult nodeClazzPubResult,
-                           MachineClazzRpcResult machineClazzRpcResult,
-                           AppClazzRpcResult appClazzRpcResult,
-                           DockerClazzRpcResult dockerClazzRpcResult) {
+                           MachineRpcClazzResult machineRpcClazzResult,
+                           AppRpcClazzResult appRpcClazzResult,
+                           DockerRpcClazzResult dockerRpcClazzResult) {
         this.nodeClazzPubResult = nodeClazzPubResult;
-        this.machineClazzRpcResult = machineClazzRpcResult;
-        this.appClazzRpcResult = appClazzRpcResult;
-        this.dockerClazzRpcResult = dockerClazzRpcResult;
+        this.machineRpcClazzResult = machineRpcClazzResult;
+        this.appRpcClazzResult = appRpcClazzResult;
+        this.dockerRpcClazzResult = dockerRpcClazzResult;
     }
 
     @Override
@@ -88,13 +88,13 @@ public class MessageListener implements MqttCallback {
         RpcResult rpcResult = rpcMsg.getRpcResult();
         switch (RpcClazz.valueOf(clazz)) {
             case AppRpcClazz:
-                appClazzRpcResult.process(msgId, method, rpcResult);
+                appRpcClazzResult.process(msgId, method, rpcResult);
                 break;
             case MachineRpcClazz:
-                machineClazzRpcResult.process(msgId, method, rpcResult);
+                machineRpcClazzResult.process(msgId, method, rpcResult);
                 break;
             case DockerRpcClazz:
-                dockerClazzRpcResult.process(msgId, method, rpcResult);
+                dockerRpcClazzResult.process(msgId, method, rpcResult);
                 break;
             default:
                 ;

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/rpcresult/AppClazzRpcResult.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/rpcresult/AppRpcClazzResult.java

@@ -7,24 +7,24 @@ import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.jdkutil.serializer.JsonConverter;
-import cn.reghao.autodop.dmaster.app.service.AppOpsResultService;
+import cn.reghao.autodop.dmaster.app.service.rpc.AppRpcClazzResultService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
- * 分发 App Result 相关的消息
+ * 分发 AppRpcClazz 相关的消息
  *
  * @author reghao
  * @date 2020-12-30 10:26:47
  */
 @Slf4j
 @Component
-public class AppClazzRpcResult {
-    private final AppOpsResultService appOpsResultService;
+public class AppRpcClazzResult {
+    private final AppRpcClazzResultService appRpcClazzResultService;
     private final DefaultMqttClient mqttClient;
 
-    public AppClazzRpcResult(AppOpsResultService appOpsResultService, DefaultMqttClient mqttClient) {
-        this.appOpsResultService = appOpsResultService;
+    public AppRpcClazzResult(AppRpcClazzResultService appRpcClazzResultService, DefaultMqttClient mqttClient) {
+        this.appRpcClazzResultService = appRpcClazzResultService;
         this.mqttClient = mqttClient;
     }
 
@@ -39,19 +39,13 @@ public class AppClazzRpcResult {
 
         switch (AppRpcClazz.valueOf(method)) {
             case deploy:
-                processAppDeployResult(rpcResult.getJsonData());
+                processDeployResult(rpcResult.getJsonData());
                 break;
             case start:
-                processAppStatusResult(rpcResult.getJsonData());
-                break;
             case stop:
-                processAppStatusResult(rpcResult.getJsonData());
-                break;
             case restart:
-                processAppStatusResult(rpcResult.getJsonData());
-                break;
             case status:
-                processAppStatusResult(rpcResult.getJsonData());
+                processStatusResult(rpcResult.getJsonData());
                 break;
             case log:
                 break;
@@ -60,15 +54,15 @@ public class AppClazzRpcResult {
         }
     }
 
-    private void processAppDeployResult(String payload) {
+    private void processDeployResult(String payload) {
         DeployResult deployResult = JsonConverter.jsonToObject(payload, DeployResult.class);
-        appOpsResultService.deployResult(deployResult);
+        appRpcClazzResultService.deployResult(deployResult);
     }
 
-    private void processAppStatusResult(String payload) {
+    private void processStatusResult(String payload) {
         AppStatus appStatus = JsonConverter.jsonToObject(payload, AppStatus.class);
         if (appStatus != null) {
-            appOpsResultService.statusResult(appStatus);
+            appRpcClazzResultService.statusResult(appStatus);
         }
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/rpcresult/DockerClazzRpcResult.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/rpcresult/DockerRpcClazzResult.java

@@ -10,10 +10,10 @@ import org.springframework.stereotype.Component;
  * @date 2021-09-15 14:45:43
  */
 @Component
-public class DockerClazzRpcResult {
+public class DockerRpcClazzResult {
     private final DefaultMqttClient mqttClient;
 
-    public DockerClazzRpcResult(DefaultMqttClient mqttClient) {
+    public DockerRpcClazzResult(DefaultMqttClient mqttClient) {
         this.mqttClient = mqttClient;
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/rpcresult/MachineClazzRpcResult.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/rpcresult/MachineRpcClazzResult.java

@@ -12,10 +12,10 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-public class MachineClazzRpcResult {
+public class MachineRpcClazzResult {
     private final DefaultMqttClient mqttClient;
 
-    public MachineClazzRpcResult(DefaultMqttClient mqttClient) {
+    public MachineRpcClazzResult(DefaultMqttClient mqttClient) {
         this.mqttClient = mqttClient;
     }