引入 cn.reghao.util 包

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.util.result.Result;
+import cn.reghao.util.result.Result;
 import lombok.Data;
 
 import java.time.LocalDateTime;

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

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

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.util.text.TextFile;
+import cn.reghao.util.text.TextFile;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

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

@@ -3,7 +3,7 @@ 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.util.IpAddressConverter;
-import cn.reghao.autodop.common.util.text.TextFile;
+import cn.reghao.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.util.DateTimeConverter;
-import cn.reghao.autodop.common.util.text.TextFile;
+import cn.reghao.util.text.DateTimeConverter;
+import cn.reghao.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.util.text.TextFile;
+import cn.reghao.util.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;

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

@@ -13,12 +13,12 @@ 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.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.util.text.JsonArrayDeserializer;
+import cn.reghao.util.text.JsonConverter;
+import cn.reghao.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 cn.reghao.util.security.Md5Util;
+import cn.reghao.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/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.util.DateTimeConverter;
+import cn.reghao.util.text.DateTimeConverter;
 
 import java.lang.management.*;
 import java.util.*;

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.util.DateTimeConverter;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.DateTimeConverter;
+import cn.reghao.util.text.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.util.result.ResultStatus.*;
+import static cn.reghao.util.result.ResultStatus.*;
 
 /**
  * RPC 调用结果

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

@@ -2,7 +2,7 @@ package cn.reghao.autodop.common.mqtt;
 
 import cn.reghao.autodop.common.message.AsyncMsg;
 import cn.reghao.autodop.common.util.MachineIdentity;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.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/util/DateTimeConverter.java

@@ -1,173 +0,0 @@
-package cn.reghao.autodop.common.util;
-
-import java.time.*;
-import java.time.format.DateTimeFormatter;
-
-/**
- * 时间日期字符串格式转换器
- *
- * @author reghao
- * @date 2020-03-20 10:20:01
- */
-public class DateTimeConverter {
-    private final static String dateTimePattern = "yyyy-MM-dd HH:mm:ss";
-
-    /**
-     * 将 LocalDateTime 对象格式化为 yyyy-MM-dd HH:mm:ss 格式的字符串
-     *
-     * @param
-     * @return
-     * @date 2021-03-02 下午4:09
-     */
-    public static String format(LocalDateTime localDateTime) {
-        if (localDateTime == null) {
-            return "";
-        }
-
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern(dateTimePattern);
-        return dtf.format(localDateTime);
-    }
-
-    /**
-     * 将 2021-02-23T13:24:51.519422470Z 格式化为 2021-02-23 13:24:51
-     *
-     * @param
-     * @return
-     * @date 2021-03-02 下午4:04
-     */
-    public static String format(String datetime) {
-        Instant instant = Instant.parse(datetime);
-        String zoneId = "Asia/Shanghai";
-        LocalDateTime localDateTime = instant.atZone(ZoneId.of(zoneId)).toLocalDateTime();
-        return format(localDateTime);
-    }
-
-    /**
-     * ms 时间戳格式化为 yyyy-MM-dd HH:mm:ss 格式的字符串
-     *
-     * @param
-     * @return
-     * @date 2021-03-02 下午5:05
-     */
-    public static String format(long timestamp) {
-        LocalDateTime localDateTime = localDateTime(timestamp);
-        return format(localDateTime);
-    }
-
-    public static String now() {
-        LocalDateTime now = LocalDateTime.now();
-        return format(now);
-    }
-
-    /**
-     * 将 2021-02-23T13:24:51.519422470Z 字符串转换为 LocalDateTime 对象
-     *
-     * @param
-     * @return
-     * @date 2021-03-02 下午4:13
-     */
-    public static LocalDateTime localDateTime(String datetime) {
-        Instant instant = Instant.parse(datetime);
-        String zoneId = "Asia/Shanghai";
-        return instant.atZone(ZoneId.of(zoneId)).toLocalDateTime();
-    }
-
-    /**
-     * ms 时间戳转换为 LocalDateTime 对象
-     *
-     * @param
-     * @return
-     * @date 2021-03-02 下午4:59
-     */
-    public static LocalDateTime localDateTime(long timestamp) {
-        Instant instant = Instant.ofEpochMilli(timestamp);
-        String zoneId = "Asia/Shanghai";
-        ZonedDateTime dateTime = instant.atZone(ZoneId.of(zoneId));
-        return dateTime.toLocalDateTime();
-    }
-
-    /**
-     * 将 0 时区时间日期字符串转换为东 8 区时间日期字符串
-     *
-     * @param
-     * @return
-     * @date 2020-06-03 上午10:39
-     */
-    public static String convert(String dateTime) {
-        ZoneId zoneId = ZoneId.of("UTC+8");
-        ZonedDateTime zonedDateTime = Instant.parse(dateTime).atZone(zoneId);
-        return format(zonedDateTime.toLocalDateTime());
-    }
-
-    /**
-     * 2021-02-23T13:24:51.519422470Z
-     * 将日期时间转换为毫秒级时间戳
-     *
-     * @param
-     * @return
-     * @date 2021-02-25 上午11:00
-     */
-    public static long convertToTimestamp(String dateTime) {
-        Instant instant = Instant.parse(dateTime);
-        return instant.toEpochMilli();
-    }
-
-    /**
-     * LocalDateTime 转换为 ms 时间戳
-     *
-     * @param
-     * @return
-     * @date 2021-06-23 下午4:04
-     */
-    public static long msTimestamp(LocalDateTime localDateTime) {
-        String timeZone = "+8";
-        return localDateTime.toInstant(ZoneOffset.of(timeZone)).toEpochMilli();
-    }
-
-    /**
-     * 毫秒时间戳转换为日期时间
-     *
-     * @param
-     * @return
-     * @date 2020-03-20 上午10:20
-     */
-    public static String msTimestamp(long timestamp) {
-        Instant instant = Instant.ofEpochMilli(timestamp);
-        ZonedDateTime dateTime = instant.atZone(ZoneId.of("Asia/Shanghai"));
-        return dateTime.toLocalDateTime().toString();
-    }
-
-    /**
-     * 毫秒时间戳转换为指定格式的日期时间字符串
-     *
-     * @param
-     * @return
-     * @date 2020-06-02 下午5:22
-     */
-    public static String msTimestampFormat(long timestamp) {
-        Instant instant = Instant.ofEpochMilli(timestamp);
-        ZonedDateTime dateTime = instant.atZone(ZoneId.of("Asia/Shanghai"));
-        LocalDateTime localDateTime = dateTime.toLocalDateTime();
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        return dtf.format(localDateTime);
-    }
-
-    /**
-     * 秒时间戳转换为日期时间
-     *
-     * @param
-     * @return
-     * @date 2020-03-20 上午10:20
-     */
-    public static String timestamp(int timestamp) {
-        Instant instant = Instant.ofEpochMilli(timestamp);
-        ZonedDateTime dateTime = instant.atZone(ZoneId.of("Asia/Shanghai"));
-        return dateTime.toLocalDateTime().toString();
-    }
-
-    public static long duration(LocalDateTime future) {
-        LocalDateTime now = LocalDateTime.now();
-        long second = Duration.between(now, future).getSeconds();
-        return second * 1000;
-    }
-}

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

