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

Author: TommyLemon

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

@@ -141,10 +141,10 @@ public String getRequestURL() {
         return getRequestBaseURL() + getRequestPath();
     }
 
-    //  @Override
-    //  public Parser<Long> newParser(HttpSession session, RequestMethod method) {
-    //      return super.newParser(session, method).setNeedVerify(false);
-    //  }
+      @Override
+      public Parser<Long> newParser(HttpSession session, RequestMethod method) {
+          return super.newParser(session, method).setNeedVerify(false);
+      }
 
     /**增删改查统一的类 RESTful API 入口，牺牲一点路由解析性能来提升一些开发效率
      * @param method

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

@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>apijson.demo</groupId>
 	<artifactId>apijsondemo-multidatasource-elasticsearch</artifactId>
-	<version>7.0.3</version>
+	<version>7.1.5</version>
 
 	<name>apijsondemo-multidatasource-elasticsearch</name>
 	<description>Demo project for testing APIJSON server based on SpringBoot</description>
@@ -46,12 +46,12 @@
 		<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 驱动 -->

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/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-Elasticsearch/src/main/java/apijson/demo/DataBaseUtil.java

@@ -13,7 +13,7 @@ public class DataBaseUtil {
      * @param url
      * @return
      */
-    public static String getLibname(String url) {
+    public static String getDBName(String url) {
         Pattern p = Pattern.compile("jdbc:(?<db>\\w+):.*((//)|@)(?<host>.+):(?<port>\\d+)(/|(;DatabaseName=)|:)(?<dbName>\\w+)\\??.*");
         Matcher m = p.matcher(url);
         if(m.find()) {
@@ -41,7 +41,7 @@ public static String getDruidUrl(String datasource) {
 	}
 
 	public static String getDruidSchema(String datasource) {
-		return getLibname(DynamicJdbcDataSource.getDetail(datasource).getUrl()); // 数据库名;
+		return getDBName(DynamicJdbcDataSource.getDetail(datasource).getUrl()); // 数据库名;
 	}
 
 	public static String getDruidDBAccount(String datasource) {

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

@@ -26,9 +26,9 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import apijson.Log;
-import apijson.framework.APIJSONApplication;
-import apijson.framework.APIJSONCreator;
-import apijson.framework.APIJSONSQLConfig;
+import apijson.framework.javax.APIJSONApplication;
+import apijson.framework.javax.APIJSONCreator;
+import apijson.framework.javax.APIJSONSQLConfig;
 import apijson.orm.AbstractFunctionParser;
 import apijson.orm.AbstractVerifier;
 import apijson.orm.FunctionParser;
@@ -67,7 +67,7 @@ public void customize(ConfigurableServletWebServerFactory server) {
 
 	// 支持 APIAuto 中 JavaScript 代码跨域请求
 	@Bean
-	public WebMvcConfigurer corsConfigurer() {
+	public WebMvcConfigurer corsConfig() {
 		return new WebMvcConfigurer() {
 			@Override
 			public void addCorsMappings(CorsRegistry registry) {
@@ -79,24 +79,24 @@ public void addCorsMappings(CorsRegistry registry) {
 
 	static {
 		// 使用本项目的自定义处理类
-		APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<String>() {
+		APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<Object>() {
 			@Override
-			public Parser<String> createParser() {
+			public Parser<Object> createParser() {
 				return new DemoParser();
 			}
 
 			@Override
-			public SQLConfig createSQLConfig() {
+			public SQLConfig<Object> createSQLConfig() {
 				return new DemoSQLConfig();
 			}
 
 			@Override
-			public FunctionParser createFunctionParser() {
+			public FunctionParser<Object> createFunctionParser() {
 				return new DemoFunctionParser();
 			}
 
 			@Override
-			public SQLExecutor createSQLExecutor() {
+			public SQLExecutor<Object> createSQLExecutor() {
 				return new DemoSQLExecutor();
 			}
 		};

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/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<Object> {
 
 	@Override
-	public Parser<Long> newParser(HttpSession session, RequestMethod method) {
+	public Parser<Object> newParser(HttpSession session, RequestMethod method) {
 		return super.newParser(session, method).setNeedVerify(false);  // TODO 这里关闭校验，方便新手快速测试，实际线上项目建议开启
 	}
 

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/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<Object> {
 	public DemoFunctionParser() {
 		this(null, null, 0, null, null);
 	}

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/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<Object> {
 
     public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
             , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {

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

@@ -3,11 +3,11 @@
 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> {
+public class DemoParser extends APIJSONParser<Object> {
 	public DemoParser() {
 		super();
 	}

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/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<Object> {
 
 	public DemoSQLConfig() {
 		super();
@@ -40,8 +40,8 @@ public DemoSQLConfig(RequestMethod method, String table) {
 	}
 
     static {
-//        DEFAULT_DATABASE = DATABASE_ELASTICSEARCH;  // TODO 默认数据库类型，改成你自己的
-//        DEFAULT_SCHEMA = "sys";  // TODO 默认数据库名/模式，改成你自己的，默认情况是 MySQL: sys, PostgreSQL: public, SQL Server: dbo, Oracle:
+		//	DEFAULT_DATABASE = DATABASE_ELASTICSEARCH;  // TODO 默认数据库类型，改成你自己的
+		//	DEFAULT_SCHEMA = "sys";  // TODO 默认数据库名/模式，改成你自己的，默认情况是 MySQL: sys, PostgreSQL: public, SQL Server: dbo, Oracle:
 
         // 表名和数据库不一致的，需要配置映射关系。只使用 APIJSONORM 时才需要；
         // 如果用了 apijson-framework 且调用了 APIJSONApplication.init 则不需要
@@ -79,8 +79,9 @@ public String getDBVersion() {
 	@JSONField(serialize = false) // 不在日志打印 账号/密码 等敏感信息，用了 UnitAuto 则一定要加
 	@Override
 	public String getDatabase() {
-		if (super.getDatabase() != null) {
-			return super.getDatabase();
+		String db = super.getDatabase();
+		if (db != null) {
+			return db;
 		}
 		try {
 			return DynamicJdbcDataSource.getDetail(this.getDatasource()).getDatabase();
@@ -92,8 +93,9 @@ public String getDatabase() {
 	@JSONField(serialize = false) // 不在日志打印 账号/密码 等敏感信息，用了 UnitAuto 则一定要加
 	@Override
 	public String getSchema() {
-		if (super.getSchema() != null) {
-			return super.getSchema();
+		String sch = super.getSchema();
+		if (sch != null) {
+			return sch;
 		}
 		try {
 			return DynamicJdbcDataSource.getDetail(this.getDatasource()).getSchema();

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

@@ -19,7 +19,7 @@
 import apijson.Log;
 import apijson.NotNull;
 import apijson.StringUtil;
-import apijson.framework.APIJSONSQLExecutor;
+import apijson.framework.javax.APIJSONSQLExecutor;
 import apijson.orm.SQLConfig;
 import lombok.extern.log4j.Log4j2;
 
@@ -29,7 +29,7 @@
  * @author Lemon
  */
 @Log4j2
-public class DemoSQLExecutor extends APIJSONSQLExecutor<Long> {
+public class DemoSQLExecutor extends APIJSONSQLExecutor<Object> {
 	public static final String TAG = "DemoSQLExecutor";
 
 	// 适配连接池，如果这里能拿到连接池的有效 Connection，则 SQLConfig 不需要配置 dbVersion, dbUri, dbAccount,
@@ -68,33 +68,33 @@ public int executeUpdate(@NotNull SQLConfig config, String sql) throws Exception
 	/***
 	 * 查询返回字段值进行二次处理
 	 */
-//	@Override
-//	protected JSONObject onPutColumn(@NotNull SQLConfig config, @NotNull ResultSet rs, @NotNull ResultSetMetaData rsmd
-//			, final int tablePosition, @NotNull JSONObject table, final int columnIndex, Join join, Map<String, JSONObject> childMap) throws Exception {
-//		if (table == null) {  // 对应副表 viceSql 不能生成正常 SQL， 或者是 ! - Outer, ( - ANTI JOIN 的副表这种不需要缓存及返回的数据
-//			Log.i(TAG, "onPutColumn table == null >> return table;");
-//			return table;
-//		}
-//
-//		if (isHideColumn(config, rs, rsmd, tablePosition, table, columnIndex, childMap)) {
-//			Log.i(TAG, "onPutColumn isHideColumn(config, rs, rsmd, tablePosition, table, columnIndex, childMap) >> return table;");
-//			return table;
-//		}
-//
-//		String label = getKey(config, rs, rsmd, tablePosition, table, columnIndex, childMap);
-//		Object value = getValue(config, rs, rsmd, tablePosition, table, columnIndex, label, childMap);
-//		
-//		// TODO
-//		if(StringUtils.equals(config.getTable(), "User") && StringUtils.equals(label, "addr_id")) {
-//			value = "1-1-1";
-//		}
-//		// 主表必须 put 至少一个 null 进去，否则全部字段为 null 都不 put 会导致中断后续正常返回值
-//		if (value != null || (join == null && table.isEmpty())) {
-//			table.put(label, value);
-//		}
-//
-//		return table;
-//	}
+	//	@Override
+	//	protected JSONObject onPutColumn(@NotNull SQLConfig config, @NotNull ResultSet rs, @NotNull ResultSetMetaData rsmd
+	//			, final int tablePosition, @NotNull JSONObject table, final int columnIndex, Join join, Map<String, JSONObject> childMap) throws Exception {
+	//		if (table == null) {  // 对应副表 viceSql 不能生成正常 SQL， 或者是 ! - Outer, ( - ANTI JOIN 的副表这种不需要缓存及返回的数据
+	//			Log.i(TAG, "onPutColumn table == null >> return table;");
+	//			return table;
+	//		}
+	//
+	//		if (isHideColumn(config, rs, rsmd, tablePosition, table, columnIndex, childMap)) {
+	//			Log.i(TAG, "onPutColumn isHideColumn(config, rs, rsmd, tablePosition, table, columnIndex, childMap) >> return table;");
+	//			return table;
+	//		}
+	//
+	//		String label = getKey(config, rs, rsmd, tablePosition, table, columnIndex, childMap);
+	//		Object value = getValue(config, rs, rsmd, tablePosition, table, columnIndex, label, childMap);
+	//
+	//		// TODO
+	//		if(StringUtils.equals(config.getTable(), "User") && StringUtils.equals(label, "addr_id")) {
+	//			value = "1-1-1";
+	//		}
+	//		// 主表必须 put 至少一个 null 进去，否则全部字段为 null 都不 put 会导致中断后续正常返回值
+	//		if (value != null || (join == null && table.isEmpty())) {
+	//			table.put(label, value);
+	//		}
+	//
+	//		return table;
+	//	}
 
 	// 取消注释支持 !key 反选字段 和 字段名映射，需要先依赖插件 https://github.com/APIJSON/apijson-column
 	// @Override

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/java/apijson/demo/DynamicJdbcDataSource.java

@@ -75,7 +75,7 @@ public static void addDataSource(DynamicJdbcDataSource detail) {
 	public static DynamicJdbcDataSource getDetail(String datasource) {
 		if (datasource == null) {
 			// 默认数据源
-			datasource = DataBaseConfig.getInstence().getPrimary();
+			datasource = DataBaseConfig.getInstance().getPrimary();
 		}
 		// 不存在交给框架处理
 		return dataSourceMap.get(datasource);
@@ -157,7 +157,7 @@ private void initJdbcDataSource() {
 			ItemDataSource dataSource = (ItemDataSource) dataSourceList.getDataSources().get(datasourceName);
 			DruidDataSource druid = (DruidDataSource) dataSource.getRealDataSource();
 			String url = druid.getDataSourceStat().getUrl(); // 数据库连接url
-			String schema = DataBaseUtil.getLibname(url); // 数据库名;
+			String schema = DataBaseUtil.getDBName(url); // 数据库名;
 			String database = JdbcUtils.getDbType(url).getDb().toUpperCase(); // 数据库类型
 			String dbAccount = druid.getUsername(); // 数据库用户名
 			String dbPassword = druid.getPassword(); // 数据库密码

APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/resources/application.yml

@@ -27,12 +27,12 @@ spring:
           password: apijson
         155db:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3888/sys?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
+          url: jdbc:mysql://localhost:3306/sys?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
           username: root
           password: apijson
         213db:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3888/sys?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
+          url: jdbc:mysql://localhost:3306/sys?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
           username: root
           password: apijson
         db1:

APIJSON-Java-Server/APIJSONFinal/pom.xml

@@ -114,6 +114,7 @@
 				资源复制到 jar 包中去，注意打包的时候需要配置 engine： me.setBaseTemplatePath("webapp"); me.setToClassPathSourceFactory();
 				如果 web 资源本身就放在 src/main/resources/webapp 之下，则不需要此插件 -->
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>3.1.0</version>
 				<executions>