Skip to content

Commit abc0b61

Browse files
committed
Java:MultiDataSource 升级 APIJSON, apijson-framework 及自身 8.1.5, apijson-fastjson2, apijson-jackson 1.1.5
1 parent 38f42fd commit abc0b61

9 files changed

Lines changed: 22 additions & 12 deletions

File tree

Binary file not shown.

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/APIJSON-8.1.0.0.jar renamed to APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/APIJSON-8.1.5.jar

258 KB
Binary file not shown.

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-fastjson2-1.0.3.jar renamed to APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-fastjson2-1.1.5.jar

37.9 KB
Binary file not shown.
Binary file not shown.

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-7.2.2.jar renamed to APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-8.1.5.jar

103 KB
Binary file not shown.
Binary file not shown.

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.boot</groupId>
77
<artifactId>apijson-boot-multi-datasource</artifactId>
8-
<version>7.2.6</version>
8+
<version>8.1.5</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONBoot-MultiDataSource</name>
@@ -23,11 +23,6 @@
2323

2424
<dependencies>
2525
<!-- APIJSON 需要用的依赖库,1.2.0 以上 -->
26-
<!-- <dependency>-->
27-
<!-- <groupId>com.alibaba</groupId>-->
28-
<!-- <artifactId>fastjson</artifactId>-->
29-
<!-- <version>1.2.83</version>-->
30-
<!-- </dependency>-->
3126
<dependency>
3227
<groupId>com.alibaba.fastjson2</groupId>
3328
<artifactId>fastjson2</artifactId>
@@ -64,25 +59,30 @@
6459
<dependency>
6560
<groupId>com.github.Tencent</groupId>
6661
<artifactId>APIJSON</artifactId>
67-
<version>8.0.2</version>
62+
<version>8.1.5</version>
6863
</dependency>
6964
<dependency>
7065
<groupId>com.github.APIJSON</groupId>
7166
<artifactId>apijson-framework</artifactId>
72-
<version>7.2.2</version>
67+
<version>8.1.5</version>
7368
</dependency>
7469
<!-- fastjson2, gson 等 JSON 库插件选其中一个即可 <<<<<<<<<<<<<<< -->
7570
<dependency>
7671
<groupId>com.github.APIJSON</groupId>
7772
<artifactId>apijson-fastjson2</artifactId>
78-
<version>1.0.3</version>
73+
<version>1.1.5</version>
7974
</dependency>
8075
<!-- <dependency>-->
8176
<!-- <groupId>com.github.APIJSON</groupId>-->
82-
<!-- <artifactId>apijson-gson</artifactId>-->
77+
<!-- <artifactId>apijson-jackson</artifactId>-->
78+
<!-- <version>1.1.5</version>-->
79+
<!-- </dependency>-->
80+
<!-- <dependency>-->
81+
<!-- <groupId>com.github.APIJSON</groupId>-->
82+
<!-- <artifactId>apijson-jackson</artifactId>-->
8383
<!-- <version>1.0.3</version>-->
8484
<!-- </dependency>-->
85-
<!-- fastjson2, gson 等 JSON 库插件选其中一个即可 >>>>>>>>>>>>>>> -->
85+
<!-- fastjson2, jackson, gson 等 JSON 库插件选其中一个即可 >>>>>>>>>>>>>>> -->
8686

8787
<dependency>
8888
<groupId>com.databend</groupId>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2841,6 +2841,16 @@ public String ui() {
28412841
return "forward:/ui/index.html"; // 两者都无效 "redirect:/ui/index.html";
28422842
}
28432843

2844+
@GetMapping("au")
2845+
public String au() {
2846+
try {
2847+
httpServletResponse.sendRedirect("/au/index.html");
2848+
} catch (Throwable e) {
2849+
e.printStackTrace();
2850+
}
2851+
return "forward:/au/index.html"; // 两者都无效 "redirect:/au/index.html";
2852+
}
2853+
28442854
// 为 APIAuto, UnitAuto, SQLAuto, UIGO 提供网页入口 >>>>>>>>>>>>>>>>>>>>>>>>>>>
28452855

28462856

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public String gainDBUri() {
243243
// return "jdbc:mysql://47.122.25.116:3306?userSSL=false&serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8";
244244
// 以下是 MySQL 5.7 及以下
245245
return "jdbc:mysql://localhost:3306?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8"; //TODO 改成你自己的,TiDB 可以当成 MySQL 使用,默认端口为 4000
246-
// return "jdbc:mysql://apijson.cn:3306?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8"; //TODO 改成你自己的,TiDB 可以当成 MySQL 使用,默认端口为 4000
246+
//return "jdbc:mysql://apijson.cn:3306?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8"; //TODO 改成你自己的,TiDB 可以当成 MySQL 使用,默认端口为 4000
247247
}
248248
if (isPostgreSQL()) { // PG JDBC 必须在 URI 传 catalog
249249
return "jdbc:postgresql://localhost:5432/postgres?stringtype=unspecified"; //TODO 改成你自己的

0 commit comments

Comments
 (0)