@@ -1,31 +0,0 @@
-package cn.reghao.autodop.common.util.result;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 调用结果
- *
- * @author reghao
- * @date 2021-05-21 16:25:02
- */
-@NoArgsConstructor
-@Data
-public class Result {
-    private int code;
-    private String msg;
-
-    public static Result result(ResultStatus resultStatus) {
-        Result result = new Result();
-        result.setCode(resultStatus.getCode());
-        result.setMsg(resultStatus.getMsg());
-        return result;
-    }
-
-    public static Result result(ResultStatus resultStatus, String msg) {
-        Result result = new Result();
-        result.setCode(resultStatus.getCode());
-        result.setMsg(msg);
-        return result;
-    }
-}

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

@@ -1,29 +0,0 @@
-package cn.reghao.autodop.common.util.result;
-
-/**
- * 结果状态
- *
- * @author reghao
- * @date 2019-10-17 16:18:25
- */
-public enum ResultStatus {
-    SUCCESS(0, "成功"),
-    FAIL(1, "失败"),
-    ERROR(-1, "错误");
-
-    private int code;
-    private String msg;
-
-    ResultStatus(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-}

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

@@ -1,17 +0,0 @@
-package cn.reghao.autodop.common.util.security;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
-/**
- * @author reghao
- * @date 2020-01-13 22:54:32
- */
-public class Base64Util {
-    private static final Base64.Encoder encoder = Base64.getEncoder();
-
-    public static String encode(String json) {
-        byte[] bytes = json.getBytes(StandardCharsets.UTF_8);
-        return encoder.encodeToString(bytes);
-    }
-}

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

@@ -1,12 +0,0 @@
-package cn.reghao.autodop.common.util.security;
-
-/**
- * 加密/解密
- *
- * @author reghao
- * @date 2020-04-27 14:03:49
- */
-public interface Cryptor {
-    String encrypt(String str);
-    String decrypt(String str);
-}

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

@@ -1,32 +0,0 @@
-package cn.reghao.autodop.common.util.security;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * @author reghao
- * @date 2019-03-26 14:46:57
- */
-public class Md5Cryptor implements Cryptor {
-    private MessageDigest md5;
-
-    public Md5Cryptor() throws NoSuchAlgorithmException {
-        this.md5 = MessageDigest.getInstance("MD5");
-    }
-
-    @Override
-    public String encrypt(String str) {
-        byte[] bytes = md5.digest(str.getBytes());
-        StringBuilder sb = new StringBuilder();
-        for (byte aByte : bytes) {
-            sb.append(Integer.toString((aByte & 0xff) + 0x100, 16).substring(1));
-        }
-
-        return sb.toString();
-    }
-
-    @Override
-    public String decrypt(String str) {
-        return null;
-    }
-}

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

@@ -1,32 +0,0 @@
-package cn.reghao.autodop.common.util.security;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * @author reghao
- * @date 2020-01-15 17:09:07
- */
-public class Md5Util {
-    public static String md5(String data) throws NoSuchAlgorithmException {
-        MessageDigest md = MessageDigest.getInstance("MD5");
-        md.update(data.getBytes());
-
-        StringBuilder sb = new StringBuilder();
-        byte[] bytes = md.digest();
-        for (int i = 0; i < bytes.length; i++) {
-            int a = bytes[i];
-            if (a < 0) {
-                a += 256;
-            }
-
-            if (a < 16) {
-                sb.append("0");
-            }
-
-            sb.append(Integer.toHexString(a));
-        }
-
-        return sb.toString();
-    }
-}

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

@@ -1,21 +0,0 @@
-package cn.reghao.autodop.common.util.security;
-
-import java.security.SecureRandom;
-import java.util.Base64;
-
-/**
- * @author reghao
- * @date 2019-04-05 12:23:47
- */
-public class Salt {
-    private static SecureRandom random = new SecureRandom();
-
-    /**
-     * @return 盐值
-     * @date 2019-04-05 12:28:08
-     */
-    public static String get(int len) {
-        byte[] seed = random.generateSeed(len);
-        return Base64.getEncoder().encodeToString(seed);
-    }
-}

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

@@ -1,32 +0,0 @@
-package cn.reghao.autodop.common.util.security;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * @author reghao
- * @date 2019-03-26 14:46:57
- */
-public class Sha256Cryptor implements Cryptor {
-    private MessageDigest sha256;
-
-    public Sha256Cryptor() throws NoSuchAlgorithmException {
-        this.sha256 = MessageDigest.getInstance("SHA-256");
-    }
-
-    @Override
-    public String encrypt(String str) {
-        byte[] bytes = sha256.digest(str.getBytes());
-        StringBuilder sb = new StringBuilder();
-        for (byte aByte : bytes) {
-            sb.append(Integer.toString((aByte & 0xff) + 0x100, 16).substring(1));
-        }
-
-        return sb.toString();
-    }
-
-    @Override
-    public String decrypt(String str) {
-        return null;
-    }
-}

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

@@ -1,38 +0,0 @@
-package cn.reghao.autodop.common.util.serializer;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParser;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * JSON 数组反序列化
- *
- * @author reghao
- * @date 2020-11-11 16:57:04
- */
-public class JsonArrayDeserializer<T> {
-    private Gson gson = new GsonBuilder()
-            .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeAdapter())
-            .create();
-
-    /**
-     * JSON 数组转换为对象集合
-     *
-     * @param
-     * @return
-     * @date 2020-11-11 下午5:14
-     */
-    public List<T> fromJsonArray(String json, Class<T> clazz) {
-        JsonParser parser = new JsonParser();
-        List<T> list = new ArrayList<>();
-        parser.parse(json).getAsJsonArray().forEach(ele -> {
-            list.add(gson.fromJson(ele, clazz));
-        });
-
-        return list;
-    }
-}

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

