Skip to content

Commit 43f412d

Browse files
TommyLemonTommyLemon
committed
Java：MultiDataSource-Redis 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5
1 parent 1b0de99 commit 43f412d

11 files changed

Lines changed: 66 additions & 48 deletions

File tree

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/pom.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99
</parent>
1010
<groupId>apijson.demo</groupId>
1111
<artifactId>apijsondemo-multidatasource-redis</artifactId>
12-
<version>7.0.3</version>
12+
<version>7.1.5</version>
1313

1414
<name>apijsondemo-multidatasource-redis</name>
1515
<description>Demo project for testing APIJSON server based on SpringBoot</description>
1616

1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20+
<java.version>17</java.version>
21+
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
22+
<maven.compiler.source>17</maven.compiler.source>
23+
<maven.compiler.target>17</maven.compiler.target>
2024
<commons-lang3.version>3.12.0</commons-lang3.version>
2125
<druid.version>1.1.16</druid.version>
2226
<mybatisplus.version>3.5.1</mybatisplus.version>
@@ -38,20 +42,19 @@
3842
<spring-boot-configuration-processor.version>2.6.6</spring-boot-configuration-processor.version>
3943
<dynamic-datasource-spring-boot-starter.version>3.5.2</dynamic-datasource-spring-boot-starter.version>
4044
<jedis.version>3.7.1</jedis.version>
41-
<java.version>1.8</java.version>
4245
</properties>
4346

4447
<dependencies>
4548
<!-- 需要的 APIJSON 相关依赖 -->
4649
<dependency>
4750
<groupId>com.github.Tencent</groupId>
4851
<artifactId>APIJSON</artifactId>
49-
<version>7.0.3</version>
52+
<version>7.1.0</version>
5053
</dependency>
5154
<dependency>
5255
<groupId>com.github.APIJSON</groupId>
5356
<artifactId>apijson-framework</artifactId>
54-
<version>7.0.3</version>
57+
<version>7.1.5</version>
5558
</dependency>
5659

5760
<!-- 需要用的数据库 JDBC 驱动 -->
@@ -62,6 +65,7 @@
6265
<dependency>
6366
<groupId>org.springframework.boot</groupId>
6467
<artifactId>spring-boot-starter-web</artifactId>
68+
<version>2.5.13</version>
6569
</dependency>
6670
<dependency>
6771
<groupId>org.springframework</groupId>
@@ -147,6 +151,7 @@
147151
<plugin>
148152
<groupId>org.springframework.boot</groupId>
149153
<artifactId>spring-boot-maven-plugin</artifactId>
154+
<version>2.5.13</version>
150155
<executions>
151156
<execution>
152157
<goals>
@@ -158,9 +163,10 @@
158163
<plugin>
159164
<groupId>org.apache.maven.plugins</groupId>
160165
<artifactId>maven-compiler-plugin</artifactId>
166+
<version>3.8.1</version>
161167
<configuration>
162-
<source>1.8</source>
163-
<target>1.8</target>
168+
<source>17</source>
169+
<target>17</target>
164170
</configuration>
165171
</plugin>
166172
</plugins>

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DemoApplication.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
2828

