From 7c55be8492b47ff32a374dd42255ba647de85cbc Mon Sep 17 00:00:00 2001 From: Ruffian Jiang Date: Thu, 20 Aug 2026 14:11:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=20Spring=20Boot=202.?= =?UTF-8?q?7.3->2.7.18=E3=80=81htmlunit=202->3(org.htmlunit)=E3=80=81json-?= =?UTF-8?q?lib->Jackson=E3=80=81Java=208->11=EF=BC=8CCI=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=20JDK=2011?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven.yml | 25 +++++++++++-------- banner/pom.xml | 5 +--- html2md/pom.xml | 19 ++++---------- .../dawn/html2md/baidu/BaiduCrawlerUrl.java | 8 +++--- .../java/com/dawn/html2md/baidu/Test.java | 6 ++--- .../com/dawn/html2md/config/WebLogAspect.java | 10 ++++++-- .../html2md/innotree/InnotreeService.java | 21 +++++++++------- .../java/com/dawn/html2md/innotree/test2.java | 4 +-- img2text/pom.xml | 5 +--- pom.xml | 9 ++++--- 10 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b05aab9..b53eb00 100644 --- a/.github/workflows/maven.yml +++ b/.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 diff --git a/banner/pom.xml b/banner/pom.xml index 8603f36..b5eb57c 100644 --- a/banner/pom.xml +++ b/banner/pom.xml @@ -12,20 +12,18 @@ Banner project for Spring Boot - 1.8 + 11 org.springframework.boot spring-boot-starter - 2.7.3 org.springframework.boot spring-boot-devtools - 2.7.3 runtime @@ -37,7 +35,6 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 test diff --git a/html2md/pom.xml b/html2md/pom.xml index 61618cc..d53add0 100644 --- a/html2md/pom.xml +++ b/html2md/pom.xml @@ -37,11 +37,11 @@ - + - net.sourceforge.htmlunit + org.htmlunit htmlunit - 2.64.0 + 3.11.0 @@ -67,14 +67,6 @@ 1.23.1 - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - com.jayway.jsonpath @@ -92,7 +84,6 @@ org.springframework.boot spring-boot-devtools - 2.7.3 runtime @@ -117,8 +108,8 @@ maven-compiler-plugin 3.7.0 - 1.8 - 1.8 + 11 + 11 diff --git a/html2md/src/main/java/com/dawn/html2md/baidu/BaiduCrawlerUrl.java b/html2md/src/main/java/com/dawn/html2md/baidu/BaiduCrawlerUrl.java index d9e3437..4f285a1 100644 --- a/html2md/src/main/java/com/dawn/html2md/baidu/BaiduCrawlerUrl.java +++ b/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; diff --git a/html2md/src/main/java/com/dawn/html2md/baidu/Test.java b/html2md/src/main/java/com/dawn/html2md/baidu/Test.java index 91a602b..85aad1c 100644 --- a/html2md/src/main/java/com/dawn/html2md/baidu/Test.java +++ b/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; diff --git a/html2md/src/main/java/com/dawn/html2md/config/WebLogAspect.java b/html2md/src/main/java/com/dawn/html2md/config/WebLogAspect.java index 547035d..1f86b44 100644 --- a/html2md/src/main/java/com/dawn/html2md/config/WebLogAspect.java +++ b/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; } -} \ No newline at end of file +} diff --git a/html2md/src/main/java/com/dawn/html2md/innotree/InnotreeService.java b/html2md/src/main/java/com/dawn/html2md/innotree/InnotreeService.java index 6dcbbb4..41dfaa4 100644 --- a/html2md/src/main/java/com/dawn/html2md/innotree/InnotreeService.java +++ b/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"); diff --git a/html2md/src/main/java/com/dawn/html2md/innotree/test2.java b/html2md/src/main/java/com/dawn/html2md/innotree/test2.java index a316050..a4f03b2 100644 --- a/html2md/src/main/java/com/dawn/html2md/innotree/test2.java +++ b/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 diff --git a/img2text/pom.xml b/img2text/pom.xml index 74bbc7a..fceefc1 100644 --- a/img2text/pom.xml +++ b/img2text/pom.xml @@ -19,20 +19,18 @@ UTF-8 UTF-8 - 1.8 + 11 org.springframework.boot spring-boot-starter - 2.7.3 org.springframework.boot spring-boot-starter-test - 2.7.3 test @@ -44,7 +42,6 @@ org.springframework.boot spring-boot-devtools - 2.7.3 runtime diff --git a/pom.xml b/pom.xml index 287af2b..9056b89 100644 --- a/pom.xml +++ b/pom.xml @@ -15,11 +15,11 @@ - 1.8 + 11 true - 1.8 - 1.8 - 2.7.3 + 11 + 11 + 2.7.18 @@ -31,6 +31,7 @@ +