Skip to content

Commit db85340

Browse files
committed
Java:HikariCP Demo 升级 JDK 17,APIJSON 7.1.0, apijson-framework 及自身 7.1.5
1 parent 382f53c commit db85340

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

APIJSON-Java-Server/APIJSONBoot-BigData/src/main/java/apijson/boot/DemoApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void customize(ConfigurableServletWebServerFactory server) {
9696

9797
// 支持 APIAuto 中 JavaScript 代码跨域请求
9898
@Bean
99-
public WebMvcConfigurer corsConfigurer() {
99+
public WebMvcConfigurer corsConfig() {
100100
return new WebMvcConfigurer() {
101101
@Override
102102
public void addCorsMappings(CorsRegistry registry) {

APIJSON-Java-Server/APIJSONDemo-HikariCP/pom.xml

+11-6
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,31 @@
66
<groupId>apijson.demo</groupId>
77
<artifactId>apijson-demo-hikaricp</artifactId>
88
<packaging>jar</packaging>
9-
<version>7.0.3</version>
9+
<version>7.1.5</version>
1010

1111
<name>APIJSONDemo</name>
1212
<description>Demo project for Testing APIJSON Server based on SpringBoot</description>
1313

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>
1821
</properties>
1922

2023
<dependencies>
2124
<!-- 需要的 APIJSON 相关依赖 -->
2225
<dependency>
2326
<groupId>com.github.Tencent</groupId>
2427
<artifactId>APIJSON</artifactId>
25-
<version>7.0.3</version>
28+
<version>7.1.0</version>
2629
</dependency>
2730
<dependency>
2831
<groupId>com.github.APIJSON</groupId>
2932
<artifactId>apijson-framework</artifactId>
30-
<version>7.0.3</version>
33+
<version>7.1.5</version>
3134
</dependency>
3235

3336
<!-- 需要用的数据库 JDBC 驱动 -->
@@ -64,6 +67,7 @@
6467
<plugin>
6568
<groupId>org.springframework.boot</groupId>
6669
<artifactId>spring-boot-maven-plugin</artifactId>
70+
<version>2.5.13</version>
6771
<executions>
6872
<execution>
6973
<goals>
@@ -75,9 +79,10 @@
7579
<plugin>
7680
<groupId>org.apache.maven.plugins</groupId>
7781
<artifactId>maven-compiler-plugin</artifactId>
82+
<version>3.8.1</version>
7883
<configuration>
79-
<source>1.8</source>
80-
<target>1.8</target>
84+
<source>17</source>
85+
<target>17</target>
8186
</configuration>
8287
</plugin>
8388
</plugins>

APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoApplication.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
2828

2929
import apijson.Log;
30-
import apijson.framework.APIJSONApplication;
31-
import apijson.framework.APIJSONCreator;
30+
import apijson.framework.javax.APIJSONApplication;
31+
import apijson.framework.javax.APIJSONCreator;
3232
import apijson.orm.SQLConfig;
3333
import apijson.orm.SQLExecutor;
3434

@@ -82,12 +82,12 @@ public void addCorsMappings(CorsRegistry registry) {
8282
// 使用本项目的自定义处理类
8383
APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<Long>() {
8484
@Override
85-
public SQLConfig createSQLConfig() {
85+
public SQLConfig<Long> createSQLConfig() {
8686
return new DemoSQLConfig();
8787
}
8888

8989
@Override
90-
public SQLExecutor createSQLExecutor() {
90+
public SQLExecutor<Long> createSQLExecutor() {
9191
return new DemoSQLExecutor();
9292
}
9393
};

APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import apijson.RequestMethod;
3131
import apijson.StringUtil;
32-
import apijson.framework.APIJSONController;
32+
import apijson.framework.javax.APIJSONController;
3333
import apijson.orm.Parser;
3434

3535

APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoSQLConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package apijson.demo;
1616

17-
import apijson.framework.APIJSONSQLConfig;
17+
import apijson.framework.javax.APIJSONSQLConfig;
1818

1919

2020
/**SQL 配置,这里不配置数据库账号密码等信息,改为使用 DemoDataSourceConfig 来配置

APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoSQLExecutor.java

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

1919
import javax.sql.DataSource;
2020

21-
import apijson.framework.APIJSONSQLExecutor;
21+
import apijson.framework.javax.APIJSONSQLExecutor;
2222
import apijson.orm.SQLConfig;
2323

2424

0 commit comments

Comments
 (0)