From b27c5759c6abde6b4228775eba4ce3e100457567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=86=E7=8C=AB?= <cktk@qq.com>
Date: Mon, 11 Sep 2023 01:28:57 +0800
Subject: [PATCH] =?UTF-8?q?fixed=2075e930c=20from=20https://gitee.com/Rayi?=
 =?UTF-8?q?n/rayin/pulls/2=20=E2=AC=86=EF=B8=8F=20=E6=94=AF=E6=8C=81Spring?=
 =?UTF-8?q?Boot3.x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 14 ++---
 rayin-datarule/pom.xml                        |  6 +-
 rayin-htmladapter-base/pom.xml                |  6 +-
 rayin-htmladapter-openhtmltopdf/pom.xml       |  6 +-
 rayin-htmladapter-spring-boot-starter/pom.xml |  6 +-
 rayin-springboot-sample/pom.xml               | 12 ++--
 .../controller/PDFCreatorController.java      |  4 +-
 rayin-test/pom.xml                            | 12 ++--
 rayin-tools/pom.xml                           | 58 +++++--------------
 9 files changed, 48 insertions(+), 76 deletions(-)

diff --git a/pom.xml b/pom.xml
index 65ad9c6..d827a44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>ink.rayin</groupId>
     <artifactId>rayin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.2</version>
+    <version>1.1.2-B3</version>
     <name>rayin-parent</name>
     <description>pdf template generate tools</description>
     <url>http://rayin.ink</url>
@@ -174,29 +174,29 @@
             <dependency>
                 <groupId>ink.rayin</groupId>
                 <artifactId>rayin-tools</artifactId>
-                <version>1.1.2</version>
+                <version>1.1.2-B3</version>
             </dependency>
 
             <dependency>
                 <groupId>ink.rayin</groupId>
                 <artifactId>rayin-htmladapter-openhtmltopdf</artifactId>
-                <version>1.1.2</version>
+                <version>1.1.2-B3</version>
             </dependency>
             <dependency>
                 <groupId>ink.rayin</groupId>
                 <artifactId>rayin-htmladapter-spring-boot-starter</artifactId>
-                <version>1.1.2</version>
+                <version>1.1.2-B3</version>
             </dependency>
 
             <dependency>
                 <groupId>ink.rayin</groupId>
                 <artifactId>rayin-htmladapter-base</artifactId>
-                <version>1.1.2</version>
+                <version>1.1.2-B3</version>
             </dependency>
             <dependency>
                 <groupId>ink.rayin</groupId>
                 <artifactId>rayin-datarule</artifactId>
-                <version>1.1.2</version>
+                <version>1.1.2-B3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -352,4 +352,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rayin-datarule/pom.xml b/rayin-datarule/pom.xml
index 83e33a2..c1ad5ac 100644
--- a/rayin-datarule/pom.xml
+++ b/rayin-datarule/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>rayin-parent</artifactId>
         <groupId>ink.rayin</groupId>
-        <version>1.1.2</version>
+        <version>1.1.2-B3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rayin-datarule</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.2-B3</version>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -108,4 +108,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rayin-htmladapter-base/pom.xml b/rayin-htmladapter-base/pom.xml
index 4fa9a3d..e6930e4 100644
--- a/rayin-htmladapter-base/pom.xml
+++ b/rayin-htmladapter-base/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>rayin-parent</artifactId>
         <groupId>ink.rayin</groupId>
-        <version>1.1.2</version>
+        <version>1.1.2-B3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rayin-htmladapter-base</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.2-B3</version>
     <dependencies>
         <dependency>
             <groupId>ink.rayin</groupId>
@@ -217,4 +217,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rayin-htmladapter-openhtmltopdf/pom.xml b/rayin-htmladapter-openhtmltopdf/pom.xml
index d1e8a9c..e153607 100644
--- a/rayin-htmladapter-openhtmltopdf/pom.xml
+++ b/rayin-htmladapter-openhtmltopdf/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>rayin-parent</artifactId>
         <groupId>ink.rayin</groupId>
-        <version>1.1.2</version>
+        <version>1.1.2-B3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rayin-htmladapter-openhtmltopdf</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.2-B3</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -274,4 +274,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rayin-htmladapter-spring-boot-starter/pom.xml b/rayin-htmladapter-spring-boot-starter/pom.xml
index 1187f93..ca5e407 100644
--- a/rayin-htmladapter-spring-boot-starter/pom.xml
+++ b/rayin-htmladapter-spring-boot-starter/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>rayin-parent</artifactId>
         <groupId>ink.rayin</groupId>
