调整包结构

common/src/main/java/cn/reghao/autodop/common/dagent/app/DeployResult.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.common.dagent.app;
 
-import cn.reghao.autodop.common.result.Result;
+import cn.reghao.autodop.common.util.result.Result;
 import lombok.Data;
 
 import java.time.LocalDateTime;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/Machine.java

@@ -7,7 +7,7 @@ import cn.reghao.autodop.common.dagent.machine.memory.Memory;
 import cn.reghao.autodop.common.dagent.machine.network.Network;
 import cn.reghao.autodop.common.dagent.machine.os.Os;
 import cn.reghao.autodop.common.message.CallResult;
-import cn.reghao.autodop.common.utils.MachineIdentity;
+import cn.reghao.autodop.common.util.MachineIdentity;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/cpu/Cpu.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.common.dagent.machine.cpu;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
-import cn.reghao.autodop.common.utils.AbstractPercentageCalculator;
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.AbstractPercentageCalculator;
+import cn.reghao.autodop.common.util.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/cpu/CpuPercentageCalculator.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.common.dagent.machine.cpu;
 
-import cn.reghao.autodop.common.utils.AbstractPercentageCalculator;
+import cn.reghao.autodop.common.util.AbstractPercentageCalculator;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/dagent/machine/memory/Memory.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.dagent.machine.memory;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.text.TextFile;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/network/Network.java

@@ -2,8 +2,8 @@ package cn.reghao.autodop.common.dagent.machine.network;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
 import cn.reghao.autodop.common.dagent.machine.os.ProcessStat;
-import cn.reghao.autodop.common.utils.IpAddressConverter;
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.IpAddressConverter;
+import cn.reghao.autodop.common.util.text.TextFile;
 
 import java.net.*;
 import java.util.ArrayList;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/os/Os.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.common.dagent.machine.os;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
-import cn.reghao.autodop.common.utils.DateTimeConverter;
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.DateTimeConverter;
+import cn.reghao.autodop.common.util.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/os/Process.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.dagent.machine.os;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;

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

@@ -12,13 +12,13 @@ import cn.reghao.autodop.common.docker.unixdomain.DockerAuth;
 import cn.reghao.autodop.common.docker.unixdomain.DockerHeader;
 import cn.reghao.autodop.common.docker.unixdomain.UnixSocketClient;
 import cn.reghao.autodop.common.docker.unixdomain.HttpClient;
-import cn.reghao.autodop.common.utils.ExceptionUtil;
-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;
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.ExceptionUtil;
+import cn.reghao.autodop.common.util.serializer.JsonArrayDeserializer;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.security.Base64Util;
+import cn.reghao.autodop.common.util.compression.TarFiles;
+import cn.reghao.autodop.common.util.security.Md5Util;
+import cn.reghao.autodop.common.util.text.TextFile;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import io.netty.handler.codec.http.FullHttpResponse;

common/src/main/java/cn/reghao/autodop/common/docker/unixdomain/HttpClient.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.common.docker.unixdomain;
 
-import cn.reghao.autodop.common.utils.ExceptionUtil;
+import cn.reghao.autodop.common.util.ExceptionUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.*;

common/src/main/java/cn/reghao/autodop/common/jvm/JVM.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.jvm;
 
 import cn.reghao.autodop.common.jvm.pojo.*;
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 
 import java.lang.management.*;
 import java.util.*;

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/BufferPoolStat.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.jvm.pojo;
 
-import cn.reghao.autodop.common.utils.ByteConverter;
-import cn.reghao.autodop.common.utils.ByteType;
+import cn.reghao.autodop.common.util.ByteConverter;
+import cn.reghao.autodop.common.util.ByteType;
 import lombok.Data;
 
 import java.lang.management.BufferPoolMXBean;

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/MemoryStat.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.jvm.pojo;
 
-import cn.reghao.autodop.common.utils.ByteConverter;
-import cn.reghao.autodop.common.utils.ByteType;
+import cn.reghao.autodop.common.util.ByteConverter;
+import cn.reghao.autodop.common.util.ByteType;
 import lombok.Data;
 
 import java.lang.management.MemoryUsage;

common/src/main/java/cn/reghao/autodop/common/log/MqttAppender.java

@@ -6,8 +6,8 @@ import cn.reghao.autodop.common.message.AsyncMsg;
 import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.message.ops.DagentOps;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.utils.DateTimeConverter;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 

