jdk11 升级到 jdk17

1.javax.servlet 更改为 jakarta.servlet

jdk/pom.xml

@@ -5,15 +5,16 @@
     <parent>
         <artifactId>jutil</artifactId>
         <groupId>cn.reghao.jutil</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>jdk17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jdk</artifactId>
+    <version>jdk17-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.reghao.jutil</groupId>
     <artifactId>jutil</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>jdk17-SNAPSHOT</version>
     <modules>
         <module>jdk</module>
         <module>tool</module>
@@ -15,8 +15,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>

tool/pom.xml

@@ -5,22 +5,23 @@
     <parent>
         <artifactId>jutil</artifactId>
         <groupId>cn.reghao.jutil</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>jdk17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>tool</artifactId>
+    <version>jdk17-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>cn.reghao.jutil</groupId>
             <artifactId>jdk</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>jdk17-SNAPSHOT</version>
         </dependency>
 
         <dependency>

web/pom.xml

@@ -5,15 +5,17 @@
     <parent>
         <artifactId>jutil</artifactId>
         <groupId>cn.reghao.jutil</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>jdk17-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>web</artifactId>
+    <version>jdk17-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <springboot.version>3.2.1</springboot.version>
     </properties>
 
     <dependencyManagement>
@@ -21,7 +23,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.3.8.RELEASE</version>
+                <version>${springboot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -29,17 +31,10 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-            <version>1.18.16</version>
-        </dependency>
-
         <dependency>
             <groupId>cn.reghao.jutil</groupId>
             <artifactId>jdk</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>jdk17-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -49,14 +44,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>28.0-jre</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>6.1.2</version>
         </dependency>
     </dependencies>
 </project>

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

@@ -7,11 +7,11 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.Enumeration;

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

@@ -1,7 +1,6 @@
 package cn.reghao.jutil.web.log;
 
 import com.google.gson.annotations.SerializedName;
-import lombok.Getter;
 
 import java.io.Serializable;
 
@@ -9,7 +8,6 @@ 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;
 
@@ -27,4 +25,60 @@ public class NginxLog implements Serializable {
     @SerializedName("http_x_forwarded_for") private String httpXForwardedFor;
     @SerializedName("http_referer") private String httpReferer;
     @SerializedName("http_user_agent") private String httpUserAgent;
+
+    public String getTimeIso8601() {
+        return timeIso8601;
+    }
+
+    public String getRemoteAddr() {
+        return remoteAddr;
+    }
+
+    public String getRequest() {
+        return request;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public String getRequestMethod() {
+        return requestMethod;
+    }
+
+    public Integer getBodyBytesSent() {
+        return bodyBytesSent;
+    }
+
+    public Double getRequestTime() {
+        return requestTime;
+    }
+
+    public String getUpstreamResponseTime() {
+        return upstreamResponseTime;
+    }
+
+    public String getUpstreamAddr() {
+        return upstreamAddr;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getHttpXForwardedFor() {
+        return httpXForwardedFor;
+    }
+
+    public String getHttpReferer() {
+        return httpReferer;
+    }
+
+    public String getHttpUserAgent() {
+        return httpUserAgent;
+    }
 }