Add files via upload

cloudAndMonkey · web-flow · commit a9f9104d2863 · 2022-12-11T09:51:48.000+08:00
1、 支持多数据源
2、统一关闭connection连接
3、支持elasticSearch-sql
4、子查询、join 主表和附表使用相同数据源
5、相关小bug修复
diff --git a/APIJSONORM/src/main/java/apijson/JSONObject.java b/APIJSONORM/src/main/java/apijson/JSONObject.java
@@ -173,6 +173,7 @@ public JSONObject setUserIdIn(List<Object> list) {
 		TABLE_KEY_LIST.add(KEY_ORDER);
 		TABLE_KEY_LIST.add(KEY_RAW);
 		TABLE_KEY_LIST.add(KEY_JSON);
+		TABLE_KEY_LIST.add(KEY_METHOD);
 	}
 
 	//@key关键字都放这个类 >>>>>>>>>>>>>>>>>>>>>>
diff --git a/APIJSONORM/src/main/java/apijson/StringUtil.java b/APIJSONORM/src/main/java/apijson/StringUtil.java
@@ -354,7 +354,7 @@ public static boolean isNotEmpty(String s, boolean trim) {
 		PATTERN_ALPHA = Pattern.compile("^[a-zA-Z]+$");
 		PATTERN_ALPHA_BIG = Pattern.compile("^[A-Z]+$");
 		PATTERN_ALPHA_SMALL = Pattern.compile("^[a-z]+$");
-		PATTERN_NAME = Pattern.compile("^[0-9a-zA-Z_:]+$");//已用55个中英字符测试通过
+		PATTERN_NAME = Pattern.compile("^[0-9a-zA-Z_.:]+$");//已用55个中英字符测试通过
 		//newest phone regex expression reference https://github.com/VincentSit/ChinaMobilePhoneNumberRegex
 		PATTERN_PHONE = Pattern.compile("^1(?:3\\d{3}|5[^4\\D]\\d{2}|8\\d{3}|7(?:[0-35-9]\\d{2}|4(?:0\\d|1[0-2]|9\\d))|9[0-35-9]\\d{2}|6[2567]\\d{2}|4(?:(?:10|4[01])\\d{3}|[68]\\d{4}|[579]\\d{2}))\\d{6}$");
 		PATTERN_EMAIL = Pattern.compile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$");

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ public JSONObject setUserIdIn(List<Object> list) {`
`173`	`173`	`TABLE_KEY_LIST.add(KEY_ORDER);`
`174`	`174`	`TABLE_KEY_LIST.add(KEY_RAW);`
`175`	`175`	`TABLE_KEY_LIST.add(KEY_JSON);`
	`176`	`+ TABLE_KEY_LIST.add(KEY_METHOD);`
`176`	`177`	`}`
`177`	`178`
`178`	`179`	`//@key关键字都放这个类 >>>>>>>>>>>>>>>>>>>>>>`