common/src/main/java/cn/reghao/autodop/common/message/CallResult.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.common.message;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import static cn.reghao.autodop.common.result.ResultStatus.*;
+import static cn.reghao.autodop.common.util.result.ResultStatus.*;
 
 /**
  * RPC 调用结果

common/src/main/java/cn/reghao/autodop/common/mqtt/DefaultMqttClient.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.common.mqtt;
 
 import cn.reghao.autodop.common.message.AsyncMsg;
-import cn.reghao.autodop.common.utils.MachineIdentity;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.MachineIdentity;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;

common/src/main/java/cn/reghao/autodop/common/utils/AbstractPercentageCalculator.java → common/src/main/java/cn/reghao/autodop/common/util/AbstractPercentageCalculator.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 import java.text.DecimalFormat;
 

common/src/main/java/cn/reghao/autodop/common/utils/ByteConverter.java → common/src/main/java/cn/reghao/autodop/common/util/ByteConverter.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 import java.util.HashMap;
 import java.util.Map;

common/src/main/java/cn/reghao/autodop/common/utils/ByteType.java → common/src/main/java/cn/reghao/autodop/common/util/ByteType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/utils/DateTimeConverter.java → common/src/main/java/cn/reghao/autodop/common/util/DateTimeConverter.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 import java.time.*;
 import java.time.format.DateTimeFormatter;

common/src/main/java/cn/reghao/autodop/common/utils/ExceptionUtil.java → common/src/main/java/cn/reghao/autodop/common/util/ExceptionUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/utils/FileOps.java → common/src/main/java/cn/reghao/autodop/common/util/FileOps.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
-import cn.reghao.autodop.common.utils.text.FileProcessor;
+import cn.reghao.autodop.common.util.text.FileProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 

common/src/main/java/cn/reghao/autodop/common/utils/IpAddressConverter.java → common/src/main/java/cn/reghao/autodop/common/util/IpAddressConverter.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 /**
  * IP 地址转换

common/src/main/java/cn/reghao/autodop/common/utils/MachineIdentity.java → common/src/main/java/cn/reghao/autodop/common/util/MachineIdentity.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 import cn.reghao.autodop.common.dagent.machine.network.NetworkInfo;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/cn/reghao/autodop/common/utils/PercentCalculator.java → common/src/main/java/cn/reghao/autodop/common/util/PercentCalculator.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils;
+package cn.reghao.autodop.common.util;
 
 import java.text.DecimalFormat;
 

common/src/main/java/cn/reghao/autodop/common/utils/compression/TarFiles.java → common/src/main/java/cn/reghao/autodop/common/util/compression/TarFiles.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.compression;
+package cn.reghao.autodop.common.util.compression;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;

common/src/main/java/cn/reghao/autodop/common/utils/compression/ZipFiles.java → common/src/main/java/cn/reghao/autodop/common/util/compression/ZipFiles.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.common.utils.compression;
+package cn.reghao.autodop.common.util.compression;
 
-import cn.reghao.autodop.common.utils.FileOps;
+import cn.reghao.autodop.common.util.FileOps;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.*;

common/src/main/java/cn/reghao/autodop/common/result/Result.java → common/src/main/java/cn/reghao/autodop/common/util/result/Result.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.result;
+package cn.reghao.autodop.common.util.result;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

common/src/main/java/cn/reghao/autodop/common/result/ResultStatus.java → common/src/main/java/cn/reghao/autodop/common/util/result/ResultStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.result;
+package cn.reghao.autodop.common.util.result;
 
 /**
  * 结果状态

common/src/main/java/cn/reghao/autodop/common/utils/security/Base64Util.java → common/src/main/java/cn/reghao/autodop/common/util/security/Base64Util.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.security;
+package cn.reghao.autodop.common.util.security;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;

common/src/main/java/cn/reghao/autodop/common/utils/security/Cryptor.java → common/src/main/java/cn/reghao/autodop/common/util/security/Cryptor.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.security;
+package cn.reghao.autodop.common.util.security;
 
 /**
  * 加密/解密

common/src/main/java/cn/reghao/autodop/common/utils/security/Md5Cryptor.java → common/src/main/java/cn/reghao/autodop/common/util/security/Md5Cryptor.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.security;
+package cn.reghao.autodop.common.util.security;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

common/src/main/java/cn/reghao/autodop/common/utils/security/Md5Util.java → common/src/main/java/cn/reghao/autodop/common/util/security/Md5Util.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.security;
+package cn.reghao.autodop.common.util.security;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

common/src/main/java/cn/reghao/autodop/common/utils/security/Salt.java → common/src/main/java/cn/reghao/autodop/common/util/security/Salt.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.security;
+package cn.reghao.autodop.common.util.security;
 
 import java.security.SecureRandom;
 import java.util.Base64;

common/src/main/java/cn/reghao/autodop/common/utils/security/Sha256Cryptor.java → common/src/main/java/cn/reghao/autodop/common/util/security/Sha256Cryptor.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.security;
+package cn.reghao.autodop.common.util.security;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

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

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

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

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.common.utils.serializer;
+package cn.reghao.autodop.common.util.serializer;
 
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.text.TextFile;
 import com.google.gson.*;
 
 import java.io.File;

common/src/main/java/cn/reghao/autodop/common/utils/serializer/LocalDateTimeAdapter.java → common/src/main/java/cn/reghao/autodop/common/util/serializer/LocalDateTimeAdapter.java

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

common/src/main/java/cn/reghao/autodop/common/utils/text/FileProcessor.java → common/src/main/java/cn/reghao/autodop/common/util/text/FileProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.text;
+package cn.reghao.autodop.common.util.text;
 
 import java.io.File;
 

common/src/main/java/cn/reghao/autodop/common/utils/text/FileStream.java → common/src/main/java/cn/reghao/autodop/common/util/text/FileStream.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.text;
+package cn.reghao.autodop.common.util.text;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/cn/reghao/autodop/common/utils/text/ReplaceCharacter.java → common/src/main/java/cn/reghao/autodop/common/util/text/ReplaceCharacter.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.text;
+package cn.reghao.autodop.common.util.text;
 
 import java.io.File;
 import java.util.ArrayList;

common/src/main/java/cn/reghao/autodop/common/utils/text/TextFile.java → common/src/main/java/cn/reghao/autodop/common/util/text/TextFile.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.utils.text;
+package cn.reghao.autodop.common.util.text;
 
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -10,10 +10,10 @@ import cn.reghao.autodop.common.dagent.app.log.LogConfig;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import cn.reghao.autodop.common.docker.exception.DockerException;
 import cn.reghao.autodop.common.message.CallResult;
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
-import cn.reghao.autodop.common.utils.ExceptionUtil;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.autodop.common.util.ExceptionUtil;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

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

@@ -12,9 +12,9 @@ import cn.reghao.autodop.common.docker.pojo.Config;
 import cn.reghao.autodop.common.docker.pojo.HostConfig;
 import cn.reghao.autodop.common.docker.pojo.State;
 import cn.reghao.autodop.common.docker.pojo.result.ContainerInfo;
-import cn.reghao.autodop.common.utils.DateTimeConverter;
-import cn.reghao.autodop.common.utils.ExceptionUtil;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
+import cn.reghao.autodop.common.util.ExceptionUtil;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 
 import java.util.ArrayList;

dagent/src/main/java/cn/reghao/autodop/dagent/machine/DagentHeartbeatJob.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.dagent.machine.Machine;
 import cn.reghao.autodop.common.message.ops.DagentOps;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/DmasterMsgDispatcher.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dagent.mqttsub;
 
 import cn.reghao.autodop.common.message.AsyncMsg;
 import cn.reghao.autodop.common.message.MessageType;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.mqttsub.processor.app.AppOpsProcessor;
 import cn.reghao.autodop.dagent.mqttsub.processor.machine.MachineOpsProcessor;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/processor/app/AppOpsProcessor.java

@@ -6,7 +6,7 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.message.ops.AppOps;
 import cn.reghao.autodop.common.message.ops.OpsProcessor;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.app.App;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/processor/machine/MachineOpsProcessor.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.message.*;
 import cn.reghao.autodop.common.message.ops.MachineOps;
 import cn.reghao.autodop.common.message.ops.OpsProcessor;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;

dagent/src/main/java/cn/reghao/autodop/dagent/spring/DagentLifecycle.java

@@ -8,8 +8,8 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.dagent.machine.Machine;
 import cn.reghao.autodop.common.message.ops.DagentOps;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.utils.MachineIdentity;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.MachineIdentity;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.mqttsub.DmasterMsgDispatcher;
 import cn.reghao.autodop.dagent.machine.DagentHeartbeatJob;
 import cn.reghao.autodop.dagent.machine.MachineScheduler;

dmaster/src/main/java/cn/reghao/autodop/dmaster/DmasterApplication.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster;
 
-import cn.reghao.autodop.dmaster.utils.lifecycle.BeforeAppShutdown;
+import cn.reghao.autodop.dmaster.spring.BeforeAppShutdown;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/AppBakController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.utils.UploadDownload;
 import cn.reghao.autodop.dmaster.utils.WebBody;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/WebhookController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
 import cn.reghao.autodop.dmaster.utils.WebBody;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.service.BuildDeployDispatcher;
 import com.google.gson.JsonObject;
 import io.swagger.annotations.ApiOperation;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/AppConfigController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.vo.NewApp;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/BuildConfigController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.common.result.Result;
+import cn.reghao.autodop.common.util.result.Result;
 import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.utils.WebBody;
 import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/view/BuildConfigPageController.java

@@ -17,7 +17,7 @@ import cn.reghao.autodop.dmaster.app.vo.KeyValue;
 import cn.reghao.autodop.dmaster.machine.entity.vo.DiskUsage;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
-import cn.reghao.autodop.dmaster.utils.lifecycle.DmasterLifecycle;
+import cn.reghao.autodop.dmaster.spring.DmasterLifecycle;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppBuildingCrudService.java

@@ -2,7 +2,6 @@ package cn.reghao.autodop.dmaster.app.db.crud;
 
 import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
 import cn.reghao.autodop.dmaster.app.repository.AppBuildingRepository;
-import cn.reghao.autodop.dmaster.common.orm.CrudOps;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppDeployingCrudService.java

@@ -2,7 +2,6 @@ package cn.reghao.autodop.dmaster.app.db.crud;
 
 import cn.reghao.autodop.dmaster.app.entity.AppDeploying;
 import cn.reghao.autodop.dmaster.app.repository.AppDeployingRepository;
-import cn.reghao.autodop.dmaster.common.orm.CrudOps;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppRunningCrudService.java

@@ -2,7 +2,6 @@ package cn.reghao.autodop.dmaster.app.db.crud;
 
 import cn.reghao.autodop.dmaster.app.entity.AppRunning;
 import cn.reghao.autodop.dmaster.app.repository.AppRunningRepository;
-import cn.reghao.autodop.dmaster.common.orm.CrudOps;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/AppCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.constant.AppType;
 import cn.reghao.autodop.dmaster.app.constant.EnvList;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/ProjCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
 import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/BuildDirCrudService.java

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
 import cn.reghao.autodop.common.dagent.machine.disk.Disk;
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
-import cn.reghao.autodop.common.utils.FileOps;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.autodop.common.util.FileOps;
 import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
 import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDirLocal;
 import cn.reghao.autodop.dmaster.app.repository.config.build.BuildDirRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/CompilerConfigCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.constant.build.CompileType;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/PackerConfigCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/RepoAuthConfigCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoType;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/AppBuilding.java

@@ -1,12 +1,12 @@
 package cn.reghao.autodop.dmaster.app.entity;
 
-import cn.reghao.autodop.common.result.ResultStatus;
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.RunningConfig;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/AppProperty.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.entity;
 
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.DeployConfig;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/config/AppOrchestration.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.dmaster.app.entity.config;
 import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.DeployConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.RunningConfig;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/config/ProjOrchestration.java

@@ -3,13 +3,12 @@ package cn.reghao.autodop.dmaster.app.entity.config;
 import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/config/build/BuildDir.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.entity.config.build;
 
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/config/build/BuildDirLocal.java

@@ -2,10 +2,10 @@ package cn.reghao.autodop.dmaster.app.entity.config.build;
 
 import cn.reghao.autodop.common.dagent.machine.disk.Disk;
 import cn.reghao.autodop.common.dagent.machine.disk.DiskInfo;
-import cn.reghao.autodop.common.utils.ByteConverter;
-import cn.reghao.autodop.common.utils.ByteType;
-import cn.reghao.autodop.common.utils.FileOps;
-import cn.reghao.autodop.dmaster.utils.lifecycle.DmasterLifecycle;
+import cn.reghao.autodop.common.util.ByteConverter;
+import cn.reghao.autodop.common.util.ByteType;
+import cn.reghao.autodop.common.util.FileOps;
+import cn.reghao.autodop.dmaster.spring.DmasterLifecycle;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/config/build/CompilerConfig.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.entity.config.build;
 
 import cn.reghao.autodop.dmaster.app.constant.build.CompileType;
 import cn.reghao.autodop.dmaster.app.validator.ValidEnum;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/config/build/PackerConfig.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.entity.config.build;
 
 import cn.reghao.autodop.common.dagent.app.deploy.PackType;
 import cn.reghao.autodop.dmaster.app.validator.ValidEnum;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/config/build/RepoAuthConfig.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.dmaster.app.entity.config.build;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoType;
 import cn.reghao.autodop.dmaster.app.validator.ValidEnum;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/log/BuildLog.java

@@ -1,11 +1,11 @@
 package cn.reghao.autodop.dmaster.app.entity.log;
 
-import cn.reghao.autodop.common.result.Result;
+import cn.reghao.autodop.common.util.result.Result;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
 import cn.reghao.autodop.dmaster.app.vo.BuildConfig;
 import cn.reghao.autodop.dmaster.auth.UserContext;
-import cn.reghao.autodop.dmaster.common.orm.BaseDocument;
+import cn.reghao.autodop.dmaster.utils.db.BaseDocument;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.data.mongodb.core.mapping.Document;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/log/DeployLog.java

@@ -2,8 +2,8 @@ package cn.reghao.autodop.dmaster.app.entity.log;
 
 import cn.reghao.autodop.common.dagent.app.AppStatus;
 import cn.reghao.autodop.common.dagent.app.DeployResult;
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.dmaster.common.orm.BaseDocument;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.dmaster.utils.db.BaseDocument;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.data.mongodb.core.mapping.Document;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/AppStatusService.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.message.ops.AppOps;
 import cn.reghao.autodop.common.dagent.app.AppIdArgs;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.constant.StatusOps;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.entity.AppRunning;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/BuildDeployDispatcher.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service;
 
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
 import cn.reghao.autodop.dmaster.app.entity.AppDeploying;
@@ -16,9 +16,8 @@ import cn.reghao.autodop.dmaster.app.service.bd.BuildNotifyMsg;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyType;
 import cn.reghao.autodop.dmaster.notification.service.NotifyService;
-import cn.reghao.autodop.dmaster.common.thread.ThreadPoolWrapper;
+import cn.reghao.autodop.dmaster.spring.thread.ThreadPoolWrapper;
 import cn.reghao.autodop.dmaster.notification.service.notifier.ding.DingMsg;
-import cn.reghao.autodop.dmaster.notification.service.notifier.email.EmailMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.stereotype.Service;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/BuildSupplier.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.service;
 
-import cn.reghao.autodop.common.result.ResultStatus;
-import cn.reghao.autodop.common.utils.ExceptionUtil;
+import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.autodop.common.util.ExceptionUtil;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.service.bd.AppIntegrate;
 import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;

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

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.message.ops.AppOps;
 import cn.reghao.autodop.common.dagent.app.deploy.AppDeployArgs;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.utils.serializer.JsonConverter;
+import cn.reghao.autodop.common.util.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.entity.config.deploy.DeployConfig;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/BuildNotifyMsg.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service.bd;
 
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.notification.service.notifier.ding.DingMsg;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/BuilderUtil.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.service.bd;
 
-import cn.reghao.autodop.common.utils.FileOps;
-import cn.reghao.autodop.common.utils.text.ReplaceCharacter;
+import cn.reghao.autodop.common.util.FileOps;
+import cn.reghao.autodop.common.util.text.ReplaceCharacter;
 import cn.reghao.autodop.dmaster.app.constant.AppType;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/DeployNotifyMsg.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.app.service.bd;
 
 import cn.reghao.autodop.common.dagent.app.AppStatus;
 import cn.reghao.autodop.common.dagent.app.DeployResult;
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.notification.service.notifier.ding.DingMsg;
 import lombok.Data;

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

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

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/tools/repo/GitImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service.bd.tools.repo;
 
-import cn.reghao.autodop.common.utils.text.TextFile;
+import cn.reghao.autodop.common.util.text.TextFile;
 import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;
 import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
 import com.jcraft.jsch.JSch;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/UsernamePasswordAuthProvider.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.config;
 
-import cn.reghao.autodop.common.utils.security.Cryptor;
-import cn.reghao.autodop.common.utils.security.Md5Cryptor;
+import cn.reghao.autodop.common.util.security.Cryptor;
+import cn.reghao.autodop.common.util.security.Md5Cryptor;
 import cn.reghao.autodop.dmaster.auth.model.po.User;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.controller;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.auth.db.crud.MenuQuery;
 import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
 import cn.reghao.autodop.dmaster.auth.model.po.Menu;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/Menu.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.model.po;
 
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/Role.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.model.po;
 
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/User.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.model.po;
 
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/RoleVO.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.model.vo;
 
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/UserVO.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.model.vo;
 
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.auth.model.constant.UserGender;
 import cn.reghao.autodop.dmaster.auth.model.po.User;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
-import cn.reghao.autodop.common.result.Result;
+import cn.reghao.autodop.common.util.result.Result;
 import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
 import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
-import cn.reghao.autodop.common.result.Result;
-import cn.reghao.autodop.common.result.ResultStatus;
+import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.autodop.common.util.result.ResultStatus;
 import cn.reghao.autodop.dmaster.auth.db.crud.MenuCrud;
 import cn.reghao.autodop.dmaster.auth.db.crud.MenuQuery;
 import cn.reghao.autodop.dmaster.auth.db.crud.RoleCrud;

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.auth.service;
 
-import cn.reghao.autodop.common.utils.security.Cryptor;
-import cn.reghao.autodop.common.utils.security.Md5Cryptor;
-import cn.reghao.autodop.common.utils.security.Salt;
+import cn.reghao.autodop.common.util.security.Cryptor;
+import cn.reghao.autodop.common.util.security.Md5Cryptor;
+import cn.reghao.autodop.common.util.security.Salt;
 import cn.reghao.autodop.dmaster.auth.db.crud.UserCrud;
 import cn.reghao.autodop.dmaster.auth.db.crud.UserQuery;
 import cn.reghao.autodop.dmaster.auth.model.dto.UserInfo;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/controller/MachinePageController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.machine.controller;
 
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.app.constant.EnvList;
 import cn.reghao.autodop.dmaster.app.vo.KeyValue;
 import cn.reghao.autodop.dmaster.machine.db.crud.MachineInfoCrudService;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/entity/po/MachineHost.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.machine.entity.po;
 
 import cn.reghao.autodop.dmaster.app.constant.EnvList;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import cn.reghao.autodop.dmaster.machine.entity.po.info.MachineInfo;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/entity/po/MachineStat.java

@@ -7,9 +7,9 @@ import cn.reghao.autodop.common.dagent.machine.network.NetworkStat;
 import cn.reghao.autodop.common.dagent.machine.network.TcpConnStat;
 import cn.reghao.autodop.common.dagent.machine.network.TcpState;
 import cn.reghao.autodop.common.dagent.machine.os.OsStat;
-import cn.reghao.autodop.common.utils.ByteConverter;
-import cn.reghao.autodop.common.utils.ByteType;
-import cn.reghao.autodop.dmaster.common.orm.BaseDocument;
+import cn.reghao.autodop.common.util.ByteConverter;
+import cn.reghao.autodop.common.util.ByteType;
+import cn.reghao.autodop.dmaster.utils.db.BaseDocument;
 import cn.reghao.autodop.dmaster.machine.entity.vo.DiskUsage;
 import cn.reghao.autodop.dmaster.machine.entity.vo.MemoryUsage;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/entity/po/info/MachineInfo.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.dmaster.machine.entity.po.info;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.List;
-import cn.reghao.autodop.dmaster.common.orm.BaseEntity;
+import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/entity/vo/DiskUsage.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.machine.entity.vo;
 
 import cn.reghao.autodop.common.dagent.machine.disk.DiskInfo;
-import cn.reghao.autodop.common.utils.ByteConverter;
-import cn.reghao.autodop.common.utils.ByteType;
+import cn.reghao.autodop.common.util.ByteConverter;
+import cn.reghao.autodop.common.util.ByteType;
 import lombok.Data;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/entity/vo/MachineHostVO.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.machine.entity.vo;
 
-import cn.reghao.autodop.common.utils.DateTimeConverter;
+import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.machine.entity.po.MachineHost;
 import cn.reghao.autodop.dmaster.machine.entity.po.info.NetworkInfo;
 import lombok.Data;