-        <version>1.1.2</version>
+        <version>1.1.2-B3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rayin-htmladapter-spring-boot-starter</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.2-B3</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -94,4 +94,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rayin-springboot-sample/pom.xml b/rayin-springboot-sample/pom.xml
index e3c85ff..71854e2 100644
--- a/rayin-springboot-sample/pom.xml
+++ b/rayin-springboot-sample/pom.xml
@@ -7,17 +7,17 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.4</version>
+        <version>3.1.3</version>
         <relativePath/>
     </parent>
 
     <groupId>ink.rayin</groupId>
-    <version>1.1.0</version>
+    <version>1.1.2-B3</version>
     <artifactId>rayin-springboot-sample</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
     <dependencies>
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>ink.rayin</groupId>
             <artifactId>rayin-htmladapter-spring-boot-starter</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.2-B3</version>
         </dependency>
 
         <dependency>
@@ -106,4 +106,4 @@
         </plugins>
 
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java b/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java
index f22f461..87c7280 100644
--- a/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java
+++ b/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java
@@ -6,13 +6,13 @@ import ink.rayin.htmladapter.base.PdfGenerator;
 import ink.rayin.htmladapter.base.Signature;
 import ink.rayin.tools.utils.Charsets;
 import ink.rayin.tools.utils.ResourceUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.OutputStream;
@@ -92,4 +92,4 @@ public class PDFCreatorController {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/rayin-test/pom.xml b/rayin-test/pom.xml
index fc83249..0ca4f17 100644
--- a/rayin-test/pom.xml
+++ b/rayin-test/pom.xml
@@ -5,20 +5,20 @@
     <parent>
         <artifactId>rayin-parent</artifactId>
         <groupId>ink.rayin</groupId>
-        <version>1.1.2</version>
+        <version>1.1.2-B3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>ink.rayin</groupId>
-    <version>1.1.2</version>
+    <version>1.1.2-B3</version>
     <artifactId>rayin-test</artifactId>
     <properties>
         <!-- 统一版本号 -->
         <master.version>1.0.0</master.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</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>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
     </properties>
     <repositories>
         <repository>
@@ -146,4 +146,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/rayin-tools/pom.xml b/rayin-tools/pom.xml
index 05c669e..66bc314 100644
--- a/rayin-tools/pom.xml
+++ b/rayin-tools/pom.xml
@@ -5,53 +5,40 @@
   <parent>
     <artifactId>rayin-parent</artifactId>
     <groupId>ink.rayin</groupId>
-    <version>1.1.2</version>
+    <version>1.1.2-B3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>ink.rayin</groupId>
   <artifactId>rayin-tools</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.2-B3</version>
 
   <name>rayin-tools</name>
 
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <protostuff.version>1.8.0</protostuff.version>
   </properties>
 
   <dependencies>
-<!--      <dependency>-->
-<!--          <groupId>org.springframework.boot</groupId>-->
-<!--          <artifactId>spring-boot-starter-web</artifactId>-->
-<!--      </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>com.fasterxml.jackson.core</groupId>-->
-<!--      <artifactId>jackson-core</artifactId>-->
-<!--      <version>2.14.0-rc2</version>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>com.fasterxml.jackson.core</groupId>-->
-<!--      <artifactId>jackson-databind</artifactId>-->
-<!--      <version>2.14.0-rc2</version>-->
-<!--    </dependency>-->
+
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>2.14.0-rc2</version>
+      <version>2.15.2</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>5.3.23</version>
+      <version>6.0.11</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>31.1-jre</version>
+      <version>32.1.2-jre</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -64,7 +51,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.10.0</version>
+      <version>5.0.0-alpha.11</version>
       <scope>compile</scope>
     </dependency>
 
@@ -85,42 +72,27 @@
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.33</version>
+      <version>2.2</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>com.alibaba</groupId>
       <artifactId>easyexcel</artifactId>
-      <version>3.1.1</version>
+      <version>3.3.2</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.9.0</version>
+      <version>2.10.1</version>
     </dependency>
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.4.0-b180830.0359</version>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>com.sun.xml.bind</groupId>-->
-<!--      <artifactId>jaxb-impl</artifactId>-->
-<!--      <version>4.0.1</version>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.glassfish.jaxb</groupId>-->
-<!--      <artifactId>jaxb-runtime</artifactId>-->
-<!--      <version>2.3.0</version>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>javax.activation</groupId>-->
-<!--      <artifactId>activation</artifactId>-->
-<!--      <version>1.1.1</version>-->
-<!--    </dependency>-->
+
 
   </dependencies>
 
-- 
Gitee