Java：完善 ShardingSphere Demo 的代码、配置、数据，并升级 JDK 17，APIJSON 7.1.0, apijson-framework 7.1.5

Author: TommyLemon

APIJSON-Java-Server/APIJSONDemo-ShardingSphere/MySQL/ds_1_single/ds_1_Comment_0.sql

@@ -5,28 +5,37 @@
 
 	<groupId>apijson.demo</groupId>
 	<artifactId>apijson-demo</artifactId>
-	<version>7.0.3</version>
+	<version>7.1.5</version>
 
 	<name>APIJSONDemo-SharingSphere</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>1.8</java.version>
+		<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>
 	</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>
+
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>6.0.0</version>
 		</dependency>
 
 		<!-- 需要用的数据库 JDBC 驱动 -->
@@ -43,18 +52,68 @@
             <version>3.1.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-jdbc-core</artifactId>
-            <version>5.2.1</version>
-        </dependency>
+		<dependency>
+			<groupId>org.apache.shardingsphere</groupId>
+			<artifactId>shardingsphere-jdbc-core</artifactId>
+			<version>5.4.1</version>
+		</dependency>
         <!-- Oracle, SQLServer 等其它数据库的 JDBC 驱动，可以在这里加上 Maven 依赖或 libs 目录放 Jar 包并依赖 -->
 
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.33</version>
+		</dependency>
+
+<!--		<dependency>-->
+<!--			<groupId>org.slf4j</groupId>-->
+<!--			<artifactId>slf4j-api</artifactId>-->
+<!--			<version>2.0.13</version>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.slf4j</groupId>-->
+<!--			<artifactId>slf4j-log4j12</artifactId>-->
+<!--			<version>2.0.13</version>-->
+<!--		</dependency>-->
+		<!-- logback -->
+<!--		<dependency>-->
+<!--			<groupId>ch.qos.logback</groupId>-->
+<!--			<artifactId>logback-classic</artifactId>-->
+<!--			<version>1.5.6</version>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>ch.qos.logback</groupId>-->
+<!--			<artifactId>logback-core</artifactId>-->
+<!--			<version>1.5.6</version>-->
+<!--		</dependency>-->
+
 		<!-- 需要用的 SpringBoot 框架，1.4.0 以上 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			<version>2.5.13</version>
+			<version>2.7.0</version>
+			<exclusions>
+<!--				<exclusion>-->
+<!--					<groupId>org.slf4j</groupId>-->
+<!--					<artifactId>slf4j-api</artifactId>-->
+<!--				</exclusion>-->
+<!--				<exclusion>-->
+<!--					<groupId>org.slf4j</groupId>-->
+<!--					<artifactId>slf4j-log4j12</artifactId>-->
+<!--				</exclusion>-->
+<!--				<exclusion>-->
+<!--					<groupId>ch.qos.logback</groupId>-->
+<!--					<artifactId>logback-classic</artifactId>-->
+<!--				</exclusion>-->
+<!--				<exclusion>-->
+<!--					<groupId>ch.qos.logback</groupId>-->
+<!--					<artifactId>logback-core</artifactId>-->
+<!--				</exclusion>-->
+				<!--                <exclusion>-->
+				<!--                    <groupId>org.slf4j</groupId>-->
+				<!--                    <artifactId>slf4j-simple</artifactId>-->
+				<!--                </exclusion>-->
+			</exclusions>
 		</dependency>
 
 	</dependencies>
@@ -64,7 +123,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.5.13</version>
+				<version>3.2.5</version>
 				<executions>
 					<execution>
 						<goals>
@@ -78,8 +137,8 @@
 				<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-ShardingSphere/MySQL/ds_1_single/ds_1_Comment_1.sql

@@ -27,8 +27,8 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import apijson.Log;
-import apijson.framework.APIJSONApplication;
-import apijson.framework.APIJSONCreator;
+import apijson.framework.javax.APIJSONApplication;
+import apijson.framework.javax.APIJSONCreator;
 import apijson.orm.SQLConfig;
 import apijson.orm.SQLExecutor;
 
