Skip to content

Commit 216b31a

Browse files
TommyLemonTommyLemon
committed
Java：APIJSONSimpleDemo-SpringBoot3 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5
1 parent 81a2846 commit 216b31a

7 files changed

Lines changed: 29 additions & 27 deletions

File tree

‎APIJSON-Java-Server/APIJSONSimpleDemo-SpringBoot3/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# 环境
22

3-
- SpringBoot3
4-
- java17
5-
- APIJSON 6.1.0
6-
- apijson-framework 6.1.0_springboot3
3+
- SpringBoot 3
4+
- Java 17
5+
- APIJSON 7.1.0
6+
- apijson-framework 7.1.5
77

8-
> 使用的apijson 版本较旧，可自行升级到最新的apijson-springboot3版本，因为没做测试，这里就先不升级了。
8+
> 使用的 apijson 版本较旧，可自行升级到最新的 apijson-springboot3 版本，因为没做测试，这里就先不升级了。
99
1010
# 和其他例子的主要区别
1111

12-
- 复杂度介于APIJSONBoot 和 APIJSONDemo 之间
12+
- 复杂度介于 APIJSONBoot 和 APIJSONDemo 之间
1313
- 完成了一些常用配置
1414
- 简单鉴权
15-
- samesite策略
15+
- samesite 策略
1616
- HikariCP 多数据源配置
1717
- 解决数字返回前端精度丢失问题

‎APIJSON-Java-Server/APIJSONSimpleDemo-SpringBoot3/pom.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.2.1</version>
8+
<version>3.2.5</version>
99
<relativePath/>
1010
<!-- lookup parent from repository -->
1111
</parent>
1212
<groupId>com.example</groupId>
1313
<artifactId>apijson-demo</artifactId>
14-
<version>1.2.1</version>
14+
<version>7.1.5</version>
1515
<name>apijson-demo</name>
1616
<description>Demo project for Spring Boot</description>
1717
<properties>
@@ -21,30 +21,33 @@
2121
<dependency>
2222
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter-web</artifactId>
24+
<version>3.2.5</version>
2425
</dependency>
2526

2627
<dependency>
2728
<groupId>org.springframework.boot</groupId>
2829
<artifactId>spring-boot-devtools</artifactId>
30+
<version>3.2.5</version>
2931
<scope>runtime</scope>
3032
<optional>true</optional>
3133
</dependency>
3234
<dependency>
3335
<groupId>org.springframework.boot</groupId>
3436
<artifactId>spring-boot-starter-test</artifactId>
37+
<version>3.2.5</version>
3538
<scope>test</scope>
3639
</dependency>
3740

3841
<!-- APIJSON 必须用到的依赖库 -->
3942
<dependency>
4043
<groupId>com.github.Tencent</groupId>
4144
<artifactId>APIJSON</artifactId>
42-
<version>6.1.0</version>
45+
<version>7.1.0</version>
4346
</dependency>
4447
<dependency>
4548
<groupId>com.github.APIJSON</groupId>
4649
<artifactId>apijson-framework</artifactId>
47-
<version>6.1.0_springboot3</version>
50+
<version>7.1.5</version>
4851
</dependency>
4952

5053
<dependency>
@@ -73,6 +76,7 @@
7376
<plugin>
7477
<groupId>org.springframework.boot</groupId>
7578
<artifactId>spring-boot-maven-plugin</artifactId>
79+
<version>3.2.5</version>
7680
</plugin>
7781
</plugins>
7882
</build>