@@ -1,94 +0,0 @@
-package cn.reghao.autodop.common.util.serializer;
-
-import cn.reghao.autodop.common.util.text.TextFile;
-import com.google.gson.*;
-
-import java.io.File;
-import java.lang.reflect.Type;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * JSON 序列化/反序列化
- *
- * @author reghao
- * @date 2020-11-11 16:57:04
- */
-public class JsonConverter {
-    private static Gson gson = new GsonBuilder()
-            .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeAdapter())
-            .create();
-    private static JsonParser jsonParser = new JsonParser();
-
-    /**
-     * 对象转换为 JSON
-     *
-     * @param
-     * @return
-     * @date 2020-11-11 下午5:10
-     */
-    public static String objectToJson(Object object) {
-        return gson.toJson(object);
-    }
-
-    /**
-     * JSON 转换为对象
-     * TODO <T> 的含义
-     *
-     * @param
-     * @return
-     * @date 2020-11-11 下午5:11
-     */
-    public static <T> T jsonToObject(String json, Class<T> clazz) {
-        return gson.fromJson(json, clazz);
-    }
-
-    /**
-     * 对泛型数据的反序列化
-     *
-     * @param
-     * @return
-     * @date 2021-05-26 下午3:38
-     */
-    public static <T> T jsonToObject(String json, Type type) {
-        return gson.fromJson(json, type);
-    }
-
-    public static <T> List<T> jsonToObjects(String json, Class<T> clazz) {
-        JsonParser parser = new JsonParser();
-        List<T> list = new ArrayList<>();
-        parser.parse(json).getAsJsonArray().forEach(ele -> {
-            list.add(gson.fromJson(ele, clazz));
-        });
-
-        return list;
-    }
-
-    /**
-     * JSON 文件转换为对象
-     *
-     * @param
-     * @return
-     * @date 2020-11-11 下午5:11
-     */
-    public static JsonElement jsonToJsonElement(File jsonFile) {
-        String content = new TextFile().readFile(jsonFile.getAbsolutePath()).replace(System.lineSeparator(), "");
-        return jsonParser.parse(content);
-    }
-
-    public static JsonElement jsonToJsonElement(String json) {
-        return jsonParser.parse(json);
-    }
-
-    /**
-     * 对象集合转换为 JSON
-     *
-     * @param
-     * @return
-     * @date 2020-11-11 下午5:10
-     */
-    public static String listToJson(List<Object> objects) {
-        return gson.toJson(objects);
-    }
-}

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

