Java：MultiDataSource-RediSQL 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5

Author: TommyLemon

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-RediSQL/README.md

@@ -12,9 +12,40 @@ Access、Request配置 访问操作权限 <br/>
 rediSQL安装使用 <br/>
 https://github.com/RedBeardLab/rediSQL
 
+下载 rediSQL.so
+https://github.com/RedBeardLab/rediSQL/releases
+
+启动 redis-server 并加载 RediSQL.so
+```shell
+redis-server --loadmodule RediSQL_<version>.so
+```
+
+例如
+```shell
+redis-server --loadmodule RediSQL_v1.1.1_9b110f__debug.so
+```
+
+```shell
+redis-server --loadmodule RediSQL_v1.1.1_9b110f__release.so
+```
+
+```shell
+redis-server --loadmodule RediSQL_v1.1.1_9b110f_x86_64-unknown-linux-gnu_debug.so
+```
+
+```shell
+redis-server --loadmodule RediSQL_v1.1.1_9b110f_armv7-unknown-linux-gnueabihf_debug.so
+```
+
+```shell
+redis-server --loadmodule RediSQL_v1.1.1_9b110f_arm-unknown-linux-gnueabi_debug.so
+```
+
 官方docker安装 <br/>
+```shell
 docker pull dalongrong/redisql
 docker run -itd --name redisql -p 6399:6379  dalongrong/redisql
+```
 
 rediSQL注意事项 <br/>
 rediSQL免费版有后遥控制,每个小时会发送 redist info 统计信息<br/>
@@ -30,7 +61,7 @@ https://www.youtube.com/watch?v=YRusC-AIq_g
 将 libredis_sql.so 导入redis.config<br/>
 --loadmodule /etc/redis/libredis_sql.so<br/>
 rediSQL 创建数据库表命令 <br/>
-```
+```shell
 REDISQL.EXEC DB "CREATE TABLE REDIS_TABLE_A(id TEXT, A INT, B TEXT, C TEXT, userId TEXT);"
 
 REDISQL.EXEC DB "INSERT INTO REDIS_TABLE_A(id,A,B,C,userId) VALUES('1', 3, '1c', 'bar','1');"

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-RediSQL/pom.xml

@@ -9,14 +9,18 @@
 	</parent>
 	<groupId>apijson.demo</groupId>
 	<artifactId>apijsondemo-multidatasource-rediSQL</artifactId>
-	<version>7.0.3</version>
+	<version>7.1.5</version>
 
 	<name>apijsondemo-multidatasource-rediSQL</name>
 	<description>Demo project for testing APIJSON server based on SpringBoot</description>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>17</java.version>
+		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<druid.version>1.1.16</druid.version>
 		<mybatisplus.version>3.5.1</mybatisplus.version>
@@ -38,20 +42,19 @@
 		<spring-boot-configuration-processor.version>2.6.6</spring-boot-configuration-processor.version>
 		<dynamic-datasource-spring-boot-starter.version>3.5.2</dynamic-datasource-spring-boot-starter.version>
 		<jedis.version>3.7.1</jedis.version>
-		<java.version>1.8</java.version>
 	</properties>
 
 	<dependencies>
 		<!-- 需要的 APIJSON 相关依赖 -->
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.5</version>
 		</dependency>
 
 		<!-- 需要用的数据库 JDBC 驱动 -->
@@ -62,6 +65,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<version>2.5.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -147,6 +151,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.5.13</version>
 				<executions>
 					<execution>
 						<goals>
@@ -158,9 +163,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
 		</plugins>

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-RediSQL/src/main/java/apijson/demo/DataBaseConfig.java

@@ -16,7 +16,7 @@ public String getPrimary() {
 		return primary;
 	}
 
-	public static DataBaseConfig getInstence() {
+	public static DataBaseConfig getInstance() {
 		return SpringContextUtils.getBean(DataBaseConfig.class);
 	}
 }

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

@@ -25,9 +25,9 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import apijson.Log;
-import apijson.framework.APIJSONApplication;
-import apijson.framework.APIJSONCreator;
-import apijson.framework.APIJSONParser;
+import apijson.framework.javax.APIJSONApplication;
+import apijson.framework.javax.APIJSONCreator;
+import apijson.framework.javax.APIJSONParser;
 import apijson.orm.AbstractFunctionParser;
 import apijson.orm.AbstractVerifier;
 import apijson.orm.FunctionParser;