@@ -68,7 +68,7 @@ public void customize(ConfigurableServletWebServerFactory server) {
 
     // 支持 APIAuto 中 JavaScript 代码跨域请求
     @Bean
-    public WebMvcConfigurer corsConfigurer() {
+    public WebMvcConfigurer corsConfig() {
         return new WebMvcConfigurer() {
             @Override
             public void addCorsMappings(CorsRegistry registry) {
@@ -85,12 +85,12 @@ public void addCorsMappings(CorsRegistry registry) {
         // 使用本项目的自定义处理类
         APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<Long>() {
             @Override
-            public SQLConfig createSQLConfig() {
+            public SQLConfig<Long> createSQLConfig() {
                 return new DemoSQLConfig();
             }
 
             @Override
-            public SQLExecutor createSQLExecutor() {
+            public SQLExecutor<Long> createSQLExecutor() {
                 return new DemoSQLExecutor();
             }
         };

APIJSON-Java-Server/APIJSONDemo-ShardingSphere/MySQL/ds_1_single/ds_1_Moment_0.sql

@@ -29,7 +29,7 @@
 
 import apijson.RequestMethod;
 import apijson.StringUtil;
-import apijson.framework.APIJSONController;
+import apijson.framework.javax.APIJSONController;
 import apijson.orm.Parser;
 
 

APIJSON-Java-Server/APIJSONDemo-ShardingSphere/MySQL/ds_1_single/ds_1_Moment_1.sql

@@ -1,51 +1,51 @@
-/*Copyright ©2016 TommyLemon(https://github.com/TommyLemon/APIJSON)
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.*/
-
-package apijson.demo;
-
-import com.zaxxer.hikari.HikariDataSource;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.sql.DataSource;
-
-
-/**数据源配置，对应 application.yml 的数据库连接池 datasource 配置。
- * 也可以直接 new 再 set 属性，具体见 HikariCP 的文档  
- * https://github.com/brettwooldridge/HikariCP#rocket-initialization
- * @author Lemon
- */
-@Configuration
-public class DemoDataSourceConfig {
-
-	@Bean
-	@ConfigurationProperties(prefix = "spring.datasource.hikari")
-	public DataSource dataSource() {
-		return new HikariDataSource();
-	}
-
-	@Bean
-	@ConfigurationProperties(prefix = "spring.datasource.ds-0")
-	public DataSource dataSourceDS0() {
-		return new HikariDataSource();
-	}
-
-	@Bean
-	@ConfigurationProperties(prefix = "spring.datasource.ds-1")
-	public DataSource dataSourceDS1() {
-		return new HikariDataSource();
-	}
-
-}
+///*Copyright ©2016 TommyLemon(https://github.com/TommyLemon/APIJSON)
+//
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.*/
+//
+//package apijson.demo;
+//
+//import com.zaxxer.hikari.HikariDataSource;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import javax.sql.DataSource;
+//
+//
+///**数据源配置，对应 application.yml 的数据库连接池 datasource 配置。
+// * 也可以直接 new 再 set 属性，具体见 HikariCP 的文档
+// * https://github.com/brettwooldridge/HikariCP#rocket-initialization
+// * @author Lemon
+// */
+//@Configuration
+//public class DemoDataSourceConfig {
+//
+//	@Bean
+//	@ConfigurationProperties(prefix = "spring.datasource.hikari")
+//	public DataSource dataSource() {
+//		return new HikariDataSource();
+//	}
+//
+//	@Bean
+//	@ConfigurationProperties(prefix = "spring.datasource.ds-0")
+//	public DataSource dataSourceDS0() {
+//		return new HikariDataSource();
+//	}
+//
+//	@Bean
+//	@ConfigurationProperties(prefix = "spring.datasource.ds-1")
+//	public DataSource dataSourceDS1() {
+//		return new HikariDataSource();
+//	}
+//
+//}

APIJSON-Java-Server/APIJSONDemo-ShardingSphere/MySQL/ds_1_single/ds_1_apijson_user.sql

@@ -16,7 +16,7 @@
 
 import com.alibaba.fastjson.annotation.JSONField;
 
-import apijson.framework.APIJSONSQLConfig;
+import apijson.framework.javax.APIJSONSQLConfig;
 
 
 /**SQL 配置
@@ -50,7 +50,10 @@ public String getDBVersion() {
 	@JSONField(serialize = false)  // 不在日志打印 账号/密码 等敏感信息
 	@Override
 	public String getDBUri() {
-		return "jdbc:mysql://localhost:3306?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8"; // TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000
+		if (isConfigTable()) {
+			return "jdbc:mysql://localhost:3306?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8"; // TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000
+		}
+		return "jdbc:shardingsphere:classpath:config.yaml"; // TODO 改成你自己的，TiDB 可以当成 MySQL 使用，默认端口为 4000
 	}
 
 	@JSONField(serialize = false)  // 不在日志打印 账号/密码 等敏感信息
@@ -65,4 +68,8 @@ public String getDBPassword() {
 		return "apijson";  // TODO 改成你自己的，TiDB 可以当成 MySQL 使用， 默认密码为空字符串 ""
 	}
 
+	@Override
+	public String getSQLSchema() {
+		return isConfigTable() ? super.getSQLSchema() : null;
+	}
 }

APIJSON-Java-Server/APIJSONDemo-ShardingSphere/MySQL/ds_2_single/ds_2_Comment_0.sql

@@ -15,11 +15,13 @@
 package apijson.demo;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
 import java.util.Map;
 
 import javax.sql.DataSource;
 
-import apijson.framework.APIJSONSQLExecutor;
+import apijson.framework.javax.APIJSONSQLExecutor;
 import apijson.orm.SQLConfig;
 
 
@@ -32,21 +34,30 @@ public class DemoSQLExecutor extends APIJSONSQLExecutor<Long> {
 
 	// 适配连接池，如果这里能拿到连接池的有效 Connection，则 SQLConfig 不需要配置 dbVersion, dbUri, dbAccount, dbPassword
 	@Override
-	public Connection getConnection(SQLConfig config) throws Exception {
+	public Connection getConnection(SQLConfig<Long> config) throws Exception {
 		//		Log.d(TAG, "getConnection  config.getDatasource() = " + config.getDatasource());
 
-		String key = config.getDatasource() + "-" + config.getDatabase();
-		Connection c = connectionMap.get(key);
-		if (c == null || c.isClosed()) {
-			Map<String, DataSource> dsMap = DemoApplication.getApplicationContext().getBeansOfType(DataSource.class);
-            DataSource ds = dsMap == null ? null : dsMap.get("dataSourceDS0");
-			// 另一种方式是 DemoDataSourceConfig 初始化获取到 Datasource 后给静态变量 DATA_SOURCE 赋值： ds = DemoDataSourceConfig.DATA_SOURCE.getConnection();
-			connectionMap.put(key, ds == null ? null : ds.getConnection());
-		}
+		//String key = config.getDatasource() + "-" + config.getDatabase();
+		//Connection c = connectionMap.get(key);
+		//if (c == null || c.isClosed()) {
+		//	Map<String, DataSource> dsMap = DemoApplication.getApplicationContext().getBeansOfType(DataSource.class);
+        //    DataSource ds = dsMap == null ? null : dsMap.get("dataSourceDS0");
+		//	// 另一种方式是 DemoDataSourceConfig 初始化获取到 Datasource 后给静态变量 DATA_SOURCE 赋值： ds = DemoDataSourceConfig.DATA_SOURCE.getConnection();
+		//	connectionMap.put(key, ds == null ? null : ds.getConnection());
+		//}
 
 		// 必须最后执行 super 方法，因为里面还有事务相关处理。
 		// 如果这里是 return c，则会导致 增删改 多个对象时只有第一个会 commit，即只有第一个对象成功插入数据库表
 		return super.getConnection(config);
 	}
 
+	@Override
+	public ResultSet executeQuery(SQLConfig<Long> config, String sql) throws Exception {
+		return super.executeQuery(config, sql);
+	}
+
+	@Override
+	public ResultSet executeQuery(Statement statement, String sql) throws Exception {
+		return super.executeQuery(statement, sql);
+	}
 }