@@ -1,30 +0,0 @@
-package cn.reghao.autodop.common.util.serializer;
-
-import com.google.gson.*;
-
-import java.lang.reflect.Type;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * Gson 序列化/反序列化 Java8 LocalDateTime
- *
- * @author reghao
- * @date 2021-03-04 19:34:31
- */
-public class LocalDateTimeAdapter implements JsonSerializer<LocalDateTime>, JsonDeserializer<LocalDateTime> {
-    private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-    private final DateTimeFormatter formatter1 = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
-
-    @Override
-    public JsonElement serialize(LocalDateTime localDateTime, Type typeOfSrc, JsonSerializationContext context) {
-        return new JsonPrimitive(localDateTime.format(formatter));
-    }
-
-    @Override
-    public LocalDateTime deserialize(JsonElement element, Type type, JsonDeserializationContext context)
-            throws JsonParseException {
-        String timestamp = element.getAsJsonPrimitive().getAsString();
-        return LocalDateTime.parse(timestamp, formatter);
-    }
-}

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

@@ -3,6 +3,7 @@ package cn.reghao.autodop.common.util.text;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import cn.reghao.util.text.TextFile;
 
 /**
  * 将 Windows 中的 \ 字符替换为 Linux 中的 / 字符

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

@@ -1,212 +0,0 @@
-package cn.reghao.autodop.common.util.text;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * 文本文件工具类
- *
- * @author reghao
- * @date 2019/02/27 15:49:32
- */
-@Slf4j
-public class TextFile {
-    // 匹配所有空白符
-    private String whiteSpace = "\\s+";
-    // 8 MiB
-    private final int bufSize = 8*1024*1024;
-
-    /**
-     * 清空空白字符
-     *
-     * @param
-     * @return
-     * @date 2019-06-10 下午3:31
-     */
-    private String clearWhiteSpace(String str) {
-        return str.replace(whiteSpace, "");
-    }
-
-    /**
-     * 读取文件内容
-     *
-     * @param
-     * @return
-     * @date 2019-09-02 上午12:22
-     */
-    public List<String> read(String filePath) {
-        File file = new File(filePath);
-        if (!file.exists()) {
-            log.info("{} not exists...", filePath);
-            return null;
-        }
-
-        List<String> lines = new ArrayList<>();
-        try {
-            BufferedReader in =  new BufferedReader(new InputStreamReader(new FileInputStream(file)), bufSize);
-            String line;
-            while ((line = in.readLine()) != null) {
-                lines.add(clearWhiteSpace(line));
-            }
-
-            in.close();
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        }
-
-        return lines;
-    }
-
-    public List<String> tailRead(String filePath, int count) throws IOException {
-        RandomAccessFile raf = new RandomAccessFile(filePath, "r");
-        long len = raf.length();
-        long next = len-1;
-        int ch;
-        String line;
-        List<String> list = new ArrayList<>();
-        while (next >= 0 && count > 0) {
-            ch = raf.read();
-            if (ch == '\n') {
-                line = raf.readLine();
-                checkAndAdd(line, list);
-                count--;
-            }
-
-            raf.seek(next);
-            if (next == 0) {
-                line = raf.readLine();
-                checkAndAdd(line, list);
-                count--;
-            }
-            next--;
-        }
-
-        Collections.reverse(list);
-        return list;
-    }
-
-    private void checkAndAdd(String line, List<String> list) {
-        if (line != null) {
-            list.add(line);
-        }
-    }
-
-    public String readFile(String filePath) {
-        File file = new File(filePath);
-        if (!file.exists()) {
-            log.info("{} not exists...", filePath);
-            return null;
-        }
-
-        StringBuilder content = new StringBuilder();
-        try {
-            BufferedReader in =  new BufferedReader(new InputStreamReader(new FileInputStream(file)), bufSize);
-            String line;
-            while ((line = in.readLine()) != null) {
-                content.append(line).append(System.lineSeparator());
-            }
-            in.close();
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        }
-
-        int index = content.lastIndexOf(System.lineSeparator());
-        return content.substring(0, index);
-    }
-
-    /**
-     * 向文件写入内容
-     *
-     * @param
-     * @return
-     * @date 2019-09-02 上午12:22
-     */
-    public void write(String filePath, List<String> list) {
-        File file = new File(filePath);
-        try {
-            /*if (file.exists() || !file.createNewFile()) {
-                log.info("{} exists or create file failed...", filePath);
-                return;
-            }*/
-
-            if (list == null || list.size() == 0) {
-                log.info("list is null or empty...");
-                return;
-            }
-
-            BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)), bufSize);
-            list.forEach(str -> {
-                try {
-                    out.write(str + System.lineSeparator());
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            });
-            out.close();
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        }
-    }
-
-    /**
-     * 向文件中写入内容
-     *
-     * @param
-     * @return
-     * @date 2020-03-10 上午10:47
-     */
-    public void write(File file, String content) throws IOException {
-        int bufSize = 8*1024*1024;
-        BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)), bufSize);
-        for (String str : content.split(System.lineSeparator())) {
-            out.write(str + System.lineSeparator());
-        }
-
-        out.close();
-    }
-
-    /**
-     * 清空文件内容
-     *
-     * @param
-     * @return
-     * @date 2020-03-10 上午10:47
-     */
-    public static void empty(File file) throws IOException {
-        file.delete();
-        file.createNewFile();
-    }
-
-    /**
-     * 将空白字符分隔的 key-value 格式文本存放到 Map
-     *
-     * @param
-     * @return
-     * @date 2019-04-29 下午2:44
-     */
-    public Map<String, String> readByLineMap(String filePath) {
-        // 有序 map
-        Map<String, String> map = new LinkedHashMap<>();
-        // 4MiB
-        // TODO: 如何确认缓冲区大小
-        final int bufSize = 4*1024*1024;
-
-        try {
-            BufferedReader in =  new BufferedReader(new InputStreamReader(new FileInputStream(filePath)), bufSize);
-            String line;
-            while ((line = in.readLine()) != null) {
-                String[] ss = line.split(whiteSpace);
-                if (ss.length == 2 && !line.split(whiteSpace)[0].equals("")
-                        && ss[0].charAt(0) > 48 && ss[0].charAt(0) < 57) {
-                    map.put(ss[0], ss[1]);
-                }
-            }
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        }
-
-        return map;
-    }
-}

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.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.util.result.ResultStatus;
 import cn.reghao.autodop.common.util.ExceptionUtil;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.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.util.DateTimeConverter;
 import cn.reghao.autodop.common.util.ExceptionUtil;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.DateTimeConverter;
