build: Spring Boot 2.7.18 补丁升级（修复 htmlunit / spring-boot-devtools / json-lib 告警）

.github/workflows/maven.yml

@@ -1,17 +1,22 @@
 name: Java CI
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn package --file pom.xml
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Build with Maven
+        run: mvn package --file pom.xml

banner/pom.xml

@@ -12,20 +12,18 @@
     <description>Banner project for Spring Boot</description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>2.7.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-            <version>2.7.3</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -37,7 +35,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.7.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

html2md/pom.xml

@@ -37,11 +37,11 @@
         </dependency>
 
 
-        <!-- https://mvnrepository.com/artifact/net.sourceforge.htmlunit/htmlunit -->
+        <!-- https://mvnrepository.com/artifact/org.htmlunit/htmlunit -->
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
+            <groupId>org.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.64.0</version>
+            <version>3.11.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.james/apache-mime4j -->
@@ -67,14 +67,6 @@
             <version>1.23.1</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/net.sf.json-lib/json-lib -->
-        <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>2.4</version>
-            <classifier>jdk15</classifier>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/com.jayway.jsonpath/json-path -->
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
@@ -92,7 +84,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-            <version>2.7.3</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -117,8 +108,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
         </plugins>

html2md/src/main/java/com/dawn/html2md/baidu/BaiduCrawlerUrl.java

@@ -1,9 +1,9 @@
 package com.dawn.html2md.baidu;
 
-import com.gargoylesoftware.htmlunit.BrowserVersion;
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.BrowserVersion;
+import org.htmlunit.FailingHttpStatusCodeException;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import com.jayway.jsonpath.JsonPath;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;

html2md/src/main/java/com/dawn/html2md/baidu/Test.java

@@ -1,8 +1,8 @@
 package com.dawn.html2md.baidu;
 
-import com.gargoylesoftware.htmlunit.BrowserVersion;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
+import org.htmlunit.BrowserVersion;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
 import org.apache.commons.io.IOUtils;
 
 import java.io.File;

html2md/src/main/java/com/dawn/html2md/config/WebLogAspect.java

@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -23,6 +24,7 @@
 public class WebLogAspect {
 
     private static final Logger loggger = LogManager.getLogger(WebLogAspect.class);
+    private static final ObjectMapper objectMapper = new ObjectMapper();
 
     @Pointcut("execution(public * com.quick..controller.*.*(..))")//两个..代表所有子目录，最后括号里的两个..代表所有参数
     public void logPointCut() {
@@ -41,7 +43,11 @@ public void doBefore(JoinPoint joinPoint) throws Throwable {
         loggger.info("CLASS_METHOD : " + joinPoint.getSignature().getDeclaringTypeName() + "."
                 + joinPoint.getSignature().getName());
 //        loggger.info("参数 : " + Arrays.toString(joinPoint.getArgs()));
-        loggger.info("参数 : " + net.sf.json.JSONArray.fromObject(joinPoint.getArgs()));
+        try {
+            loggger.info("参数 : " + objectMapper.writeValueAsString(joinPoint.getArgs()));
+        } catch (Exception e) {
+            loggger.info("参数 : " + java.util.Arrays.toString(joinPoint.getArgs()));
+        }
 //        loggger.info("参数 : " + joinPoint.getArgs());
     }
 
@@ -58,4 +64,4 @@ public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
         loggger.info("耗时 : " + (System.currentTimeMillis() - startTime));
         return ob;
     }
-}
+}

html2md/src/main/java/com/dawn/html2md/innotree/InnotreeService.java

@@ -7,13 +7,14 @@
 import java.util.ArrayList;
 import java.util.Date;
 
-import com.gargoylesoftware.htmlunit.HttpMethod;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebRequest;
-import com.gargoylesoftware.htmlunit.util.NameValuePair;
+import org.htmlunit.HttpMethod;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebRequest;
+import org.htmlunit.util.NameValuePair;
 
-import net.sf.json.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
  * @Author: wangxc
@@ -23,6 +24,8 @@
  * @wxid: BMHJQS
  */
 public class InnotreeService {
+    private static final ObjectMapper mapper = new ObjectMapper();
+
     public static void main(String[] args) throws IOException {
         final WebClient webClient = new WebClient();// 创建WebClient
 
@@ -55,7 +58,7 @@ public static void main(String[] args) throws IOException {
 
         WebRequest webRequest = new WebRequest(new URL("http://www.innotree.cn/collectlog/info.ajax"));
         webRequest.setHttpMethod(HttpMethod.POST);
-        JSONObject params = new JSONObject();
+        ObjectNode params = mapper.createObjectNode();
         params.put("source_type","pc");
         params.put("collect_type","click");
         params.put("collect_key","search");
@@ -67,8 +70,8 @@ public static void main(String[] args) throws IOException {
         params.put("gen_time",format.format(new Date()));
         params.put("collect_page","SearchList");
 
-        JSONObject nj = new JSONObject();
-        nj.put("json",params);
+        ObjectNode nj = mapper.createObjectNode();
+        nj.set("json",params);
 
         webRequest.setAdditionalHeader("Accept","application/json, text/javascript, */*; q=0.01");
         webRequest.setAdditionalHeader("Accept-Encoding","gzip, deflate");

html2md/src/main/java/com/dawn/html2md/innotree/test2.java

@@ -6,8 +6,8 @@
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
 
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
 
 /**
  * @Author: wangxc

img2text/pom.xml

@@ -19,20 +19,18 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>2.7.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.7.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -44,7 +42,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-            <version>2.7.3</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

pom.xml

@@ -15,11 +15,11 @@
     </modules>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <maven.test.skip>true</maven.test.skip>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <spring.boot.version>2.7.3</spring.boot.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <spring.boot.version>2.7.18</spring.boot.version>
     </properties>
 
     <dependencies>
@@ -31,6 +31,7 @@
     </dependencies>
 
 
+
     <dependencyManagement>
         <dependencies>
             <dependency>