update model

web/src/main/java/cn/reghao/devops/web/mgr/app/service/AppDeployService.java

@@ -18,8 +18,8 @@ public interface AppDeployService {
     void deleteAppDeploying(String appId, String machineId);
     void deleteDeployLog(String buildLogId);
 
-    void afterBuild(AppBuilding appBuilding);
-    void beforeDeploy(AppBuilding appBuilding, String machineId, String deployBy);
-    void afterDeploy(EvtAppStatResult statResult);
-    void refresh(EvtAppStatResult statResult);
+    void updateAfterBuild(AppBuilding appBuilding);
+    void updateBeforeDeploy(AppBuilding appBuilding, String machineId, String deployBy);
+    void updateAfterDeploy(EvtAppStatResult statResult);
+    void updateAppDeployingNode(EvtAppStatResult statResult);
 }

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

@@ -103,7 +103,7 @@ public class DeployAppImpl implements DeployApp {
             return;
         }
 
-        appDeployService.beforeDeploy(appBuilding, machineId, deployBy);
+        appDeployService.updateBeforeDeploy(appBuilding, machineId, deployBy);
         EventMessage evtMsg = EventMessage.evt(deployParam);
         try {
             wsSender.send(machineId, evtMsg);
@@ -111,7 +111,7 @@ public class DeployAppImpl implements DeployApp {
             e.printStackTrace();
             EvtAppStatResult statResult = new EvtAppStatResult(appId, machineId);
             statResult.setResult(Result.result(ResultStatus.FAIL, "连接异常"));
-            appDeployService.afterDeploy(statResult);
+            appDeployService.updateAfterDeploy(statResult);
         }
     }
 }

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

@@ -213,7 +213,7 @@ public class AppBuildServiceImpl implements AppBuildService {
             appBuilding1.afterBuild(buildLog);
             buildingRepository.save(appBuilding1);
 
-            appDeployService.afterBuild(appBuilding1);
+            appDeployService.updateAfterBuild(appBuilding1);
             return appBuilding1;
         } catch (Exception e) {
             String errMsg = e.getMessage();

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

@@ -197,7 +197,7 @@ public class AppDeployServiceImpl implements AppDeployService {
     }
 
     @Override
-    public void afterBuild(AppBuilding appBuilding) {
+    public void updateAfterBuild(AppBuilding appBuilding) {
         AppConfig appConfig = appBuilding.getAppConfig();
         AppDeploying appDeploying = deployingRepository.findByAppConfig(appConfig);
         if (appDeploying != null) {
@@ -213,7 +213,7 @@ public class AppDeployServiceImpl implements AppDeployService {
     }
 
     @Override
-    public void beforeDeploy(AppBuilding appBuilding, String machineId, String deployBy) {
+    public void updateBeforeDeploy(AppBuilding appBuilding, String machineId, String deployBy) {
         AppDeploying appDeploying = deployingRepository.findByAppConfig(appBuilding.getAppConfig());
         appDeploying.setBuildLog(appBuilding.getBuildLog());
         appDeploying.getDeployingNodes().forEach(appDeployingNode -> {
@@ -230,7 +230,7 @@ public class AppDeployServiceImpl implements AppDeployService {
     }
 
     @Override
-    public void afterDeploy(EvtAppStatResult deployResult) {
+    public void updateAfterDeploy(EvtAppStatResult deployResult) {
         log.info("执行 {} 部署后的操作", deployResult.getAppId());
         String machineId = deployResult.getMachineId();
         String appId = deployResult.getAppId();
@@ -265,7 +265,7 @@ public class AppDeployServiceImpl implements AppDeployService {
     }
 
     @Override
-    public void refresh(EvtAppStatResult statResult) {
+    public void updateAppDeployingNode(EvtAppStatResult statResult) {
         String appId = statResult.getAppId();
         String machineId = statResult.getMachineId();
         AppDeploying appDeploying = deployingRepository.findByAppConfig_AppId(appId);

web/src/main/java/cn/reghao/devops/web/ws/event/EvtAppStatResultHandler.java

@@ -22,9 +22,9 @@ public class EvtAppStatResultHandler extends Handler {
     public void handle(Event evt) {
         EvtAppStatResult statResult = (EvtAppStatResult) evt;
         if (statResult.getDeploy()) {
-            appDeployService.afterDeploy(statResult);
+            appDeployService.updateAfterDeploy(statResult);
         } else {
-            appDeployService.refresh(statResult);
+            appDeployService.updateAppDeployingNode(statResult);
         }
     }
 }