+import cn.reghao.util.text.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.util.serializer.JsonConverter;
+import cn.reghao.util.text.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.util.serializer.JsonConverter;
+import cn.reghao.util.text.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.util.serializer.JsonConverter;
+import cn.reghao.util.text.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.util.serializer.JsonConverter;
+import cn.reghao.util.text.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

@@ -9,7 +9,7 @@ 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.util.MachineIdentity;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.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/app/controller/AppBakController.java

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.result.WebBody;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.utils.UploadDownload;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
+import cn.reghao.util.result.WebBody;
 import cn.reghao.autodop.dmaster.app.constant.StatusOps;
 import cn.reghao.autodop.dmaster.app.service.AppStatusService;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
+import cn.reghao.util.result.WebBody;
 import cn.reghao.autodop.dmaster.app.service.AppBuildDeployService;
 import cn.reghao.autodop.dmaster.app.service.BuildDeployDispatcher;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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

@@ -1,12 +1,13 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import cn.reghao.util.result.WebBody;
+
 /**
  * @author reghao
  * @date 2019-08-30 18:49:15

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.util.serializer.JsonConverter;
+import cn.reghao.util.result.WebBody;
+import cn.reghao.util.text.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,14 +1,14 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.common.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import cn.reghao.autodop.dmaster.app.db.crud.config.AppCrudService;
 import cn.reghao.autodop.dmaster.app.db.crud.config.ProjCrudService;
+import cn.reghao.util.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,8 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller.config;
 
-import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.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;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.BuildDirCrudService;
 import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
@@ -10,6 +9,7 @@ import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.CompilerConfigCrudService;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.PackerConfigCrudService;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.RepoAuthConfigCrudService;
+import cn.reghao.util.result.WebBody;
 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/config/AppCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config;
 
-import cn.reghao.autodop.common.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
 import cn.reghao.autodop.common.dagent.machine.disk.Disk;
-import cn.reghao.autodop.common.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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;

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.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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.util.result.ResultStatus;
-import cn.reghao.autodop.common.util.DateTimeConverter;
+import cn.reghao.util.result.ResultStatus;
 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.utils.db.BaseEntity;
+import cn.reghao.util.text.DateTimeConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.entity.log;
 
-import cn.reghao.autodop.common.util.result.Result;
+import cn.reghao.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;

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

@@ -2,7 +2,7 @@ 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.util.result.Result;
+import cn.reghao.util.result.Result;
 import cn.reghao.autodop.dmaster.utils.db.BaseDocument;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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.util.serializer.JsonConverter;
+import cn.reghao.util.text.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.util.result.ResultStatus;
+import cn.reghao.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;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service;
 
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.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;

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.util.serializer.JsonConverter;
+import cn.reghao.util.text.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,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.service.bd;
 
-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 cn.reghao.util.text.DateTimeConverter;
 import lombok.Data;
 
 /**

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

@@ -2,9 +2,9 @@ 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.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.notification.service.notifier.ding.DingMsg;
+import cn.reghao.util.text.DateTimeConverter;
 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.util.serializer.JsonConverter;
+import cn.reghao.util.text.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,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.service.bd.tools.repo;
 
-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 cn.reghao.util.text.TextFile;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;

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.util.security.Cryptor;
-import cn.reghao.autodop.common.util.security.Md5Cryptor;
+import cn.reghao.util.security.Cryptor;
+import cn.reghao.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/config/WebAuthSuccessHandlerImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.auth.config;
 
-import cn.reghao.autodop.dmaster.utils.WebBody;
+import cn.reghao.util.result.WebBody;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;

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

@@ -1,12 +1,11 @@
 package cn.reghao.autodop.dmaster.auth.controller;
 
-import cn.reghao.autodop.common.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
 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;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import cn.reghao.autodop.dmaster.auth.service.MenuServiceImpl;
+import cn.reghao.util.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
@@ -42,8 +41,9 @@ public class ResourceController {
     @ApiOperation(value = "修改资源")
     @PostMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE)
     public String modifyMenu(@Validated MenuDTO menuDTO) {
-        Result result = menuServiceImpl.updateMenu(menuDTO);
-        return WebBody.result(Result.result(ResultStatus.SUCCESS));
+        /*Result result = menuServiceImpl.updateMenu(menuDTO);
+        return WebBody.result(Result.result(ResultStatus.SUCCESS));*/
+        return WebBody.success("");
     }
 
     @ApiOperation(value = "修改资源状态")

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