‎APIJSON-Java-Server/APIJSONSimpleDemo-SpringBoot3/src/main/java/com/example/apijsondemo/ApijsonDemoApplication.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void main(String[] args) throws Exception {
4242
// TODO 需要设置限制条件
4343
// 支持 APIAuto 中 JavaScript 代码跨域请求
4444
@Bean
45-
public WebMvcConfigurer corsConfigurer() {
45+
public WebMvcConfigurer corsConfig() {
4646
return new WebMvcConfigurer() {
4747
@Override
4848
public void addCorsMappings(CorsRegistry registry) {
@@ -60,12 +60,12 @@ public void addCorsMappings(CorsRegistry registry) {
6060
// 使用本项目的自定义处理类
6161
APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<Long>() {
6262
@Override
63-
public SQLConfig createSQLConfig() {
63+
public SQLConfig<Long> createSQLConfig() {
6464
return new DemoSQLConfig();
6565
}
6666

6767
@Override
68-
public SQLExecutor createSQLExecutor() {
68+
public SQLExecutor<Long> createSQLExecutor() {
6969
return new DemoSQLExecutor();
7070
}
7171
};

‎APIJSON-Java-Server/APIJSONSimpleDemo-SpringBoot3/src/main/java/com/example/apijsondemo/DemoSQLExecutor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import com.alibaba.fastjson.JSONObject;
2626
import apijson.Log;
27-
import apijson.framework.APIJSONSQLExecutor;
27+
import apijson.framework.javax.APIJSONSQLExecutor;
2828
import apijson.orm.SQLConfig;
2929

3030
/**
@@ -33,11 +33,11 @@
3333
*
3434
* @author Lemon
3535
*/
36-
public class DemoSQLExecutor extends APIJSONSQLExecutor {
36+
public class DemoSQLExecutor extends APIJSONSQLExecutor<Long> {
3737
public static final String TAG = "SQL执行器";
3838

3939
// 解决 id 精度丢失 问题
40-
protected Object getValue(SQLConfig config, ResultSet rs, ResultSetMetaData rsmd, int tablePosition,
40+
protected Object getValue(SQLConfig<Long> config, ResultSet rs, ResultSetMetaData rsmd, int tablePosition,
4141
JSONObject table, int columnIndex, String lable, Map<String, JSONObject> childMap) throws Exception {
4242

4343
Object value = super.getValue(config, rs, rsmd, tablePosition, table, columnIndex, lable, childMap);
@@ -60,7 +60,7 @@ protected Object getValue(SQLConfig config, ResultSet rs, ResultSetMetaData rsmd
6060

6161
// 适配连接池，如果这里能拿到连接池的有效 Connection，则 SQLConfig 不需要配置 dbVersion, dbUri, dbAccount,
6262
@Override
63-
public Connection getConnection(SQLConfig config) throws Exception {
63+
public Connection getConnection(SQLConfig<Long> config) throws Exception {
6464
String datasource = config.getDatasource();
6565

6666
Log.d(TAG, "getConnection config.getDatasource() = " + datasource);

‎APIJSON-Java-Server/APIJSONSimpleDemo-SpringBoot3/src/main/java/com/example/apijsondemo/config/DemoSQLConfig.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.example.apijsondemo.config;
22

3-
import com.alibaba.fastjson.annotation.JSONField;
4-
53
import apijson.framework.APIJSONSQLConfig;
64

7-
public class DemoSQLConfig extends APIJSONSQLConfig {
5+
public class DemoSQLConfig extends APIJSONSQLConfig<Long> {
86

97
static {
108
DEFAULT_DATABASE = DATABASE_MYSQL; // 用的数据库软件
11-
DEFAULT_SCHEMA = "apijson"; // 数据库名
9+
DEFAULT_SCHEMA = "sys"; // 数据库名
1210

1311
// 表名和数据库不一致的，需要配置映射关系。只使用 APIJSONORM 时才需要；
1412
// 如果用了 apijson-framework 且调用了 APIJSONApplication.init 则不需要

‎APIJSON-Java-Server/APIJSONSimpleDemo-SpringBoot3/src/main/java/com/example/apijsondemo/controller/DemoController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public Parser<Long> newParser(HttpSession session, RequestMethod method) {
7070
* @param session
7171
* @return
7272
*/
73-
@PostMapping(value = "crud/{method}") // 如果和其它的接口 URL 冲突，可以加前缀，例如改为 crud/{method} 或 Controller 注解
73+
@PostMapping(value = "{method}") // 如果和其它的接口 URL 冲突，可以加前缀，例如改为 crud/{method} 或 Controller 注解
7474
@Override
7575
public String crud(@PathVariable String method, @RequestBody String request, HttpSession session) {
7676
return super.crud(method, request, session);
@@ -86,7 +86,7 @@ public String crud(@PathVariable String method, @RequestBody String request, Htt
8686
* @param session
8787
* @return
8888
*/
89-
@PostMapping("crud/{method}/{tag}") // 如果和其它的接口 URL 冲突，可以加前缀，例如改为 crud/{method}/{tag} 或 Controller 注解
89+
@PostMapping("{method}/{tag}") // 如果和其它的接口 URL 冲突，可以加前缀，例如改为 crud/{method}/{tag} 或 Controller 注解
9090
@Override
9191
public String crudByTag(@PathVariable String method, @PathVariable String tag,
9292
@RequestParam Map<String, String> params, @RequestBody String request, HttpSession session) {

‎APIJSON-Java-Server/APIJSONSimpleDemo-SpringBoot3/src/main/resources/application.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ spring:
1212
driver-class-name: com.mysql.cj.jdbc.Driver
1313
jdbc-url: jdbc:mysql://127.0.0.1:3306
1414
username: root
15-
password: 123456
15+
password: apijson
1616
db1:
1717
type: com.zaxxer.hikari.HikariDataSource
1818
driver-class-name: com.mysql.cj.jdbc.Driver
1919
jdbc-url: jdbc:mysql://127.0.0.1:3306
2020
username: root
21-
password: 123456
21+
password: apijson
2222
db2:
2323
type: com.zaxxer.hikari.HikariDataSource
2424
driver-class-name: com.mysql.cj.jdbc.Driver
2525
jdbc-url: jdbc:mysql://127.0.0.1:3306
2626
username: root
27-
password: 123456
27+
password: apijson
2828

2929

0 commit comments

Comments
 (0)