Skip to content

Commit 709779d

Browse files
TommyLemonTommyLemon
committed
Java：MultiDataSource 升级 JDK 17，APIJSON, apijson-framework 及自身 7.1.0，apijson-column 2.1.0
1 parent 644546f commit 709779d

File tree

6 files changed

+57
-35
lines changed

6 files changed

+57
-35
lines changed

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<version>1.2.83</version>
3030
</dependency>
3131

32-
<!-- apijson-framework 需要用的依赖库，4.0.0 以上 -->
32+
<!-- apijson-framework 需要用的依赖库，6.0.0 以上 -->
3333
<dependency>
3434
<groupId>jakarta.servlet</groupId>
3535
<artifactId>jakarta.servlet-api</artifactId>
@@ -262,6 +262,8 @@
262262
<!-- </exclusions>-->
263263
<!-- </dependency>-->
264264

265+
266+
<!-- APIJSONBoot 需要用的 SpringBoot 框架，JDK 17+ 对应 SpringBoot 3.0+，排除导致编译报错的 snakeyaml 和 logback，重新依赖 snakeyaml -->
265267
<dependency>
266268
<groupId>org.yaml</groupId>
267269
<artifactId>snakeyaml</artifactId>

‎APIJSON-Java-Server/APIJSONBoot/pom.xml

+48-26
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.boot</groupId>
77
<artifactId>apijson-boot</artifactId>
8-
<version>6.3.0</version>
8+
<version>7.1.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONBoot</name>
@@ -14,7 +14,11 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
17-
<java.version>1.8</java.version>
17+
<java.version>17</java.version>
18+
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
19+
<maven.compiler.source>17</maven.compiler.source>
20+
<maven.compiler.target>17</maven.compiler.target>
21+
<version>3.2.5</version>
1822
</properties>
1923

2024
<dependencies>
@@ -25,11 +29,11 @@
2529
<version>1.2.83</version>
2630
</dependency>
2731

28-
<!-- apijson-framework 需要用的依赖库，4.0.0 以上 -->
32+
<!-- apijson-framework 需要用的依赖库，6.0.0 以上 -->
2933
<dependency>
30-
<groupId>javax.servlet</groupId>
31-
<artifactId>javax.servlet-api</artifactId>
32-
<version>4.0.1</version>
34+
<groupId>jakarta.servlet</groupId>
35+
<artifactId>jakarta.servlet-api</artifactId>
36+
<version>6.0.0</version>
3337
</dependency>
3438

3539
<!-- 单元测试：可使用 libs 目录的 unitauto-java.jar 和 unitauto-jar.jar 来替代，两种方式二选一 <<<<<<<<< -->
@@ -55,30 +59,30 @@
5559
<dependency>
5660
<groupId>com.github.Tencent</groupId>
5761
<artifactId>APIJSON</artifactId>
58-
<version>6.3.0</version>
62+
<version>7.1.0</version>
5963
</dependency>
6064
<dependency>
6165
<groupId>com.github.APIJSON</groupId>
6266
<artifactId>apijson-framework</artifactId>
63-
<version>6.3.0</version>
67+
<version>7.1.0</version>
6468
</dependency>
6569
<dependency>
6670
<groupId>com.github.APIJSON</groupId>
6771
<artifactId>apijson-column</artifactId>
68-
<version>1.8.0</version>
72+
<version>2.1.0</version>
6973
</dependency>
7074
<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
7175

7276
<!-- 需要用的数据库 JDBC 驱动 -->
7377
<dependency>
74-
<groupId>mysql</groupId>
75-
<artifactId>mysql-connector-java</artifactId>
76-
<version>8.0.29</version>
78+
<groupId>com.mysql</groupId>
79+
<artifactId>mysql-connector-j</artifactId>
80+
<version>8.4.0</version>
7781
</dependency>
7882
<dependency>
7983
<groupId>org.postgresql</groupId>
8084
<artifactId>postgresql</artifactId>
81-
<version>42.3.4</version>
85+
<version>42.7.3</version>
8286
</dependency>
8387
<dependency>
8488
<groupId>net.sourceforge.jtds</groupId>
@@ -94,11 +98,27 @@
9498
<!-- 数据库 JDBC 驱动 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
9599

96100