@@ -4,7 +4,7 @@ import cn.reghao.autodop.dmaster.auth.db.crud.MenuQuery;
 import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import cn.reghao.autodop.dmaster.auth.service.RoleService;
-import cn.reghao.autodop.dmaster.utils.WebBody;
+import cn.reghao.util.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

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

@@ -1,12 +1,12 @@
 package cn.reghao.autodop.dmaster.auth.controller;
 
+import cn.reghao.util.result.WebBody;
 import cn.reghao.autodop.dmaster.auth.model.dto.UserInfo;
 import cn.reghao.autodop.dmaster.auth.model.dto.UserRole;
 import cn.reghao.autodop.dmaster.auth.model.po.UserAuthority;
 import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import cn.reghao.autodop.dmaster.auth.model.po.User;
 import cn.reghao.autodop.dmaster.auth.service.UserService;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.auth.model.vo;
 
-import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.util.text.DateTimeConverter;
 import lombok.Data;
 
 /**

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.auth.model.vo;
 
-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 cn.reghao.util.text.DateTimeConverter;
 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.util.result.Result;
+import cn.reghao.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.util.result.Result;
-import cn.reghao.autodop.common.util.result.ResultStatus;
+import cn.reghao.util.result.Result;
+import cn.reghao.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.util.security.Cryptor;
-import cn.reghao.autodop.common.util.security.Md5Cryptor;
-import cn.reghao.autodop.common.util.security.Salt;
+import cn.reghao.util.security.Cryptor;
+import cn.reghao.util.security.Md5Cryptor;
+import cn.reghao.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/MachineController.java

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.machine.controller;
 
+import cn.reghao.util.result.WebBody;
 import cn.reghao.autodop.dmaster.machine.entity.po.SshAuth;
 import cn.reghao.autodop.dmaster.machine.service.MachineService;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,6 +1,5 @@
 package cn.reghao.autodop.dmaster.machine.controller;
 
-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;
@@ -17,6 +16,7 @@ import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
 import cn.reghao.autodop.dmaster.notification.repository.NotifyGroupRepository;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
+import cn.reghao.util.text.DateTimeConverter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.machine.entity.vo;
 
-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 cn.reghao.util.text.DateTimeConverter;
 import lombok.Data;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/ssh/WebSshImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.machine.service.ssh;
 
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.dmaster.spring.thread.ThreadPoolWrapper;
 import cn.reghao.autodop.dmaster.machine.entity.SshConnData;
 import cn.reghao.autodop.dmaster.machine.entity.SshConnInfo;

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/controller/MonitorController.java

@@ -2,8 +2,7 @@ package cn.reghao.autodop.dmaster.monitor.controller;
 
 import cn.reghao.autodop.dmaster.monitor.entity.MonitorJob;
 import cn.reghao.autodop.dmaster.monitor.service.MonitorService;
-import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
-import cn.reghao.autodop.dmaster.utils.WebBody;
+import cn.reghao.util.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +11,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/MonitorScheduler.java

@@ -1,8 +1,9 @@
 package cn.reghao.autodop.dmaster.monitor.service;
 
+import cn.reghao.autodop.dmaster.DmasterApplication;
 import cn.reghao.autodop.dmaster.monitor.entity.MonitorJob;
 import cn.reghao.autodop.dmaster.monitor.repository.MonitorJobRepository;
-import cn.reghao.autodop.dmaster.utils.clazz.PackageScanner;
+import cn.reghao.util.clazz.PackageScanner;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
@@ -64,7 +65,7 @@ public class MonitorScheduler {
         String jobClassName = monitorJob.getJobClassName();
         String cronExp = monitorJob.getCronExp();
         String jobPkg = "cn.reghao.autodop.dmaster.monitor.service.job";
-        Class clazz = packageScanner.findClassBySimpleName(jobClassName, jobPkg);
+        Class clazz = packageScanner.findClassBySimpleName(DmasterApplication.class, jobClassName, jobPkg);
 
         JobDetail jobDetail = JobBuilder.newJob(clazz)
                 .withIdentity(jobId)

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/service/job/MachineStatCheckJob.java

@@ -4,7 +4,6 @@ import cn.reghao.autodop.common.dagent.machine.disk.DiskInfo;
 import cn.reghao.autodop.common.dagent.machine.memory.MemoryInfo;
 import cn.reghao.autodop.common.util.ByteConverter;
 import cn.reghao.autodop.common.util.ByteType;
-import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.common.util.PercentCalculator;
 import cn.reghao.autodop.dmaster.machine.db.crud.MachineStatCrudService;
 import cn.reghao.autodop.dmaster.machine.db.query.MachineQuery;
@@ -17,6 +16,7 @@ import cn.reghao.autodop.dmaster.monitor.entity.MonitorJob;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
 import cn.reghao.autodop.dmaster.notification.service.NotifyService;
 import cn.reghao.autodop.dmaster.notification.service.notifier.ding.DingMsg;
+import cn.reghao.util.text.DateTimeConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobDataMap;

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

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.mqttsub;
 
 import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.message.AsyncMsg;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.dmaster.mqttsub.processor.AppOpsProcessor;
 import cn.reghao.autodop.dmaster.mqttsub.processor.DagentOpsProcessor;
 import cn.reghao.autodop.dmaster.mqttsub.processor.MachineOpsProcessor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/processor/AppOpsProcessor.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.dagent.app.DeployResult;
 import cn.reghao.autodop.common.message.CallResult;
 import cn.reghao.autodop.common.message.ops.AppOps;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.dmaster.app.service.AppOpsResultService;
 import cn.reghao.autodop.common.message.ops.OpsProcessor;
 import com.google.gson.reflect.TypeToken;

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/processor/DagentOpsProcessor.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.mqttsub.processor;
 
 import cn.reghao.autodop.common.message.ops.DagentOps;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.common.message.ops.OpsProcessor;
 import cn.reghao.autodop.dmaster.machine.entity.po.MachineStat;
 import cn.reghao.autodop.dmaster.machine.entity.po.MachineStatus;

dmaster/src/main/java/cn/reghao/autodop/dmaster/notification/controller/NotificationController.java

@@ -1,5 +1,6 @@
 package cn.reghao.autodop.dmaster.notification.controller;
 
+import cn.reghao.util.result.WebBody;
 import cn.reghao.autodop.dmaster.notification.entity.DingAccount;
 import cn.reghao.autodop.dmaster.notification.entity.EmailAccount;
 import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
@@ -8,7 +9,6 @@ import cn.reghao.autodop.dmaster.notification.repository.DingAccountRepository;
 import cn.reghao.autodop.dmaster.notification.repository.NotifyGroupRepository;
 import cn.reghao.autodop.dmaster.notification.repository.EmailAccountRepository;
 import cn.reghao.autodop.dmaster.notification.repository.SmsAccountRepository;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

dmaster/src/main/java/cn/reghao/autodop/dmaster/notification/service/notifier/ding/DingNotify.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dmaster.notification.service.notifier.ding;
 
 import cn.reghao.autodop.common.http.WebRequest;
 import cn.reghao.autodop.common.http.WebResponse;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.dmaster.notification.entity.DingAccount;
 import cn.reghao.autodop.dmaster.notification.service.notifier.Notify;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/spring/exception/ControllerExceptionHandler.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.spring.exception;
 
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import cn.reghao.autodop.common.util.ExceptionUtil;
+import cn.reghao.util.result.WebBody;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/controller/SysController.java

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.sys.controller;
 
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.result.WebBody;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.dmaster.sys.service.SysConfig;
 import cn.reghao.autodop.dmaster.utils.UploadDownload;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/controller/SysPageController.java

@@ -3,10 +3,10 @@ package cn.reghao.autodop.dmaster.sys.controller;
 import cn.reghao.autodop.common.jvm.JVM;
 import cn.reghao.autodop.common.jvm.pojo.JvmInfo;
 import cn.reghao.autodop.common.jvm.pojo.JvmStat;
-import cn.reghao.autodop.common.util.serializer.JsonConverter;
+import cn.reghao.util.result.WebBody;
+import cn.reghao.util.text.JsonConverter;
 import cn.reghao.autodop.dmaster.sys.service.SysConfig;
 import cn.reghao.autodop.dmaster.utils.UploadDownload;
-import cn.reghao.autodop.dmaster.utils.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/controller/TestController.java

@@ -6,10 +6,10 @@ import cn.reghao.autodop.dmaster.auth.model.po.UserAuthority;
 import cn.reghao.autodop.dmaster.auth.model.po.Menu;
 import cn.reghao.autodop.dmaster.auth.model.po.Role;
 import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.utils.WebBody;
-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.util.result.WebBody;
+import cn.reghao.util.security.Cryptor;
+import cn.reghao.util.security.Md5Cryptor;
+import cn.reghao.util.security.Salt;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/WebBody.java

@@ -1,138 +0,0 @@
-package cn.reghao.autodop.dmaster.utils;
-
-import cn.reghao.autodop.common.util.result.Result;
-import cn.reghao.autodop.common.util.DateTimeConverter;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-import static cn.reghao.autodop.common.util.result.ResultStatus.*;
-
-/**
- * HTTP 响应 body 数据
- *
- * @author reghao
- * @date 2019-09-28 10:05:35
- */
-@Data
-@NoArgsConstructor
-public class WebBody {
-    private static ObjectMapper objectMapper = new ObjectMapper();
-    static {
-        JavaTimeModule javaTimeModule = new JavaTimeModule();
-        javaTimeModule
-                .addSerializer(LocalDateTime.class,
-                        new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
-                .addDeserializer(LocalDateTime.class,
-                        new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        objectMapper.registerModule(javaTimeModule);
-    }
-
-    private int code;
-    private String msg;
-    private String timestamp;
-    private Object data;
-
-    private WebBody(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public static String success() {
-        WebBody webBody = new WebBody(SUCCESS.getCode(), SUCCESS.getMsg());
-        webBody.setTimestamp(DateTimeConverter.now());
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String successWithMsg(String msg) {
-        WebBody webBody = new WebBody(SUCCESS.getCode(), msg);
-        webBody.setTimestamp(DateTimeConverter.now());
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String result(Result result) {
-        WebBody webBody = new WebBody(result.getCode(), result.getMsg());
-        webBody.setTimestamp(DateTimeConverter.now());
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String success(Object data) {
-        WebBody webBody = new WebBody(SUCCESS.getCode(), SUCCESS.getMsg());
-        webBody.setTimestamp(DateTimeConverter.now());
-        webBody.setData(data);
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String fail(Object data) {
-        WebBody webBody = new WebBody(FAIL.getCode(), FAIL.getMsg());
-        webBody.setTimestamp(DateTimeConverter.now());
-        webBody.setData(data);
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String failWithMsg(String msg) {
-        WebBody webBody = new WebBody(FAIL.getCode(), msg);
-        webBody.setTimestamp(DateTimeConverter.now());
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String error(Object data) {
-        WebBody webBody = new WebBody(ERROR.getCode(), ERROR.getMsg());
-        webBody.setTimestamp(DateTimeConverter.now());
-        webBody.setData(data);
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static String errorMsg(String msg) {
-        WebBody webBody = new WebBody(ERROR.getCode(), msg);
-        webBody.setTimestamp(DateTimeConverter.now());
-        try {
-            return objectMapper.writeValueAsString(webBody);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/clazz/PackageScanner.java

@@ -1,108 +0,0 @@
-package cn.reghao.autodop.dmaster.utils.clazz;
-
-import cn.reghao.autodop.dmaster.DmasterApplication;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-
-/**
- * 扫描指定包路径下的所有 class 文件
- *
- * @author reghao
- * @date 2020-09-24 15:41:07
- */
-public class PackageScanner {
-    public Class findClassBySimpleName(String simpleName, String pkgPath) throws IOException {
-        List<Class<?>> classList = doScan(DmasterApplication.class, pkgPath);
-        for (Class<?> clazz : classList) {
-            if (clazz.getSimpleName().equals(simpleName)) {
-                return clazz;
-            }
-        }
-        return null;
-    }
-
-    public List<Class<?>> doScan(Class<?> clazz, String basePackage) throws IOException {
-        List<Class<?>> classList = new ArrayList<>();
-        String pkgPath = basePackage.replace(".", "/");
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-
-        URL url = cl.getResource(pkgPath);
-        assert url != null;
-        File file = new File(rootPath(url));
-        String protocol = url.getProtocol();
-        if ("jar".equals(protocol)) {
-            readFromJarFile(file, pkgPath, classList);
-        } else if ("file".equals(protocol)) {
-            if (file.isDirectory()) {
-                readFromDir(file, clazz, classList);
-            } else {
-                addClazz(file.getAbsolutePath(), clazz, classList);
-            }
-        }
-        return classList;
-    }
-
-    private String rootPath(URL url) {
-        String path = url.getPath();
-        int pos = path.indexOf("!");
-        if (pos == -1) {
-            return path.replace("file:", "");
-        } else {
-            return path.substring(0, pos).replace("file:", "");
-        }
-    }
-
-    private void readFromDir(File dir, Class<?> clazz, List<Class<?>> classList) {
-        File[] files = dir.listFiles();
-        assert files != null;
-        Arrays.asList(files).forEach(file -> {
-            if (file.isDirectory()) {
-                readFromDir(file, clazz, classList);
-            } else {
-                String path = file.getPath();
-                addClazz(path, clazz, classList);
-            }
-        });
-    }
-
-    private void addClazz(String filepath, Class<?> clazz, List<Class<?>> classList) {
-        String tmp = filepath.replace(clazz.getResource("/").getPath(), "");
-        String className = tmp.replace("/", ".")
-            .replace(".class", "");
-        try {
-            classList.add(Class.forName(className));
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void readFromJarFile(File jarFile, String pkgPath, List<Class<?>> classList) throws IOException {
-        if (!jarFile.exists()) {
-            System.out.println("jar 文件 " + jarFile.getAbsolutePath() + " 不存在...");
-        }
-
-        JarInputStream in = new JarInputStream(new FileInputStream(jarFile));
-        JarEntry entry = in.getNextJarEntry();
-        while (entry != null) {
-            String name = entry.getName();
-            if (name.startsWith(pkgPath) && name.endsWith(".class")) {
-                String pkg = name.replace("/", ".").replace(".class", "");
-                try {
-                    Class<?> clazz = Class.forName(pkg);
-                    classList.add(clazz);
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                }
-            }
-            entry = in.getNextJarEntry();
-        }
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/log/MongoAppender.java

@@ -2,10 +2,10 @@ package cn.reghao.autodop.dmaster.utils.log;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
-import cn.reghao.autodop.common.util.DateTimeConverter;
 import cn.reghao.autodop.dmaster.sys.db.AppRuntimeLogCrudService;
 import cn.reghao.autodop.dmaster.sys.entity.AppRuntimeLog;
 import cn.reghao.autodop.dmaster.spring.DmasterLifecycle;
+import cn.reghao.util.text.DateTimeConverter;
 
 /**
  * @author reghao

dmaster/src/main/resources/application-dev.yml

@@ -5,7 +5,11 @@ spring:
     password: Dev@123456
   data:
     mongodb:
-      uri: mongodb://localhost/reghao_devops_rdb
+      host: localhost
+      database: "reghao_devops_rdb"
+      authentication-database: admin
+      username: dev
+      password: Dev@123456
 mosquitto:
   broker: tcp://localhost:1883
   username: dev

pom.xml

@@ -38,6 +38,12 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.reghao</groupId>
+            <artifactId>util</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>