删除 model 模块

logstash/pom.xml

@@ -20,12 +20,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.reghao.devops</groupId>
-            <artifactId>model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>

model/src/main/java/cn/reghao/devops/model/NginxLog.java → logstash/src/main/java/cn/reghao/devops/logstash/model/NginxLog.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.model;
+package cn.reghao.devops.logstash.model;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Getter;

logstash/src/main/java/cn/reghao/devops/logstash/service/TailReader.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.logstash.service;
 
+import cn.reghao.devops.logstash.model.NginxLog;
 import cn.reghao.devops.logstash.ws.WsClient;
-import cn.reghao.devops.model.NginxLog;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 

manager/pom.xml

@@ -44,11 +44,6 @@
             <artifactId>common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>cn.reghao.devops</groupId>
-            <artifactId>model</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

manager/src/main/java/cn/reghao/devops/manager/log/model/po/NginxLog.java

@@ -0,0 +1,30 @@
+package cn.reghao.devops.manager.log.model.po;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2023-11-07 14:58:07
+ */
+@Getter
+public class NginxLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @SerializedName("time_iso8601") private String timeIso8601;
+    @SerializedName("remote_addr") private String remoteAddr;
+    private String request;
+    private Integer status;
+    @SerializedName("request_method") private String requestMethod;
+    @SerializedName("body_bytes_sent") private Integer bodyBytesSent;
+    @SerializedName("request_time") private Double requestTime;
+    @SerializedName("upstream_response_time") private Double upstreamResponseTime;
+    @SerializedName("upstream_addr") private String upstreamAddr;
+    private String host;
+    private String url;
+    @SerializedName("http_x_forwarded_for") private String httpXForwardedFor;
+    @SerializedName("http_referer") private String httpReferer;
+    @SerializedName("http_user_agent") private String httpUserAgent;
+}

manager/src/main/java/cn/reghao/devops/manager/log/service/LoggingService.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.log.service;
 
-import cn.reghao.devops.model.NginxLog;
+import cn.reghao.devops.manager.log.model.po.NginxLog;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.text.TextFile;

manager/src/main/java/cn/reghao/devops/manager/ws/handler/LogHandler.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.ws.handler;
 
-import cn.reghao.devops.model.NginxLog;
+import cn.reghao.devops.manager.log.model.po.NginxLog;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.result.AppLog;
 import cn.reghao.jutil.jdk.serializer.JdkSerializer;

model/pom.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>devops</artifactId>
-        <groupId>cn.reghao.devops</groupId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>model</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-</project>

pom.xml

@@ -11,7 +11,6 @@
         <module>common</module>
         <module>manager</module>
         <module>agent</module>
-        <module>model</module>
         <module>logstash</module>
     </modules>
     <packaging>pom</packaging>