2929
import apijson.Log;
30-
import apijson.framework.APIJSONApplication;
31-
import apijson.framework.APIJSONCreator;
32-
import apijson.framework.APIJSONParser;
30+
import apijson.framework.javax.APIJSONApplication;
31+
import apijson.framework.javax.APIJSONCreator;
32+
import apijson.framework.javax.APIJSONParser;
3333
import apijson.orm.AbstractFunctionParser;
3434
import apijson.orm.AbstractVerifier;
3535
import apijson.orm.FunctionParser;
@@ -67,7 +67,7 @@ public void customize(ConfigurableServletWebServerFactory server) {
6767

6868
// 支持 APIAuto 中 JavaScript 代码跨域请求
6969
@Bean
70-
public WebMvcConfigurer corsConfigurer() {
70+
public WebMvcConfigurer corsConfig() {
7171
return new WebMvcConfigurer() {
7272
@Override
7373
public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
@@ -77,7 +77,10 @@ public void configureContentNegotiation(ContentNegotiationConfigurer configurer)
7777

7878
@Override
7979
public void addCorsMappings(CorsRegistry registry) {
80-
registry.addMapping("/**").allowedOriginPatterns("*").allowedMethods("*").allowCredentials(true)
80+
registry.addMapping("/**")
81+
.allowedOriginPatterns("*")
82+
.allowedMethods("*")
83+
.allowCredentials(true)
8184
.maxAge(3600);
8285
}
8386
};
@@ -92,17 +95,17 @@ public Parser<String> createParser() {
9295
}
9396

9497
@Override
95-
public SQLConfig createSQLConfig() {
98+
public SQLConfig<String> createSQLConfig() {
9699
return new DemoSQLConfig();
97100
}
98101

99102
@Override
100-
public FunctionParser createFunctionParser() {
103+
public FunctionParser<String> createFunctionParser() {
101104
return new DemoFunctionParser();
102105
}
103106

104107
@Override
105-
public SQLExecutor createSQLExecutor() {
108+
public SQLExecutor<String> createSQLExecutor() {
106109
return new DemoSQLExecutor();
107110
}
108111
};

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DemoController.java‎

Lines changed: 3 additions & 3 deletions
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

@@ -46,10 +46,10 @@
4646
*/
4747
@RestController
4848
@RequestMapping("")
49-
public class DemoController extends APIJSONController<Long> {
49+
public class DemoController extends APIJSONController<String> {
5050

5151
@Override
52-
public Parser<Long> newParser(HttpSession session, RequestMethod method) {
52+
public Parser<String> newParser(HttpSession session, RequestMethod method) {
5353
return super.newParser(session, method).setNeedVerify(false); // TODO 这里关闭校验，方便新手快速测试，实际线上项目建议开启
5454
}
5555

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DemoFunctionParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import apijson.NotNull;
88
import apijson.RequestMethod;
99
import apijson.StringUtil;
10-
import apijson.framework.APIJSONFunctionParser;
11-
import apijson.framework.APIJSONVerifier;
10+
import apijson.framework.javax.APIJSONFunctionParser;
11+
import apijson.framework.javax.APIJSONVerifier;
1212
import lombok.extern.slf4j.Slf4j;
1313

1414
@Slf4j
15-
public class DemoFunctionParser extends APIJSONFunctionParser {
15+
public class DemoFunctionParser extends APIJSONFunctionParser<String> {
1616
public DemoFunctionParser() {
1717
this(null, null, 0, null, null);
1818
}

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DemoObjectParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
import apijson.NotNull;
1010
import apijson.RequestMethod;
11-
import apijson.framework.APIJSONObjectParser;
11+
import apijson.framework.javax.APIJSONObjectParser;
1212
import apijson.orm.Join;
1313
import apijson.orm.SQLConfig;
1414

15-
public class DemoObjectParser extends APIJSONObjectParser {
15+
public class DemoObjectParser extends APIJSONObjectParser<String> {
1616

17-
public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
17+
public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig<String> arrayConfig
1818
, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
1919
super(session, request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable);
2020
}

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DemoParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.alibaba.fastjson.JSONObject;
44

55
import apijson.RequestMethod;
6-
import apijson.framework.APIJSONObjectParser;
7-
import apijson.framework.APIJSONParser;
6+
import apijson.framework.javax.APIJSONObjectParser;
7+
import apijson.framework.javax.APIJSONParser;
88
import apijson.orm.SQLConfig;
99

1010
public class DemoParser extends APIJSONParser<String> {
@@ -27,7 +27,7 @@ public DemoParser(RequestMethod method, boolean needVerify) {
2727
// }
2828

2929
@Override
30-
public APIJSONObjectParser createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
30+
public APIJSONObjectParser<String> createObjectParser(JSONObject request, String parentPath, SQLConfig<String> arrayConfig, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
3131
return new DemoObjectParser(getSession(), request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable).setMethod(getMethod()).setParser(this);
3232
}
3333

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DemoSQLConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.alibaba.fastjson.annotation.JSONField;
2020

2121
import apijson.RequestMethod;
22-
import apijson.framework.APIJSONSQLConfig;
22+
import apijson.framework.javax.APIJSONSQLConfig;
2323
import apijson.orm.AbstractSQLConfig;
2424

2525

@@ -29,7 +29,7 @@
2929
* https://github.com/Tencent/APIJSON/blob/master/%E8%AF%A6%E7%BB%86%E7%9A%84%E8%AF%B4%E6%98%8E%E6%96%87%E6%A1%A3.md#c-1-1%E4%BF%AE%E6%94%B9%E6%95%B0%E6%8D%AE%E5%BA%93%E9%93%BE%E6%8E%A5
3030
* @author Lemon
3131
*/
32-
public class DemoSQLConfig extends APIJSONSQLConfig<Long> {
32+
public class DemoSQLConfig extends APIJSONSQLConfig<String> {
3333

3434
public DemoSQLConfig() {
3535
super();
@@ -52,7 +52,7 @@ public DemoSQLConfig(RequestMethod method, String table) {
5252
SIMPLE_CALLBACK = new SimpleCallback<String>() {
5353

5454
@Override
55-
public AbstractSQLConfig getSQLConfig(RequestMethod method, String database, String schema,
55+
public AbstractSQLConfig<String> getSQLConfig(RequestMethod method, String database, String schema,
5656
String datasource, String table) {
5757
return new DemoSQLConfig(method, table);
5858
}

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DemoSQLExecutor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import apijson.demo.redis.RedisClusterModelEnum;
3737
import apijson.demo.redis.RedisExecutor;
3838
import apijson.demo.resultSet.DataBuildResultSet;
39-
import apijson.framework.APIJSONSQLExecutor;
39+
import apijson.framework.javax.APIJSONSQLExecutor;
4040
import apijson.orm.SQLConfig;
4141
import lombok.extern.log4j.Log4j2;
4242
import redis.clients.jedis.ListPosition;
@@ -51,13 +51,13 @@
5151
* @author Lemon
5252
*/
5353
@Log4j2
54-
public class DemoSQLExecutor extends APIJSONSQLExecutor<Long> {
54+
public class DemoSQLExecutor extends APIJSONSQLExecutor<String> {
5555
public static final String TAG = "DemoSQLExecutor";
5656

5757
// 适配连接池，如果这里能拿到连接池的有效 Connection，则 SQLConfig 不需要配置 dbVersion, dbUri, dbAccount,
5858
// dbPassword
5959
@Override
60-
public Connection getConnection(SQLConfig config) throws Exception {
60+
public Connection getConnection(SQLConfig<String> config) throws Exception {
6161
String datasource = config.getDatasource();
6262
Log.d(TAG, "getConnection config.getDatasource() = " + datasource);
6363

@@ -71,7 +71,7 @@ public Connection getConnection(SQLConfig config) throws Exception {
7171
}
7272

7373
@Override
74-
public ResultSet executeQuery(@NotNull SQLConfig config, String sql) throws Exception {
74+
public ResultSet executeQuery(@NotNull SQLConfig<String> config, String sql) throws Exception {
7575
if (config.isRedis()) {
7676
return redisExecuteQuery(config, sql);
7777
}
@@ -80,15 +80,15 @@ public ResultSet executeQuery(@NotNull SQLConfig config, String sql) throws Exce
8080

8181

8282
@Override
83-
public int executeUpdate(@NotNull SQLConfig config, String sql) throws Exception {
83+
public int executeUpdate(@NotNull SQLConfig<String> config, String sql) throws Exception {
8484
if (config.isRedis()) {
8585
return redisExecuteUpdate(config, sql).intValue();
8686
}
8787
return super.executeUpdate(config, sql);
8888
}
8989

9090
@SuppressWarnings("unchecked")
91-
public ResultSet redisExecuteQuery(@NotNull SQLConfig config, String sql) throws Exception {
91+
public ResultSet redisExecuteQuery(@NotNull SQLConfig<String> config, String sql) throws Exception {
9292
try {
9393
List<List<Object>> rsData = new ArrayList<>();
9494
List<String> headers = new ArrayList<>();
@@ -517,7 +517,7 @@ public ResultSet redisExecuteQuery(@NotNull SQLConfig config, String sql) throws
517517
return null;
518518
}
519519

520-
private Long redisExecuteUpdate(@NotNull SQLConfig config, String sql) throws Exception {
520+
private Long redisExecuteUpdate(@NotNull SQLConfig<String> config, String sql) throws Exception {
521521
try {
522522
RedisExecutor redisExecutor = DynamicDataSource.getDetail(config.getDatasource()).getRedisExecutor();
523523
String configTable = config.getTable();

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/DynamicDataSource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void run(ApplicationArguments args) throws Exception {
9393

9494
initRedisSingle();
9595

96-
initRedisSentinel();
96+
//initRedisSentinel();
9797
}
9898

9999

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Redis/src/main/java/apijson/demo/redis/RedisDataSource.java‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void createSingle() {
5959
}
6060

6161
public void createSentinel() {
62-
Set<String> sentinels = new HashSet<String>(Arrays.asList("xxx:26379", "xxx:26380", "xxx:26381"));
62+
Set<String> sentinels = new HashSet<String>(Arrays.asList("localhost:26379", "localhost:26380", "localhost:26381"));
6363
// 创建Jedis配置对象
6464
String password = "";
6565
Integer port = 6379;
@@ -72,7 +72,8 @@ public void createSentinel() {
7272
poolConfig.setTestOnReturn(TEST_ON_RETURN);
7373
String masterName = "mymaster";
7474
// 初始化
75-
sentinelPool = new JedisSentinelPool(masterName, sentinels, poolConfig, TIMEOUT, password);
75+
sentinelPool = new JedisSentinelPool(masterName, sentinels, poolConfig, TIMEOUT);
76+
//sentinelPool = new JedisSentinelPool(masterName, sentinels, poolConfig, TIMEOUT, password);
7677
}
7778

7879
/**
@@ -81,12 +82,20 @@ public void createSentinel() {
8182
public void createCluster() {
8283
Set<HostAndPort> jedisClusterNode = new HashSet<HostAndPort>();
8384
String password = "apijson";
84-
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6371));
85-
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6372));
86-
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6373));
87-
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6374));
88-
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6375));
89-
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6376));
85+
86+
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6380));
87+
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6381));
88+
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6382));
89+
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6383));
90+
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6384));
91+
jedisClusterNode.add(new HostAndPort("127.0.0.1", 6385));
92+
93+
//jedisClusterNode.add(new HostAndPort("127.0.0.1", 6371));
94+
//jedisClusterNode.add(new HostAndPort("127.0.0.1", 6372));
95+
//jedisClusterNode.add(new HostAndPort("127.0.0.1", 6373));
96+
//jedisClusterNode.add(new HostAndPort("127.0.0.1", 6374));
97+
//jedisClusterNode.add(new HostAndPort("127.0.0.1", 6375));
98+
//jedisClusterNode.add(new HostAndPort("127.0.0.1", 6376));
9099
JedisPoolConfig poolConfig = new JedisPoolConfig();
91100
/*
92101
* 注意： 在高版本的jedis jar包，比如本版本2.9.0，JedisPoolConfig没有setMaxActive和setMaxWait属性了
@@ -103,9 +112,9 @@ public void createCluster() {
103112
int maxAttempts = 5;
104113
// JedisCluster jc = new JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT,
105114
// DEFAULT_TIMEOUT, DEFAULT_REDIRECTIONS, "cluster", DEFAULT_CONFIG);
106-
jedisCluster = new JedisCluster(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, poolConfig);
115+
jedisCluster = new JedisCluster(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, poolConfig);
116+
//jedisCluster = new JedisCluster(jedisClusterNode, connectionTimeout, soTimeout, maxAttempts, password, poolConfig);
107117
log.info("节点信息:{}", jedisCluster.getClusterNodes().keySet());
108118
}
109-
110119

111120
}

0 commit comments

Comments
 (0)