97-
<!-- APIJSONBoot 需要用的 SpringBoot 框架，1.4.0 以上 -->
101+
<!-- APIJSONBoot 需要用的 SpringBoot 框架，JDK 17+ 对应 SpringBoot 3.0+，排除导致编译报错的 snakeyaml 和 logback，重新依赖 snakeyaml -->
102+
<dependency>
103+
<groupId>org.yaml</groupId>
104+
<artifactId>snakeyaml</artifactId>
105+
<version>2.2</version>
106+
</dependency>
107+
98108
<dependency>
99109
<groupId>org.springframework.boot</groupId>
100110
<artifactId>spring-boot-starter-web</artifactId>
101-
<version>2.5.13</version>
111+
<version>3.2.5</version>
112+
<exclusions>
113+
<exclusion>
114+
<groupId>ch.qos.logback</groupId>
115+
<artifactId>logback-classic</artifactId>
116+
</exclusion>
117+
<!-- <exclusion>-->
118+
<!-- <groupId>org.slf4j</groupId>-->
119+
<!-- <artifactId>slf4j-simple</artifactId>-->
120+
<!-- </exclusion>-->
121+
</exclusions>
102122
</dependency>
103123

104124
</dependencies>
@@ -108,20 +128,22 @@
108128
<plugin>
109129
<groupId>org.springframework.boot</groupId>
110130
<artifactId>spring-boot-maven-plugin</artifactId>
131+
<version>3.2.5</version>
111132
<executions>
112-
<execution>
113-
<goals>
114-
<goal>repackage</goal>
115-
</goals>
116-
</execution>
133+
<execution>
134+
<goals>
135+
<goal>repackage</goal>
136+
</goals>
137+
</execution>
117138
</executions>
118139
</plugin>
119140
<plugin>
120141
<groupId>org.apache.maven.plugins</groupId>
121142
<artifactId>maven-compiler-plugin</artifactId>
143+
<version>3.8.1</version>
122144
<configuration>
123-
<source>1.8</source>
124-
<target>1.8</target>
145+
<source>17</source>
146+
<target>17</target>
125147
</configuration>
126148
</plugin>
127149
</plugins>
@@ -141,14 +163,14 @@
141163

142164
<repository>
143165
<id>spring-snapshots</id>
144-
<url>http://repo.spring.io/snapshot</url>
166+
<url>https://repo.spring.io/snapshot</url>
145167
<snapshots>
146168
<enabled>true</enabled>
147169
</snapshots>
148170
</repository>
149171
<repository>
150172
<id>spring-milestones</id>
151-
<url>http://repo.spring.io/milestone</url>
173+
<url>https://repo.spring.io/milestone</url>
152174
<snapshots>
153175
<enabled>true</enabled>
154176
</snapshots>
@@ -157,11 +179,11 @@
157179
<pluginRepositories>
158180
<pluginRepository>
159181
<id>spring-snapshots</id>
160-
<url>http://repo.spring.io/snapshot</url>
182+
<url>https://repo.spring.io/snapshot</url>
161183
</pluginRepository>
162184
<pluginRepository>
163185
<id>spring-milestones</id>
164-
<url>http://repo.spring.io/milestone</url>
186+
<url>https://repo.spring.io/milestone</url>
165187
</pluginRepository>
166188
</pluginRepositories>
167189

‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/DemoController.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import java.util.Set;
4646
import java.util.concurrent.TimeoutException;
4747

48-
import javax.servlet.http.HttpServletRequest;
49-
import javax.servlet.http.HttpServletResponse;
50-
import javax.servlet.http.HttpSession;
48+
import jakarta.servlet.http.HttpServletRequest;
49+
import jakarta.servlet.http.HttpServletResponse;
50+
import jakarta.servlet.http.HttpSession;
5151

5252
import org.springframework.beans.factory.annotation.Autowired;
5353
import org.springframework.http.HttpEntity;
@@ -115,8 +115,6 @@ public String getRequestURL() {
115115

116116
/**增删改查统一入口，这个一个方法可替代以下 7 个方法，牺牲一些路由解析性能来提升一点开发效率
117117
* @param method
118-
* @param tag
119-
* @param params
120118
* @param request
121119
* @param session
122120
* @return

‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/FileController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.ArrayList;
88
import java.util.List;
99

10-
import javax.annotation.PostConstruct;
10+
import jakarta.annotation.PostConstruct;
1111

1212
import org.springframework.core.io.InputStreamResource;
1313
import org.springframework.http.HttpHeaders;

‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoFunctionParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.Collection;
2020
import java.util.List;
2121

22-
import javax.servlet.http.HttpSession;
22+
import jakarta.servlet.http.HttpSession;
2323

2424
import com.alibaba.fastjson.JSONArray;
2525
import com.alibaba.fastjson.JSONObject;

‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/DemoObjectParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.List;
2020

21-
import javax.servlet.http.HttpSession;
21+
import jakarta.servlet.http.HttpSession;
2222

2323
import apijson.NotNull;
2424
import apijson.RequestMethod;

0 commit comments

Comments
 (0)