重构 dagent

common/src/main/java/cn/reghao/autodop/common/amqp/RabbitProducer.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.common.amqp;
 
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Component;

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/AppIdArgs.java

@@ -10,5 +10,6 @@ import lombok.Data;
  */
 @Data
 public class AppIdArgs {
+    private String packerType;
     private String appId;
 }

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/AppStatus.java

@@ -8,6 +8,7 @@ import lombok.Data;
  */
 @Data
 public class AppStatus {
+    private String packerType;
     private String appId;
     private String commitId;
     private String host;

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/deploy/PackerType.java

@@ -7,15 +7,5 @@ package cn.reghao.autodop.common.dagent.app.api.data.deploy;
  * @date 2019-11-15 21:59:35
  */
 public enum PackerType {
-    docker("Docker"), zip("Zip");
-
-    private String value;
-
-    PackerType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
+    docker, zip;
 }

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/log/AppLogArgs.java

@@ -8,6 +8,7 @@ import lombok.Data;
  */
 @Data
 public class AppLogArgs {
+    private String packerType;
     private String logType;
     private String logLevel;
     private String appId;

common/src/main/java/cn/reghao/autodop/common/dockerc/Docker.java

@@ -10,8 +10,8 @@ import cn.reghao.autodop.common.dockerc.unixdomain.DockerAuth;
 import cn.reghao.autodop.common.dockerc.unixdomain.DockerHeader;
 import cn.reghao.autodop.common.dockerc.unixdomain.UnixSocketClient;
 import cn.reghao.autodop.common.dockerc.unixdomain.HttpClient;
-import cn.reghao.autodop.common.utils.data.serializer.JsonArrayDeserializer;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonArrayDeserializer;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.common.utils.security.Base64Util;
 import cn.reghao.autodop.common.utils.compression.TarFiles;
 import cn.reghao.autodop.common.utils.security.Md5Util;
@@ -200,6 +200,31 @@ public class Docker implements ImageOps, ContainerOps, AutoCloseable {
         return null;
     }
 
+    private String create(String containerName, String repoTag, Config config) throws DockerException {
+        String uri = DockerApi.createPost + "?name=" + containerName;
+
+        config.setImage(repoTag);
+        String tmp = JsonConverter.objectToJson(config);
+        String json = tmp.replace("image", "Image")
+                .replace("hostConfig", "HostConfig")
+                .replace("networkMode", "NetworkMode");
+        //.replace("volumes", "Volumes");
+
+        FullHttpResponse response = client.postJson(uri, null, json);
+        if (response != null) {
+            int statusCode = response.status().code();
+            String result = response.content().toString(StandardCharsets.UTF_8);
+            if (statusCode == 201) {
+                JsonObject jsonObject = new JsonParser().parse(result).getAsJsonObject();
+                return jsonObject.get("Id").getAsString();
+            } else {
+                throw new DockerException(result);
+            }
+        }
+
+        return null;
+    }
+
     @Override
     public String run(String name, String image) throws DockerException {
         stopAndDelete(name);
@@ -210,6 +235,15 @@ public class Docker implements ImageOps, ContainerOps, AutoCloseable {
         return containerId;
     }
 
+    public String run(String containerName, String repoTag, Config config) throws DockerException {
+        stopAndDelete(containerName);
+        String containerId = create(containerName, repoTag, config);
+        if (containerId != null) {
+            start(containerId);
+        }
+        return containerId;
+    }
+
     @Override
     public void start(String containerId) throws DockerException {
         String uri = DockerApi.startPost.replace("{}", containerId);

common/src/main/java/cn/reghao/autodop/common/dockerc/pojo/Config.java

@@ -1,9 +1,7 @@
 package cn.reghao.autodop.common.dockerc.pojo;
 
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

common/src/main/java/cn/reghao/autodop/common/result/RpcResult.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.common.result;
 
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/result/WebResult.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.result;
 
 import cn.reghao.autodop.common.utils.DatetimeConverter;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

common/src/main/java/cn/reghao/autodop/common/utils/data/serializer/JsonArrayDeserializer.java → common/src/main/java/cn/reghao/autodop/common/utils/serializer/JsonArrayDeserializer.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.data.serializer;
+package cn.reghao.autodop.common.utils.serializer;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonParser;

common/src/main/java/cn/reghao/autodop/common/utils/data/serializer/JsonConverter.java → common/src/main/java/cn/reghao/autodop/common/utils/serializer/JsonConverter.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.data.serializer;
+package cn.reghao.autodop.common.utils.serializer;
 
 import com.google.gson.Gson;
 

dagent/src/main/java/cn/reghao/autodop/dagent/app/App.java

@@ -1,37 +1,77 @@
 package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.amqp.RpcResult;
+import cn.reghao.autodop.common.dagent.app.api.data.AppIdArgs;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
+import cn.reghao.autodop.common.dagent.app.api.data.log.AppLogArgs;
+import cn.reghao.autodop.common.dockerc.exception.DockerException;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
 
 /**
  * @author reghao
  * @date 2021-02-22 16:20:22
  */
+@Slf4j
+@Component
 public class App {
-    public RpcResult deploy(String payload) {
-        return RpcResult.success("");
+    private DockerAppServiceImpl dockerAppServiceImpl;
+    private ZipAppServiceImpl zipAppServiceImpl;
+
+    public App() {
+        this.dockerAppServiceImpl = new DockerAppServiceImpl();
+        this.zipAppServiceImpl = new ZipAppServiceImpl();
     }
 
-    public RpcResult status(String payload) {
-        return RpcResult.success("");
+    public RpcResult deploy(String payload) {
+        AppDeployArgs appDeployArgs = (AppDeployArgs) JsonConverter.jsonToObject(payload, AppDeployArgs.class);
+        switch (PackerType.valueOf(appDeployArgs.getPackerType())) {
+            case docker:
+                try {
+                    dockerAppServiceImpl.deploy(appDeployArgs);
+                } catch (DockerException e) {
+                    e.printStackTrace();
+                }
+                break;
+            case zip:
+                zipAppServiceImpl.deploy(appDeployArgs);
+                break;
+            default:
+                log.error("没有这种打包类型...");
+        }
+
+        return RpcResult.success("test");
     }
 
     public RpcResult log(String payload) {
-        return RpcResult.success("");
+        AppLogArgs appLogArgs = (AppLogArgs) JsonConverter.jsonToObject(payload, AppLogArgs.class);
+        return RpcResult.success("test");
+    }
+
+    public RpcResult status(String payload) {
+        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        return RpcResult.success("test");
     }
 
     public RpcResult start(String payload) {
-        return RpcResult.success("");
+        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        return RpcResult.success("test");
     }
 
     public RpcResult stop(String payload) {
-        return RpcResult.success("");
+        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        return RpcResult.success("test");
     }
 
     public RpcResult restart(String payload) {
-        return RpcResult.success("");
+        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        return RpcResult.success("test");
     }
 
     public RpcResult run(String payload) {
-        return RpcResult.success("");
+        AppIdArgs appIdArgs = (AppIdArgs) JsonConverter.jsonToObject(payload, AppIdArgs.class);
+        return RpcResult.success("test");
     }
 }

dagent/src/main/java/cn/reghao/autodop/dagent/app/AppService.java

@@ -2,6 +2,8 @@ package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.dagent.app.api.data.AppStatus;
 import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
+import cn.reghao.autodop.common.dagent.app.api.data.log.AppLogArgs;
+import cn.reghao.autodop.common.dockerc.exception.DockerException;
 
 import java.util.List;
 
@@ -10,8 +12,8 @@ import java.util.List;
  * @date 2021-02-22 16:21:28
  */
 public interface AppService {
-    void deploy(AppDeployArgs appDeployArgs);
-    List<String> log(String appId, String logType, String logLevel, String filePath);
+    void deploy(AppDeployArgs appDeployArgs) throws DockerException;
+    List<String> log(AppLogArgs appLogArgs);
     AppStatus status(String appId);
     void start(String appId);
     void stop(String appId);

dagent/src/main/java/cn/reghao/autodop/dagent/app/DockerAppServiceImpl.java

@@ -0,0 +1,61 @@
+package cn.reghao.autodop.dagent.app;
+
+import cn.reghao.autodop.common.dagent.app.api.data.AppStatus;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
+import cn.reghao.autodop.common.dagent.app.api.data.log.AppLogArgs;
+import cn.reghao.autodop.common.dockerc.Docker;
+import cn.reghao.autodop.common.dockerc.exception.DockerException;
+import cn.reghao.autodop.common.dockerc.pojo.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2021-02-22 16:21:37
+ */
+public class DockerAppServiceImpl implements AppService {
+    @Override
+    public void deploy(AppDeployArgs appDeployArgs) throws DockerException {
+        try(Docker docker = new Docker()) {
+            String repoTag = appDeployArgs.getPackagePath();
+            docker.pull(repoTag);
+
+            String appId = appDeployArgs.getAppId();
+            String packagePath = appDeployArgs.getPackagePath();
+            Config dockerConfig = appDeployArgs.getDockerConfig();
+            docker.run(appId, packagePath, dockerConfig);
+        }
+    }
+
+    @Override
+    public List<String> log(AppLogArgs appLogArgs) {
+        List<String> list = new ArrayList<>();
+        return list;
+    }
+
+    @Override
+    public AppStatus status(String appId) {
+        return null;
+    }
+
+    @Override
+    public void start(String appId) {
+
+    }
+
+    @Override
+    public void stop(String appId)  {
+
+    }
+
+    @Override
+    public void restart(String appId)  {
+
+    }
+
+    @Override
+    public void run(String appId, String commitId) {
+
+    }
+}

dagent/src/main/java/cn/reghao/autodop/dagent/app/DockerAppService.java → dagent/src/main/java/cn/reghao/autodop/dagent/app/ZipAppServiceImpl.java

@@ -2,6 +2,7 @@ package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.dagent.app.api.data.AppStatus;
 import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
+import cn.reghao.autodop.common.dagent.app.api.data.log.AppLogArgs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,14 +11,13 @@ import java.util.List;
  * @author reghao
  * @date 2021-02-22 16:21:37
  */
-public class DockerAppService implements AppService {
+public class ZipAppServiceImpl implements AppService {
     @Override
     public void deploy(AppDeployArgs appDeployArgs) {
-
     }
 
     @Override
-    public List<String> log(String appId, String logType, String logLevel, String filePath) {
+    public List<String> log(AppLogArgs appLogArgs) {
         List<String> list = new ArrayList<>();
         return list;
     }
@@ -44,6 +44,5 @@ public class DockerAppService implements AppService {
 
     @Override
     public void run(String appId, String commitId) {
-
     }
 }

dagent/src/main/java/cn/reghao/autodop/dagent/app/log/AppLogService.java → dagent/src/main/java/cn/reghao/autodop/dagent/app/deploy/AppLogService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dagent.app.log;
+package cn.reghao.autodop.dagent.app.deploy;
 
 import java.util.List;
 

dagent/src/main/java/cn/reghao/autodop/dagent/app/status/AppStatusService.java → dagent/src/main/java/cn/reghao/autodop/dagent/app/deploy/AppStatusService.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dagent.app.status;
+package cn.reghao.autodop.dagent.app.deploy;
 
 import cn.reghao.autodop.common.dockerc.exception.DockerException;
 

dagent/src/main/java/cn/reghao/autodop/dagent/app/log/DockerAppLogServiceImpl.java → dagent/src/main/java/cn/reghao/autodop/dagent/app/deploy/DockerAppLogServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dagent.app.log;
+package cn.reghao.autodop.dagent.app.deploy;
 
 import cn.reghao.autodop.common.dagent.app.api.data.log.LogLevel;
 import cn.reghao.autodop.common.dagent.app.api.data.log.LogType;

dagent/src/main/java/cn/reghao/autodop/dagent/app/status/DockerAppStatusServiceImpl.java → dagent/src/main/java/cn/reghao/autodop/dagent/app/deploy/DockerAppStatusServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dagent.app.status;
+package cn.reghao.autodop.dagent.app.deploy;
 
 import cn.reghao.autodop.common.deploy.AppStatus;
 import cn.reghao.autodop.common.dockerc.Docker;

dagent/src/main/java/cn/reghao/autodop/dagent/machine/timer/HeartbeatJob.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.amqp.MessageType;
 import cn.reghao.autodop.common.amqp.RabbitProducer;
 import cn.reghao.autodop.common.dagent.machine.Machine;
 import cn.reghao.autodop.common.dagent.machine.api.MachineOps;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.springframework.stereotype.Component;

dagent/src/main/java/cn/reghao/autodop/dagent/utils/amqp/AppMessageDispatcher.java

@@ -4,12 +4,14 @@ import cn.reghao.autodop.common.amqp.RpcResult;
 import cn.reghao.autodop.common.dagent.app.api.AppOps;
 import cn.reghao.autodop.dagent.app.App;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
 
 /**
  * @author reghao
  * @date 2020-12-30 10:26:47
  */
 @Slf4j
+@Component
 public class AppMessageDispatcher {
     public App app;
     

dagent/src/main/java/cn/reghao/autodop/dagent/utils/amqp/MachineMessageDispatcher.java

@@ -4,12 +4,14 @@ import cn.reghao.autodop.common.amqp.RpcResult;
 import cn.reghao.autodop.common.dagent.machine.Machine;
 import cn.reghao.autodop.common.dagent.machine.api.MachineOps;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
 
 /**
  * @author reghao
  * @date 2020-12-30 10:26:47
  */
 @Slf4j
+@Component
 public class MachineMessageDispatcher {
     private Machine machine;
 

dagent/src/main/java/cn/reghao/autodop/dagent/utils/amqp/RabbitConsumer.java

@@ -4,7 +4,7 @@ import cn.reghao.autodop.common.amqp.MQMessage;
 import cn.reghao.autodop.common.amqp.MessageType;
 import cn.reghao.autodop.common.amqp.RpcResult;
 import cn.reghao.autodop.common.dagent.machine.Machine;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -28,8 +28,12 @@ public class RabbitConsumer implements ChannelAwareMessageListener {
     private MachineMessageDispatcher machineMessageDispatcher;
     private AppMessageDispatcher appMessageDispatcher;
 
-    public RabbitConsumer(RabbitTemplate rabbitTemplate) {
+    public RabbitConsumer(RabbitTemplate rabbitTemplate,
+                          MachineMessageDispatcher machineMessageDispatcher,
+                          AppMessageDispatcher appMessageDispatcher) {
         this.rabbitTemplate = rabbitTemplate;
+        this.machineMessageDispatcher = machineMessageDispatcher;
+        this.appMessageDispatcher = appMessageDispatcher;
     }
 
     @Override
@@ -50,6 +54,7 @@ public class RabbitConsumer implements ChannelAwareMessageListener {
                 log.info("忽略不是发送到本机或 dagent 启动前发送到 MQ 中的所有消息...");
             }
 
+            log.info("新消息...");
             switch (MessageType.valueOf(type)) {
                 case machineType:
                     if (isRpc) {
@@ -85,7 +90,7 @@ public class RabbitConsumer implements ChannelAwareMessageListener {
     private void rpcReply(MessageProperties messageProperties, RpcResult result) {
         String replyTo = messageProperties.getReplyTo();
         String correlationId = messageProperties.getCorrelationId();
-        rabbitTemplate.convertAndSend(replyTo, result, message -> {
+        rabbitTemplate.convertAndSend(replyTo, JsonConverter.objectToJson(result), message -> {
             message.getMessageProperties().setCorrelationId(correlationId);
             return message;
         });

dagent/src/main/java/cn/reghao/autodop/dagent/utils/lifecycle/AfterAppStart.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.amqp.MessageType;
 import cn.reghao.autodop.common.amqp.RabbitProducer;
 import cn.reghao.autodop.common.dagent.machine.Machine;
 import cn.reghao.autodop.common.dagent.machine.api.MachineOps;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.machine.timer.HeartbeatJob;
 import cn.reghao.autodop.dagent.machine.timer.MachineScheduler;
 import lombok.extern.slf4j.Slf4j;

dagent/src/main/resources/logback.xml

@@ -11,14 +11,15 @@
         </encoder>
     </appender>
 
+    <!-- 输出到 MQ -->
     <appender name="RABBITMQ" class="org.springframework.amqp.rabbit.logback.AmqpAppender">
         <layout>
             <pattern><![CDATA[ %d %p %t [%c] - <%m>%n ]]></pattern>
         </layout>
         <!--rabbitmq地址 -->
         <addresses>localhost:5672</addresses>
-        <username>reghao</username>
-        <password>12345678</password>
+        <username>dev</username>
+        <password>Dev@12345678</password>
         <declareExchange>true</declareExchange>
         <exchangeType>direct</exchangeType>
         <exchangeName>rabbit.log</exchangeName>

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/crud/BuildConfigCrudController.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.controller.crud;
 
 import cn.reghao.autodop.common.result.WebResult;
 import cn.reghao.autodop.dmaster.common.db.PageList;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.build.tools.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.tools.PackerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.tools.RepoConfig;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/crud/GlobalCrudController.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.controller.crud;
 
 import cn.reghao.autodop.common.result.WebResult;
 import cn.reghao.autodop.dmaster.common.db.PageList;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.BuildDir;
 import cn.reghao.autodop.dmaster.app.entity.config.NotifierConfig;
 import cn.reghao.autodop.dmaster.app.service.crud.global.LocalDirCrudService;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/crud/OrchestrateCrudController.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.controller.crud;
 
 import cn.reghao.autodop.common.result.WebResult;
 import cn.reghao.autodop.dmaster.common.db.PageList;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.orchestration.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.orchestration.ProjOrchestration;
 import cn.reghao.autodop.dmaster.app.service.crud.orchestarte.AppCrudService;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/compiler/ShellCompiler.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.service.build.tools.compiler;
 
 import cn.reghao.autodop.common.shell.ShellExecutor;
 import cn.reghao.autodop.common.shell.ShellResult;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.build.tools.CompilerConfig;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/deploy/AppDeployer.java

@@ -7,7 +7,7 @@ import cn.reghao.autodop.common.dagent.app.api.AppOps;
 import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
 import cn.reghao.autodop.common.amqp.RabbitProducer;
 import cn.reghao.autodop.common.dockerc.pojo.Config;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.deploy.DeployConfig;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/orchestration/AppVO.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.vo.orchestration;
 
 import cn.reghao.autodop.common.dagent.app.api.data.log.LogLevel;
 import cn.reghao.autodop.common.dagent.app.api.data.log.LogType;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.constant.build.PackerType;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoType;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/orchestration/ProjVO.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.vo.orchestration;
 
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.constant.build.CompilerType;
 import cn.reghao.autodop.dmaster.app.constant.build.PackerType;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/controller/App3CrudController.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.dmaster.app3.entity.App3;
 import cn.reghao.autodop.dmaster.app3.entity.App3Bak;
 import cn.reghao.autodop.dmaster.app3.service.crud.App3BakCrudService;
 import cn.reghao.autodop.dmaster.app3.service.crud.App3CrudService;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/IndexController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.controller;
 
 import cn.reghao.autodop.common.utils.DatetimeConverter;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.auth.entity.Permission;
 import cn.reghao.autodop.dmaster.auth.entity.Role;
 import cn.reghao.autodop.dmaster.auth.entity.UserAuth;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/jwt/LogoutSuccessHandlerImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.jwt;
 
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import lombok.Data;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/jwt/UsernamePasswordAuthFilter.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.jwt;
 
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/UserService.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.common.utils.security.Cryptor;
 import cn.reghao.autodop.common.utils.security.Md5Cryptor;
 import cn.reghao.autodop.common.utils.security.Salt;

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/amqp/MachineMessageDispatcher.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.cluster.amqp;
 
 import cn.reghao.autodop.common.dagent.machine.api.MachineOps;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.cluster.entity.data.MachineHeartbeat;
 import cn.reghao.autodop.dmaster.cluster.entity.data.MachineLog;
 import cn.reghao.autodop.dmaster.cluster.entity.data.MachineRegistry;

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/amqp/RabbitConsumer.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.cluster.amqp;
 
 import cn.reghao.autodop.common.amqp.MQMessage;
 import cn.reghao.autodop.common.amqp.MessageType;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/notifier/DingNotify.java

@@ -4,7 +4,7 @@ import cn.reghao.autodop.common.httpc.DefaultWebRequest;
 import cn.reghao.autodop.common.httpc.WebRequest;
 import cn.reghao.autodop.common.httpc.WebResponse;
 import cn.reghao.autodop.dmaster.utils.notifier.ding.DingText;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 
 /**
  * @author reghao

dmaster/src/test/java/cn/reghao/autodop/common/amqp/RabbitProducerTest.java

@@ -4,7 +4,7 @@ import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
 import cn.reghao.autodop.common.dagent.machine.api.MachineOps;
 import cn.reghao.autodop.common.dagent.machine.api.data.MachineShell;
 import cn.reghao.autodop.common.dagent.machine.api.data.MachineShellArgs;
-import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
+import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.DmasterApplication;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;