将 AppLog 和 GatewayLog 迁移到 jdk 模块

jdk/src/main/java/cn/reghao/jutil/jdk/result/AppLog.java

@@ -0,0 +1,98 @@
+package cn.reghao.jutil.jdk.result;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2025-07-18 11:33:46
+ */
+public class AppLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String requestId;
+    private String app;
+    private String host;
+    private long timestamp;
+    private String level;
+    private String thread;
+    private String logger;
+    private String message;
+
+    public AppLog() {
+    }
+
+    public AppLog(String requestId, String app, String host, long timestamp, String level, String thread, String logger, String message) {
+        this.requestId = requestId;
+        this.app = app;
+        this.host = host;
+        this.timestamp = timestamp;
+        this.level = level;
+        this.thread = thread;
+        this.logger = logger;
+        this.message = message;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setApp(String app) {
+        this.app = app;
+    }
+
+    public String getApp() {
+        return app;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setThread(String thread) {
+        this.thread = thread;
+    }
+
+    public String getThread() {
+        return thread;
+    }
+
+    public void setLogger(String logger) {
+        this.logger = logger;
+    }
+
+    public String getLogger() {
+        return logger;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

jdk/src/main/java/cn/reghao/jutil/jdk/result/GatewayLog.java

@@ -0,0 +1,209 @@
+package cn.reghao.jutil.jdk.result;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @author reghao
+ * @date 2024-11-20 16:40:24
+ */
+public class GatewayLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String requestId;
+    // ms
+    private long requestTime;
+    private String targetRoute;
+    private String targetService;
+    private String requestUrl;
+    private String requestMethod;
+    private Map<String, String> requestHeaders;
+    private String requestBody;
+    private long requestBytes;
+    private String remoteAddr;
+    private int remotePort;
+    private int statusCode;
+    private Map<String, String> responseHeaders;
+    private String responseBody;
+    private long responseBytes;
+    // ms
+    private long responseTime;
+    // ms
+    private long executeTime;
+    private String fingerprint;
+
+    public GatewayLog() {
+        this.targetRoute = "";
+        this.targetService = "";
+        this.requestBody = "";
+        this.requestBytes = 0;
+        this.remoteAddr = "";
+        this.remotePort = 0;
+        this.responseBody = "";
+        this.responseBytes = 0;
+        this.fingerprint = "";
+    }
+
+    public GatewayLog(String requestId, long requestTime, String requestUrl, String requestMethod, Map<String, String> requestHeaders,
+                      String remoteAddr, int remotePort, int statusCode, Map<String, String> responseHeaders, long responseTime) {
+        this.requestId = requestId;
+        this.requestTime = requestTime;
+        this.targetRoute = "";
+        this.targetService = "";
+        this.requestUrl = requestUrl;
+        this.requestMethod = requestMethod;
+        this.requestHeaders = requestHeaders;
+        this.requestBody = "";
+        this.remoteAddr = remoteAddr;
+        this.remotePort = remotePort;
+        this.statusCode = statusCode;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = "";
+        this.responseTime = responseTime;
+        this.executeTime = responseTime-requestTime;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setRequestTime(long requestTime) {
+        this.requestTime = requestTime;
+    }
+
+    public long getRequestTime() {
+        return requestTime;
+    }
+
+    public void setTargetRoute(String targetRoute) {
+        this.targetRoute = targetRoute;
+    }
+
+    public String getTargetRoute() {
+        return targetRoute;
+    }
+
+    public void setTargetService(String targetService) {
+        this.targetService = targetService;
+    }
+
+    public String getTargetService() {
+        return targetService;
+    }
+
+    public void setRequestUrl(String requestUrl) {
+        this.requestUrl = requestUrl;
+    }
+
+    public String getRequestUrl() {
+        return requestUrl;
+    }
+
+    public void setRequestMethod(String requestMethod) {
+        this.requestMethod = requestMethod;
+    }
+
+    public String getRequestMethod() {
+        return requestMethod;
+    }
+
+    public void setRequestHeaders(Map<String, String> requestHeaders) {
+        this.requestHeaders = requestHeaders;
+    }
+
+    public Map<String, String> getRequestHeaders() {
+        return requestHeaders;
+    }
+
+    public void setRequestBody(String requestBody) {
+        this.requestBody = requestBody;
+    }
+
+    public String getRequestBody() {
+        return requestBody;
+    }
+
+    public void setRequestBytes(long requestBytes) {
+        this.requestBytes = requestBytes;
+    }
+
+    public long getRequestBytes() {
+        return requestBytes;
+    }
+
+    public void setRemoteAddr(String remoteAddr) {
+        this.remoteAddr = remoteAddr;
+    }
+
+    public String getRemoteAddr() {
+        return remoteAddr;
+    }
+
+    public void setRemotePort(int remotePort) {
+        this.remotePort = remotePort;
+    }
+
+    public int getRemotePort() {
+        return remotePort;
+    }
+
+    public void setStatusCode(int statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setResponseHeaders(Map<String, String> responseHeaders) {
+        this.responseHeaders = responseHeaders;
+    }
+
+    public Map<String, String> getResponseHeaders() {
+        return responseHeaders;
+    }
+
+    public void setResponseBody(String responseBody) {
+        this.responseBody = responseBody;
+    }
+
+    public String getResponseBody() {
+        return responseBody;
+    }
+
+    public void setResponseBytes(long responseBytes) {
+        this.responseBytes = responseBytes;
+    }
+
+    public long getResponseBytes() {
+        return responseBytes;
+    }
+
+    public void setResponseTime(long responseTime) {
+        this.responseTime = responseTime;
+    }
+
+    public long getResponseTime() {
+        return responseTime;
+    }
+
+    public void setExecuteTime(long executeTime) {
+        this.executeTime = executeTime;
+    }
+
+    public long getExecuteTime() {
+        return executeTime;
+    }
+
+    public void setFingerprint(String fingerprint) {
+        this.fingerprint = fingerprint;
+    }
+
+    public String getFingerprint() {
+        return fingerprint;
+    }
+}

web/src/main/java/cn/reghao/jutil/web/ServletUtil.java

@@ -1,7 +1,7 @@
 package cn.reghao.jutil.web;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.jutil.web.log.GatewayLog;
+import cn.reghao.jutil.jdk.result.GatewayLog;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;

web/src/main/java/cn/reghao/jutil/web/log/AppLog.java

@@ -1,27 +0,0 @@
-package cn.reghao.jutil.web.log;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2025-07-18 11:33:46
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Getter
-public class AppLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String requestId;
-    private String app;
-    private String host;
-    private long timestamp;
-    private String level;
-    private String thread;
-    private String logger;
-    private String message;
-}

web/src/main/java/cn/reghao/jutil/web/log/GatewayLog.java

@@ -1,70 +0,0 @@
-package cn.reghao.jutil.web.log;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2024-11-20 16:40:24
- */
-@Setter
-@Getter
-public class GatewayLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String requestId;
-    // ms
-    private long requestTime;
-    private String targetRoute;
-    private String targetService;
-    private String requestUrl;
-    private String requestMethod;
-    private Map<String, String> requestHeaders;
-    private String requestBody;
-    private long requestBytes;
-    private String remoteAddr;
-    private int remotePort;
-    private int statusCode;
-    private Map<String, String> responseHeaders;
-    private String responseBody;
-    private long responseBytes;
-    // ms
-    private long responseTime;
-    // ms
-    private long executeTime;
-    private String fingerprint;
-
-    public GatewayLog() {
-        this.targetRoute = "";
-        this.targetService = "";
-        this.requestBody = "";
-        this.requestBytes = 0;
-        this.remoteAddr = "";
-        this.remotePort = 0;
-        this.responseBody = "";
-        this.responseBytes = 0;
-        this.fingerprint = "";
-    }
-
-    public GatewayLog(String requestId, long requestTime, String requestUrl, String requestMethod, Map<String, String> requestHeaders,
-                      String remoteAddr, int remotePort, int statusCode, Map<String, String> responseHeaders, long responseTime) {
-        this.requestId = requestId;
-        this.requestTime = requestTime;
-        this.targetRoute = "";
-        this.targetService = "";
-        this.requestUrl = requestUrl;
-        this.requestMethod = requestMethod;
-        this.requestHeaders = requestHeaders;
-        this.requestBody = "";
-        this.remoteAddr = remoteAddr;
-        this.remotePort = remotePort;
-        this.statusCode = statusCode;
-        this.responseHeaders = responseHeaders;
-        this.responseBody = "";
-        this.responseTime = responseTime;
-        this.executeTime = responseTime-requestTime;
-    }
-}