@@ -65,11 +65,14 @@ public void customize(ConfigurableServletWebServerFactory server) {
 
 	// 支持 APIAuto 中 JavaScript 代码跨域请求
 	@Bean
-	public WebMvcConfigurer corsConfigurer() {
+	public WebMvcConfigurer corsConfig() {
 		return new WebMvcConfigurer() {
 			@Override
 			public void addCorsMappings(CorsRegistry registry) {
-				registry.addMapping("/**").allowedOriginPatterns("*").allowedMethods("*").allowCredentials(true)
+				registry.addMapping("/**")
+						.allowedOriginPatterns("*")
+						.allowedMethods("*")
+						.allowCredentials(true)
 						.maxAge(3600);
 			}
 		};
@@ -84,17 +87,17 @@ public Parser<String> createParser() {
 			}
 
 			@Override
-			public SQLConfig createSQLConfig() {
+			public SQLConfig<String> createSQLConfig() {
 				return new DemoSQLConfig();
 			}
 
 			@Override
-			public FunctionParser createFunctionParser() {
+			public FunctionParser<String> createFunctionParser() {
 				return new DemoFunctionParser();
 			}
 
 			@Override
-			public SQLExecutor createSQLExecutor() {
+			public SQLExecutor<String> createSQLExecutor() {
 				return new DemoSQLExecutor();
 			}
 		};

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

@@ -29,7 +29,7 @@
 
 import apijson.RequestMethod;
 import apijson.StringUtil;
-import apijson.framework.APIJSONController;
+import apijson.framework.javax.APIJSONController;
 import apijson.orm.Parser;
 
 
@@ -46,10 +46,10 @@
  */
 @RestController
 @RequestMapping("")
-public class DemoController extends APIJSONController<Long> {
+public class DemoController extends APIJSONController<String> {
 
 	@Override
-	public Parser<Long> newParser(HttpSession session, RequestMethod method) {
+	public Parser<String> newParser(HttpSession session, RequestMethod method) {
 		return super.newParser(session, method).setNeedVerify(false);  // TODO 这里关闭校验，方便新手快速测试，实际线上项目建议开启
 	}
 

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

@@ -7,12 +7,12 @@
 import apijson.NotNull;
 import apijson.RequestMethod;
 import apijson.StringUtil;
-import apijson.framework.APIJSONFunctionParser;
-import apijson.framework.APIJSONVerifier;
+import apijson.framework.javax.APIJSONFunctionParser;
+import apijson.framework.javax.APIJSONVerifier;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class DemoFunctionParser extends APIJSONFunctionParser {
+public class DemoFunctionParser extends APIJSONFunctionParser<String> {
 	public DemoFunctionParser() {
 		this(null, null, 0, null, null);
 	}

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

@@ -8,11 +8,11 @@
 
 import apijson.NotNull;
 import apijson.RequestMethod;
-import apijson.framework.APIJSONObjectParser;
+import apijson.framework.javax.APIJSONObjectParser;
 import apijson.orm.Join;
 import apijson.orm.SQLConfig;
 
-public class DemoObjectParser extends APIJSONObjectParser {
+public class DemoObjectParser extends APIJSONObjectParser<String> {
 
     public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
             , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {

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

@@ -3,8 +3,8 @@
 import com.alibaba.fastjson.JSONObject;
 
 import apijson.RequestMethod;
-import apijson.framework.APIJSONObjectParser;
-import apijson.framework.APIJSONParser;
+import apijson.framework.javax.APIJSONObjectParser;
+import apijson.framework.javax.APIJSONParser;
 import apijson.orm.SQLConfig;
 
 public class DemoParser extends APIJSONParser<String> {
@@ -27,7 +27,7 @@ public DemoParser(RequestMethod method, boolean needVerify) {
 	// }
 
 	@Override
-	public APIJSONObjectParser createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
+	public APIJSONObjectParser<String> createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
 		return new DemoObjectParser(getSession(), request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable).setMethod(getMethod()).setParser(this);
 	}
 

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

@@ -19,7 +19,7 @@
 import com.alibaba.fastjson.annotation.JSONField;
 
 import apijson.RequestMethod;
-import apijson.framework.APIJSONSQLConfig;
+import apijson.framework.javax.APIJSONSQLConfig;
 import apijson.orm.AbstractSQLConfig;
 
 
@@ -29,7 +29,7 @@
  * 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
  * @author Lemon
  */
-public class DemoSQLConfig extends APIJSONSQLConfig<Long> {
+public class DemoSQLConfig extends APIJSONSQLConfig<String> {
 
 	public DemoSQLConfig() {
 		super();

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

@@ -25,7 +25,7 @@
 import apijson.NotNull;
 import apijson.StringUtil;
 import apijson.demo.resultSet.DataBuildResultSet;
-import apijson.framework.APIJSONSQLExecutor;
+import apijson.framework.javax.APIJSONSQLExecutor;
 import apijson.orm.SQLConfig;
 import lombok.extern.log4j.Log4j2;
 
@@ -35,7 +35,7 @@
  * @author Lemon
  */
 @Log4j2
-public class DemoSQLExecutor extends APIJSONSQLExecutor<Long> {
+public class DemoSQLExecutor extends APIJSONSQLExecutor<String> {
 	public static final String TAG = "DemoSQLExecutor";
 
 	// 适配连接池，如果这里能拿到连接池的有效 Connection，则 SQLConfig 不需要配置 dbVersion, dbUri, dbAccount,