From e29b18b41a5a8ddbe55b2fe11e6aa522254b0ce8 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 12 Nov 2020 21:46:57 +0800
Subject: [PATCH 0001/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 4472d0072..efa1344fc 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
From e61c343b84ab7a9b43b490acd0fb0a9236972455 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 12 Nov 2020 21:47:48 +0800
Subject: [PATCH 0002/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index efa1344fc..582a69f10 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
From 57844b53b75090591cb64b8ae81962bc3002e60b Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 12 Nov 2020 21:48:25 +0800
Subject: [PATCH 0003/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 582a69f10..861ccabdb 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
From 4c2fe45765c1b90c9028dc34ddf9033521187f19 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 12 Nov 2020 21:48:46 +0800
Subject: [PATCH 0004/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 861ccabdb..f975ccc19 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
From 45018b258035db5b656825c56cfeb9d744796050 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 12 Nov 2020 21:49:31 +0800
Subject: [PATCH 0005/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f975ccc19..7b5e17551 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
From bd5fff03694f3cb54d2661518515447a2e9caac3 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 12 Nov 2020 21:51:30 +0800
Subject: [PATCH 0006/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7b5e17551..ed56552ba 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
@@ -123,7 +123,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
@@ -123,7 +123,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
apijson.orm
apijson-orm
- 4.2.3
+ 4.2.4
jar
APIJSONORM
@@ -22,7 +22,7 @@
com.alibaba
fastjson
- 1.2.73
+ 1.2.74
From da9c96eb4e37b9beb47a52a7b1afc62618c12ba3 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 18 Nov 2020 00:00:09 +0800
Subject: [PATCH 0010/1181] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 286b6532f..116a15b41 100644
--- a/README.md
+++ b/README.md
@@ -258,6 +258,8 @@ QQ 技术群： 734652054（新）、607020115（旧）
[APIJSON简单部署和使用](https://blog.csdn.net/m450744192/article/details/108462611)
+[学习自动化接口APIJSON](https://www.jianshu.com/p/981a2a630c7b)
+
[3步创建APIJSON后端新表及配置](https://my.oschina.net/tommylemon/blog/889074)
[APIJSON 自动化接口和文档的快速开发神器 （一）](https://blog.csdn.net/qq_41829492/article/details/88670940)
From eb69b7a274f8aac2e07b8555afa7826081cb8f06 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 18 Nov 2020 00:03:59 +0800
Subject: [PATCH 0011/1181] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 116a15b41..1fa5b30db 100644
--- a/README.md
+++ b/README.md
@@ -256,12 +256,12 @@ QQ 技术群： 734652054（新）、607020115（旧）
[后端自动化版本管理，再也不用改URL了！](https://my.oschina.net/tommylemon/blog/1576587)
+[3步创建APIJSON后端新表及配置](https://my.oschina.net/tommylemon/blog/889074)
+
[APIJSON简单部署和使用](https://blog.csdn.net/m450744192/article/details/108462611)
[学习自动化接口APIJSON](https://www.jianshu.com/p/981a2a630c7b)
-[3步创建APIJSON后端新表及配置](https://my.oschina.net/tommylemon/blog/889074)
-
[APIJSON 自动化接口和文档的快速开发神器 （一）](https://blog.csdn.net/qq_41829492/article/details/88670940)
[APIJSON在mac电脑环境下配置去连接SQL Server](https://juejin.im/post/5e16d21ef265da3e2e4f4956)
From 52456d76173ed5ce62679116ee61417011c235f6 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:15:41 +0800
Subject: [PATCH 0012/1181] Update README.md
---
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 1fa5b30db..c18951b51 100644
--- a/README.md
+++ b/README.md
@@ -87,35 +87,35 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
以下使用 APIAuto-机器学习HTTP接口工具 来展示基于 APIJSON 协议的 HTTP API (当然 Postman 等也都可以请求)：
- 多表关联查询、结构自由组合、多个测试账号、一键共享测试用例
+ APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
- 自动生成封装请求JSON的Android与iOS代码、一键自动生成JavaBean或解析Response的代码
+ APIAuto 自动生成前端(客户端)请求代码、后端接口代码、测试用例代码，一键下载
- 自动保存请求记录、自动生成接口文档，可添加常用请求、快捷查看一键恢复
+ APIAuto 自动保存请求记录、自动生成接口文档，可添加常用请求、快捷查看一键恢复
- 一键自动接口回归测试，不需要写任何代码(注解、注释等全都不要)
+ APIAuto 一键自动接口回归测试，不需要写任何代码(注解、注释等全都不要)
- 一图胜千言 - 部分基础功能概览
+ 一图胜千言 - APIJSON 部分基础功能概览
From 32b81b56f1fa2aeec2fe58c1ad3c250184f7376e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:23:54 +0800
Subject: [PATCH 0013/1181] Update README.md
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c18951b51..f7a15bdce 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,8 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
From 5f87a4e133e2ab8621803cd8d88edf7410e1c457 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:24:26 +0800
Subject: [PATCH 0014/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f7a15bdce..86fbaac2b 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
From 6358e39930406ddc539040892f6b360bcc9b7e51 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:25:39 +0800
Subject: [PATCH 0015/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 86fbaac2b..a9e2f9cea 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
### APIJSON接口展示
以下使用 APIAuto-机器学习接口工具 来展示基于 APIJSON 协议的 HTTP API (注意界面是 APIAuto， URL+JSON 才是 APIJSON。
APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
From ef331c2ffc15702b4ab861bf2e72c26e43fca140 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:25:53 +0800
Subject: [PATCH 0016/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a9e2f9cea..790b49870 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
### APIJSON接口展示
以下使用 APIAuto-机器学习接口工具 来展示基于 APIJSON 协议的 HTTP API (注意界面是 APIAuto， URL+JSON 才是 APIJSON。
APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
From 5d7565b2ce26dc60b22138e7a3cbfb53af1b1020 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:30:22 +0800
Subject: [PATCH 0017/1181] Update README.md
---
README.md | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 790b49870..85e743221 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,12 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
From 0bc7eea98652182468ac358410604e0e2e014ad0 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:40:47 +0800
Subject: [PATCH 0018/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 85e743221..98baeaf2b 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
From 62721e4b86b2bd1f38d6ece94df2d61953849648 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:45:50 +0800
Subject: [PATCH 0019/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 98baeaf2b..15e0156af 100644
--- a/README.md
+++ b/README.md
@@ -328,4 +328,4 @@ https://github.com/Tencent/APIJSON/commits/master
https://git.code.tencent.com/Tencent_Open_Source/APIJSON
### 码云主页
-https://gitee.com/TommyLemon/APIJSON
+https://gitee.com/Tencent/APIJSON
From c67b072fefa976805c2c75bc71b1175abb6c00d2 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:53:51 +0800
Subject: [PATCH 0020/1181] Update README.md
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 15e0156af..738278da5 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,8 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
From 9e501d43c224e0f98e87270f3a2c4aad949a1417 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 20 Nov 2020 11:56:18 +0800
Subject: [PATCH 0021/1181] Update README.md
---
README.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 738278da5..174c29e6d 100644
--- a/README.md
+++ b/README.md
@@ -83,14 +83,14 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
APIJSON 多表关联查询、结构自由组合，APIAuto 多个测试账号、一键共享测试用例
@@ -128,7 +128,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
implements Parser, ParserCreator, VerifierCreator, SQLCreator {
+public abstract class AbstractParser implements Parser, ParserCreator, VerifierCreator, SQLCreator, IdCallback {
protected static final String TAG = "AbstractParser";
@@ -490,11 +491,25 @@ public JSONObject parseCorrectRequest(RequestMethod method, String tag, int vers
//获取指定的JSON结构 >>>>>>>>>>>>>>
+
//JSONObject clone 浅拷贝没用，Structure.parse 会导致 structure 里面被清空，第二次从缓存里取到的就是 {}
- return Structure.parseRequest(method, name, target, request, maxUpdateCount, creator);
+ return Structure.parseRequest(method, name, target, request, maxUpdateCount, getGlobleDatabase(), getGlobleSchema(), this, creator);
}
-
+ @Override
+ public String getIdKey(String database, String schema, String table) {
+ return apijson.JSONObject.KEY_ID;
+ }
+ @Override
+ public String getUserIdKey(String database, String schema, String table) {
+ return apijson.JSONObject.KEY_USER_ID;
+ }
+ @Override
+ public Object newId(RequestMethod method, String database, String schema, String table) {
+ return System.currentTimeMillis();
+ }
+
+
/**新建带状态内容的JSONObject
* @param code
* @param msg
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index c2bdf0933..892e87719 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -16,8 +16,8 @@
import static apijson.JSONObject.KEY_ID;
import static apijson.JSONObject.KEY_JSON;
import static apijson.JSONObject.KEY_ORDER;
-import static apijson.JSONObject.KEY_ROLE;
import static apijson.JSONObject.KEY_RAW;
+import static apijson.JSONObject.KEY_ROLE;
import static apijson.JSONObject.KEY_SCHEMA;
import static apijson.JSONObject.KEY_USER_ID;
import static apijson.RequestMethod.DELETE;
@@ -48,6 +48,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import apijson.JSON;
+import apijson.JSONResponse;
import apijson.Log;
import apijson.NotNull;
import apijson.RequestMethod;
@@ -55,13 +56,20 @@
import apijson.SQL;
import apijson.StringUtil;
import apijson.orm.exception.NotExistException;
+import apijson.orm.model.Access;
import apijson.orm.model.Column;
+import apijson.orm.model.Document;
import apijson.orm.model.ExtendedProperty;
+import apijson.orm.model.Function;
import apijson.orm.model.PgAttribute;
import apijson.orm.model.PgClass;
+import apijson.orm.model.Request;
+import apijson.orm.model.Response;
import apijson.orm.model.SysColumn;
import apijson.orm.model.SysTable;
import apijson.orm.model.Table;
+import apijson.orm.model.Test;
+import apijson.orm.model.TestRecord;
/**config sql for JSON Request
* @author Lemon
@@ -77,6 +85,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
* 表名映射，隐藏真实表名，对安全要求很高的表可以这么做
*/
public static final Map TABLE_KEY_MAP;
+ public static final List CONFIG_TABLE_LIST;
public static final List DATABASE_LIST;
// 自定义where条件拼接
public static final Map RAW_MAP;
@@ -89,6 +98,16 @@ public abstract class AbstractSQLConfig implements SQLConfig {
TABLE_KEY_MAP.put(SysTable.class.getSimpleName(), SysTable.TABLE_NAME);
TABLE_KEY_MAP.put(SysColumn.class.getSimpleName(), SysColumn.TABLE_NAME);
TABLE_KEY_MAP.put(ExtendedProperty.class.getSimpleName(), ExtendedProperty.TABLE_NAME);
+
+ CONFIG_TABLE_LIST = new ArrayList<>(); // Table, Column 等是系统表 AbstractVerifier.SYSTEM_ACCESS_MAP.keySet());
+ CONFIG_TABLE_LIST.add(Function.class.getSimpleName());
+ CONFIG_TABLE_LIST.add(Request.class.getSimpleName());
+ CONFIG_TABLE_LIST.add(Response.class.getSimpleName());
+ CONFIG_TABLE_LIST.add(Test.class.getSimpleName());
+ CONFIG_TABLE_LIST.add(Access.class.getSimpleName());
+ CONFIG_TABLE_LIST.add(Document.class.getSimpleName());
+ CONFIG_TABLE_LIST.add(TestRecord.class.getSimpleName());
+
DATABASE_LIST = new ArrayList<>();
DATABASE_LIST.add(DATABASE_MYSQL);
@@ -1623,8 +1642,18 @@ public String getCompareString(String key, Object value, String type) throws Exc
}
public String getKey(String key) {
+ if (isTest()) {
+ if (key.contains("'")) { // || key.contains("#") || key.contains("--")) {
+ throw new IllegalArgumentException("参数 " + key + " 不合法！key 中不允许有单引号 ' ！");
+ }
+ return getSQLValue(key).toString();
+ }
+
+ return getSQLKey(key);
+ }
+ public String getSQLKey(String key) {
String q = getQuote();
- return (isKeyPrefix() ? getAliasWithQuote() + "." : "") + q + key + q;
+ return (isKeyPrefix() ? getAliasWithQuote() + "." : "") + q + key + q;
}
/**
@@ -1636,6 +1665,9 @@ private Object getValue(@NotNull Object value) {
preparedValueList.add(value);
return "?";
}
+ return getSQLValue(value);
+ }
+ public Object getSQLValue(@NotNull Object value) {
// return (value instanceof Number || value instanceof Boolean) && DATABASE_POSTGRESQL.equals(getDatabase()) ? value : "'" + value + "'";
return (value instanceof Number || value instanceof Boolean) ? value : "'" + value + "'"; //MySQL 隐式转换用不了索引
}
@@ -2230,9 +2262,15 @@ public static String getSQL(AbstractSQLConfig config) throws Exception {
case DELETE:
return "DELETE FROM " + tablePath + config.getWhereString(true);
default:
+ String explain = (config.isExplain() ? (config.isSQLServer() || config.isOracle() ? "SET STATISTICS PROFILE ON " : "EXPLAIN ") : "");
+ if (config.isTest() && RequestMethod.isGetMethod(config.getMethod(), true)) {
+ String q = config.getQuote(); // 生成 SELECT ( (24 >=0 AND 24 <3) ) AS `code` LIMIT 1 OFFSET 0
+ return explain + "SELECT " + config.getWhereString(false) + " AS " + q + JSONResponse.KEY_CODE + q + config.getLimitString();
+ }
+
config.setPreparedValueList(new ArrayList());
String column = config.getColumnString();
- return (config.isExplain() ? (config.isSQLServer() || config.isOracle() ? "SET STATISTICS PROFILE ON " : "EXPLAIN ") : "") + "SELECT " + (config.getCache() == JSONRequest.CACHE_RAM ? "SQL_NO_CACHE " : "") + column + " FROM " + getConditionString(column, tablePath, config);
+ return explain + "SELECT " + (config.getCache() == JSONRequest.CACHE_RAM ? "SQL_NO_CACHE " : "") + column + " FROM " + getConditionString(column, tablePath, config);
}
}
@@ -2915,16 +2953,7 @@ else if (key.endsWith("-")) {//缩减，PUT查询时处理
}
- public static interface Callback {
- /**获取 SQLConfig 的实例
- * @param method
- * @param database
- * @param schema
- * @param table
- * @return
- */
- SQLConfig getSQLConfig(RequestMethod method, String database, String schema, String table);
-
+ public static interface IdCallback {
/**为 post 请求新建 id， 只能是 Long 或 String
* @param method
* @param database
@@ -2949,7 +2978,18 @@ public static interface Callback {
* @return
*/
String getUserIdKey(String database, String schema, String table);
-
+ }
+
+ public static interface Callback extends IdCallback {
+ /**获取 SQLConfig 的实例
+ * @param method
+ * @param database
+ * @param schema
+ * @param table
+ * @return
+ */
+ SQLConfig getSQLConfig(RequestMethod method, String database, String schema, String table);
+
/**combine 里的 key 在 request 中 value 为 null 或不存在，即 request 中缺少用来作为 combine 条件的 key: value
* @param combine
* @param key
diff --git a/APIJSONORM/src/main/java/apijson/orm/Operation.java b/APIJSONORM/src/main/java/apijson/orm/Operation.java
index ec93b0300..a0e2278b1 100755
--- a/APIJSONORM/src/main/java/apijson/orm/Operation.java
+++ b/APIJSONORM/src/main/java/apijson/orm/Operation.java
@@ -9,21 +9,26 @@
* @author Lemon
*/
public enum Operation {
+ /**
+ * 必须传的字段，结构是
+ * "key0,key1,key2..."
+ */
+ MUST,
+ /**
+ * @deprecated 用 MUST 代替，最早可能 4.5.0 移除
+ */
+ NECESSARY,
/**
* 不允许传的字段，结构是
* "key0,key1,key2..."
- * TODO 改成 MUST 减少长度 ?
*/
- DISALLOW,
-
+ REFUSE,
/**
- * 必须传的字段，结构是
- * "key0,key1,key2..."
- * TODO 改成 REFUSE 减少长度 ?
+ * @deprecated 用 REFUSE 代替，最早可能 4.5.0 移除
*/
- NECESSARY,
-
+ DISALLOW,
+
/**TODO 是否应该把数组类型写成 BOOLEANS, NUMBERS 等复数单词，以便抽取 enum ？扩展用 VERIFY 或 INSERT/UPDATE 远程函数等
* 验证是否符合预设的类型:
diff --git a/APIJSONORM/src/main/java/apijson/orm/Structure.java b/APIJSONORM/src/main/java/apijson/orm/Structure.java
index 4b752de08..9f7d622d6 100755
--- a/APIJSONORM/src/main/java/apijson/orm/Structure.java
+++ b/APIJSONORM/src/main/java/apijson/orm/Structure.java
@@ -5,12 +5,12 @@
package apijson.orm;
-import static apijson.JSONObject.KEY_ID;
-import static apijson.JSONObject.KEY_USER_ID;
import static apijson.orm.Operation.DISALLOW;
import static apijson.orm.Operation.EXIST;
import static apijson.orm.Operation.INSERT;
+import static apijson.orm.Operation.MUST;
import static apijson.orm.Operation.NECESSARY;
+import static apijson.orm.Operation.REFUSE;
import static apijson.orm.Operation.REMOVE;
import static apijson.orm.Operation.REPLACE;
import static apijson.orm.Operation.TYPE;
@@ -45,10 +45,11 @@
import apijson.NotNull;
import apijson.RequestMethod;
import apijson.StringUtil;
+import apijson.orm.AbstractSQLConfig.Callback;
+import apijson.orm.AbstractSQLConfig.IdCallback;
import apijson.orm.exception.ConflictException;
-import apijson.orm.model.Test;
-/**结构类
+/**结构类。 TODO 重构为 AbstractContentVerifier implements ContentVerifier 或干脆整合进 AbstractVerifier
* 增删改查: OPERATION(ADD,REPLACE,PUT,REMOVE) OPERATION:{key0:value0, key1:value1 ...}
* 对值校验: VERIFY:{key0:value0, key1:value1 ...} (key{}:range,key$:"%m%"等)
* 对值重复性校验: UNIQUE:"key0:, key1 ..." (UNIQUE:"phone,email" 等)
@@ -62,7 +63,7 @@ public class Structure {
COMPILE_MAP = new HashMap();
}
-
+
private Structure() {}
@@ -91,9 +92,28 @@ public static JSONObject parseRequest(@NotNull final RequestMethod method, final
*/
public static JSONObject parseRequest(@NotNull final RequestMethod method, final String name
, final JSONObject target, final JSONObject request, final int maxUpdateCount, final SQLCreator creator) throws Exception {
+ return parseRequest(method, name, target, request, maxUpdateCount, null, null, null, creator);
+ }
+ /**从request提取target指定的内容
+ * @param method
+ * @param name
+ * @param target
+ * @param request
+ * @param maxUpdateCount
+ * @param idKey
+ * @param userIdKey
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject parseRequest(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject request, final int maxUpdateCount
+ , final String database, final String schema, final IdCallback idCallback, final SQLCreator creator) throws Exception {
+
Log.i(TAG, "parseRequest method = " + method + "; name = " + name
+ "; target = \n" + JSON.toJSONString(target)
+ "\n request = \n" + JSON.toJSONString(request));
+
if (target == null || request == null) {// || request.isEmpty()) {
Log.i(TAG, "parseRequest target == null || request == null >> return null;");
return null;
@@ -105,30 +125,47 @@ public static JSONObject parseRequest(@NotNull final RequestMethod method, final
// ":{ " + JSONRequest.KEY_ROLE + ":admin } ！");
// }
+
//解析
- return parse(method, name, target, request, creator, new OnParseCallback() {
+ return parse(method, name, target, request, database, schema, idCallback, creator, new OnParseCallback() {
@Override
public JSONObject onParseJSONObject(String key, JSONObject tobj, JSONObject robj) throws Exception {
// Log.i(TAG, "parseRequest.parse.onParseJSONObject key = " + key + "; robj = " + robj);
+
if (robj == null) {
if (tobj != null) {//不允许不传Target中指定的Table
throw new IllegalArgumentException(method + "请求，请在 " + name + " 内传 " + key + ":{} ！");
}
} else if (apijson.JSONObject.isTableKey(key)) {
+ String db = request.getString(apijson.JSONObject.KEY_DATABASE);
+ String sh = request.getString(apijson.JSONObject.KEY_SCHEMA);
+ if (StringUtil.isEmpty(db, false)) {
+ db = database;
+ }
+ if (StringUtil.isEmpty(sh, false)) {
+ sh = schema;
+ }
+
+ String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, key);
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+
if (method == RequestMethod.POST) {
- if (robj.containsKey(KEY_ID)) {
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key + " 不能传 " + KEY_ID + " ！");
+ if (robj.containsKey(finalIdKey)) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key + " 不能传 " + finalIdKey + " ！");
}
} else {
if (RequestMethod.isQueryMethod(method) == false) {
- verifyId(method.name(), name, key, robj, KEY_ID, maxUpdateCount, true);
- verifyId(method.name(), name, key, robj, KEY_USER_ID, maxUpdateCount, false);
+ verifyId(method.name(), name, key, robj, finalIdKey, maxUpdateCount, true);
+
+ String userIdKey = idCallback == null ? null : idCallback.getUserIdKey(db, sh, key);
+ String finalUserIdKey = StringUtil.isEmpty(userIdKey, false) ? apijson.JSONObject.KEY_USER_ID : userIdKey;
+ verifyId(method.name(), name, key, robj, finalUserIdKey, maxUpdateCount, false);
}
}
}
- return parseRequest(method, key, tobj, robj, maxUpdateCount, creator);
+ return parseRequest(method, key, tobj, robj, maxUpdateCount, database, schema, idCallback, creator);
}
@Override
@@ -214,34 +251,70 @@ private static void verifyId(@NotNull String method, @NotNull String name, @NotN
*/
public static JSONObject parseResponse(@NotNull final RequestMethod method, final String name
, final JSONObject target, final JSONObject response, SQLCreator creator, OnParseCallback callback) throws Exception {
+ return parseResponse(method, name, target, response, null, null, null, creator, callback);
+ }
+ /**校验并将response转换为指定的内容和结构
+ * @param method
+ * @param name
+ * @param target
+ * @param response
+ * @param idKey
+ * @param callback
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject parseResponse(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject response, final String database, final String schema
+ , final Callback idKeyCallback, SQLCreator creator, OnParseCallback callback) throws Exception {
+
Log.i(TAG, "parseResponse method = " + method + "; name = " + name
+ "; target = \n" + JSON.toJSONString(target)
+ "\n response = \n" + JSON.toJSONString(response));
+
if (target == null || response == null) {// || target.isEmpty() {
Log.i(TAG, "parseRequest target == null || response == null >> return response;");
return response;
}
//解析
- return parse(method, name, target, response, creator, callback != null ? callback : new OnParseCallback() {});
+ return parse(method, name, target, response, database, schema, idKeyCallback, creator, callback != null ? callback : new OnParseCallback() {});
}
/**对request和response不同的解析用callback返回
+ * @param method
+ * @param name
* @param target
- * @param request
+ * @param real
+ * @param creator
* @param callback
- * @param creator
* @return
- * @throws Exception
+ * @throws Exception
*/
public static JSONObject parse(@NotNull final RequestMethod method, String name, JSONObject target, JSONObject real
, SQLCreator creator, @NotNull OnParseCallback callback) throws Exception {
+ return parse(method, name, target, real, null, null, null, creator, callback);
+ }
+
+ /**对request和response不同的解析用callback返回
+ * @param method
+ * @param name
+ * @param target
+ * @param real
+ * @param idKey
+ * @param userIdKey
+ * @param creator
+ * @param callback
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject parse(@NotNull final RequestMethod method, String name, JSONObject target, JSONObject real
+ , final String database, final String schema, final IdCallback idCallback, SQLCreator creator, @NotNull OnParseCallback callback) throws Exception {
if (target == null) {
return null;
}
-
//获取配置<<<<<<<<<<<<<<<<<<<<<<<<<<<<
JSONObject type = target.getJSONObject(TYPE.name());
JSONObject verify = target.getJSONObject(VERIFY.name());
@@ -252,6 +325,8 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
String exist = StringUtil.getNoBlankString(target.getString(EXIST.name()));
String unique = StringUtil.getNoBlankString(target.getString(UNIQUE.name()));
String remove = StringUtil.getNoBlankString(target.getString(REMOVE.name()));
+ String must = StringUtil.getNoBlankString(target.getString(MUST.name()));
+ String refuse = StringUtil.getNoBlankString(target.getString(REFUSE.name()));
String necessary = StringUtil.getNoBlankString(target.getString(NECESSARY.name()));
String disallow = StringUtil.getNoBlankString(target.getString(DISALLOW.name()));
@@ -264,6 +339,8 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
target.remove(EXIST.name());
target.remove(UNIQUE.name());
target.remove(REMOVE.name());
+ target.remove(MUST.name());
+ target.remove(REFUSE.name());
target.remove(NECESSARY.name());
target.remove(DISALLOW.name());
@@ -279,6 +356,15 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
//移除字段>>>>>>>>>>>>>>>>>>>
//判断必要字段是否都有<<<<<<<<<<<<<<<<<<<
+ String[] musts = StringUtil.split(must);
+ List mustList = musts == null ? new ArrayList() : Arrays.asList(musts);
+ for (String s : mustList) {
+ if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不能缺少 " + s + " 等[" + must + "]内的任何字段！");
+ }
+ }
+
String[] necessarys = StringUtil.split(necessary);
List necessaryList = necessarys == null ? new ArrayList() : Arrays.asList(necessarys);
for (String s : necessaryList) {
@@ -323,7 +409,7 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 ARRAY ，结构为 [] !");
}
tvalue = callback.onParseJSONArray(key, (JSONArray) tvalue, (JSONArray) rvalue);
-
+
if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
objKeySet.add(key);
}
@@ -345,6 +431,21 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
Set rkset = real.keySet(); //解析内容并没有改变rkset
//解析不允许的字段<<<<<<<<<<<<<<<<<<<
+ List refuseList = new ArrayList();
+ if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
+ for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
+ if (key != null && key.startsWith("@") == false
+ && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
+ refuseList.add(key);
+ }
+ }
+ } else {
+ String[] refuses = StringUtil.split(refuse);
+ if (refuses != null && refuses.length > 0) {
+ refuseList.addAll(Arrays.asList(refuses));
+ }
+ }
+
List disallowList = new ArrayList();
if ("!".equals(disallow)) {//所有非necessary，改成 !necessary 更好
for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
@@ -364,6 +465,10 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
//判断不允许传的key<<<<<<<<<<<<<<<<<<<<<<<<<
for (String rk : rkset) {
+ if (refuseList.contains(rk)) { //不允许的字段
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不允许传 " + rk + " 等" + StringUtil.getString(refuseList) + "内的任何字段！");
+ }
if (disallowList.contains(rk)) { //不允许的字段
throw new IllegalArgumentException(method + "请求，" + name
+ " 里面不允许传 " + rk + " 等" + StringUtil.getString(disallowList) + "内的任何字段！");
@@ -378,7 +483,7 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
//不允许传远程函数，只能后端配置
if (rk.endsWith("()") && rv instanceof String) {
- throw new UnsupportedOperationException(method + " 请求，" +rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
+ throw new UnsupportedOperationException(method + " 请求，" + rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
}
//不在target内的 key:{}
@@ -404,11 +509,23 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
real = operate(REPLACE, replace, real, creator);
//校验与修改Request>>>>>>>>>>>>>>>>>
+
+ String db = real.getString(apijson.JSONObject.KEY_DATABASE);
+ String sh = real.getString(apijson.JSONObject.KEY_SCHEMA);
+ if (StringUtil.isEmpty(db, false)) {
+ db = database;
+ }
+ if (StringUtil.isEmpty(sh, false)) {
+ sh = schema;
+ }
+ String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, name);
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+
//TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
//校验存在<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
String[] exists = StringUtil.split(exist);
if (exists != null && exists.length > 0) {
- long exceptId = real.getLongValue(KEY_ID);
+ long exceptId = real.getLongValue(finalIdKey);
for (String e : exists) {
verifyExist(name, e, real.get(e), exceptId, creator);
}
@@ -419,9 +536,9 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
//校验重复<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
String[] uniques = StringUtil.split(unique);
if (uniques != null && uniques.length > 0) {
- long exceptId = real.getLongValue(KEY_ID);
+ long exceptId = real.getLongValue(finalIdKey);
for (String u : uniques) {
- verifyRepeat(name, u, real.get(u), exceptId, creator);
+ verifyRepeat(name, u, real.get(u), exceptId, finalIdKey, creator);
}
}
//校验重复>>>>>>>>>>>>>>>>>>>
@@ -437,6 +554,8 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
target.put(EXIST.name(), exist);
target.put(UNIQUE.name(), unique);
target.put(REMOVE.name(), remove);
+ target.put(MUST.name(), must);
+ target.put(REFUSE.name(), refuse);
target.put(NECESSARY.name(), necessary);
target.put(DISALLOW.name(), disallow);
//还原 >>>>>>>>>>
@@ -768,10 +887,16 @@ private static void sqlVerify(@NotNull String funChar, @NotNull JSONObject real,
return;
}
- SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.HEAD).setCount(1).setPage(0);
- config.setTable(Test.class.getSimpleName());
+ if (rv instanceof String && ((String) rv).contains("'")) { // || key.contains("#") || key.contains("--")) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！value 中不允许有单引号 ' ！");
+ }
+
+ SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.GET).setCount(1).setPage(0);
config.setTest(true);
- config.putWhere("'" + rv + "'" + logic.getChar() + funChar, tv, false);
+ // config.setTable(Test.class.getSimpleName());
+ // config.setColumn(rv + logic.getChar() + funChar)
+ config.putWhere(rv + logic.getChar() + funChar, tv, false); // 字符串可能 SQL 注入，目前的解决方式是加 TYPE 校验类型或者干脆不用 sqlVerify，而是通过远程函数来校验
+ config.setCount(1);
SQLExecutor executor = creator.createSQLExecutor();
JSONObject result = null;
@@ -780,12 +905,12 @@ private static void sqlVerify(@NotNull String funChar, @NotNull JSONObject real,
} finally {
executor.close();
}
- if (result != null && JSONResponse.isExist(result.getIntValue(JSONResponse.KEY_COUNT)) == false) {
- throw new IllegalArgumentException(rk + ":" + rv + "中value不合法！必须匹配 " + logic.getChar() + tv + " ！");
+ if (result != null && JSONResponse.isExist(result.getIntValue(JSONResponse.KEY_CODE)) == false) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 '" + tk + "': '" + tv + "' ！");
}
}
-
+
/**验证是否存在
* @param table
* @param key
@@ -829,7 +954,7 @@ public static void verifyExist(String table, String key, Object value, long exce
public static void verifyRepeat(String table, String key, Object value, @NotNull SQLCreator creator) throws Exception {
verifyRepeat(table, key, value, 0, creator);
}
-
+
/**验证是否重复
* @param table
* @param key
@@ -838,6 +963,19 @@ public static void verifyRepeat(String table, String key, Object value, @NotNull
* @throws Exception
*/
public static void verifyRepeat(String table, String key, Object value, long exceptId, @NotNull SQLCreator creator) throws Exception {
+ verifyRepeat(table, key, value, exceptId, null, creator);
+ }
+
+ /**验证是否重复
+ * @param table
+ * @param key
+ * @param value
+ * @param exceptId 不包含id
+ * @param idKey
+ * @param creator
+ * @throws Exception
+ */
+ public static void verifyRepeat(String table, String key, Object value, long exceptId, String idKey, @NotNull SQLCreator creator) throws Exception {
if (key == null || value == null) {
Log.e(TAG, "verifyRepeat key == null || value == null >> return;");
return;
@@ -845,15 +983,16 @@ public static void verifyRepeat(String table, String key, Object value, long exc
if (value instanceof JSON) {
throw new UnsupportedDataTypeException(key + ":value 中value的类型不能为JSON！");
}
-
-
+
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+
SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.HEAD).setCount(1).setPage(0);
config.setTable(table);
if (exceptId > 0) {//允许修改自己的属性为该属性原来的值
- config.putWhere(JSONRequest.KEY_ID + "!", exceptId, false);
+ config.putWhere(finalIdKey + "!", exceptId, false);
}
config.putWhere(key, value, false);
-
+
SQLExecutor executor = creator.createSQLExecutor();
try {
JSONObject result = executor.execute(config, false);
diff --git a/APIJSONORM/src/main/java/apijson/orm/model/Test.java b/APIJSONORM/src/main/java/apijson/orm/model/Test.java
index 838fa6398..5b887e383 100755
--- a/APIJSONORM/src/main/java/apijson/orm/model/Test.java
+++ b/APIJSONORM/src/main/java/apijson/orm/model/Test.java
@@ -7,9 +7,11 @@
import apijson.MethodAccess;
-/**条件测试
+/**条件测试。最早可能 4.5.0 移除。AbstractSQLConfig 已支持 SELECT 2>1 这种简单条件表达式，
+ * 相当于是 SELECT 后只有 WHERE 条件表达式，其它全都没有，这样就可以去掉仅用来动态执行校验逻辑 Test 表了。
* @author Lemon
*/
+@Deprecated
@MethodAccess(POST = {}, PUT = {}, DELETE = {})
public class Test {
}
From e656258c6e1e4158a084227024a79d7d2a7443b4 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 22 Nov 2020 03:06:44 +0800
Subject: [PATCH 0023/1181] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20APIJSONORM=20?=
=?UTF-8?q?=E7=9A=84=E8=BF=9C=E7=A8=8B=E4=BE=9D=E8=B5=96=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APIJSONORM/README.md | 51 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 APIJSONORM/README.md
diff --git a/APIJSONORM/README.md b/APIJSONORM/README.md
new file mode 100644
index 000000000..f99a32f8d
--- /dev/null
+++ b/APIJSONORM/README.md
@@ -0,0 +1,51 @@
+# APIJSONORM [](https://jitpack.io/#Tencent/APIJSON)
+腾讯 [APIJSON](https://github.com/Tencent/APIJSON) ORM 库，可通过 Maven, Gradle 等远程依赖。
+
+ jitpack.io
+ https://jitpack.io
+
+
+```
+
+ com.github.Tencent
+ APIJSON
+ LATEST
+
+```
+
+
- com.github.Tencent
+ com.github.Tencent
APIJSON
LATEST
From b40734c1e77f9a75413e179765a10a4813a00572 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 23 Nov 2020 23:26:05 +0800
Subject: [PATCH 0025/1181] Update README.md
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 174c29e6d..3c262b187 100644
--- a/README.md
+++ b/README.md
@@ -163,11 +163,11 @@ https://github.com/Tencent/APIJSON/issues?q=is%3Aissue+is%3Aclosed
### 快速上手
-#### 1.后端部署
+#### 1.后端上手
可以跳过这个步骤，直接用APIJSON服务器IP地址 apijson.cn:8080 来测试接口。apijson.orm
apijson-orm
- 4.2.4
+ 4.3.0
jar
APIJSONORM
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
index 038b1121b..ccfe38f8c 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
@@ -666,31 +666,8 @@ public Connection getConnection(@NotNull SQLConfig config) throws Exception {
connection = connectionMap.get(config.getDatabase());
if (connection == null || connection.isClosed()) {
Log.i(TAG, "select connection " + (connection == null ? " = null" : ("isClosed = " + connection.isClosed()))) ;
-
- if (config.isMySQL()) {
- int v;
- try {
- String[] vs = config.getDBVersion().split("[.]");
- v = Integer.parseInt(vs[0]);
- }
- catch (Exception e) {
- v = 1;
- Log.e(TAG, "getStatement try { String[] vs = config.getDBVersion().split([.]); ... >> } catch (Exception e) {\n" + e.getMessage());
- }
-
- if (v >= 8) {
- connection = DriverManager.getConnection(config.getDBUri() + "?userSSL=false&serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&user="
- + config.getDBAccount() + "&password=" + config.getDBPassword());
- }
- else {
- connection = DriverManager.getConnection(config.getDBUri() + "?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&user="
- + config.getDBAccount() + "&password=" + config.getDBPassword());
- }
- }
- else { //PostgreSQL 不允许 cross-database
- connection = DriverManager.getConnection(config.getDBUri(), config.getDBAccount(), config.getDBPassword());
- }
-
+ // PostgreSQL 不允许 cross-database
+ connection = DriverManager.getConnection(config.getDBUri(), config.getDBAccount(), config.getDBPassword());
connectionMap.put(config.getDatabase(), connection);
}
@@ -795,14 +772,14 @@ public ResultSet executeQuery(@NotNull SQLConfig config) throws Exception {
public int executeUpdate(@NotNull SQLConfig config) throws Exception {
PreparedStatement s = getStatement(config);
int count = s.executeUpdate(); //PreparedStatement 不用传 SQL
-
+
if (config.getMethod() == RequestMethod.POST && config.getId() == null) { //自增id
ResultSet rs = s.getGeneratedKeys();
if (rs != null && rs.next()) {
config.setId(rs.getLong(1));//返回插入的主键id
}
}
-
+
return count;
}
From b74e6e619d9db603ade1c8b3d3891334fc435a7e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 29 Nov 2020 00:54:01 +0800
Subject: [PATCH 0028/1181] Update README.md
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index f91b17c4a..28294aa4a 100644
--- a/README.md
+++ b/README.md
@@ -186,6 +186,7 @@ https://github.com/Tencent/APIJSON/issues?q=is%3Aissue+is%3Aclosed
implements Parser, ParserCreator, VerifierCreator, SQLCreator, IdCallback {
+public abstract class AbstractParser implements Parser, ParserCreator, VerifierCreator, SQLCreator {
protected static final String TAG = "AbstractParser";
@@ -248,10 +247,16 @@ public AbstractParser setNeedVerifyContent(boolean needVerifyContent) {
@Override
public SQLExecutor getSQLExecutor() {
+ if (sqlExecutor == null) {
+ sqlExecutor = createSQLExecutor();
+ }
return sqlExecutor;
}
@Override
public Verifier getVerifier() {
+ if (verifier == null) {
+ verifier = createVerifier().setVisitor(getVisitor());
+ }
return verifier;
}
@@ -377,7 +382,7 @@ public JSONObject parseResponse(JSONObject request) {
long duration = endTime - startTime;
if (Log.DEBUG) { //用 | 替代 /，避免 APIJSON ORM，APIAuto 等解析路径错误
- requestObject.put("sql:generate|cache|execute|maxExecute", sqlExecutor.getGeneratedSQLCount() + "|" + sqlExecutor.getCachedSQLCount() + "|" + sqlExecutor.getExecutedSQLCount() + "|" + getMaxSQLCount());
+ requestObject.put("sql:generate|cache|execute|maxExecute", getSQLExecutor().getGeneratedSQLCount() + "|" + getSQLExecutor().getCachedSQLCount() + "|" + getSQLExecutor().getExecutedSQLCount() + "|" + getMaxSQLCount());
requestObject.put("depth:count|max", queryDepth + "|" + getMaxQueryDepth());
requestObject.put("time:start|duration|end", startTime + "|" + duration + "|" + endTime);
}
@@ -402,7 +407,7 @@ public JSONObject parseResponse(JSONObject request) {
@Override
public void onVerifyLogin() throws Exception {
- verifier.verifyLogin();
+ getVerifier().verifyLogin();
}
@Override
public void onVerifyContent() throws Exception {
@@ -427,7 +432,7 @@ public void onVerifyRole(@NotNull SQLConfig config) throws Exception {
config.setRole(getVisitor().getId() == null ? RequestRole.UNKNOWN : RequestRole.LOGIN);
}
}
- verifier.verify(config);
+ getVerifier().verifyAccess(config);
}
}
@@ -493,20 +498,7 @@ public JSONObject parseCorrectRequest(RequestMethod method, String tag, int vers
//JSONObject clone 浅拷贝没用，Structure.parse 会导致 structure 里面被清空，第二次从缓存里取到的就是 {}
- return Structure.parseRequest(method, name, target, request, maxUpdateCount, getGlobleDatabase(), getGlobleSchema(), this, creator);
- }
-
- @Override
- public String getIdKey(String database, String schema, String table) {
- return apijson.JSONObject.KEY_ID;
- }
- @Override
- public String getUserIdKey(String database, String schema, String table) {
- return apijson.JSONObject.KEY_USER_ID;
- }
- @Override
- public Object newId(RequestMethod method, String database, String schema, String table) {
- return System.currentTimeMillis();
+ return getVerifier().verifyRequest(method, name, target, request, maxUpdateCount, getGlobleDatabase(), getGlobleSchema(), creator);
}
@@ -694,12 +686,8 @@ public JSONObject getStructure(@NotNull String table, String key, String value,
config.setOrder(JSONRequest.KEY_VERSION + (version > 0 ? "+" : "-"));
config.setCount(1);
- if (sqlExecutor == null) {
- sqlExecutor = createSQLExecutor();
- }
-
//too many connections error: 不try-catch，可以让客户端看到是服务器内部异常
- JSONObject result = sqlExecutor.execute(config, false);
+ JSONObject result = getSQLExecutor().execute(config, false);
return getJSONObject(result, "structure");//解决返回值套了一层 "structure":{}
}
@@ -1405,10 +1393,10 @@ public JSONObject executeSQL(SQLConfig config, boolean isSubquery) throws Except
JSONObject result;
if (explain) { //如果先执行 explain，则 execute 会死循环，所以只能先执行非 explain
config.setExplain(false); //对下面 config.getSQL(false); 生效
- JSONObject res = sqlExecutor.execute(config, false);
+ JSONObject res = getSQLExecutor().execute(config, false);
config.setExplain(explain);
- JSONObject explainResult = config.isMain() && config.getPosition() != 0 ? null : sqlExecutor.execute(config, false);
+ JSONObject explainResult = config.isMain() && config.getPosition() != 0 ? null : getSQLExecutor().execute(config, false);
if (explainResult == null) {
result = res;
@@ -1420,7 +1408,7 @@ public JSONObject executeSQL(SQLConfig config, boolean isSubquery) throws Except
}
}
else {
- result = sqlExecutor.execute(config, false);
+ result = getSQLExecutor().execute(config, false);
}
return parseCorrectResponse(config.getTable(), result);
@@ -1434,7 +1422,7 @@ public JSONObject executeSQL(SQLConfig config, boolean isSubquery) throws Except
finally {
if (config.getPosition() == 0 && config.limitSQLCount()) {
int maxSQLCount = getMaxSQLCount();
- int sqlCount = sqlExecutor.getExecutedSQLCount();
+ int sqlCount = getSQLExecutor().getExecutedSQLCount();
Log.d(TAG, "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< \n\n\n 已执行 " + sqlCount + "/" + maxSQLCount + " 条 SQL \n\n\n >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
if (sqlCount > maxSQLCount) {
throw new IllegalArgumentException("截至 " + config.getTable() + " 已执行 " + sqlCount + " 条 SQL，数量已超限，必须在 0-" + maxSQLCount + " 内 !");
@@ -1458,27 +1446,27 @@ public void setTransactionIsolation(int transactionIsolation) {
@Override
public void begin(int transactionIsolation) {
Log.d("\n\n" + TAG, "<<<<<<<<<<<<<<<<<<<<<<< begin transactionIsolation = " + transactionIsolation + " >>>>>>>>>>>>>>>>>>>>>>> \n\n");
- sqlExecutor.setTransactionIsolation(transactionIsolation); //不知道 connection 什么时候创建，不能在这里准确控制，sqlExecutor.begin(transactionIsolation);
+ getSQLExecutor().setTransactionIsolation(transactionIsolation); //不知道 connection 什么时候创建，不能在这里准确控制，getSqlExecutor().begin(transactionIsolation);
}
@Override
public void rollback() throws SQLException {
Log.d("\n\n" + TAG, "<<<<<<<<<<<<<<<<<<<<<<< rollback >>>>>>>>>>>>>>>>>>>>>>> \n\n");
- sqlExecutor.rollback();
+ getSQLExecutor().rollback();
}
@Override
public void rollback(Savepoint savepoint) throws SQLException {
Log.d("\n\n" + TAG, "<<<<<<<<<<<<<<<<<<<<<<< rollback savepoint " + (savepoint == null ? "" : "!") + "= null >>>>>>>>>>>>>>>>>>>>>>> \n\n");
- sqlExecutor.rollback(savepoint);
+ getSQLExecutor().rollback(savepoint);
}
@Override
public void commit() throws SQLException {
Log.d("\n\n" + TAG, "<<<<<<<<<<<<<<<<<<<<<<< commit >>>>>>>>>>>>>>>>>>>>>>> \n\n");
- sqlExecutor.commit();
+ getSQLExecutor().commit();
}
@Override
public void close() {
Log.d("\n\n" + TAG, "<<<<<<<<<<<<<<<<<<<<<<< close >>>>>>>>>>>>>>>>>>>>>>> \n\n");
- sqlExecutor.close();
+ getSQLExecutor().close();
}
/**开始事务
@@ -1535,6 +1523,7 @@ protected void onClose() {
// Log.d(TAG, "onClose >>");
close();
+ verifier = null;
sqlExecutor = null;
queryResultMap.clear();
queryResultMap = null;
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
index 7e21c0b21..ea163a480 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -12,12 +12,34 @@
import static apijson.RequestMethod.HEADS;
import static apijson.RequestMethod.POST;
import static apijson.RequestMethod.PUT;
+import static apijson.orm.Operation.DISALLOW;
+import static apijson.orm.Operation.EXIST;
+import static apijson.orm.Operation.INSERT;
+import static apijson.orm.Operation.MUST;
+import static apijson.orm.Operation.NECESSARY;
+import static apijson.orm.Operation.REFUSE;
+import static apijson.orm.Operation.REMOVE;
+import static apijson.orm.Operation.REPLACE;
+import static apijson.orm.Operation.TYPE;
+import static apijson.orm.Operation.UNIQUE;
+import static apijson.orm.Operation.UPDATE;
+import static apijson.orm.Operation.VERIFY;
+import java.net.URL;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.regex.Pattern;
import javax.activation.UnsupportedDataTypeException;
@@ -32,6 +54,7 @@
import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.StringUtil;
+import apijson.orm.AbstractSQLConfig.IdCallback;
import apijson.orm.exception.ConflictException;
import apijson.orm.exception.NotLoggedInException;
import apijson.orm.model.Access;
@@ -49,11 +72,12 @@
import apijson.orm.model.Test;
import apijson.orm.model.TestRecord;
-/**权限验证
+/**校验器(权限、请求参数、返回结果等)
+ * TODO 合并 Structure 的代码
* @author Lemon
* @param id 与 userId 的类型，一般为 Long
*/
-public abstract class AbstractVerifier implements Verifier {
+public abstract class AbstractVerifier implements Verifier, IdCallback {
private static final String TAG = "AbstractVerifier";
@@ -61,15 +85,16 @@ public abstract class AbstractVerifier implements Verifier {
// >
public static final Map> SYSTEM_ACCESS_MAP;
public static final Map> ACCESS_MAP;
- ;
+
+ public static final Map COMPILE_MAP;
static {
SYSTEM_ACCESS_MAP = new HashMap>();
+ SYSTEM_ACCESS_MAP.put(Access.class.getSimpleName(), getAccessMap(Access.class.getAnnotation(MethodAccess.class)));
SYSTEM_ACCESS_MAP.put(Function.class.getSimpleName(), getAccessMap(Function.class.getAnnotation(MethodAccess.class)));
SYSTEM_ACCESS_MAP.put(Request.class.getSimpleName(), getAccessMap(Request.class.getAnnotation(MethodAccess.class)));
SYSTEM_ACCESS_MAP.put(Response.class.getSimpleName(), getAccessMap(Response.class.getAnnotation(MethodAccess.class)));
SYSTEM_ACCESS_MAP.put(Test.class.getSimpleName(), getAccessMap(Test.class.getAnnotation(MethodAccess.class)));
- SYSTEM_ACCESS_MAP.put(Access.class.getSimpleName(), getAccessMap(Access.class.getAnnotation(MethodAccess.class)));
if (Log.DEBUG) {
SYSTEM_ACCESS_MAP.put(Table.class.getSimpleName(), getAccessMap(Table.class.getAnnotation(MethodAccess.class)));
@@ -85,6 +110,8 @@ public abstract class AbstractVerifier implements Verifier {
}
ACCESS_MAP = new HashMap<>(SYSTEM_ACCESS_MAP);
+
+ COMPILE_MAP = new HashMap();
}
/**获取权限Map，每种操作都只允许对应的角色
@@ -114,6 +141,19 @@ public String getVisitorIdKey(SQLConfig config) {
return config.getUserIdKey();
}
+ @Override
+ public String getIdKey(String database, String schema, String table) {
+ return apijson.JSONObject.KEY_ID;
+ }
+ @Override
+ public String getUserIdKey(String database, String schema, String table) {
+ return apijson.JSONObject.KEY_USER_ID;
+ }
+ @Override
+ public Object newId(RequestMethod method, String database, String schema, String table) {
+ return System.currentTimeMillis();
+ }
+
@NotNull
@@ -144,7 +184,17 @@ public AbstractVerifier setVisitor(Visitor visitor) {
* @return
* @throws Exception
*/
+ @Deprecated
public boolean verify(SQLConfig config) throws Exception {
+ return verifyAccess(config);
+ }
+ /**验证权限是否通过
+ * @param config
+ * @param visitor
+ * @return
+ * @throws Exception
+ */
+ public boolean verifyAccess(SQLConfig config) throws Exception {
String table = config == null ? null : config.getTable();
if (table == null) {
return true;
@@ -332,6 +382,7 @@ public void verifyAdmin() throws Exception {
/**验证是否重复
+ * FIXME 这个方法实际上没有被使用
* @param table
* @param key
* @param value
@@ -342,6 +393,7 @@ public void verifyRepeat(String table, String key, Object value) throws Exceptio
verifyRepeat(table, key, value, 0);
}
/**验证是否重复
+ * FIXME 这个方法实际上没有被使用，而且与 Structure.verifyRepeat 代码重复度比较高，需要简化
* @param table
* @param key
* @param value
@@ -360,18 +412,999 @@ public void verifyRepeat(String table, String key, Object value, long exceptId)
JSONRequest request = new JSONRequest(key, value);
if (exceptId > 0) {//允许修改自己的属性为该属性原来的值
- request.put(JSONRequest.KEY_ID + "!", exceptId);
+ request.put(JSONRequest.KEY_ID + "!", exceptId); // FIXME 这里 id 写死了，不支持自定义
}
- JSONObject repeat = createParser().setMethod(HEAD).setNeedVerify(true).parseResponse(
+ JSONObject repeat = createParser().setMethod(GET).setNeedVerify(true).parseResponse(
new JSONRequest(table, request)
);
repeat = repeat == null ? null : repeat.getJSONObject(table);
if (repeat == null) {
throw new Exception("服务器内部错误 verifyRepeat repeat == null");
}
- if (repeat.getIntValue(JSONResponse.KEY_COUNT) > 0) {
+ if (repeat.getIntValue(JSONResponse.KEY_CODE) > 0) {
throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");
}
}
+
+
+ /**从request提取target指定的内容
+ * @param method
+ * @param name
+ * @param target
+ * @param request
+ * @param maxUpdateCount
+ * @param idKey
+ * @param userIdKey
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public JSONObject verifyRequest(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject request, final int maxUpdateCount
+ , final String database, final String schema, final SQLCreator creator) throws Exception {
+ return verifyRequest(method, name, target, request, maxUpdateCount, database, schema, this, creator);
+ }
+
+ /**从request提取target指定的内容
+ * @param method
+ * @param name
+ * @param target
+ * @param request
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject verifyRequest(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject request, final SQLCreator creator) throws Exception {
+ return verifyRequest(method, name, target, request, Parser.MAX_UPDATE_COUNT, creator);
+ }
+ /**从request提取target指定的内容
+ * @param method
+ * @param name
+ * @param target
+ * @param request
+ * @param maxUpdateCount
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject verifyRequest(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject request, final int maxUpdateCount, final SQLCreator creator) throws Exception {
+ return verifyRequest(method, name, target, request, maxUpdateCount, null, null, null, creator);
+ }
+
+ /**从request提取target指定的内容
+ * @param method
+ * @param name
+ * @param target
+ * @param request
+ * @param maxUpdateCount
+ * @param idKey
+ * @param userIdKey
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject verifyRequest(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject request, final int maxUpdateCount
+ , final String database, final String schema, final IdCallback idCallback, final SQLCreator creator) throws Exception {
+
+ Log.i(TAG, "verifyRequest method = " + method + "; name = " + name
+ + "; target = \n" + JSON.toJSONString(target)
+ + "\n request = \n" + JSON.toJSONString(request));
+
+ if (target == null || request == null) {// || request.isEmpty()) {
+ Log.i(TAG, "verifyRequest target == null || request == null >> return null;");
+ return null;
+ }
+
+ //已在 Verifier 中处理
+ // if (RequestRole.get(request.getString(JSONRequest.KEY_ROLE)) == RequestRole.ADMIN) {
+ // throw new IllegalArgumentException("角色设置错误！不允许在写操作Request中传 " + name +
+ // ":{ " + JSONRequest.KEY_ROLE + ":admin } ！");
+ // }
+
+
+ //解析
+ return parse(method, name, target, request, database, schema, idCallback, creator, new OnParseCallback() {
+
+ @Override
+ public JSONObject onParseJSONObject(String key, JSONObject tobj, JSONObject robj) throws Exception {
+ // Log.i(TAG, "verifyRequest.parse.onParseJSONObject key = " + key + "; robj = " + robj);
+
+ if (robj == null) {
+ if (tobj != null) {//不允许不传Target中指定的Table
+ throw new IllegalArgumentException(method + "请求，请在 " + name + " 内传 " + key + ":{} ！");
+ }
+ } else if (apijson.JSONObject.isTableKey(key)) {
+ String db = request.getString(apijson.JSONObject.KEY_DATABASE);
+ String sh = request.getString(apijson.JSONObject.KEY_SCHEMA);
+ if (StringUtil.isEmpty(db, false)) {
+ db = database;
+ }
+ if (StringUtil.isEmpty(sh, false)) {
+ sh = schema;
+ }
+
+ String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, key);
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+
+ if (method == RequestMethod.POST) {
+ if (robj.containsKey(finalIdKey)) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key + " 不能传 " + finalIdKey + " ！");
+ }
+ } else {
+ if (RequestMethod.isQueryMethod(method) == false) {
+ verifyId(method.name(), name, key, robj, finalIdKey, maxUpdateCount, true);
+
+ String userIdKey = idCallback == null ? null : idCallback.getUserIdKey(db, sh, key);
+ String finalUserIdKey = StringUtil.isEmpty(userIdKey, false) ? apijson.JSONObject.KEY_USER_ID : userIdKey;
+ verifyId(method.name(), name, key, robj, finalUserIdKey, maxUpdateCount, false);
+ }
+ }
+ }
+
+ return verifyRequest(method, key, tobj, robj, maxUpdateCount, database, schema, idCallback, creator);
+ }
+
+ @Override
+ protected JSONArray onParseJSONArray(String key, JSONArray tarray, JSONArray rarray) throws Exception {
+ if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
+ if (rarray == null || rarray.isEmpty()) {
+ throw new IllegalArgumentException(method + "请求，请在 " + name + " 内传 " + key + ":[{ ... }] "
+ + "，批量新增 Table[]:value 中 value 必须是包含表对象的非空数组！其中每个子项 { ... } 都是"
+ + " tag:" + key.substring(0, key.length() - 2) + " 对应单个新增的 structure ！");
+ }
+ if (rarray.size() > maxUpdateCount) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + key + ":[{ ... }] 中 [] 的长度不能超过 " + maxUpdateCount + " ！");
+ }
+ }
+ return super.onParseJSONArray(key, tarray, rarray);
+ }
+ });
+
+ }
+
+ /**
+ * @param method
+ * @param name
+ * @param key
+ * @param robj
+ * @param idKey
+ * @param atLeastOne 至少有一个不为null
+ */
+ private static void verifyId(@NotNull String method, @NotNull String name, @NotNull String key
+ , @NotNull JSONObject robj, @NotNull String idKey, final int maxUpdateCount, boolean atLeastOne) {
+ //单个修改或删除
+ Object id = robj.get(idKey); //如果必须传 id ，可在Request表中配置NECESSARY
+ if (id != null && id instanceof Number == false && id instanceof String == false) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + idKey + ":value 中value的类型只能是 Long 或 String ！");
+ }
+
+
+ //批量修改或删除
+ String idInKey = idKey + "{}";
+
+ JSONArray idIn = null;
+ try {
+ idIn = robj.getJSONArray(idInKey); //如果必须传 id{} ，可在Request表中配置NECESSARY
+ } catch (Exception e) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + idInKey + ":value 中value的类型只能是 [Long] ！");
+ }
+ if (idIn == null) {
+ if (atLeastOne && id == null) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面 " + idKey + " 和 " + idInKey + " 至少传其中一个！");
+ }
+ } else {
+ if (idIn.size() > maxUpdateCount) { //不允许一次操作 maxUpdateCount 条以上记录
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + idInKey + ":[] 中[]的长度不能超过 " + maxUpdateCount + " ！");
+ }
+ //解决 id{}: ["1' OR 1='1'))--"] 绕过id{}限制
+ //new ArrayList(idIn) 不能检查类型，Java泛型擦除问题，居然能把 ["a"] 赋值进去还不报错
+ for (int i = 0; i < idIn.size(); i++) {
+ Object o = idIn.get(i);
+ if (o != null && o instanceof Number == false && o instanceof String == false) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + idInKey + ":[] 中所有项的类型都只能是 Long 或 String ！");
+ }
+ }
+ }
+ }
+
+
+ /**校验并将response转换为指定的内容和结构
+ * @param method
+ * @param name
+ * @param target
+ * @param response
+ * @param idKey
+ * @param callback
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public JSONObject verifyResponse(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject response, final String database, final String schema
+ , SQLCreator creator, OnParseCallback callback) throws Exception {
+ return verifyResponse(method, name, target, response, database, schema, this, creator, callback);
+ }
+
+ /**校验并将response转换为指定的内容和结构
+ * @param method
+ * @param name
+ * @param target
+ * @param response
+ * @param callback
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject verifyResponse(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject response, SQLCreator creator, OnParseCallback callback) throws Exception {
+ return verifyResponse(method, name, target, response, null, null, null, creator, callback);
+ }
+ /**校验并将response转换为指定的内容和结构
+ * @param method
+ * @param name
+ * @param target
+ * @param response
+ * @param idKey
+ * @param callback
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject verifyResponse(@NotNull final RequestMethod method, final String name
+ , final JSONObject target, final JSONObject response, final String database, final String schema
+ , final IdCallback idKeyCallback, SQLCreator creator, OnParseCallback callback) throws Exception {
+
+ Log.i(TAG, "verifyResponse method = " + method + "; name = " + name
+ + "; target = \n" + JSON.toJSONString(target)
+ + "\n response = \n" + JSON.toJSONString(response));
+
+ if (target == null || response == null) {// || target.isEmpty() {
+ Log.i(TAG, "verifyRequest target == null || response == null >> return response;");
+ return response;
+ }
+
+ //解析
+ return parse(method, name, target, response, database, schema, idKeyCallback, creator, callback != null ? callback : new OnParseCallback() {});
+ }
+
+
+ /**对request和response不同的解析用callback返回
+ * @param method
+ * @param name
+ * @param target
+ * @param real
+ * @param creator
+ * @param callback
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject parse(@NotNull final RequestMethod method, String name, JSONObject target, JSONObject real
+ , SQLCreator creator, @NotNull OnParseCallback callback) throws Exception {
+ return parse(method, name, target, real, null, null, null, creator, callback);
+ }
+
+ /**对request和response不同的解析用callback返回
+ * @param method
+ * @param name
+ * @param target
+ * @param real
+ * @param idKey
+ * @param userIdKey
+ * @param creator
+ * @param callback
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject parse(@NotNull final RequestMethod method, String name, JSONObject target, JSONObject real
+ , final String database, final String schema, final IdCallback idCallback, SQLCreator creator, @NotNull OnParseCallback callback) throws Exception {
+ if (target == null) {
+ return null;
+ }
+
+ //获取配置<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ JSONObject type = target.getJSONObject(TYPE.name());
+ JSONObject verify = target.getJSONObject(VERIFY.name());
+ JSONObject insert = target.getJSONObject(INSERT.name());
+ JSONObject update = target.getJSONObject(UPDATE.name());
+ JSONObject replace = target.getJSONObject(REPLACE.name());
+
+ String exist = StringUtil.getNoBlankString(target.getString(EXIST.name()));
+ String unique = StringUtil.getNoBlankString(target.getString(UNIQUE.name()));
+ String remove = StringUtil.getNoBlankString(target.getString(REMOVE.name()));
+ String must = StringUtil.getNoBlankString(target.getString(MUST.name()));
+ String refuse = StringUtil.getNoBlankString(target.getString(REFUSE.name()));
+ String necessary = StringUtil.getNoBlankString(target.getString(NECESSARY.name()));
+ String disallow = StringUtil.getNoBlankString(target.getString(DISALLOW.name()));
+
+ target.remove(TYPE.name());
+ target.remove(VERIFY.name());
+ target.remove(INSERT.name());
+ target.remove(UPDATE.name());
+ target.remove(REPLACE.name());
+
+ target.remove(EXIST.name());
+ target.remove(UNIQUE.name());
+ target.remove(REMOVE.name());
+ target.remove(MUST.name());
+ target.remove(REFUSE.name());
+ target.remove(NECESSARY.name());
+ target.remove(DISALLOW.name());
+
+
+
+ //移除字段<<<<<<<<<<<<<<<<<<<
+ String[] removes = StringUtil.split(remove);
+ if (removes != null && removes.length > 0) {
+ for (String r : removes) {
+ real.remove(r);
+ }
+ }
+ //移除字段>>>>>>>>>>>>>>>>>>>
+
+ //判断必要字段是否都有<<<<<<<<<<<<<<<<<<<
+ String[] musts = StringUtil.split(must);
+ List mustList = musts == null ? new ArrayList() : Arrays.asList(musts);
+ for (String s : mustList) {
+ if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不能缺少 " + s + " 等[" + must + "]内的任何字段！");
+ }
+ }
+
+ String[] necessarys = StringUtil.split(necessary);
+ List necessaryList = necessarys == null ? new ArrayList() : Arrays.asList(necessarys);
+ for (String s : necessaryList) {
+ if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不能缺少 " + s + " 等[" + necessary + "]内的任何字段！");
+ }
+ }
+ //判断必要字段是否都有>>>>>>>>>>>>>>>>>>>
+
+
+ Set objKeySet = new HashSet(); //不能用tableKeySet，仅判断 Table:{} 会导致 key:{ Table:{} } 绕过判断
+
+ //解析内容<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+ Set> set = new LinkedHashSet<>(target.entrySet());
+ if (set.isEmpty() == false) {
+
+ String key;
+ Object tvalue;
+ Object rvalue;
+ for (Entry entry : set) {
+ key = entry == null ? null : entry.getKey();
+ if (key == null) {
+ continue;
+ }
+ tvalue = entry.getValue();
+ rvalue = real.get(key);
+ if (callback.onParse(key, tvalue, rvalue) == false) {
+ continue;
+ }
+
+ if (tvalue instanceof JSONObject) { //JSONObject，往下一级提取
+ if (rvalue != null && rvalue instanceof JSONObject == false) {
+ throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 OBJECT ，结构为 {} !");
+ }
+ tvalue = callback.onParseJSONObject(key, (JSONObject) tvalue, (JSONObject) rvalue);
+
+ objKeySet.add(key);
+ } else if (tvalue instanceof JSONArray) { //JSONArray
+ if (rvalue != null && rvalue instanceof JSONArray == false) {
+ throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 ARRAY ，结构为 [] !");
+ }
+ tvalue = callback.onParseJSONArray(key, (JSONArray) tvalue, (JSONArray) rvalue);
+
+ if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
+ objKeySet.add(key);
+ }
+ } else {//其它Object
+ tvalue = callback.onParseObject(key, tvalue, rvalue);
+ }
+
+ if (tvalue != null) {//可以在target中加上一些不需要客户端传的键值对
+ real.put(key, tvalue);
+ }
+ }
+
+ }
+
+ //解析内容>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+ Set rkset = real.keySet(); //解析内容并没有改变rkset
+
+ //解析不允许的字段<<<<<<<<<<<<<<<<<<<
+ List refuseList = new ArrayList();
+ if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
+ for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
+ if (key != null && key.startsWith("@") == false
+ && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
+ refuseList.add(key);
+ }
+ }
+ } else {
+ String[] refuses = StringUtil.split(refuse);
+ if (refuses != null && refuses.length > 0) {
+ refuseList.addAll(Arrays.asList(refuses));
+ }
+ }
+
+ List disallowList = new ArrayList();
+ if ("!".equals(disallow)) {//所有非necessary，改成 !necessary 更好
+ for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
+ if (key != null && key.startsWith("@") == false
+ && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
+ disallowList.add(key);
+ }
+ }
+ } else {
+ String[] disallows = StringUtil.split(disallow);
+ if (disallows != null && disallows.length > 0) {
+ disallowList.addAll(Arrays.asList(disallows));
+ }
+ }
+ //解析不允许的字段>>>>>>>>>>>>>>>>>>>
+
+
+ //判断不允许传的key<<<<<<<<<<<<<<<<<<<<<<<<<
+ for (String rk : rkset) {
+ if (refuseList.contains(rk)) { //不允许的字段
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不允许传 " + rk + " 等" + StringUtil.getString(refuseList) + "内的任何字段！");
+ }
+ if (disallowList.contains(rk)) { //不允许的字段
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不允许传 " + rk + " 等" + StringUtil.getString(disallowList) + "内的任何字段！");
+ }
+
+ if (rk == null) { //无效的key
+ real.remove(rk);
+ continue;
+ }
+
+ Object rv = real.get(rk);
+
+ //不允许传远程函数，只能后端配置
+ if (rk.endsWith("()") && rv instanceof String) {
+ throw new UnsupportedOperationException(method + " 请求，" + rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
+ }
+
+ //不在target内的 key:{}
+ if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
+ if (rv instanceof JSONObject) {
+ throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");
+ }
+ if ((method == RequestMethod.POST || method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {
+ throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");
+ }
+ }
+ }
+ //判断不允许传的key>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+ //校验与修改Request<<<<<<<<<<<<<<<<<
+ //在tableKeySet校验后操作，避免 导致put/add进去的Table 被当成原Request的内容
+ real = operate(TYPE, type, real, creator);
+ real = operate(VERIFY, verify, real, creator);
+ real = operate(INSERT, insert, real, creator);
+ real = operate(UPDATE, update, real, creator);
+ real = operate(REPLACE, replace, real, creator);
+ //校验与修改Request>>>>>>>>>>>>>>>>>
+
+
+ String db = real.getString(apijson.JSONObject.KEY_DATABASE);
+ String sh = real.getString(apijson.JSONObject.KEY_SCHEMA);
+ if (StringUtil.isEmpty(db, false)) {
+ db = database;
+ }
+ if (StringUtil.isEmpty(sh, false)) {
+ sh = schema;
+ }
+ String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, name);
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+
+ //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
+ //校验存在<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
+ String[] exists = StringUtil.split(exist);
+ if (exists != null && exists.length > 0) {
+ long exceptId = real.getLongValue(finalIdKey);
+ for (String e : exists) {
+ verifyExist(name, e, real.get(e), exceptId, creator);
+ }
+ }
+ //校验存在>>>>>>>>>>>>>>>>>>>
+
+ //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
+ //校验重复<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
+ String[] uniques = StringUtil.split(unique);
+ if (uniques != null && uniques.length > 0) {
+ long exceptId = real.getLongValue(finalIdKey);
+ for (String u : uniques) {
+ verifyRepeat(name, u, real.get(u), exceptId, finalIdKey, creator);
+ }
+ }
+ //校验重复>>>>>>>>>>>>>>>>>>>
+
+
+ //还原 <<<<<<<<<<
+ target.put(TYPE.name(), type);
+ target.put(VERIFY.name(), verify);
+ target.put(INSERT.name(), insert);
+ target.put(UPDATE.name(), update);
+ target.put(REPLACE.name(), replace);
+
+ target.put(EXIST.name(), exist);
+ target.put(UNIQUE.name(), unique);
+ target.put(REMOVE.name(), remove);
+ target.put(MUST.name(), must);
+ target.put(REFUSE.name(), refuse);
+ target.put(NECESSARY.name(), necessary);
+ target.put(DISALLOW.name(), disallow);
+ //还原 >>>>>>>>>>
+
+ Log.i(TAG, "parse return real = " + JSON.toJSONString(real));
+ return real;
+ }
+
+
+
+ /**执行操作
+ * @param opt
+ * @param targetChild
+ * @param real
+ * @param creator
+ * @return
+ * @throws Exception
+ */
+ private static JSONObject operate(Operation opt, JSONObject targetChild, JSONObject real, SQLCreator creator) throws Exception {
+ if (targetChild == null) {
+ return real;
+ }
+ if (real == null) {
+ throw new IllegalArgumentException("operate real == null!!!");
+ }
+
+
+ Set> set = new LinkedHashSet<>(targetChild.entrySet());
+ String tk;
+ Object tv;
+
+ for (Entry e : set) {
+ tk = e == null ? null : e.getKey();
+ if (tk == null) {
+ continue;
+ }
+ tv = e.getValue();
+
+ if (opt == TYPE) {
+ verifyType(tk, tv, real);
+ }
+ else if (opt == VERIFY) {
+ verifyValue(tk, tv, real, creator);
+ }
+ else if (opt == UPDATE) {
+ real.put(tk, tv);
+ }
+ else {
+ if (real.containsKey(tk)) {
+ if (opt == REPLACE) {
+ real.put(tk, tv);
+ }
+ }
+ else {
+ if (opt == INSERT) {
+ real.put(tk, tv);
+ }
+ }
+ }
+ }
+
+ return real;
+ }
+
+
+ /**验证值类型
+ * @param tk
+ * @param tv {@link Operation}
+ * @param real
+ * @throws Exception
+ */
+ public static void verifyType(@NotNull String tk, Object tv, @NotNull JSONObject real) throws UnsupportedDataTypeException {
+ if (tv instanceof String == false) {
+ throw new UnsupportedDataTypeException("服务器内部错误，" + tk + ":value 的value不合法！"
+ + "Request表校验规则中 TYPE:{ key:value } 中的value只能是String类型！");
+ }
+
+ verifyType(tk, (String) tv, real.get(tk));
+ }
+ /**验证值类型
+ * @param tk
+ * @param tv {@link Operation}
+ * @param rv
+ * @throws Exception
+ */
+ public static void verifyType(@NotNull String tk, @NotNull String tv, Object rv) throws UnsupportedDataTypeException {
+ verifyType(tk, tv, rv, false);
+ }
+ /**验证值类型
+ * @param tk
+ * @param tv {@link Operation}
+ * @param rv
+ * @param isInArray
+ * @throws Exception
+ */
+ public static void verifyType(@NotNull String tk, @NotNull String tv, Object rv, boolean isInArray) throws UnsupportedDataTypeException {
+ if (rv == null) {
+ return;
+ }
+
+ if (tv.endsWith("[]")) {
+
+ verifyType(tk, "ARRAY", rv);
+
+ for (Object o : (Collection) rv) {
+ verifyType(tk, tv.substring(0, tv.length() - 2), o, true);
+ }
+
+ return;
+ }
+
+ //这里不抽取 enum，因为 enum 不能满足扩展需求，子类需要可以自定义，而且 URL[] 这种也不符合命名要求，得用 constructor + getter + setter
+ switch (tv) {
+ case "BOOLEAN": //Boolean.parseBoolean(real.getString(tk)); 只会判断null和true
+ if (rv instanceof Boolean == false) { //JSONObject.getBoolean 可转换Number类型
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 BOOLEAN" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "NUMBER": //整数
+ try {
+ Long.parseLong(rv.toString()); //1.23会转换为1 real.getLong(tk);
+ } catch (Exception e) {
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 NUMBER" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "DECIMAL": //小数
+ try {
+ Double.parseDouble(rv.toString());
+ } catch (Exception e) {
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 DECIMAL" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "STRING":
+ if (rv instanceof String == false) { //JSONObject.getString 可转换任何类型
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 STRING" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "URL": //网址，格式为 http://www.apijson.org, https://www.google.com 等
+ try {
+ new URL((String) rv);
+ } catch (Exception e) {
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 URL" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "DATE": //日期，格式为 YYYY-MM-DD（例如 2020-02-20）的 STRING
+ try {
+ LocalDate.parse((String) rv);
+ } catch (Exception e) {
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是格式为 YYYY-MM-DD（例如 2020-02-20）的 DATE" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "TIME": //时间，格式为 HH:mm:ss（例如 12:01:30）的 STRING
+ try {
+ LocalTime.parse((String) rv);
+ } catch (Exception e) {
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是格式为 HH:mm:ss（例如 12:01:30）的 TIME" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "DATETIME": //日期+时间，格式为 YYYY-MM-DDTHH:mm:ss（例如 2020-02-20T12:01:30）的 STRING
+ try {
+ LocalDateTime.parse((String) rv);
+ } catch (Exception e) {
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是格式为 YYYY-MM-DDTHH:mm:ss（例如 2020-02-20T12:01:30）的 DATETIME" + (isInArray ? "[] !" : " !"));
+ }
+ break;
+ case "OBJECT":
+ if (rv instanceof Map == false) { //JSONObject.getJSONObject 可转换String类型
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 OBJECT" + (isInArray ? "[] !" : " !") + " OBJECT 结构为 {} !");
+ }
+ break;
+ case "ARRAY":
+ if (rv instanceof Collection == false) { //JSONObject.getJSONArray 可转换String类型
+ throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 ARRAY" + (isInArray ? "[] !" : " !") + " ARRAY 结构为 [] !");
+ }
+ break;
+ //目前在业务表中还用不上，单一的类型校验已经够用
+ // case "JSON":
+ // try {
+ // com.alibaba.fastjson.JSON.parse(rv.toString());
+ // } catch (Exception e) {
+ // throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 JSON ！"
+ // + "也就是 {Object}, [Array] 或 它们对应的字符串 '{Object}', '[Array]' 4种中的一个 !");
+ // }
+ // break;
+ default:
+ throw new UnsupportedDataTypeException(
+ "服务器内部错误，类型 " + tv + " 不合法！Request表校验规则中 TYPE:{ key:value } 中的 value 必须是"
+ + " [ BOOLEAN, NUMBER, DECIMAL, STRING, URL, DATE, TIME, DATETIME, OBJECT, ARRAY ] 或它们的数组"
+ + " [ BOOLEAN[], NUMBER[], DECIMAL[], STRING[], URL[], DATE[], TIME[], DATETIME[], OBJECT[], ARRAY[] ] 中的一个!");
+ }
+
+ }
+
+
+ /**验证值
+ * @param tk
+ * @param tv
+ * @param real
+ * @param creator
+ * @throws Exception
+ */
+ private static void verifyValue(@NotNull String tk, @NotNull Object tv, @NotNull JSONObject real, SQLCreator creator) throws Exception {
+ if (tv == null) {
+ throw new IllegalArgumentException("operate operate == VERIFY " + tk + ":" + tv + " , >> tv == null!!!");
+ }
+
+ String rk;
+ Object rv;
+ Logic logic;
+ if (tk.endsWith("$")) { //搜索
+ verifyCondition("$", real, tk, tv, creator);
+ }
+ else if (tk.endsWith("~") || tk.endsWith("?")) { //TODO 正则表达式, 以后可能取消支持 ? 作为 正则匹配 的功能符
+ logic = new Logic(tk.substring(0, tk.length() - 1));
+ rk = logic.getKey();
+ rv = real.get(rk);
+ if (rv == null) {
+ return;
+ }
+
+ JSONArray array = AbstractSQLConfig.newJSONArray(tv);
+
+ boolean m;
+ boolean isOr = false;
+ Pattern reg;
+ for (Object r : array) {
+ if (r instanceof String == false) {
+ throw new UnsupportedDataTypeException(rk + ":" + rv + " 中value只支持 String 或 [String] 类型！");
+ }
+ reg = COMPILE_MAP.get(r);
+ if (reg == null) {
+ reg = Pattern.compile((String) r);
+ }
+ m = reg.matcher("" + rv).matches();
+ if (m) {
+ if (logic.isNot()) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
+ }
+ if (logic.isOr()) {
+ isOr = true;
+ break;
+ }
+ } else {
+ if (logic.isAnd()) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
+ }
+ }
+ }
+
+ if (isOr == false && logic.isOr()) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
+ }
+ }
+ else if (tk.endsWith("{}")) { //rv符合tv条件或在tv内
+ if (tv instanceof String) {//TODO >= 0, < 10
+ verifyCondition("{}", real, tk, tv, creator);
+ }
+ else if (tv instanceof JSONArray) {
+ logic = new Logic(tk.substring(0, tk.length() - 2));
+ rk = logic.getKey();
+ rv = real.get(rk);
+ if (rv == null) {
+ return;
+ }
+
+ if (((JSONArray) tv).contains(rv) == logic.isNot()) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
+ }
+ }
+ else {
+ throw new UnsupportedDataTypeException("服务器Request表verify配置错误！");
+ }
+ }
+ else if (tk.endsWith("<>")) { //rv包含tv内的值
+ logic = new Logic(tk.substring(0, tk.length() - 2));
+ rk = logic.getKey();
+ rv = real.get(rk);
+ if (rv == null) {
+ return;
+ }
+
+ if (rv instanceof JSONArray == false) {
+ throw new UnsupportedDataTypeException("服务器Request表verify配置错误！");
+ }
+
+ JSONArray array = AbstractSQLConfig.newJSONArray(tv);
+
+ boolean isOr = false;
+ for (Object o : array) {
+ if (((JSONArray) rv).contains(o)) {
+ if (logic.isNot()) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
+ }
+ if (logic.isOr()) {
+ isOr = true;
+ break;
+ }
+ } else {
+ if (logic.isAnd()) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
+ }
+ }
+ }
+
+ if (isOr == false && logic.isOr()) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
+ }
+ }
+ else {
+ throw new IllegalArgumentException("服务器Request表verify配置错误！");
+ }
+ }
+
+ /**通过数据库执行SQL语句来验证条件
+ * @param funChar
+ * @param real
+ * @param tk
+ * @param tv
+ * @param creator
+ * @throws Exception
+ */
+ private static void verifyCondition(@NotNull String funChar, @NotNull JSONObject real, @NotNull String tk, @NotNull Object tv
+ , @NotNull SQLCreator creator) throws Exception {
+ //不能用Parser, 0 这种不符合 StringUtil.isName !
+ Logic logic = new Logic(tk.substring(0, tk.length() - funChar.length()));
+ String rk = logic.getKey();
+ Object rv = real.get(rk);
+ if (rv == null) {
+ return;
+ }
+
+ if (rv instanceof String && ((String) rv).contains("'")) { // || key.contains("#") || key.contains("--")) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！value 中不允许有单引号 ' ！");
+ }
+
+ SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.GET).setCount(1).setPage(0);
+ config.setTest(true);
+ // config.setTable(Test.class.getSimpleName());
+ // config.setColumn(rv + logic.getChar() + funChar)
+ config.putWhere(rv + logic.getChar() + funChar, tv, false); // 字符串可能 SQL 注入，目前的解决方式是加 TYPE 校验类型或者干脆不用 sqlVerify，而是通过远程函数来校验
+ config.setCount(1);
+
+ SQLExecutor executor = creator.createSQLExecutor();
+ JSONObject result = null;
+ try {
+ result = executor.execute(config, false);
+ } finally {
+ executor.close();
+ }
+ if (result != null && JSONResponse.isExist(result.getIntValue(JSONResponse.KEY_CODE)) == false) {
+ throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 '" + tk + "': '" + tv + "' ！");
+ }
+ }
+
+
+ /**验证是否存在
+ * @param table
+ * @param key
+ * @param value
+ * @throws Exception
+ */
+ public static void verifyExist(String table, String key, Object value, long exceptId, @NotNull SQLCreator creator) throws Exception {
+ if (key == null || value == null) {
+ Log.e(TAG, "verifyExist key == null || value == null >> return;");
+ return;
+ }
+ if (value instanceof JSON) {
+ throw new UnsupportedDataTypeException(key + ":value 中value的类型不能为JSON！");
+ }
+
+
+ SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.HEAD).setCount(1).setPage(0);
+ config.setTable(table);
+ config.putWhere(key, value, false);
+
+ SQLExecutor executor = creator.createSQLExecutor();
+ try {
+ JSONObject result = executor.execute(config, false);
+ if (result == null) {
+ throw new Exception("服务器内部错误 verifyExist result == null");
+ }
+ if (result.getIntValue(JSONResponse.KEY_COUNT) <= 0) {
+ throw new ConflictException(key + ": " + value + " 不存在！如果必要请先创建！");
+ }
+ } finally {
+ executor.close();
+ }
+ }
+
+ /**验证是否重复
+ * @param table
+ * @param key
+ * @param value
+ * @throws Exception
+ */
+ public static void verifyRepeat(String table, String key, Object value, @NotNull SQLCreator creator) throws Exception {
+ verifyRepeat(table, key, value, 0, creator);
+ }
+
+ /**验证是否重复
+ * @param table
+ * @param key
+ * @param value
+ * @param exceptId 不包含id
+ * @throws Exception
+ */
+ public static void verifyRepeat(String table, String key, Object value, long exceptId, @NotNull SQLCreator creator) throws Exception {
+ verifyRepeat(table, key, value, exceptId, null, creator);
+ }
+
+ /**验证是否重复
+ * TODO 与 AbstractVerifier.verifyRepeat 代码重复，需要简化
+ * @param table
+ * @param key
+ * @param value
+ * @param exceptId 不包含id
+ * @param idKey
+ * @param creator
+ * @throws Exception
+ */
+ public static void verifyRepeat(String table, String key, Object value, long exceptId, String idKey, @NotNull SQLCreator creator) throws Exception {
+ if (key == null || value == null) {
+ Log.e(TAG, "verifyRepeat key == null || value == null >> return;");
+ return;
+ }
+ if (value instanceof JSON) {
+ throw new UnsupportedDataTypeException(key + ":value 中value的类型不能为JSON！");
+ }
+
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+
+ SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.GET).setCount(1).setPage(0);
+ config.setTable(table);
+ if (exceptId > 0) { //允许修改自己的属性为该属性原来的值
+ config.putWhere(finalIdKey + "!", exceptId, false);
+ }
+ config.putWhere(key, value, false);
+
+ SQLExecutor executor = creator.createSQLExecutor();
+ try {
+ JSONObject result = executor.execute(config, false);
+ if (result == null) {
+ throw new Exception("服务器内部错误 verifyRepeat result == null");
+ }
+ if (result.getIntValue(JSONResponse.KEY_CODE) > 0) {
+ throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");
+ }
+ } finally {
+ executor.close();
+ }
+ }
+
+
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/Structure.java b/APIJSONORM/src/main/java/apijson/orm/Structure.java
index 9f7d622d6..b5d146f90 100755
--- a/APIJSONORM/src/main/java/apijson/orm/Structure.java
+++ b/APIJSONORM/src/main/java/apijson/orm/Structure.java
@@ -5,64 +5,31 @@
package apijson.orm;
-import static apijson.orm.Operation.DISALLOW;
-import static apijson.orm.Operation.EXIST;
-import static apijson.orm.Operation.INSERT;
-import static apijson.orm.Operation.MUST;
-import static apijson.orm.Operation.NECESSARY;
-import static apijson.orm.Operation.REFUSE;
-import static apijson.orm.Operation.REMOVE;
-import static apijson.orm.Operation.REPLACE;
-import static apijson.orm.Operation.TYPE;
-import static apijson.orm.Operation.UNIQUE;
-import static apijson.orm.Operation.UPDATE;
-import static apijson.orm.Operation.VERIFY;
-
-import java.net.URL;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
import java.util.regex.Pattern;
import javax.activation.UnsupportedDataTypeException;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import apijson.JSON;
-import apijson.JSONResponse;
import apijson.Log;
import apijson.NotNull;
import apijson.RequestMethod;
-import apijson.StringUtil;
import apijson.orm.AbstractSQLConfig.Callback;
import apijson.orm.AbstractSQLConfig.IdCallback;
-import apijson.orm.exception.ConflictException;
-/**结构类。 TODO 重构为 AbstractContentVerifier implements ContentVerifier 或干脆整合进 AbstractVerifier
+/**结构类。已整合进 AbstractVerifier，最快 4.5.0 移除
* 增删改查: OPERATION(ADD,REPLACE,PUT,REMOVE) OPERATION:{key0:value0, key1:value1 ...}
* 对值校验: VERIFY:{key0:value0, key1:value1 ...} (key{}:range,key$:"%m%"等)
* 对值重复性校验: UNIQUE:"key0:, key1 ..." (UNIQUE:"phone,email" 等)
* @author Lemon
*/
+@Deprecated
public class Structure {
public static final String TAG = "Structure";
- public static final Map COMPILE_MAP;
- static {
- COMPILE_MAP = new HashMap();
- }
-
+ public static final Map COMPILE_MAP = AbstractVerifier.COMPILE_MAP;
private Structure() {}
@@ -110,135 +77,9 @@ public static JSONObject parseRequest(@NotNull final RequestMethod method, final
, final JSONObject target, final JSONObject request, final int maxUpdateCount
, final String database, final String schema, final IdCallback idCallback, final SQLCreator creator) throws Exception {
- Log.i(TAG, "parseRequest method = " + method + "; name = " + name
- + "; target = \n" + JSON.toJSONString(target)
- + "\n request = \n" + JSON.toJSONString(request));
-
- if (target == null || request == null) {// || request.isEmpty()) {
- Log.i(TAG, "parseRequest target == null || request == null >> return null;");
- return null;
- }
-
- //已在 Verifier 中处理
- // if (RequestRole.get(request.getString(JSONRequest.KEY_ROLE)) == RequestRole.ADMIN) {
- // throw new IllegalArgumentException("角色设置错误！不允许在写操作Request中传 " + name +
- // ":{ " + JSONRequest.KEY_ROLE + ":admin } ！");
- // }
-
-
- //解析
- return parse(method, name, target, request, database, schema, idCallback, creator, new OnParseCallback() {
-
- @Override
- public JSONObject onParseJSONObject(String key, JSONObject tobj, JSONObject robj) throws Exception {
- // Log.i(TAG, "parseRequest.parse.onParseJSONObject key = " + key + "; robj = " + robj);
-
- if (robj == null) {
- if (tobj != null) {//不允许不传Target中指定的Table
- throw new IllegalArgumentException(method + "请求，请在 " + name + " 内传 " + key + ":{} ！");
- }
- } else if (apijson.JSONObject.isTableKey(key)) {
- String db = request.getString(apijson.JSONObject.KEY_DATABASE);
- String sh = request.getString(apijson.JSONObject.KEY_SCHEMA);
- if (StringUtil.isEmpty(db, false)) {
- db = database;
- }
- if (StringUtil.isEmpty(sh, false)) {
- sh = schema;
- }
-
- String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, key);
- String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
-
- if (method == RequestMethod.POST) {
- if (robj.containsKey(finalIdKey)) {
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key + " 不能传 " + finalIdKey + " ！");
- }
- } else {
- if (RequestMethod.isQueryMethod(method) == false) {
- verifyId(method.name(), name, key, robj, finalIdKey, maxUpdateCount, true);
-
- String userIdKey = idCallback == null ? null : idCallback.getUserIdKey(db, sh, key);
- String finalUserIdKey = StringUtil.isEmpty(userIdKey, false) ? apijson.JSONObject.KEY_USER_ID : userIdKey;
- verifyId(method.name(), name, key, robj, finalUserIdKey, maxUpdateCount, false);
- }
- }
- }
-
- return parseRequest(method, key, tobj, robj, maxUpdateCount, database, schema, idCallback, creator);
- }
-
- @Override
- protected JSONArray onParseJSONArray(String key, JSONArray tarray, JSONArray rarray) throws Exception {
- if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
- if (rarray == null || rarray.isEmpty()) {
- throw new IllegalArgumentException(method + "请求，请在 " + name + " 内传 " + key + ":[{ ... }] "
- + "，批量新增 Table[]:value 中 value 必须是包含表对象的非空数组！其中每个子项 { ... } 都是"
- + " tag:" + key.substring(0, key.length() - 2) + " 对应单个新增的 structure ！");
- }
- if (rarray.size() > maxUpdateCount) {
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key
- + " 里面的 " + key + ":[{ ... }] 中 [] 的长度不能超过 " + maxUpdateCount + " ！");
- }
- }
- return super.onParseJSONArray(key, tarray, rarray);
- }
- });
-
- }
-
- /**
- * @param method
- * @param name
- * @param key
- * @param robj
- * @param idKey
- * @param atLeastOne 至少有一个不为null
- */
- private static void verifyId(@NotNull String method, @NotNull String name, @NotNull String key
- , @NotNull JSONObject robj, @NotNull String idKey, final int maxUpdateCount, boolean atLeastOne) {
- //单个修改或删除
- Object id = robj.get(idKey); //如果必须传 id ，可在Request表中配置NECESSARY
- if (id != null && id instanceof Number == false && id instanceof String == false) {
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key
- + " 里面的 " + idKey + ":value 中value的类型只能是 Long 或 String ！");
- }
-
-
- //批量修改或删除
- String idInKey = idKey + "{}";
-
- JSONArray idIn = null;
- try {
- idIn = robj.getJSONArray(idInKey); //如果必须传 id{} ，可在Request表中配置NECESSARY
- } catch (Exception e) {
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key
- + " 里面的 " + idInKey + ":value 中value的类型只能是 [Long] ！");
- }
- if (idIn == null) {
- if (atLeastOne && id == null) {
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key
- + " 里面 " + idKey + " 和 " + idInKey + " 至少传其中一个！");
- }
- } else {
- if (idIn.size() > maxUpdateCount) { //不允许一次操作 maxUpdateCount 条以上记录
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key
- + " 里面的 " + idInKey + ":[] 中[]的长度不能超过 " + maxUpdateCount + " ！");
- }
- //解决 id{}: ["1' OR 1='1'))--"] 绕过id{}限制
- //new ArrayList(idIn) 不能检查类型，Java泛型擦除问题，居然能把 ["a"] 赋值进去还不报错
- for (int i = 0; i < idIn.size(); i++) {
- Object o = idIn.get(i);
- if (o != null && o instanceof Number == false && o instanceof String == false) {
- throw new IllegalArgumentException(method + "请求，" + name + "/" + key
- + " 里面的 " + idInKey + ":[] 中所有项的类型都只能是 Long 或 String ！");
- }
- }
- }
+ return AbstractVerifier.verifyRequest(method, name, target, request, maxUpdateCount, database, schema, idCallback, creator);
}
-
-
/**校验并将response转换为指定的内容和结构
* @param method
* @param name
@@ -311,316 +152,11 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
*/
public static JSONObject parse(@NotNull final RequestMethod method, String name, JSONObject target, JSONObject real
, final String database, final String schema, final IdCallback idCallback, SQLCreator creator, @NotNull OnParseCallback callback) throws Exception {
- if (target == null) {
- return null;
- }
-
- //获取配置<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- JSONObject type = target.getJSONObject(TYPE.name());
- JSONObject verify = target.getJSONObject(VERIFY.name());
- JSONObject insert = target.getJSONObject(INSERT.name());
- JSONObject update = target.getJSONObject(UPDATE.name());
- JSONObject replace = target.getJSONObject(REPLACE.name());
-
- String exist = StringUtil.getNoBlankString(target.getString(EXIST.name()));
- String unique = StringUtil.getNoBlankString(target.getString(UNIQUE.name()));
- String remove = StringUtil.getNoBlankString(target.getString(REMOVE.name()));
- String must = StringUtil.getNoBlankString(target.getString(MUST.name()));
- String refuse = StringUtil.getNoBlankString(target.getString(REFUSE.name()));
- String necessary = StringUtil.getNoBlankString(target.getString(NECESSARY.name()));
- String disallow = StringUtil.getNoBlankString(target.getString(DISALLOW.name()));
-
- target.remove(TYPE.name());
- target.remove(VERIFY.name());
- target.remove(INSERT.name());
- target.remove(UPDATE.name());
- target.remove(REPLACE.name());
-
- target.remove(EXIST.name());
- target.remove(UNIQUE.name());
- target.remove(REMOVE.name());
- target.remove(MUST.name());
- target.remove(REFUSE.name());
- target.remove(NECESSARY.name());
- target.remove(DISALLOW.name());
-
-
-
- //移除字段<<<<<<<<<<<<<<<<<<<
- String[] removes = StringUtil.split(remove);
- if (removes != null && removes.length > 0) {
- for (String r : removes) {
- real.remove(r);
- }
- }
- //移除字段>>>>>>>>>>>>>>>>>>>
-
- //判断必要字段是否都有<<<<<<<<<<<<<<<<<<<
- String[] musts = StringUtil.split(must);
- List mustList = musts == null ? new ArrayList() : Arrays.asList(musts);
- for (String s : mustList) {
- if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不能缺少 " + s + " 等[" + must + "]内的任何字段！");
- }
- }
-
- String[] necessarys = StringUtil.split(necessary);
- List necessaryList = necessarys == null ? new ArrayList() : Arrays.asList(necessarys);
- for (String s : necessaryList) {
- if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不能缺少 " + s + " 等[" + necessary + "]内的任何字段！");
- }
- }
- //判断必要字段是否都有>>>>>>>>>>>>>>>>>>>
-
-
- Set objKeySet = new HashSet(); //不能用tableKeySet，仅判断 Table:{} 会导致 key:{ Table:{} } 绕过判断
-
- //解析内容<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
- Set> set = new LinkedHashSet<>(target.entrySet());
- if (set.isEmpty() == false) {
-
- String key;
- Object tvalue;
- Object rvalue;
- for (Entry entry : set) {
- key = entry == null ? null : entry.getKey();
- if (key == null) {
- continue;
- }
- tvalue = entry.getValue();
- rvalue = real.get(key);
- if (callback.onParse(key, tvalue, rvalue) == false) {
- continue;
- }
-
- if (tvalue instanceof JSONObject) { //JSONObject，往下一级提取
- if (rvalue != null && rvalue instanceof JSONObject == false) {
- throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 OBJECT ，结构为 {} !");
- }
- tvalue = callback.onParseJSONObject(key, (JSONObject) tvalue, (JSONObject) rvalue);
-
- objKeySet.add(key);
- } else if (tvalue instanceof JSONArray) { //JSONArray
- if (rvalue != null && rvalue instanceof JSONArray == false) {
- throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 ARRAY ，结构为 [] !");
- }
- tvalue = callback.onParseJSONArray(key, (JSONArray) tvalue, (JSONArray) rvalue);
-
- if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
- objKeySet.add(key);
- }
- } else {//其它Object
- tvalue = callback.onParseObject(key, tvalue, rvalue);
- }
-
- if (tvalue != null) {//可以在target中加上一些不需要客户端传的键值对
- real.put(key, tvalue);
- }
- }
-
- }
-
- //解析内容>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
-
-
- Set rkset = real.keySet(); //解析内容并没有改变rkset
-
- //解析不允许的字段<<<<<<<<<<<<<<<<<<<
- List refuseList = new ArrayList();
- if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
- for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
- if (key != null && key.startsWith("@") == false
- && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
- refuseList.add(key);
- }
- }
- } else {
- String[] refuses = StringUtil.split(refuse);
- if (refuses != null && refuses.length > 0) {
- refuseList.addAll(Arrays.asList(refuses));
- }
- }
-
- List disallowList = new ArrayList();
- if ("!".equals(disallow)) {//所有非necessary，改成 !necessary 更好
- for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
- if (key != null && key.startsWith("@") == false
- && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
- disallowList.add(key);
- }
- }
- } else {
- String[] disallows = StringUtil.split(disallow);
- if (disallows != null && disallows.length > 0) {
- disallowList.addAll(Arrays.asList(disallows));
- }
- }
- //解析不允许的字段>>>>>>>>>>>>>>>>>>>
-
-
- //判断不允许传的key<<<<<<<<<<<<<<<<<<<<<<<<<
- for (String rk : rkset) {
- if (refuseList.contains(rk)) { //不允许的字段
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不允许传 " + rk + " 等" + StringUtil.getString(refuseList) + "内的任何字段！");
- }
- if (disallowList.contains(rk)) { //不允许的字段
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不允许传 " + rk + " 等" + StringUtil.getString(disallowList) + "内的任何字段！");
- }
-
- if (rk == null) { //无效的key
- real.remove(rk);
- continue;
- }
-
- Object rv = real.get(rk);
-
- //不允许传远程函数，只能后端配置
- if (rk.endsWith("()") && rv instanceof String) {
- throw new UnsupportedOperationException(method + " 请求，" + rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
- }
-
- //不在target内的 key:{}
- if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
- if (rv instanceof JSONObject) {
- throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");
- }
- if ((method == RequestMethod.POST || method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {
- throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");
- }
- }
- }
- //判断不允许传的key>>>>>>>>>>>>>>>>>>>>>>>>>
-
-
-
- //校验与修改Request<<<<<<<<<<<<<<<<<
- //在tableKeySet校验后操作，避免 导致put/add进去的Table 被当成原Request的内容
- real = operate(TYPE, type, real, creator);
- real = operate(VERIFY, verify, real, creator);
- real = operate(INSERT, insert, real, creator);
- real = operate(UPDATE, update, real, creator);
- real = operate(REPLACE, replace, real, creator);
- //校验与修改Request>>>>>>>>>>>>>>>>>
-
-
- String db = real.getString(apijson.JSONObject.KEY_DATABASE);
- String sh = real.getString(apijson.JSONObject.KEY_SCHEMA);
- if (StringUtil.isEmpty(db, false)) {
- db = database;
- }
- if (StringUtil.isEmpty(sh, false)) {
- sh = schema;
- }
- String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, name);
- String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
-
- //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
- //校验存在<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
- String[] exists = StringUtil.split(exist);
- if (exists != null && exists.length > 0) {
- long exceptId = real.getLongValue(finalIdKey);
- for (String e : exists) {
- verifyExist(name, e, real.get(e), exceptId, creator);
- }
- }
- //校验存在>>>>>>>>>>>>>>>>>>>
-
- //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
- //校验重复<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
- String[] uniques = StringUtil.split(unique);
- if (uniques != null && uniques.length > 0) {
- long exceptId = real.getLongValue(finalIdKey);
- for (String u : uniques) {
- verifyRepeat(name, u, real.get(u), exceptId, finalIdKey, creator);
- }
- }
- //校验重复>>>>>>>>>>>>>>>>>>>
-
-
- //还原 <<<<<<<<<<
- target.put(TYPE.name(), type);
- target.put(VERIFY.name(), verify);
- target.put(INSERT.name(), insert);
- target.put(UPDATE.name(), update);
- target.put(REPLACE.name(), replace);
-
- target.put(EXIST.name(), exist);
- target.put(UNIQUE.name(), unique);
- target.put(REMOVE.name(), remove);
- target.put(MUST.name(), must);
- target.put(REFUSE.name(), refuse);
- target.put(NECESSARY.name(), necessary);
- target.put(DISALLOW.name(), disallow);
- //还原 >>>>>>>>>>
-
- Log.i(TAG, "parse return real = " + JSON.toJSONString(real));
- return real;
+ return AbstractVerifier.parse(method, name, target, real, database, schema, idCallback, creator, callback);
}
- /**执行操作
- * @param opt
- * @param targetChild
- * @param real
- * @param creator
- * @return
- * @throws Exception
- */
- private static JSONObject operate(Operation opt, JSONObject targetChild, JSONObject real, SQLCreator creator) throws Exception {
- if (targetChild == null) {
- return real;
- }
- if (real == null) {
- throw new IllegalArgumentException("operate real == null!!!");
- }
-
-
- Set> set = new LinkedHashSet<>(targetChild.entrySet());
- String tk;
- Object tv;
-
- for (Entry e : set) {
- tk = e == null ? null : e.getKey();
- if (tk == null) {
- continue;
- }
- tv = e.getValue();
-
- if (opt == TYPE) {
- type(tk, tv, real);
- }
- else if (opt == VERIFY) {
- verify(tk, tv, real, creator);
- }
- else if (opt == UPDATE) {
- real.put(tk, tv);
- }
- else {
- if (real.containsKey(tk)) {
- if (opt == REPLACE) {
- real.put(tk, tv);
- }
- }
- else {
- if (opt == INSERT) {
- real.put(tk, tv);
- }
- }
- }
- }
-
- return real;
- }
-
-
/**验证值类型
* @param tk
* @param tv {@link Operation}
@@ -652,262 +188,7 @@ public static void type(@NotNull String tk, @NotNull String tv, Object rv) throw
* @throws Exception
*/
public static void type(@NotNull String tk, @NotNull String tv, Object rv, boolean isInArray) throws UnsupportedDataTypeException {
- if (rv == null) {
- return;
- }
-
- if (tv.endsWith("[]")) {
-
- type(tk, "ARRAY", rv);
-
- for (Object o : (Collection) rv) {
- type(tk, tv.substring(0, tv.length() - 2), o, true);
- }
-
- return;
- }
-
- //这里不抽取 enum，因为 enum 不能满足扩展需求，子类需要可以自定义，而且 URL[] 这种也不符合命名要求，得用 constructor + getter + setter
- switch (tv) {
- case "BOOLEAN": //Boolean.parseBoolean(real.getString(tk)); 只会判断null和true
- if (rv instanceof Boolean == false) { //JSONObject.getBoolean 可转换Number类型
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 BOOLEAN" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "NUMBER": //整数
- try {
- Long.parseLong(rv.toString()); //1.23会转换为1 real.getLong(tk);
- } catch (Exception e) {
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 NUMBER" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "DECIMAL": //小数
- try {
- Double.parseDouble(rv.toString());
- } catch (Exception e) {
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 DECIMAL" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "STRING":
- if (rv instanceof String == false) { //JSONObject.getString 可转换任何类型
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 STRING" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "URL": //网址，格式为 http://www.apijson.org, https://www.google.com 等
- try {
- new URL((String) rv);
- } catch (Exception e) {
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 URL" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "DATE": //日期，格式为 YYYY-MM-DD（例如 2020-02-20）的 STRING
- try {
- LocalDate.parse((String) rv);
- } catch (Exception e) {
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是格式为 YYYY-MM-DD（例如 2020-02-20）的 DATE" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "TIME": //时间，格式为 HH:mm:ss（例如 12:01:30）的 STRING
- try {
- LocalTime.parse((String) rv);
- } catch (Exception e) {
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是格式为 HH:mm:ss（例如 12:01:30）的 TIME" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "DATETIME": //日期+时间，格式为 YYYY-MM-DDTHH:mm:ss（例如 2020-02-20T12:01:30）的 STRING
- try {
- LocalDateTime.parse((String) rv);
- } catch (Exception e) {
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是格式为 YYYY-MM-DDTHH:mm:ss（例如 2020-02-20T12:01:30）的 DATETIME" + (isInArray ? "[] !" : " !"));
- }
- break;
- case "OBJECT":
- if (rv instanceof Map == false) { //JSONObject.getJSONObject 可转换String类型
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 OBJECT" + (isInArray ? "[] !" : " !") + " OBJECT 结构为 {} !");
- }
- break;
- case "ARRAY":
- if (rv instanceof Collection == false) { //JSONObject.getJSONArray 可转换String类型
- throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 ARRAY" + (isInArray ? "[] !" : " !") + " ARRAY 结构为 [] !");
- }
- break;
- //目前在业务表中还用不上，单一的类型校验已经够用
- // case "JSON":
- // try {
- // com.alibaba.fastjson.JSON.parse(rv.toString());
- // } catch (Exception e) {
- // throw new UnsupportedDataTypeException(tk + ":value 的value不合法！类型必须是 JSON ！"
- // + "也就是 {Object}, [Array] 或 它们对应的字符串 '{Object}', '[Array]' 4种中的一个 !");
- // }
- // break;
- default:
- throw new UnsupportedDataTypeException(
- "服务器内部错误，类型 " + tv + " 不合法！Request表校验规则中 TYPE:{ key:value } 中的 value 必须是"
- + " [ BOOLEAN, NUMBER, DECIMAL, STRING, URL, DATE, TIME, DATETIME, OBJECT, ARRAY ] 或它们的数组"
- + " [ BOOLEAN[], NUMBER[], DECIMAL[], STRING[], URL[], DATE[], TIME[], DATETIME[], OBJECT[], ARRAY[] ] 中的一个!");
- }
-
- }
-
-
- /**验证值
- * @param tk
- * @param tv
- * @param real
- * @param creator
- * @throws Exception
- */
- private static void verify(@NotNull String tk, @NotNull Object tv, @NotNull JSONObject real, SQLCreator creator) throws Exception {
- if (tv == null) {
- throw new IllegalArgumentException("operate operate == VERIFY " + tk + ":" + tv + " , >> tv == null!!!");
- }
-
- String rk;
- Object rv;
- Logic logic;
- if (tk.endsWith("$")) { //搜索
- sqlVerify("$", real, tk, tv, creator);
- }
- else if (tk.endsWith("~") || tk.endsWith("?")) { //TODO 正则表达式, 以后可能取消支持 ? 作为 正则匹配 的功能符
- logic = new Logic(tk.substring(0, tk.length() - 1));
- rk = logic.getKey();
- rv = real.get(rk);
- if (rv == null) {
- return;
- }
-
- JSONArray array = AbstractSQLConfig.newJSONArray(tv);
-
- boolean m;
- boolean isOr = false;
- Pattern reg;
- for (Object r : array) {
- if (r instanceof String == false) {
- throw new UnsupportedDataTypeException(rk + ":" + rv + " 中value只支持 String 或 [String] 类型！");
- }
- reg = COMPILE_MAP.get(r);
- if (reg == null) {
- reg = Pattern.compile((String) r);
- }
- m = reg.matcher("" + rv).matches();
- if (m) {
- if (logic.isNot()) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
- }
- if (logic.isOr()) {
- isOr = true;
- break;
- }
- } else {
- if (logic.isAnd()) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
- }
- }
- }
-
- if (isOr == false && logic.isOr()) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
- }
- }
- else if (tk.endsWith("{}")) { //rv符合tv条件或在tv内
- if (tv instanceof String) {//TODO >= 0, < 10
- sqlVerify("{}", real, tk, tv, creator);
- }
- else if (tv instanceof JSONArray) {
- logic = new Logic(tk.substring(0, tk.length() - 2));
- rk = logic.getKey();
- rv = real.get(rk);
- if (rv == null) {
- return;
- }
-
- if (((JSONArray) tv).contains(rv) == logic.isNot()) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
- }
- }
- else {
- throw new UnsupportedDataTypeException("服务器Request表verify配置错误！");
- }
- }
- else if (tk.endsWith("<>")) { //rv包含tv内的值
- logic = new Logic(tk.substring(0, tk.length() - 2));
- rk = logic.getKey();
- rv = real.get(rk);
- if (rv == null) {
- return;
- }
-
- if (rv instanceof JSONArray == false) {
- throw new UnsupportedDataTypeException("服务器Request表verify配置错误！");
- }
-
- JSONArray array = AbstractSQLConfig.newJSONArray(tv);
-
- boolean isOr = false;
- for (Object o : array) {
- if (((JSONArray) rv).contains(o)) {
- if (logic.isNot()) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
- }
- if (logic.isOr()) {
- isOr = true;
- break;
- }
- } else {
- if (logic.isAnd()) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
- }
- }
- }
-
- if (isOr == false && logic.isOr()) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 " + tk + ":" + tv + " !");
- }
- }
- else {
- throw new IllegalArgumentException("服务器Request表verify配置错误！");
- }
- }
-
- /**通过数据库执行SQL语句来验证条件
- * @param funChar
- * @param real
- * @param tk
- * @param tv
- * @param creator
- * @throws Exception
- */
- private static void sqlVerify(@NotNull String funChar, @NotNull JSONObject real, @NotNull String tk, @NotNull Object tv
- , @NotNull SQLCreator creator) throws Exception {
- //不能用Parser, 0 这种不符合 StringUtil.isName !
- Logic logic = new Logic(tk.substring(0, tk.length() - funChar.length()));
- String rk = logic.getKey();
- Object rv = real.get(rk);
- if (rv == null) {
- return;
- }
-
- if (rv instanceof String && ((String) rv).contains("'")) { // || key.contains("#") || key.contains("--")) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！value 中不允许有单引号 ' ！");
- }
-
- SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.GET).setCount(1).setPage(0);
- config.setTest(true);
- // config.setTable(Test.class.getSimpleName());
- // config.setColumn(rv + logic.getChar() + funChar)
- config.putWhere(rv + logic.getChar() + funChar, tv, false); // 字符串可能 SQL 注入，目前的解决方式是加 TYPE 校验类型或者干脆不用 sqlVerify，而是通过远程函数来校验
- config.setCount(1);
-
- SQLExecutor executor = creator.createSQLExecutor();
- JSONObject result = null;
- try {
- result = executor.execute(config, false);
- } finally {
- executor.close();
- }
- if (result != null && JSONResponse.isExist(result.getIntValue(JSONResponse.KEY_CODE)) == false) {
- throw new IllegalArgumentException(rk + ":value 中value不合法！必须匹配 '" + tk + "': '" + tv + "' ！");
- }
+ AbstractVerifier.verifyType(tk, tv, rv, isInArray);
}
@@ -918,31 +199,7 @@ private static void sqlVerify(@NotNull String funChar, @NotNull JSONObject real,
* @throws Exception
*/
public static void verifyExist(String table, String key, Object value, long exceptId, @NotNull SQLCreator creator) throws Exception {
- if (key == null || value == null) {
- Log.e(TAG, "verifyExist key == null || value == null >> return;");
- return;
- }
- if (value instanceof JSON) {
- throw new UnsupportedDataTypeException(key + ":value 中value的类型不能为JSON！");
- }
-
-
- SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.HEAD).setCount(1).setPage(0);
- config.setTable(table);
- config.putWhere(key, value, false);
-
- SQLExecutor executor = creator.createSQLExecutor();
- try {
- JSONObject result = executor.execute(config, false);
- if (result == null) {
- throw new Exception("服务器内部错误 verifyExist result == null");
- }
- if (result.getIntValue(JSONResponse.KEY_COUNT) <= 0) {
- throw new ConflictException(key + ": " + value + " 不存在！如果必要请先创建！");
- }
- } finally {
- executor.close();
- }
+ AbstractVerifier.verifyExist(table, key, value, exceptId, creator);
}
/**验证是否重复
@@ -967,6 +224,7 @@ public static void verifyRepeat(String table, String key, Object value, long exc
}
/**验证是否重复
+ * TODO 与 AbstractVerifier.verifyRepeat 代码重复，需要简化
* @param table
* @param key
* @param value
@@ -976,35 +234,7 @@ public static void verifyRepeat(String table, String key, Object value, long exc
* @throws Exception
*/
public static void verifyRepeat(String table, String key, Object value, long exceptId, String idKey, @NotNull SQLCreator creator) throws Exception {
- if (key == null || value == null) {
- Log.e(TAG, "verifyRepeat key == null || value == null >> return;");
- return;
- }
- if (value instanceof JSON) {
- throw new UnsupportedDataTypeException(key + ":value 中value的类型不能为JSON！");
- }
-
- String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
-
- SQLConfig config = creator.createSQLConfig().setMethod(RequestMethod.HEAD).setCount(1).setPage(0);
- config.setTable(table);
- if (exceptId > 0) {//允许修改自己的属性为该属性原来的值
- config.putWhere(finalIdKey + "!", exceptId, false);
- }
- config.putWhere(key, value, false);
-
- SQLExecutor executor = creator.createSQLExecutor();
- try {
- JSONObject result = executor.execute(config, false);
- if (result == null) {
- throw new Exception("服务器内部错误 verifyRepeat result == null");
- }
- if (result.getIntValue(JSONResponse.KEY_COUNT) > 0) {
- throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");
- }
- } finally {
- executor.close();
- }
+ AbstractVerifier.verifyRepeat(table, key, value, exceptId, idKey, creator);
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/Verifier.java b/APIJSONORM/src/main/java/apijson/orm/Verifier.java
index f3e7c099d..b91549ec0 100755
--- a/APIJSONORM/src/main/java/apijson/orm/Verifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/Verifier.java
@@ -5,22 +5,32 @@
package apijson.orm;
+import com.alibaba.fastjson.JSONObject;
+
import apijson.NotNull;
import apijson.RequestMethod;
import apijson.RequestRole;
-/**权限验证器
+/**校验器(权限、请求参数、返回结果等)
* @author Lemon
*/
public interface Verifier {
- /**验证权限是否通过
+ /**验证权限是否通过，用 verifyAccess 替代，最早 4.5.0 移除
* @param config
* @param visitor
* @return
* @throws Exception
*/
+ @Deprecated
boolean verify(SQLConfig config) throws Exception;
+ /**验证权限是否通过
+ * @param config
+ * @param visitor
+ * @return
+ * @throws Exception
+ */
+ boolean verifyAccess(SQLConfig config) throws Exception;
/**允许请求，角色不好判断，让访问者发过来角色名，OWNER,CONTACT,ADMIN等
* @param table
@@ -62,15 +72,33 @@ public interface Verifier {
*/
void verifyRepeat(String table, String key, Object value, long exceptId) throws Exception;
+ /**验证请求参数的数据和结构
+ * @param table
+ * @param key
+ * @param value
+ * @param exceptId 不包含id
+ * @throws Exception
+ */
+ JSONObject verifyRequest(RequestMethod method, String name, JSONObject target, JSONObject request,
+ int maxUpdateCount, String globleDatabase, String globleSchema, SQLCreator creator) throws Exception;
+
+ /**验证返回结果的数据和结构
+ * @param table
+ * @param key
+ * @param value
+ * @param exceptId 不包含id
+ * @throws Exception
+ */
+ JSONObject verifyResponse(RequestMethod method, String name, JSONObject target, JSONObject response,
+ String database, String schema, SQLCreator creator, OnParseCallback callback) throws Exception;
+
@NotNull
Parser createParser();
-
@NotNull
Visitor getVisitor();
Verifier setVisitor(@NotNull Visitor visitor);
-
String getVisitorIdKey(SQLConfig config);
diff --git a/APIJSONORM/src/main/java/apijson/orm/model/TestRecord.java b/APIJSONORM/src/main/java/apijson/orm/model/TestRecord.java
index 0ab28d8f4..b8c519e75 100644
--- a/APIJSONORM/src/main/java/apijson/orm/model/TestRecord.java
+++ b/APIJSONORM/src/main/java/apijson/orm/model/TestRecord.java
@@ -13,7 +13,7 @@
import apijson.MethodAccess;
-/**条件测试
+/**测试结果。5.0.0 之后可能改名为 Test
* @author Lemon
*/
@MethodAccess(GET = { LOGIN, ADMIN }, HEAD = { LOGIN, ADMIN })
From a1a0316cf4584c8019c38f2ae3928db353ecd7df Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 29 Nov 2020 03:54:28 +0800
Subject: [PATCH 0035/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 38db498b5..fcca8d769 100644
--- a/README.md
+++ b/README.md
@@ -234,7 +234,7 @@ https://github.com/Tencent/APIJSON/issues?q=is%3Aissue+is%3Aclosed
https://github.com/Tencent/APIJSON/blob/master/Roadmap.md
理论上所有支持 SQL 与 JDBC/ODBC 的软件，都可以用本项目对接 CRUD，待测试: English
通用文档
视频教程
- 在线工具
+ 在线体验
From 9d4bd7b37f9f06ef90f4cb2823902daffc8345b5 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 2 Dec 2020 00:27:52 +0800
Subject: [PATCH 0054/1181] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20Windows=20mysql-?=
=?UTF-8?q?5.6.26-winx64=20=E7=AD=89=E4=BD=8E=E4=BA=8E=205.7=20=E7=9A=84?=
=?UTF-8?q?=20MySQL=20=E5=8F=AF=E8=83=BD=20id{}:=20[0]=20=E7=94=9F?=
=?UTF-8?q?=E6=88=90=20id=20IN(0)=20=E8=A7=A6=E5=8F=91=20MySQL=20bug=20?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=BF=BD=E7=95=A5=20IN=20=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/apijson/orm/AbstractVerifier.java | 21 ++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
index ea163a480..4f4c135dd 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -56,6 +56,7 @@
import apijson.StringUtil;
import apijson.orm.AbstractSQLConfig.IdCallback;
import apijson.orm.exception.ConflictException;
+import apijson.orm.exception.NotExistException;
import apijson.orm.exception.NotLoggedInException;
import apijson.orm.model.Access;
import apijson.orm.model.Column;
@@ -610,7 +611,25 @@ private static void verifyId(@NotNull String method, @NotNull String name, @NotN
//new ArrayList(idIn) 不能检查类型，Java泛型擦除问题，居然能把 ["a"] 赋值进去还不报错
for (int i = 0; i < idIn.size(); i++) {
Object o = idIn.get(i);
- if (o != null && o instanceof Number == false && o instanceof String == false) {
+ if (o == null) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + idInKey + ":[] 中所有项都不能为 [ null, <= 0 的数字, 空字符串 \"\" ] 中任何一个 ！");
+ }
+ if (o instanceof Number) {
+ //解决 Windows mysql-5.6.26-winx64 等低于 5.7 的 MySQL 可能 id{}: [0] 生成 id IN(0) 触发 MySQL bug 导致忽略 IN 条件
+ //例如 UPDATE `apijson`.`TestRecord` SET `testAccountId` = -1 WHERE ( (`id` IN (0)) AND (`userId`= 82001) )
+ if (((Number) o).longValue() <= 0) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + idInKey + ":[] 中所有项都不能为 [ null, <= 0 的数字, 空字符串 \"\" ] 中任何一个 ！");
+ }
+ }
+ else if (o instanceof String) {
+ if (StringUtil.isEmpty(o, true)) {
+ throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ + " 里面的 " + idInKey + ":[] 中所有项都不能为 [ null, <= 0 的数字, 空字符串 \"\" ] 中任何一个 ！");
+ }
+ }
+ else {
throw new IllegalArgumentException(method + "请求，" + name + "/" + key
+ " 里面的 " + idInKey + ":[] 中所有项的类型都只能是 Long 或 String ！");
}
From 1501954efe6319ca35162cc16e78ad948bb26102 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 2 Dec 2020 11:52:25 +0800
Subject: [PATCH 0055/1181] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index a3ebc4868..cdad5e63c 100644
--- a/README.md
+++ b/README.md
@@ -148,6 +148,8 @@ https://github.com/Tencent/APIJSON/wiki
* 使用安全简单 (自动增删改查、自动生成文档、自动校验权限、自动管理版本、自动防 SQL 注入 等)
* 灵活定制业务 (在后端编写 远程函数，可以拿到 session、version、当前 JSON 对象 等，然后自定义处理)
* 高质可靠代码 (代码工整规范、商业分析软件源伞 Pinpoint 代码扫描报告平均每行代码 bug 率低至 0.15%)
+* 兼容各种项目 (对各类 Web 框架集成友好且提供 SpringBoot, JFinal 的 Demo，协议不限 HTTP，与其它库无冲突)
+* 工程轻量小巧 (仅依赖 fastjson，Java 文件仅 59 个共 13719 行代码，Jar 仅 280KB，例如 APIJSONORM 4.3.1)
* 多年持续迭代 (自 2016 年开源至今已连续 4 年 2000+ Commits、70+ Releases，不断更新迭代中)
From 56318a3243f16229134d802058772c0164b34001 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 2 Dec 2020 11:53:48 +0800
Subject: [PATCH 0056/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index cdad5e63c..53ff11ddd 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ https://github.com/Tencent/APIJSON/wiki
* 灵活定制业务 (在后端编写 远程函数，可以拿到 session、version、当前 JSON 对象 等，然后自定义处理)
* 高质可靠代码 (代码工整规范、商业分析软件源伞 Pinpoint 代码扫描报告平均每行代码 bug 率低至 0.15%)
* 兼容各种项目 (对各类 Web 框架集成友好且提供 SpringBoot, JFinal 的 Demo，协议不限 HTTP，与其它库无冲突)
-* 工程轻量小巧 (仅依赖 fastjson，Java 文件仅 59 个共 13719 行代码，Jar 仅 280KB，例如 APIJSONORM 4.3.1)
+* 工程轻量小巧 (仅依赖 fastjson，Jar 仅 280KB，Java 文件仅 59 个共 13719 行代码，例如 APIJSONORM 4.3.1)
* 多年持续迭代 (自 2016 年开源至今已连续 4 年 2000+ Commits、70+ Releases，不断更新迭代中)
From 19e00de3eb106284225890cd7397fb59fcd75157 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 2 Dec 2020 11:58:58 +0800
Subject: [PATCH 0057/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 53ff11ddd..68948e2f6 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ https://github.com/Tencent/APIJSON/wiki
* 高质可靠代码 (代码工整规范、商业分析软件源伞 Pinpoint 代码扫描报告平均每行代码 bug 率低至 0.15%)
* 兼容各种项目 (对各类 Web 框架集成友好且提供 SpringBoot, JFinal 的 Demo，协议不限 HTTP，与其它库无冲突)
* 工程轻量小巧 (仅依赖 fastjson，Jar 仅 280KB，Java 文件仅 59 个共 13719 行代码，例如 APIJSONORM 4.3.1)
-* 多年持续迭代 (自 2016 年开源至今已连续 4 年 2000+ Commits、70+ Releases，不断更新迭代中)
+* 多年持续迭代 (自 2016 年开源至今已连续 4 年 2000+ Commits、70+ Releases，不断更新迭代中...)
### 常见问题
From 462dd34bb080f7389a5f1d51c62e4bcaa6b9d158 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 2 Dec 2020 12:03:11 +0800
Subject: [PATCH 0058/1181] Update README.md
---
README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 68948e2f6..4f215d138 100644
--- a/README.md
+++ b/README.md
@@ -135,17 +135,17 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
前后端 关于接口的 开发、文档、联调 等 10 大痛点解析
From bf891b7b1b088d9058e5a246d55d9c115d3c7747 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 10 Dec 2020 20:52:12 +0800
Subject: [PATCH 0066/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d15084822..0a74c3a4d 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ https://github.com/Tencent/APIJSON/wiki
* 腾讯官方开源 (使用 GitHub、Gitee、工蜂 等平台的官方账号开源，微信公众号、腾讯云+社区 等官方公告)
* 社区影响力大 (GitHub 9.2K Star 在 350W Java 项目中排名前 200，远超 FLAG, BAT 等国内外绝大部分开源项目)
* 各项荣誉成就 (腾讯开源五个第一、腾讯首个 GVP 获奖项目、腾讯后端项目 Star 第一、GitHub Java 周榜第一 等)
-* 多样用户案例 (内部用户包含 腾讯互娱、腾讯云与智慧，已登记外部用户包含 千亿资本国企、500 强上市公司 等)
+* 多样用户案例 (内部用户包含 腾讯互娱、腾讯云与智慧、腾讯音乐，已登记外部用户包含 500强上市公司、千亿资本国企 等)
* 适用场景广泛 (社交聊天、阅读资讯、影音视频、办公学习 等各种 App、网站、公众号、小程序 等非金融类项目)
* 周边生态丰富 (Android, iOS, Web 等各种 Demo、继承 JSON 的海量生态、零代码 接口测试 和 单元测试 工具等)
* 文档视频齐全 (项目介绍、快速上手、安装部署 等后端、前端、客户端的 图文解说、视频教程、代码注释 等)
From 65d00472287a3a9dcefc1ee0d291c2d1f1173448 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 10 Dec 2020 20:53:13 +0800
Subject: [PATCH 0067/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0a74c3a4d..040576c8d 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ https://github.com/Tencent/APIJSON/wiki
* 腾讯官方开源 (使用 GitHub、Gitee、工蜂 等平台的官方账号开源，微信公众号、腾讯云+社区 等官方公告)
* 社区影响力大 (GitHub 9.2K Star 在 350W Java 项目中排名前 200，远超 FLAG, BAT 等国内外绝大部分开源项目)
* 各项荣誉成就 (腾讯开源五个第一、腾讯首个 GVP 获奖项目、腾讯后端项目 Star 第一、GitHub Java 周榜第一 等)
-* 多样用户案例 (内部用户包含 腾讯互娱、腾讯云与智慧、腾讯音乐，已登记外部用户包含 500强上市公司、千亿资本国企 等)
+* 多样用户案例 (腾讯内部用户包含 互娱、云与智慧、音乐，已登记外部用户包含 500强上市公司、千亿资本国企 等)
* 适用场景广泛 (社交聊天、阅读资讯、影音视频、办公学习 等各种 App、网站、公众号、小程序 等非金融类项目)
* 周边生态丰富 (Android, iOS, Web 等各种 Demo、继承 JSON 的海量生态、零代码 接口测试 和 单元测试 工具等)
* 文档视频齐全 (项目介绍、快速上手、安装部署 等后端、前端、客户端的 图文解说、视频教程、代码注释 等)
From 173413f5fe412d79bd4c114cfd2148414fda0c1b Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 10 Dec 2020 20:55:32 +0800
Subject: [PATCH 0068/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 040576c8d..436706f50 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ https://github.com/Tencent/APIJSON/wiki
* 腾讯官方开源 (使用 GitHub、Gitee、工蜂 等平台的官方账号开源，微信公众号、腾讯云+社区 等官方公告)
* 社区影响力大 (GitHub 9.2K Star 在 350W Java 项目中排名前 200，远超 FLAG, BAT 等国内外绝大部分开源项目)
* 各项荣誉成就 (腾讯开源五个第一、腾讯首个 GVP 获奖项目、腾讯后端项目 Star 第一、GitHub Java 周榜第一 等)
-* 多样用户案例 (腾讯内部用户包含 互娱、云与智慧、音乐，已登记外部用户包含 500强上市公司、千亿资本国企 等)
+* 多样用户案例 (腾讯内部用户包含 互娱、音乐、云与智慧，外部用户包含 500强上市公司、数千亿资本国企 等)
* 适用场景广泛 (社交聊天、阅读资讯、影音视频、办公学习 等各种 App、网站、公众号、小程序 等非金融类项目)
* 周边生态丰富 (Android, iOS, Web 等各种 Demo、继承 JSON 的海量生态、零代码 接口测试 和 单元测试 工具等)
* 文档视频齐全 (项目介绍、快速上手、安装部署 等后端、前端、客户端的 图文解说、视频教程、代码注释 等)
From 48d8358597515f9cedaad4e7027aecbe20860b7a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 10 Dec 2020 20:56:24 +0800
Subject: [PATCH 0069/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 436706f50..c9d832af2 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ https://github.com/Tencent/APIJSON/wiki
* 腾讯官方开源 (使用 GitHub、Gitee、工蜂 等平台的官方账号开源，微信公众号、腾讯云+社区 等官方公告)
* 社区影响力大 (GitHub 9.2K Star 在 350W Java 项目中排名前 200，远超 FLAG, BAT 等国内外绝大部分开源项目)
* 各项荣誉成就 (腾讯开源五个第一、腾讯首个 GVP 获奖项目、腾讯后端项目 Star 第一、GitHub Java 周榜第一 等)
-* 多样用户案例 (腾讯内部用户包含 互娱、音乐、云与智慧，外部用户包含 500强上市公司、数千亿资本国企 等)
+* 多样用户案例 (腾讯内部用户包含 互娱、音乐、云与智慧，外部用户包含 500 强上市公司、数千亿资本国企 等)
* 适用场景广泛 (社交聊天、阅读资讯、影音视频、办公学习 等各种 App、网站、公众号、小程序 等非金融类项目)
* 周边生态丰富 (Android, iOS, Web 等各种 Demo、继承 JSON 的海量生态、零代码 接口测试 和 单元测试 工具等)
* 文档视频齐全 (项目介绍、快速上手、安装部署 等后端、前端、客户端的 图文解说、视频教程、代码注释 等)
From 0d56303ebf67ad723312e1ebd5ec703d258dd4a5 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 10 Dec 2020 20:59:30 +0800
Subject: [PATCH 0070/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c9d832af2..07ab86d12 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
- APIAuto 自动生成前端(客户端)请求代码、后端接口代码、测试用例代码，一键下载
+ APIAuto 自动生成前端(客户端)请求代码 和 Python 测试用例代码，一键下载
From b848b8228f67ea635dee4557cc354c8947d704c8 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 10 Dec 2020 21:10:56 +0800
Subject: [PATCH 0071/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 07ab86d12..ab659b326 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@ https://github.com/Tencent/APIJSON/wiki
* 解决十大痛点 (APIJSON 大幅提振开发效率、强力杜绝联调扯皮、巧妙规避文档缺陷、非常节省流量带宽 等)
* 开发提速巨大 (CRUD 零代码热更新自动化，APIJSONBoot 对比 SSM、SSH 等保守估计可提速 20 倍以上)
* 腾讯官方开源 (使用 GitHub、Gitee、工蜂 等平台的官方账号开源，微信公众号、腾讯云+社区 等官方公告)
-* 社区影响力大 (GitHub 9.2K Star 在 350W Java 项目中排名前 200，远超 FLAG, BAT 等国内外绝大部分开源项目)
+* 社区影响力大 (GitHub 9.3K Star 在 350W Java 项目中排名前 200，远超 FLAG, BAT 等国内外绝大部分开源项目)
* 各项荣誉成就 (腾讯开源五个第一、腾讯首个 GVP 获奖项目、腾讯后端项目 Star 第一、GitHub Java 周榜第一 等)
* 多样用户案例 (腾讯内部用户包含 互娱、音乐、云与智慧，外部用户包含 500 强上市公司、数千亿资本国企 等)
* 适用场景广泛 (社交聊天、阅读资讯、影音视频、办公学习 等各种 App、网站、公众号、小程序 等非金融类项目)
From f08b1397904ddf479d7ac39e84b5f91797e4b71f Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 12 Dec 2020 14:09:19 +0800
Subject: [PATCH 0072/1181] Update README.md
---
README.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index ab659b326..7aa2c5884 100644
--- a/README.md
+++ b/README.md
@@ -43,13 +43,13 @@ This source code is licensed under the Apache License Version 2.0
From ad4ff1a1c5d4df4a4305919aef8567c7bff3a701 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 12 Dec 2020 14:20:14 +0800
Subject: [PATCH 0075/1181] Update README.md
---
README.md | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index 444d5f1c5..5506cb7b5 100644
--- a/README.md
+++ b/README.md
@@ -134,22 +134,22 @@ APIJSON 是一种专为 API 而生的 JSON 网络传输协议 以及 基于这
前后端 关于接口的 开发、文档、联调 等 10 大痛点解析
@@ -134,9 +134,6 @@ APIJSON 是一种专为 API 而生的 JSON 网络传输协议 以及 基于这
前后端 关于接口的 开发、文档、联调 等 10 大痛点解析 list) {
public static final String KEY_GROUP = "@group"; //分组方式
public static final String KEY_HAVING = "@having"; //聚合函数条件，一般和@group一起用
public static final String KEY_ORDER = "@order"; //排序方式
+ public static final String KEY_RAW = "@raw"; // 自定义原始 SQL 片段
public static final String KEY_JSON = "@json"; //SQL Server 把字段转为 JSON 输出
- public static final String KEY_RAW = "@raw"; //自定义where条件拼接
public static final List TABLE_KEY_LIST;
static {
@@ -162,8 +162,8 @@ public JSONObject setUserIdIn(List list) {
TABLE_KEY_LIST.add(KEY_GROUP);
TABLE_KEY_LIST.add(KEY_HAVING);
TABLE_KEY_LIST.add(KEY_ORDER);
- TABLE_KEY_LIST.add(KEY_JSON);
TABLE_KEY_LIST.add(KEY_RAW);
+ TABLE_KEY_LIST.add(KEY_JSON);
}
//@key关键字都放这个类 >>>>>>>>>>>>>>>>>>>>>>
@@ -325,10 +325,29 @@ public JSONObject setOrder(String keys) {
return puts(KEY_ORDER, keys);
}
+ /**set keys to raw
+ * @param keys "key0,key1,key2..."
+ * @return
+ */
+ public JSONObject setRaw(String keys) {
+ return puts(KEY_RAW, keys);
+ }
+
/**set keys to cast to json
* @param keys "key0,key1,key2..."
* @return
*/
+ public JSONObject setJson(String keys) {
+ return puts(KEY_JSON, keys);
+ }
+
+ /**用 setJson 替代。
+ * set keys to cast to json
+ * @param keys "key0,key1,key2..."
+ * @return
+ * @see #{@link #setJson(String)}
+ */
+ @Deprecated
public JSONObject setJSON(String keys) {
return puts(KEY_JSON, keys);
}
diff --git a/APIJSONORM/src/main/java/apijson/StringUtil.java b/APIJSONORM/src/main/java/apijson/StringUtil.java
index c4f2474a2..7f8fa831c 100755
--- a/APIJSONORM/src/main/java/apijson/StringUtil.java
+++ b/APIJSONORM/src/main/java/apijson/StringUtil.java
@@ -736,6 +736,14 @@ public static String[] split(String s) {
public static String[] split(String s, String split) {
return split(s, split, true);
}
+ /**将s用split分割成String[]
+ * @param s
+ * @param trim 去掉前后两端的split
+ * @return
+ */
+ public static String[] split(String s, boolean trim) {
+ return split(s, null, trim);
+ }
/**将s用split分割成String[]
* @param s
* @param split
@@ -747,7 +755,7 @@ public static String[] split(String s, String split, boolean trim) {
if (s.isEmpty()) {
return null;
}
- if (isNotEmpty(split, false) == false) {
+ if (isEmpty(split, false)) {
split = ",";
}
if (trim) {
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index 892e87719..613b3b251 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -87,7 +87,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
public static final Map TABLE_KEY_MAP;
public static final List CONFIG_TABLE_LIST;
public static final List DATABASE_LIST;
- // 自定义where条件拼接
+ // 自定义原始 SQL 片段 Map：当 substring 为 null 时忽略；当 substring 为 "" 时整个 value 是 raw SQL；其它情况则只是 substring 这段为 raw SQL
public static final Map RAW_MAP;
static {
TABLE_KEY_MAP = new HashMap();
@@ -98,7 +98,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
TABLE_KEY_MAP.put(SysTable.class.getSimpleName(), SysTable.TABLE_NAME);
TABLE_KEY_MAP.put(SysColumn.class.getSimpleName(), SysColumn.TABLE_NAME);
TABLE_KEY_MAP.put(ExtendedProperty.class.getSimpleName(), ExtendedProperty.TABLE_NAME);
-
+
CONFIG_TABLE_LIST = new ArrayList<>(); // Table, Column 等是系统表 AbstractVerifier.SYSTEM_ACCESS_MAP.keySet());
CONFIG_TABLE_LIST.add(Function.class.getSimpleName());
CONFIG_TABLE_LIST.add(Request.class.getSimpleName());
@@ -107,7 +107,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
CONFIG_TABLE_LIST.add(Access.class.getSimpleName());
CONFIG_TABLE_LIST.add(Document.class.getSimpleName());
CONFIG_TABLE_LIST.add(TestRecord.class.getSimpleName());
-
+
DATABASE_LIST = new ArrayList<>();
DATABASE_LIST.add(DATABASE_MYSQL);
@@ -116,7 +116,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
DATABASE_LIST.add(DATABASE_ORACLE);
DATABASE_LIST.add(DATABASE_DB2);
- RAW_MAP = new HashMap<>();
+ RAW_MAP = new LinkedHashMap<>(); // 保证顺序，避免配置冲突等意外情况
}
@Override
@@ -152,6 +152,7 @@ public String getUserIdKey() {
private String group; //分组方式的字符串数组，','分隔
private String having; //聚合函数的字符串数组，','分隔
private String order; //排序方式的字符串数组，','分隔
+ private List raw; //需要保留原始 SQL 的字段，','分隔
private List json; //需要转为 JSON 的字段，','分隔
private Subquery from; //子查询临时表
private List column; //表内字段名(或函数名，仅查询操作可用)的字符串数组，','分隔
@@ -684,7 +685,7 @@ public String getOrderString(boolean hasPrefix) {
else {
sort = " ASC ";
}
-
+
String origin = index < 0 ? item : item.substring(0, index);
if (isPrepared()) { //不能通过 ? 来代替，SELECT 'id','name' 返回的就是 id:"id", name:"name"，而不是数据库里的值！
@@ -694,13 +695,53 @@ public String getOrderString(boolean hasPrefix) {
+ "每一项必须是 随机函数 rand() 或 column+ / column- 且其中 column 必须是 1 个单词！并且不要有多余的空格！");
}
}
-
+
keys[i] = getKey(origin) + sort;
}
return (hasPrefix ? " ORDER BY " : "") + StringUtil.concat(StringUtil.getString(keys), joinOrder, ", ");
}
+ @Override
+ public List getRaw() {
+ return raw;
+ }
+ @Override
+ public SQLConfig setRaw(List raw) {
+ this.raw = raw;
+ return this;
+ }
+
+ /**获取原始 SQL 片段
+ * @param key
+ * @param value
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public String getRawSQL(String key, Object value) throws Exception {
+ List rawList = getRaw();
+ boolean containRaw = rawList != null && rawList.contains(key);
+ if (containRaw && value instanceof String == false) {
+ throw new UnsupportedOperationException("@raw:value 的 value 中 " + key + " 不合法！"
+ + "对应的 " + key + ":value 中 value 类型只能为 String！");
+ }
+
+ String rawSQL = containRaw ? RAW_MAP.get(value) : null;
+ if (containRaw) {
+ if (rawSQL == null) {
+ throw new UnsupportedOperationException("@raw:value 的 value 中 " + key + " 不合法！"
+ + "对应的 " + key + ":value 中 value 值 " + value + " 未在后端 RAW_MAP 中配置 ！");
+ }
+
+ if ("".equals(rawSQL)) {
+ return (String) value;
+ }
+ }
+
+ return rawSQL;
+ }
+
@Override
public List getJson() {
@@ -823,6 +864,9 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
}
+ List raw = getRaw();
+ boolean containRaw = raw != null && raw.contains(KEY_COLUMN);
+
String expression;
String method = null;
@@ -832,13 +876,30 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
//fun(arg0,arg1,...)
expression = keys[i];
+ if (containRaw) {
+ if (RAW_MAP.containsValue(expression) || "".equals(RAW_MAP.get(expression))) { // newSQLConfig 提前处理好的
+ continue;
+ }
+
+ // 简单点， 后台配置就带上 AS
+// int index = expression.lastIndexOf(":");
+// String alias = expression.substring(index+1);
+// boolean hasAlias = StringUtil.isName(alias);
+// String pre = index > 0 && hasAlias ? expression.substring(0, index) : expression;
+// if (RAW_MAP.containsValue(pre) || "".equals(RAW_MAP.get(pre))) { // newSQLConfig 提前处理好的
+// expression = pre + (hasAlias ? " AS " + alias : "");
+// continue;
+// }
+ }
+
+
int start = expression.indexOf("(");
int end = 0;
if (start >= 0) {
end = expression.indexOf(")");
if (start >= end) {
throw new IllegalArgumentException("字符 " + expression + " 不合法！"
- + "@having:value 中 value 里的 SQL函数必须为 function(arg0,arg1,...) 这种格式！");
+ + "@column:value 中 value 里的 SQL函数必须为 function(arg0,arg1,...) 这种格式！");
}
method = expression.substring(0, start);
@@ -1383,7 +1444,7 @@ else if ("!".equals(ce.getKey())) {
//各种 JOIN 没办法统一用 & | ！连接，只能按优先级，和 @combine 一样?
for (Join j : joinList) {
String jt = j.getJoinType();
-
+
switch (jt) {
case "*": // CROSS JOIN
case "@": // APP JOIN
@@ -1409,7 +1470,7 @@ else if ("!".equals(ce.getKey())) {
boolean isAntiJoin = "(".equals(jt);
boolean isForeignJoin = ")".equals(jt);
boolean isWsEmpty = StringUtil.isEmpty(ws, true);
-
+
if (isWsEmpty) {
if (isOuterJoin) { // ! OUTER JOIN: ! (A | B)
throw new NotExistException("no result for ! OUTER JOIN( ! (A | B) ) when A or B is empty!");
@@ -1418,7 +1479,7 @@ else if ("!".equals(ce.getKey())) {
throw new NotExistException("no result for ) FOREIGN JOIN( B & ! A ) when A is empty!");
}
}
-
+
if (StringUtil.isEmpty(js, true)) {
if (isOuterJoin) { // ! OUTER JOIN: ! (A | B)
throw new NotExistException("no result for ! OUTER JOIN( ! (A | B) ) when A or B is empty!");
@@ -1426,7 +1487,7 @@ else if ("!".equals(ce.getKey())) {
if (isAntiJoin) { // ( ANTI JOIN: A & ! B
throw new NotExistException("no result for ( ANTI JOIN( A & ! B ) when B is empty!");
}
-
+
if (isWsEmpty) {
if (isSideJoin) {
throw new NotExistException("no result for ^ SIDE JOIN( ! (A & B) ) when both A and B are empty!");
@@ -1435,13 +1496,13 @@ else if ("!".equals(ce.getKey())) {
else {
if (isSideJoin || isForeignJoin) {
newWs += " ( " + getCondition(true, ws) + " ) ";
-
+
newPvl.addAll(pvl);
newPvl.addAll(jc.getPreparedValueList());
changed = true;
}
}
-
+
continue;
}
@@ -1484,7 +1545,7 @@ else if (isSideJoin) { // ^ SIDE JOIN: ! (A & B)
"join:value 中 value 里的 " + jt + "/" + j.getPath()
+ "错误！不支持 " + jt + " 等 [ @ APP, < LEFT, > RIGHT, * CROSS"
+ ", & INNER, | FULL, ! OUTER, ^ SIDE, ( ANTI, ) FOREIGN ] 之外的 JOIN 类型 !"
- );
+ );
}
}
@@ -1515,8 +1576,7 @@ private String getWhereItem(String key, Object value
, RequestMethod method, boolean verifyName) throws Exception {
Log.d(TAG, "getWhereItem key = " + key);
//避免筛选到全部 value = key == null ? null : where.get(key);
- if (key == null || value == null || key.endsWith("()")
- || (key.startsWith("@") && KEY_RAW.equals(key) == false)) { //关键字||方法, +或-直接报错
+ if (key == null || value == null || key.endsWith("()") || key.startsWith("@")) { //关键字||方法, +或-直接报错
Log.d(TAG, "getWhereItem key == null || value == null"
+ " || key.startsWith(@) || key.endsWith(()) >> continue;");
return null;
@@ -1526,6 +1586,9 @@ private String getWhereItem(String key, Object value
throw new IllegalArgumentException(TAG + ".getWhereItem: 字符 " + key + " 不合法！");
}
+ // 原始 SQL 片段
+ String rawSQL = getRawSQL(key, value);
+
int keyType;
if (key.endsWith("$")) {
keyType = 1;
@@ -1556,12 +1619,10 @@ else if (key.endsWith(">")) {
}
else if (key.endsWith("<")) {
keyType = 10;
- }
- else if (key.startsWith("@")) {
- keyType = 11;
- } else { //else绝对不能省，避免再次踩坑！ keyType = 0; 写在for循环外面都没注意！
+ } else { // else绝对不能省，避免再次踩坑！ keyType = 0; 写在for循环外面都没注意！
keyType = 0;
}
+
key = getRealKey(method, key, false, true, verifyName, getQuote());
switch (keyType) {
@@ -1571,46 +1632,26 @@ else if (key.startsWith("@")) {
case 2:
return getRegExpString(key, value, keyType < 0);
case 3:
- return getBetweenString(key, value);
+ return getBetweenString(key, value, rawSQL);
case 4:
- return getRangeString(key, value);
+ return getRangeString(key, value, rawSQL);
case 5:
return getExistsString(key, value);
case 6:
- return getContainString(key, value);
+ return getContainString(key, value, rawSQL);
case 7:
- return getCompareString(key, value, ">=");
+ return getCompareString(key, value, ">=", rawSQL);
case 8:
- return getCompareString(key, value, "<=");
+ return getCompareString(key, value, "<=", rawSQL);
case 9:
- return getCompareString(key, value, ">");
+ return getCompareString(key, value, ">", rawSQL);
case 10:
- return getCompareString(key, value, "<");
- case 11:
- return getRaw(key,value);
- default: //TODO MySQL JSON类型的字段对比 key='[]' 会无结果！ key LIKE '[1, 2, 3]' //TODO MySQL , 后面有空格！
+ return getCompareString(key, value, "<", rawSQL);
+ default: // TODO MySQL JSON类型的字段对比 key='[]' 会无结果！ key LIKE '[1, 2, 3]' //TODO MySQL , 后面有空格！
return getEqualString(key, value);
}
}
- @JSONField(serialize = false)
- public String getRaw(String key, Object value) throws Exception {
- if (JSON.isBooleanOrNumberOrString(value) == false && value instanceof Subquery == false) {
- throw new IllegalArgumentException(key + ":value 中value不合法！非PUT请求只支持 [Boolean, Number, String] 内的类型 ！");
- }
-
- String[] rawList = ((String)value).split(",");
- String whereItem = "";
- for (int i = 0; i < rawList.length; i++) {
- if(rawList.length>1&& i!=0){
- whereItem += " and " + RAW_MAP.get(rawList[i]);
- }else{
- whereItem += RAW_MAP.get(rawList[i]);
- }
- }
-
- return whereItem;
- }
@JSONField(serialize = false)
public String getEqualString(String key, Object value) throws Exception {
@@ -1630,7 +1671,7 @@ public String getEqualString(String key, Object value) throws Exception {
}
@JSONField(serialize = false)
- public String getCompareString(String key, Object value, String type) throws Exception {
+ public String getCompareString(String key, Object value, String type, String rawSQL) throws Exception {
if (JSON.isBooleanOrNumberOrString(value) == false && value instanceof Subquery == false) {
throw new IllegalArgumentException(key + type + ":value 中value不合法！比较运算 [>, <, >=, <=] 只支持 [Boolean, Number, String] 内的类型 ！");
}
@@ -1638,7 +1679,7 @@ public String getCompareString(String key, Object value, String type) throws Exc
throw new IllegalArgumentException(key + type + ":value 中key不合法！比较运算 [>, <, >=, <=] 不支持 [&, !, |] 中任何逻辑运算符 ！");
}
- return getKey(key) + " " + type + " " + (value instanceof Subquery ? getSubqueryString((Subquery) value) : getValue(value));
+ return getKey(key) + " " + type + " " + (value instanceof Subquery ? getSubqueryString((Subquery) value) : (rawSQL != null ? rawSQL : getValue(value)));
}
public String getKey(String key) {
@@ -1648,7 +1689,7 @@ public String getKey(String key) {
}
return getSQLValue(key).toString();
}
-
+
return getSQLKey(key);
}
public String getSQLKey(String key) {
@@ -1905,7 +1946,7 @@ public String getBetweenString(String key, Object start, Object end) throws Ille
* @throws Exception
*/
@JSONField(serialize = false)
- public String getRangeString(String key, Object range) throws Exception {
+ public String getRangeString(String key, Object range, String rawSQL) throws Exception {
Log.i(TAG, "getRangeString key = " + key);
if (range == null) {//依赖的对象都没有给出有效值，这个存在无意义。如果是客户端传的，那就能在客户端确定了。
throw new NotExistException(TAG + "getRangeString(" + key + ", " + range
@@ -1917,6 +1958,11 @@ public String getRangeString(String key, Object range) throws Exception {
Log.i(TAG, "getRangeString k = " + k);
if (range instanceof List) {
+ if (rawSQL != null) {
+ throw new UnsupportedOperationException("@raw:value 的 value 中 " + key + "{} 不合法！"
+ + "Raw SQL 不支持 key{}:[] 这种键值对！");
+ }
+
if (logic.isOr() || logic.isNot()) {
List l = (List) range;
if (logic.isNot() && l.isEmpty()) {
@@ -1927,13 +1973,43 @@ public String getRangeString(String key, Object range) throws Exception {
throw new IllegalArgumentException(key + "{}\":[] 中 {} 前面的逻辑运算符错误！只能用'|','!'中的一种 ！");
}
else if (range instanceof String) {//非Number类型需要客户端拼接成 < 'value0', >= 'value1'这种
- String[] cs = StringUtil.split((String) range);
String condition = "";
+ String[] cs = rawSQL != null ? null : StringUtil.split((String) range, false);
+
+ if (rawSQL != null) {
+ int index = rawSQL == null ? -1 : rawSQL.indexOf("(");
+ condition = (index >= 0 && index < rawSQL.indexOf(")") ? "" : getKey(k) + " ") + rawSQL;
+ }
+
+ // 还是只支持整段为 Raw SQL 比较好
+ // boolean appendRaw = false;
+ // if ("".equals(rawSQL)) {
+ // condition = rawSQL;
+ // cs = null;
+ // }
+ // else {
+ // if (rawSQL != null) { //先找出所有 rawSQL 的位置，然后去掉，再最后按原位置来拼接
+ // String[] rs = StringUtil.split((String) range, rawSQL, false);
+ //
+ // if (rs != null && rs.length > 0) {
+ // String cond = "";
+ // for (int i = 0; i < rs.length; i++) {
+ // cond += rs[i];
+ // }
+ // range = cond;
+ // appendRaw = true;
+ // }
+ // }
+ //
+ // cs = StringUtil.split((String) range, false);
+ // }
+
if (cs != null) {
String c;
int index;
for (int i = 0; i < cs.length; i++) {//对函数条件length(key)<=5这种不再在开头加key
c = cs[i];
+
if ("=null".equals(c)) {
c = SQL.isNull();
}
@@ -1946,9 +2022,9 @@ else if (isPrepared() && PATTERN_RANGE.matcher(c).matches() == false) {
}
index = c == null ? -1 : c.indexOf("(");
- condition += ((i <= 0 ? "" : (logic.isAnd() ? AND : OR))//连接方式
- + (index >= 0 && index < c.indexOf(")") ? "" : getKey(k) + " ")//函数和非函数条件
- + c);//单个条件
+ condition += ((i <= 0 ? "" : (logic.isAnd() ? AND : OR)) //连接方式
+ + (index >= 0 && index < c.indexOf(")") ? "" : getKey(k) + " ") //函数和非函数条件
+ + c); // 还是只支持整段为 Raw SQL 比较好 (appendRaw && index > 0 ? rawSQL : "") + c); //单个条件，如果有 Raw SQL 则按原来位置拼接
}
}
if (condition.isEmpty()) {
@@ -2020,7 +2096,7 @@ public String getExistsString(String key, Object value) throws Exception {
* @throws NotExistException
*/
@JSONField(serialize = false)
- public String getContainString(String key, Object value) throws IllegalArgumentException {
+ public String getContainString(String key, Object value, String rawSQL) throws IllegalArgumentException {
if (value == null) {
return "";
}
@@ -2267,7 +2343,7 @@ public static String getSQL(AbstractSQLConfig config) throws Exception {
String q = config.getQuote(); // 生成 SELECT ( (24 >=0 AND 24 <3) ) AS `code` LIMIT 1 OFFSET 0
return explain + "SELECT " + config.getWhereString(false) + " AS " + q + JSONResponse.KEY_CODE + q + config.getLimitString();
}
-
+
config.setPreparedValueList(new ArrayList());
String column = config.getColumnString();
return explain + "SELECT " + (config.getCache() == JSONRequest.CACHE_RAM ? "SQL_NO_CACHE " : "") + column + " FROM " + getConditionString(column, tablePath, config);
@@ -2411,7 +2487,7 @@ public String getJoinString() throws Exception {
"join:value 中 value 里的 " + jt + "/" + j.getPath()
+ "错误！不支持 " + jt + " 等 [ @ APP, < LEFT, > RIGHT, * CROSS"
+ ", & INNER, | FULL, ! OUTER, ^ SIDE, ( ANTI, ) FOREIGN ] 之外的 JOIN 类型 !"
- );
+ );
}
joinOns += " \n " + sql;
@@ -2533,6 +2609,7 @@ else if (id instanceof Subquery) {}
String group = request.getString(KEY_GROUP);
String having = request.getString(KEY_HAVING);
String order = request.getString(KEY_ORDER);
+ String raw = request.getString(KEY_RAW);
String json = request.getString(KEY_JSON);
//强制作为条件且放在最前面优化性能
@@ -2550,8 +2627,11 @@ else if (id instanceof Subquery) {}
request.remove(KEY_GROUP);
request.remove(KEY_HAVING);
request.remove(KEY_ORDER);
+ request.remove(KEY_RAW);
request.remove(KEY_JSON);
+ String[] rawArr = StringUtil.split(raw);
+ config.setRaw(rawArr == null || rawArr.length <= 0 ? null : new ArrayList<>(Arrays.asList(rawArr)));
Map tableWhere = new LinkedHashMap();//保证顺序好优化 WHERE id > 1 AND name LIKE...
@@ -2706,20 +2786,54 @@ else if (whereList != null && whereList.contains(key)) {
config.setContent(tableContent);
}
- boolean distinct = column == null ? false : column.startsWith(PREFFIX_DISTINCT);
List cs = new ArrayList<>();
- String[] fks = StringUtil.split(distinct ? column.substring(PREFFIX_DISTINCT.length()) : column, ";"); // key0,key1;fun0(key0,...);fun1(key0,...);key3;fun2(key0,...)
- if (fks != null) {
- String[] ks;
- for (String fk : fks) {
- if (fk.contains("(")) { //fun0(key0,...)
- cs.add(fk);
+
+ String rawColumnSQL = null;
+ List rawList = config.getRaw();
+ boolean containRaw = rawList != null && rawList.contains(KEY_COLUMN);
+
+ if (containRaw) {
+ try {
+ rawColumnSQL = config.getRawSQL(KEY_COLUMN, column);
+ if (rawColumnSQL != null) {
+ cs.add(rawColumnSQL);
}
- else { //key0,key1...
- ks = StringUtil.split(fk);
- if (ks != null && ks.length > 0) {
- cs.addAll(Arrays.asList(ks));
+ } catch (Exception e) {
+ Log.e(TAG, "newSQLConfig config instanceof AbstractSQLConfig >> try { "
+ + " rawColumnSQL = ((AbstractSQLConfig) config).getRawSQL(KEY_COLUMN, column); "
+ + "} catch (Exception e) = " + e.getMessage());
+ }
+ }
+
+ boolean distinct = column == null || rawColumnSQL != null ? false : column.startsWith(PREFFIX_DISTINCT);
+ if (rawColumnSQL == null) {
+ String[] fks = StringUtil.split(distinct ? column.substring(PREFFIX_DISTINCT.length()) : column, ";"); // key0,key1;fun0(key0,...);fun1(key0,...);key3;fun2(key0,...)
+ if (fks != null) {
+ String[] ks;
+ for (String fk : fks) {
+ if (containRaw) {
+ try {
+ String rawSQL = config.getRawSQL(KEY_COLUMN, fk);
+ if (rawSQL != null) {
+ cs.add(rawSQL);
+ continue;
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "newSQLConfig rawColumnSQL == null >> try { "
+ + " String rawSQL = ((AbstractSQLConfig) config).getRawSQL(KEY_COLUMN, fk); ... "
+ + "} catch (Exception e) = " + e.getMessage());
+ }
+ }
+
+ if (fk.contains("(")) { // fun0(key0,...)
+ cs.add(fk);
+ }
+ else { //key0,key1...
+ ks = StringUtil.split(fk);
+ if (ks != null && ks.length > 0) {
+ cs.addAll(Arrays.asList(ks));
+ }
}
}
}
@@ -2761,6 +2875,7 @@ else if (whereList != null && whereList.contains(key)) {
request.put(KEY_GROUP, group);
request.put(KEY_HAVING, having);
request.put(KEY_ORDER, order);
+ request.put(KEY_RAW, raw);
request.put(KEY_JSON, json);
return config;
@@ -2979,7 +3094,7 @@ public static interface IdCallback {
*/
String getUserIdKey(String database, String schema, String table);
}
-
+
public static interface Callback extends IdCallback {
/**获取 SQLConfig 的实例
* @param method
@@ -2989,7 +3104,7 @@ public static interface Callback extends IdCallback {
* @return
*/
SQLConfig getSQLConfig(RequestMethod method, String database, String schema, String table);
-
+
/**combine 里的 key 在 request 中 value 为 null 或不存在，即 request 中缺少用来作为 combine 条件的 key: value
* @param combine
* @param key
@@ -3015,7 +3130,7 @@ public String getIdKey(String database, String schema, String table) {
public String getUserIdKey(String database, String schema, String table) {
return KEY_USER_ID;
}
-
+
@Override
public void onMissingKey4Combine(String name, JSONObject request, String combine, String item, String key) throws Exception {
throw new IllegalArgumentException(name + ":{} 里的 @combine:value 中的value里 " + item + " 对应的条件 " + key + ":value 中 value 不能为 null！");
diff --git a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java
index c41c176df..ed466e2cf 100755
--- a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java
@@ -138,6 +138,9 @@ public interface SQLConfig {
String getTablePath();
+ List getRaw();
+ SQLConfig setRaw(List raw);
+
SQLConfig setTable(String table);
String getGroup();
@@ -164,8 +167,6 @@ public interface SQLConfig {
Map getContent();
SQLConfig setContent(Map content);
-
-
Map getWhere();
SQLConfig setWhere(Map where);
@@ -213,6 +214,8 @@ public interface SQLConfig {
String getWhereString(boolean hasPrefix) throws Exception;
+ String getRawSQL(String key, Object value) throws Exception;
+
boolean isKeyPrefix();
SQLConfig setKeyPrefix(boolean keyPrefix);
@@ -229,4 +232,5 @@ public interface SQLConfig {
SQLConfig setProcedure(String procedure);
+
}
From a215d49f309e1f3f6e1ee0617af74e9ea97919c2 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 13 Dec 2020 22:53:55 +0800
Subject: [PATCH 0084/1181] Update Document.md
---
Document.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Document.md b/Document.md
index 048695ecb..7196faa44 100644
--- a/Document.md
+++ b/Document.md
@@ -354,7 +354,7 @@ DELETE: content, bo
String setString = "";
if (set != null && set.size() > 0) {
- String quote = getQuote();
-
boolean isFirst = true;
int keyType;// 0 - =; 1 - +, 2 - -
Object value;
@@ -2244,7 +2241,7 @@ public String getSetString(RequestMethod method, Map content, bo
keyType = 0; //注意重置类型，不然不该加减的字段会跟着加减
}
value = content.get(key);
- key = getRealKey(method, key, false, true, verifyName, quote);
+ key = getRealKey(method, key, false, true, verifyName);
setString += (isFirst ? "" : ", ") + (getKey(key) + " = " + (keyType == 1 ? getAddString(key, value) : (keyType == 2
? getRemoveString(key, value) : getValue(value)) ) );
@@ -2967,8 +2964,8 @@ LEFT JOIN ( SELECT count(*) AS count FROM sys.Comment ) AS Comment ON Comment.m
* @return
*/
public static String getRealKey(RequestMethod method, String originKey
- , boolean isTableKey, boolean saveLogic, String quote) throws Exception {
- return getRealKey(method, originKey, isTableKey, saveLogic, true, quote);
+ , boolean isTableKey, boolean saveLogic) throws Exception {
+ return getRealKey(method, originKey, isTableKey, saveLogic, true);
}
/**获取客户端实际需要的key
* @param method
@@ -2979,11 +2976,10 @@ public static String getRealKey(RequestMethod method, String originKey
* @return
*/
public static String getRealKey(RequestMethod method, String originKey
- , boolean isTableKey, boolean saveLogic, boolean verifyName, String quote) throws Exception {
+ , boolean isTableKey, boolean saveLogic, boolean verifyName) throws Exception {
Log.i(TAG, "getRealKey saveLogic = " + saveLogic + "; originKey = " + originKey);
- if (originKey == null || originKey.startsWith(quote) || apijson.JSONObject.isArrayKey(originKey)) {
- Log.w(TAG, "getRealKey originKey == null || originKey.startsWith(`)"
- + " || apijson.JSONObject.isArrayKey(originKey) >> return originKey;");
+ if (originKey == null || apijson.JSONObject.isArrayKey(originKey)) {
+ Log.w(TAG, "getRealKey originKey == null || apijson.JSONObject.isArrayKey(originKey) >> return originKey;");
return originKey;
}
@@ -2991,7 +2987,7 @@ public static String getRealKey(RequestMethod method, String originKey
if (key.endsWith("$")) {//搜索 LIKE，查询时处理
key = key.substring(0, key.length() - 1);
}
- else if (key.endsWith("~") || key.endsWith("?")) {//匹配正则表达式 REGEXP，查询时处理 TODO ？可能以后会被废弃，全用 ~ 和 *~ 替代，更接近 PostgreSQL 语法
+ else if (key.endsWith("~")) {//匹配正则表达式 REGEXP，查询时处理
key = key.substring(0, key.length() - 1);
if (key.endsWith("*")) {//忽略大小写
key = key.substring(0, key.length() - 1);
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
index 4f4c135dd..9783918f6 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -56,7 +56,6 @@
import apijson.StringUtil;
import apijson.orm.AbstractSQLConfig.IdCallback;
import apijson.orm.exception.ConflictException;
-import apijson.orm.exception.NotExistException;
import apijson.orm.exception.NotLoggedInException;
import apijson.orm.model.Access;
import apijson.orm.model.Column;
@@ -1182,10 +1181,10 @@ private static void verifyValue(@NotNull String tk, @NotNull Object tv, @NotNull
String rk;
Object rv;
Logic logic;
- if (tk.endsWith("$")) { //搜索
+ if (tk.endsWith("$")) { // 模糊搜索
verifyCondition("$", real, tk, tv, creator);
}
- else if (tk.endsWith("~") || tk.endsWith("?")) { //TODO 正则表达式, 以后可能取消支持 ? 作为 正则匹配 的功能符
+ else if (tk.endsWith("~")) { // 正则匹配
logic = new Logic(tk.substring(0, tk.length() - 1));
rk = logic.getKey();
rv = real.get(rk);
From 3dc9dd1ce54e8572a96a49d428a1aa89df4194cc Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 01:37:31 +0800
Subject: [PATCH 0088/1181] =?UTF-8?q?@raw=20=E6=94=AF=E6=8C=81=20key:value?=
=?UTF-8?q?=20=E5=92=8C=20@having=EF=BC=9B@having=20=E5=92=8C=20@column=20?=
=?UTF-8?q?=E4=B8=80=E6=A0=B7=E6=94=AF=E6=8C=81=20function(arg,&char,!)=20?=
=?UTF-8?q?=E4=B8=AD=E5=8C=85=E5=90=AB=E4=B8=8D=E7=AC=A6=E5=90=88=20?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D=20=E7=9A=84=E5=AD=97?=
=?UTF-8?q?=E7=AC=A6=EF=BC=9B=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E5=92=8C?=
=?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/apijson/orm/AbstractParser.java | 4 +
.../java/apijson/orm/AbstractSQLConfig.java | 150 +++++++++++++-----
2 files changed, 112 insertions(+), 42 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
index 002fd9609..d8230e850 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -385,6 +385,10 @@ public JSONObject parseResponse(JSONObject request) {
requestObject.put("sql:generate|cache|execute|maxExecute", getSQLExecutor().getGeneratedSQLCount() + "|" + getSQLExecutor().getCachedSQLCount() + "|" + getSQLExecutor().getExecutedSQLCount() + "|" + getMaxSQLCount());
requestObject.put("depth:count|max", queryDepth + "|" + getMaxQueryDepth());
requestObject.put("time:start|duration|end", startTime + "|" + duration + "|" + endTime);
+ if (error != null) {
+ requestObject.put("throw", error.getClass().getName());
+ requestObject.put("trace", error.getStackTrace());
+ }
}
onClose();
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index 98fc29bb4..aa4639eb5 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -81,6 +81,10 @@ public abstract class AbstractSQLConfig implements SQLConfig {
public static String DEFAULT_SCHEMA = "sys";
public static String PREFFIX_DISTINCT = "DISTINCT ";
+ // * 和 / 不能同时出现，防止 /* */ 段注释！ # 和 -- 不能出现，防止行注释！ ; 不能出现，防止隔断SQL语句！空格不能出现，防止 CRUD,DROP,SHOW TABLES等语句！
+ private static final Pattern PATTERN_RANGE;
+ private static final Pattern PATTERN_FUNCTION;
+
/**
* 表名映射，隐藏真实表名，对安全要求很高的表可以这么做
*/
@@ -89,7 +93,11 @@ public abstract class AbstractSQLConfig implements SQLConfig {
public static final List DATABASE_LIST;
// 自定义原始 SQL 片段 Map：当 substring 为 null 时忽略；当 substring 为 "" 时整个 value 是 raw SQL；其它情况则只是 substring 这段为 raw SQL
public static final Map RAW_MAP;
- static {
+ static { // 凡是 SQL 边界符、分隔符、注释符 都不允许，例如 ' " ` ( ) ; # -- ，以免拼接 SQL 时被注入意外可执行指令
+ PATTERN_RANGE = Pattern.compile("^[0-9%,!=\\<\\>/\\.\\+\\-\\*\\^]+$"); // ^[a-zA-Z0-9_*%!=<>(),"]+$ 导致 exists(select*from(Comment)) 通过！
+ PATTERN_FUNCTION = Pattern.compile("^[A-Za-z0-9%,:_@&~!=\\<\\>\\|\\[\\]\\{\\} /\\.\\+\\-\\*\\^\\?\\$]+$"); //TODO 改成更好的正则，校验前面为单词，中间为操作符，后面为值
+
+
TABLE_KEY_MAP = new HashMap();
TABLE_KEY_MAP.put(Table.class.getSimpleName(), Table.TABLE_NAME);
TABLE_KEY_MAP.put(Column.class.getSimpleName(), Column.TABLE_NAME);
@@ -119,6 +127,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
RAW_MAP = new LinkedHashMap<>(); // 保证顺序，避免配置冲突等意外情况
}
+
@Override
public boolean limitSQLCount() {
return Log.DEBUG == false || AbstractVerifier.SYSTEM_ACCESS_MAP.containsKey(getTable()) == false;
@@ -487,7 +496,7 @@ public AbstractSQLConfig setHaving(String having) {
this.having = having;
return this;
}
- /**
+ /**TODO @having 改为默认 | 或连接，且支持 @having: { "key1>": 1, "key{}": "length(key2)>0", "@combine": "key1,key2" }
* @return HAVING conditoin0 AND condition1 OR condition2 ...
*/
@JSONField(serialize = false)
@@ -517,12 +526,17 @@ public String getHavingString(boolean hasPrefix) {
}
}
- having = StringUtil.getTrimedString(having);
- String[] keys = StringUtil.split(having, ";");
+ String[] keys = StringUtil.split(getHaving(), ";");
if (keys == null || keys.length <= 0) {
return StringUtil.isEmpty(joinHaving, true) ? "" : (hasPrefix ? " HAVING " : "") + joinHaving;
}
+
+ String quote = getQuote();
+ String tableAlias = getAliasWithQuote();
+ List raw = getRaw();
+ boolean containRaw = raw != null && raw.contains(KEY_HAVING);
+
String expression;
String method;
//暂时不允许 String prefix;
@@ -533,13 +547,31 @@ public String getHavingString(boolean hasPrefix) {
//fun(arg0,arg1,...)
expression = keys[i];
+ if (containRaw) {
+ try {
+ String rawSQL = getRawSQL(KEY_HAVING, expression);
+ if (rawSQL != null) {
+ keys[i] = rawSQL;
+ continue;
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "newSQLConfig rawColumnSQL == null >> try { "
+ + " String rawSQL = ((AbstractSQLConfig) config).getRawSQL(KEY_COLUMN, fk); ... "
+ + "} catch (Exception e) = " + e.getMessage());
+ }
+ }
+
+ if (expression.length() > 50) {
+ throw new UnsupportedOperationException("@having:value 的 value 中字符串 " + expression + " 不合法！"
+ + "不允许传超过 50 个字符的函数或表达式！请用 @raw 简化传参！");
+ }
int start = expression.indexOf("(");
if (start < 0) {
- if (isPrepared() && PATTERN_HAVING.matcher(expression).matches() == false) {
+ if (isPrepared() && PATTERN_FUNCTION.matcher(expression).matches() == false) {
throw new UnsupportedOperationException("字符串 " + expression + " 不合法！"
+ "预编译模式下 @having:\"column?value;function(arg0,arg1,...)?value...\""
- + " 中 column?value 必须符合正则表达式 ^[A-Za-z0-9%!=<>]+$ ！不允许空格！");
+ + " 中 column?value 必须符合正则表达式 " + PATTERN_FUNCTION + " 且不包含连续减号 -- ！不允许空格！");
}
continue;
}
@@ -560,24 +592,40 @@ public String getHavingString(boolean hasPrefix) {
suffix = expression.substring(end + 1, expression.length());
- if (isPrepared() && PATTERN_HAVING_SUFFIX.matcher((String) suffix).matches() == false) {
+ if (isPrepared() && (((String) suffix).contains("--") || PATTERN_RANGE.matcher((String) suffix).matches() == false)) {
throw new UnsupportedOperationException("字符串 " + suffix + " 不合法！"
+ "预编译模式下 @having:\"column?value;function(arg0,arg1,...)?value...\""
- + " 中 ?value 必须符合正则表达式 ^[0-9%!=<>]+$ ！不允许空格！");
+ + " 中 ?value 必须符合正则表达式 " + PATTERN_RANGE + " 且不包含连续减号 -- ！不允许多余的空格！");
}
String[] ckeys = StringUtil.split(expression.substring(start + 1, end));
if (ckeys != null) {
for (int j = 0; j < ckeys.length; j++) {
+ String origin = ckeys[j];
+
+ if (isPrepared()) {
+ if (origin.startsWith("_") || origin.contains("--") || PATTERN_FUNCTION.matcher(origin).matches() == false) {
+ throw new IllegalArgumentException("字符 " + ckeys[j] + " 不合法！"
+ + "预编译模式下 @having:\"column?value;function(arg0,arg1,...)?value...\""
+ + " 中所有 column, arg 都必须是1个不以 _ 开头的单词 或者 符合正则表达式 " + PATTERN_FUNCTION + " 且不包含连续减号 -- ！不允许多余的空格！");
+ }
+ }
- if (isPrepared() && (StringUtil.isName(ckeys[j]) == false || ckeys[j].startsWith("_"))) {
- throw new IllegalArgumentException("字符 " + ckeys[j] + " 不合法！"
- + "预编译模式下 @having:\"column?value;function(arg0,arg1,...)?value...\""
- + " 中所有 arg 都必须是1个不以 _ 开头的单词！并且不要有空格！");
+ //JOIN 副表不再在外层加副表名前缀 userId AS `Commet.userId`， 而是直接 userId AS `userId`
+ boolean isName = false;
+ if (StringUtil.isNumer(origin)) {
+ //do nothing
+ }
+ else if (StringUtil.isName(origin)) {
+ origin = quote + origin + quote;
+ isName = true;
+ }
+ else {
+ origin = getValue(origin).toString();
}
- ckeys[j] = getKey(ckeys[j]);
+ ckeys[j] = (isName && isKeyPrefix() ? tableAlias + "." : "") + origin;
}
}
@@ -876,8 +924,8 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
//fun(arg0,arg1,...)
expression = keys[i];
- if (containRaw) {
- if (RAW_MAP.containsValue(expression) || "".equals(RAW_MAP.get(expression))) { // newSQLConfig 提前处理好的
+ if (containRaw) { // 由于 HashMap 对 key 做了 hash 处理，所以 get 比 containsValue 更快
+ if ("".equals(RAW_MAP.get(expression)) || RAW_MAP.containsValue(expression)) { // newSQLConfig 提前处理好的
continue;
}
@@ -892,6 +940,11 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
// }
}
+ if (expression.length() > 50) {
+ throw new UnsupportedOperationException("@column:value 的 value 中字符串 " + expression + " 不合法！"
+ + "不允许传超过 50 个字符的函数或表达式！请用 @raw 简化传参！");
+ }
+
int start = expression.indexOf("(");
int end = 0;
@@ -944,10 +997,10 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
}
else {
// if ((StringUtil.isName(origin) == false || origin.startsWith("_"))) {
- if (origin.startsWith("_") || PATTERN_FUNCTION.matcher(origin).matches() == false) {
+ if (origin.startsWith("_") || origin.contains("--") || PATTERN_FUNCTION.matcher(origin).matches() == false) {
throw new IllegalArgumentException("字符 " + ckeys[j] + " 不合法！"
+ "预编译模式下 @column:\"column0,column1:alias;function0(arg0,arg1,...);function1(...):alias...\""
- + " 中所有 arg 都必须是1个不以 _ 开头的单词 或者符合正则表达式 " + PATTERN_FUNCTION + " ！DISTINCT 必须全大写，且后面必须有且只有 1 个空格！其它情况不允许空格！");
+ + " 中所有 arg 都必须是1个不以 _ 开头的单词 或者符合正则表达式 " + PATTERN_FUNCTION + " 且不包含连续减号 -- ！DISTINCT 必须全大写，且后面必须有且只有 1 个空格！其它情况不允许空格！");
}
}
}
@@ -1626,16 +1679,16 @@ else if (key.endsWith("<")) {
switch (keyType) {
case 1:
- return getSearchString(key, value);
+ return getSearchString(key, value, rawSQL);
case -2:
case 2:
- return getRegExpString(key, value, keyType < 0);
+ return getRegExpString(key, value, keyType < 0, rawSQL);
case 3:
return getBetweenString(key, value, rawSQL);
case 4:
return getRangeString(key, value, rawSQL);
case 5:
- return getExistsString(key, value);
+ return getExistsString(key, value, rawSQL);
case 6:
return getContainString(key, value, rawSQL);
case 7:
@@ -1647,13 +1700,13 @@ else if (key.endsWith("<")) {
case 10:
return getCompareString(key, value, "<", rawSQL);
default: // TODO MySQL JSON类型的字段对比 key='[]' 会无结果！ key LIKE '[1, 2, 3]' //TODO MySQL , 后面有空格！
- return getEqualString(key, value);
+ return getEqualString(key, value, rawSQL);
}
}
@JSONField(serialize = false)
- public String getEqualString(String key, Object value) throws Exception {
+ public String getEqualString(String key, Object value, String rawSQL) throws Exception {
if (JSON.isBooleanOrNumberOrString(value) == false && value instanceof Subquery == false) {
throw new IllegalArgumentException(key + ":value 中value不合法！非PUT请求只支持 [Boolean, Number, String] 内的类型 ！");
}
@@ -1666,7 +1719,7 @@ public String getEqualString(String key, Object value) throws Exception {
throw new IllegalArgumentException(key + ":value 中key不合法！不支持 ! 以外的逻辑符 ！");
}
- return getKey(key) + (not ? " != " : " = ") + (value instanceof Subquery ? getSubqueryString((Subquery) value) : getValue(value));
+ return getKey(key) + (not ? " != " : " = ") + (value instanceof Subquery ? getSubqueryString((Subquery) value) : (rawSQL != null ? rawSQL : getValue(value)));
}
@JSONField(serialize = false)
@@ -1729,7 +1782,10 @@ public AbstractSQLConfig setPreparedValueList(List preparedValueList) {
* @throws IllegalArgumentException
*/
@JSONField(serialize = false)
- public String getSearchString(String key, Object value) throws IllegalArgumentException {
+ public String getSearchString(String key, Object value, String rawSQL) throws IllegalArgumentException {
+ if (rawSQL != null) {
+ throw new UnsupportedOperationException("@raw:value 中 " + key + " 不合法！@raw 不支持 key$ 这种功能符 ！只支持 key, key!, key<, key{} 等比较运算 和 @column, @having ！");
+ }
if (value == null) {
return "";
}
@@ -1789,7 +1845,10 @@ public String getLikeString(String key, Object value) {
* @throws IllegalArgumentException
*/
@JSONField(serialize = false)
- public String getRegExpString(String key, Object value, boolean ignoreCase) throws IllegalArgumentException {
+ public String getRegExpString(String key, Object value, boolean ignoreCase, String rawSQL) throws IllegalArgumentException {
+ if (rawSQL != null) {
+ throw new UnsupportedOperationException("@raw:value 中 " + key + " 不合法！@raw 不支持 key~ 这种功能符 ！只支持 key, key!, key<, key{} 等比较运算 和 @column, @having ！");
+ }
if (value == null) {
return "";
}
@@ -1925,18 +1984,6 @@ public String getBetweenString(String key, Object start, Object end) throws Ille
//{} range <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- // * 和 / 不能同时出现，防止 /* */ 段注释！ # 和 -- 不能出现，防止行注释！ ; 不能出现，防止隔断SQL语句！空格不能出现，防止 CRUD,DROP,SHOW TABLES等语句！
- private static final Pattern PATTERN_RANGE;
- private static final Pattern PATTERN_FUNCTION;
- private static final Pattern PATTERN_HAVING;
- private static final Pattern PATTERN_HAVING_SUFFIX;
- static {
- PATTERN_RANGE = Pattern.compile("^[0-9%!=<>,]+$"); // ^[a-zA-Z0-9_*%!=<>(),"]+$ 导致 exists(select*from(Comment)) 通过！
- PATTERN_FUNCTION = Pattern.compile("^[A-Za-z0-9%-_:!=<> ]+$"); //TODO 改成更好的正则，校验前面为单词，中间为操作符，后面为值
- PATTERN_HAVING = Pattern.compile("^[A-Za-z0-9%!=<>]+$"); //TODO 改成更好的正则，校验前面为单词，中间为操作符，后面为值
- PATTERN_HAVING_SUFFIX = Pattern.compile("^[0-9%!=<>]+$"); // ^[a-zA-Z0-9_*%!=<>(),"]+$ 导致 exists(select*from(Comment)) 通过！
- }
-
/**WHERE key > 'key0' AND key <= 'key1' AND ...
* @param key
@@ -2070,7 +2117,10 @@ public String getInString(String key, Object[] in, boolean not) throws NotExistE
* @throws NotExistException
*/
@JSONField(serialize = false)
- public String getExistsString(String key, Object value) throws Exception {
+ public String getExistsString(String key, Object value, String rawSQL) throws Exception {
+ if (rawSQL != null) {
+ throw new UnsupportedOperationException("@raw:value 中 " + key + " 不合法！@raw 不支持 key}{ 这种功能符 ！只支持 key, key!, key<, key{} 等比较运算 和 @column, @having ！");
+ }
if (value == null) {
return "";
}
@@ -2562,6 +2612,22 @@ public static SQLConfig newSQLConfig(RequestMethod method, String table, String
}
}
+ if (idIn instanceof List) { // 排除掉 0, 负数, 空字符串 等无效 id 值
+ List ids = ((List) idIn);
+ List newIdIn = new ArrayList<>();
+ Object d;
+ for (int i = 0; i < ids.size(); i++) { //不用 idIn.contains(id) 因为 idIn 里存到很可能是 Integer，id 又是 Long！
+ d = ids.get(i);
+ if ((d instanceof Number && ((Number) d).longValue() > 0) || (d instanceof String && StringUtil.isNotEmpty(d, true))) {
+ newIdIn.add(d);
+ }
+ }
+ if (newIdIn.isEmpty()) {
+ throw new NotExistException(TAG + ": newSQLConfig idIn instanceof List >> 去掉无效 id 后 newIdIn.isEmpty()");
+ }
+ idIn = newIdIn;
+ }
+
//对id和id{}处理，这两个一定会作为条件
Object id = request.get(idKey);
if (id != null) { //null无效
@@ -2786,11 +2852,11 @@ else if (whereList != null && whereList.contains(key)) {
List cs = new ArrayList<>();
- String rawColumnSQL = null;
List rawList = config.getRaw();
- boolean containRaw = rawList != null && rawList.contains(KEY_COLUMN);
+ boolean containColumnRaw = rawList != null && rawList.contains(KEY_COLUMN);
- if (containRaw) {
+ String rawColumnSQL = null;
+ if (containColumnRaw) {
try {
rawColumnSQL = config.getRawSQL(KEY_COLUMN, column);
if (rawColumnSQL != null) {
@@ -2809,7 +2875,7 @@ else if (whereList != null && whereList.contains(key)) {
if (fks != null) {
String[] ks;
for (String fk : fks) {
- if (containRaw) {
+ if (containColumnRaw) {
try {
String rawSQL = config.getRawSQL(KEY_COLUMN, fk);
if (rawSQL != null) {
From b47140b477b2afa2874378ac25f5f62f7b959348 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 02:01:49 +0800
Subject: [PATCH 0089/1181] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?=E8=8C=83=E5=9B=B4=20key{}:"=E8=A1=A8=E8=BE=BE=E5=BC=8F"=20?=
=?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E8=BF=9E=E7=BB=AD=E5=87=8F=E5=8F=B7?=
=?UTF-8?q?=20--=EF=BC=9B=E5=8D=87=E7=BA=A7=E9=A1=B9=E7=9B=AE=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APIJSONORM/pom.xml | 2 +-
APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
index af8e3b3a3..3756b076f 100755
--- a/APIJSONORM/pom.xml
+++ b/APIJSONORM/pom.xml
@@ -5,7 +5,7 @@
apijson.orm
apijson-orm
- 4.3.0
+ 4.4.0
jar
APIJSONORM
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index aa4639eb5..9d306d2b9 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -2062,9 +2062,9 @@ else if (range instanceof String) {//非Number类型需要客户端拼接成 < '
else if ("!=null".equals(c)) {
c = SQL.isNull(false);
}
- else if (isPrepared() && PATTERN_RANGE.matcher(c).matches() == false) {
+ else if (isPrepared() && (c.contains("--") || PATTERN_RANGE.matcher(c).matches() == false)) {
throw new UnsupportedOperationException(key + "{}:value 的 value 中 " + c + " 不合法！"
- + "预编译模式下 key{}:\"condition\" 中 condition 必须 为 =null 或 !=null 或 符合正则表达式 ^[0-9%!=<>,]+$ ！不允许空格！");
+ + "预编译模式下 key{}:\"condition\" 中 condition 必须 为 =null 或 !=null 或 符合正则表达式 ^[0-9%!=<>,]+$ ！不允许连续减号 -- ！不允许空格！");
}
index = c == null ? -1 : c.indexOf("(");
From 7fa6ac181e4871e54f9215d2c2ec9726693bd219 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 02:05:31 +0800
Subject: [PATCH 0090/1181] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8D?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=8C=83=E5=9B=B4=E7=9A=84=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index 9d306d2b9..d621f17e8 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -2064,7 +2064,7 @@ else if ("!=null".equals(c)) {
}
else if (isPrepared() && (c.contains("--") || PATTERN_RANGE.matcher(c).matches() == false)) {
throw new UnsupportedOperationException(key + "{}:value 的 value 中 " + c + " 不合法！"
- + "预编译模式下 key{}:\"condition\" 中 condition 必须 为 =null 或 !=null 或 符合正则表达式 ^[0-9%!=<>,]+$ ！不允许连续减号 -- ！不允许空格！");
+ + "预编译模式下 key{}:\"condition\" 中 condition 必须 为 =null 或 !=null 或 符合正则表达式 " + PATTERN_RANGE + " ！不允许连续减号 -- ！不允许空格！");
}
index = c == null ? -1 : c.indexOf("(");
From 81656d852d99a9e3cec26f6261796b86bffc09cb Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 15:43:28 +0800
Subject: [PATCH 0091/1181] Update Document.md
---
Document.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Document.md b/Document.md
index 0110e5521..df4a6bcba 100644
--- a/Document.md
+++ b/Document.md
@@ -1,5 +1,5 @@
# APIJSON通用文档
-后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)
+后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)（如果和本文档有出入，以本文档为准）
* ### [1.示例](#1)
* ### [2.对比传统方式](#2)
From 12489963e19ea7f9024c42c74ed6648ea5162634 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 15:45:20 +0800
Subject: [PATCH 0092/1181] Update Document.md
---
Document.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Document.md b/Document.md
index df4a6bcba..a5718483a 100644
--- a/Document.md
+++ b/Document.md
@@ -1,5 +1,5 @@
# APIJSON通用文档
-后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)（如果和本文档有出入，以本文档为准）
+后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)（如果和本文档有出入，以本文档为准，例如 key? 以废弃，全面用 key~ 替代）
* ### [1.示例](#1)
* ### [2.对比传统方式](#2)
From 0ae912e8a563d36a1ba4aa159fa892bce76a542a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 15:45:34 +0800
Subject: [PATCH 0093/1181] Update Document.md
---
Document.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Document.md b/Document.md
index a5718483a..a239f30ef 100644
--- a/Document.md
+++ b/Document.md
@@ -1,5 +1,5 @@
# APIJSON通用文档
-后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)（如果和本文档有出入，以本文档为准，例如 key? 以废弃，全面用 key~ 替代）
+后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)（如果和本文档有出入，以本文档为准，例如 key? 已废弃，全面用 key~ 替代）
* ### [1.示例](#1)
* ### [2.对比传统方式](#2)
From cb72eda29cf1cfb6566c2513af9ad75e9fd4ebaf Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 15:46:15 +0800
Subject: [PATCH 0094/1181] Update Document.md
---
Document.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Document.md b/Document.md
index a239f30ef..061e98e42 100644
--- a/Document.md
+++ b/Document.md
@@ -1,5 +1,5 @@
# APIJSON通用文档
-后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)（如果和本文档有出入，以本文档为准，例如 key? 已废弃，全面用 key~ 替代）
+后端开发者可以先看这个详细的 [图文入门教程](https://vincentcheng.github.io/apijson-doc/zh)（如果和本文档有出入，以本文档为准，例如正则匹配 key? 已废弃，全面用 key~ 替代）
* ### [1.示例](#1)
* ### [2.对比传统方式](#2)
From 183f05a06a7b49b286c354db2c51c63196933488 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 16:11:11 +0800
Subject: [PATCH 0095/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e49e6b6f3..d951bcc8a 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ This source code is licensed under the Apache License Version 2.0 English
通用文档
视频教程
- 在线体验
+ 在线体验
From 2179b56dc5c0e7f68aaee1ad06e6c51fc5c5ef29 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 14 Dec 2020 17:56:59 +0800
Subject: [PATCH 0096/1181] Update README-English.md
---
README-English.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README-English.md b/README-English.md
index aee69a6c0..67223f81a 100644
--- a/README-English.md
+++ b/README-English.md
@@ -33,7 +33,7 @@ This source code is licensed under the Apache License Version 2.0 中文版
Document
Video
- Test
+ Test
From 9bb8e5b4211e3913d13a468d4f59e7204f6881f4 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 18 Dec 2020 10:38:14 +0800
Subject: [PATCH 0097/1181] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index d951bcc8a..363bcda73 100644
--- a/README.md
+++ b/README.md
@@ -296,9 +296,9 @@ QQ 技术群： 734652054（新）、607020115（旧）
[apijson-framework](https://github.com/APIJSON/apijson-framework) APIJSON 服务端框架，可通过 Maven, Gradle 等远程依赖
-[APIAuto](https://github.com/TommyLemon/APIAuto) 机器学习测试、自动生成代码、自动静态检查、自动生成文档与注释等，做最先进的接口管理工具
+[APIAuto](https://github.com/TommyLemon/APIAuto) 敏捷开发最强大易用的 HTTP 接口工具，机器学习零代码测试、生成代码与静态检查、生成文档与光标悬浮注释
-[UnitAuto](https://github.com/TommyLemon/UnitAuto) 机器学习自动化单元测试平台，零代码、全方位、自动化 测试 方法/函数 的正确性和可用性
+[UnitAuto](https://github.com/TommyLemon/UnitAuto) 机器学习单元测试平台，零代码、全方位、自动化 测试 方法/函数 的正确性和可用性
[apijson-doc](https://github.com/vincentCheng/apijson-doc) APIJSON 官方文档，提供排版清晰、搜索方便的文档内容展示，包括设计规范、图文教程等
From 8766cf8db8099148b158b0f9e430e2738cbabe43 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 18 Dec 2020 10:54:04 +0800
Subject: [PATCH 0098/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 363bcda73..e2488c867 100644
--- a/README.md
+++ b/README.md
@@ -290,7 +290,7 @@ QQ 技术群： 734652054（新）、607020115（旧）
### 生态项目
-[APIJSON-Demo](https://github.com/APIJSON/APIJSON-Demo) APIJSON 各种语言、各种框架的使用示例项目
+[APIJSON-Demo](https://github.com/APIJSON/APIJSON-Demo) APIJSON 各种语言、各种框架的使用示例项目及上手文档
[apijson-orm](https://github.com/APIJSON/apijson-orm) APIJSON ORM 库，可通过 Maven, Gradle 等远程依赖
From b2500657ff2f095af5a5adb3546ccf8353978c6d Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 18 Dec 2020 10:54:57 +0800
Subject: [PATCH 0099/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e2488c867..c9e0704bc 100644
--- a/README.md
+++ b/README.md
@@ -290,7 +290,7 @@ QQ 技术群： 734652054（新）、607020115（旧）
### 生态项目
-[APIJSON-Demo](https://github.com/APIJSON/APIJSON-Demo) APIJSON 各种语言、各种框架的使用示例项目及上手文档
+[APIJSON-Demo](https://github.com/APIJSON/APIJSON-Demo) APIJSON 各种语言、各种框架的 使用示例项目、SQL 测试数据、上手文档 等
[apijson-orm](https://github.com/APIJSON/apijson-orm) APIJSON ORM 库，可通过 Maven, Gradle 等远程依赖
From a2f2c07a285995be3af59e47fdcba63b30998066 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Fri, 18 Dec 2020 10:55:24 +0800
Subject: [PATCH 0100/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c9e0704bc..347b3108c 100644
--- a/README.md
+++ b/README.md
@@ -290,7 +290,7 @@ QQ 技术群： 734652054（新）、607020115（旧）
### 生态项目
-[APIJSON-Demo](https://github.com/APIJSON/APIJSON-Demo) APIJSON 各种语言、各种框架的 使用示例项目、SQL 测试数据、上手文档 等
+[APIJSON-Demo](https://github.com/APIJSON/APIJSON-Demo) APIJSON 各种语言、各种框架 的 使用示例项目、上手文档、测试数据 SQL 文件 等
[apijson-orm](https://github.com/APIJSON/apijson-orm) APIJSON ORM 库，可通过 Maven, Gradle 等远程依赖
From 2ae7013904eeea416508e5b0ddce348aa1358d82 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 21 Dec 2020 23:48:12 +0800
Subject: [PATCH 0101/1181] Update Document.md
---
Document.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Document.md b/Document.md
index 061e98e42..82cbca4dc 100644
--- a/Document.md
+++ b/Document.md
@@ -370,6 +370,6 @@ DELETE: If$B-hVA5e&13Aw4zwcoIpiKE=N=cmT+za5(vK69
zzx^QW1RWPQ4=>-T)8Z0mBo!2ulvOTVymD1bTSr&#n(0k5a|=r=Yey&NJ1(wn?moVL
z5B&oIgTkLgL`Fr&#HOS^OH0pq{vtCkzo77SQE|zeca>GuHMQ^S>Ra2|J36~QcJ~Yn
z4h@f>N5{r7*x9-Hg~g@i75vus?Va5{!v4Vzx+p+Y|3Vh<_g^Uci7r-vE=p=@Dr(vv
zbWu?H{~(-|n&#yBV{Dqnv<~;#MdThI=eV4lThVetRNe%~dHX>>9haB_<`n)1X}?nT
z=Lie?4^j44!v03r1n3Hg^4CU1Nl8URMMXt(j0R}OjvxEcj?*3gwbA{hG5p$?el+I4
zHZm{>1uzCRH8m~p%R+yGp5>oz!t)=nN?AHqM}_wU@lkhidnp3YQ@S;i>L6`g?{)FRXKd7-Uy#h;#P_ygDwgBkU=y9@C08n=+13O
z^7EsI8Q+CaT7k60v!2|fM;8}K^aW%P9|Ys$irS_?LvVKDg#M!!(IjoKT_Ldx*>A5&
z2GM6}kwH03b!1T3GNdz!U^^~*1oG=6a_f;4;6H|qLc77wuWtW?Ie^EWC(SwRj6-{a
zjyUJQxVkFn0caILIGajzC4(Y9=aE5QX>G}%7GK1y&h8!2eV&m2*4d_85gl>Y2Rl4V
zx_$EW&eKI1SEmp2COL>AGY|yMpxAfyQI~lwomf8#qZRL}Ukfsn;WsViC7zuv&WmmT
zDv=ip`op8#zr9%oHyyr~aRYyfXnwA4JnM_SHfcrp(}mp|2KPMih_u+A*y=pz)HUwVEGbo$Nt2M=Q#I0{l4l$MYp-ti;>$NE0~k+WE}7?HuE
z(Y7IPI$h!!)W2mikIG-4!@`dzrt^OgC0Tp@RPwNG$4&q3w`>MAzQ;jhXK@^r3iYQ;IVzVOy6@Da
z2=ID_v!`Sk61s4Y+FncLltb)KL%0ZhH!+>%78-q?=Nt&JreUuxXs)~L73SWYn^hDG
zIjO~A@ezC#;0w^t2WQq>_nIKC)Zj9A#&_ebyyDLe#M~`OVO6C)B<1ta2o158&Q;H%
zr7t;2?R?XWdWHqJ4yxi;jnbL)^VBxmGCjXkK2QtBrm=fi$I`}t(<*91O^!c4EMVYv
z_@w01#rf^#eUQkdi!|V#0%Ym4^1f_cK)NUYeeV1V*9uDHJyKC!ghpA{6Bf0Fw4Mxf
z301hi)RHziXH*rjbSnC(9yss;vm?|X>^QYRI8=$Kt(E#gNYsKCJhmsk6`yQ>l+&P}
zyF75=lX{gH!sLdtm19opH$gup
zt)a%y1JzBvE%5&NbRHpA5iW{m7}c}@`Xf}RsxOAmW&IQxbQ~S6rah&myA56c#N+2l
zZ!#>c&~`uYz9-+r@;JW^PrAfc&-!{R=)-HADpY+Wt|bVIFDenj9Lh_OZ#N;(g+Q-0
zMC>riY7SQ+t6xWX@;q7L%Ix=0-RC`*Abnp)?vdP#CuMQLx*uvem;{}>7`G2EOBxCB
zo^=U_$>UA05%jUn^#gu_p<_h@n_doMMNoaAS(&%Ws?o~lbEX_`73B78v{1DYPXeY5
z^-(I(`1Q9HZWN0Gin*z2eKIH9xFPmTfsIw>$&1Bzj=r_{cN(5BIYIfJ3`(%4#V5ry
z%UKa6@D@oss?#*Y%U_9C?%lmzQ&E$ppVHxJ#`k4i`1{a1Bk8+VF%oNa3(Z^v$649v
z^yy=3L`d0mKrEDD6?~j%9K35_-=!CBAm_GwLyY#ihf2y!XUxe3pA=pr@zc5X=q>LJ
z6d5Ffevua+yraKayH8A-qNhJpH*cLV9eiyQr~h%l)%i+V$^{O&ciA&x$4mVdp~oR}
zDFkuShfHr$s*Zh}_05EW{ysyCSO+bRn_NHG!E{Krtg3%_g0%bY3HS7z|Z?RaAMAFx<`5{GYl3bM5p9@f)zF_ihA@q
zDx3lQb%ZhH$-7!J9(pzkf&?f9X2m_b!F+DRbcbw-2Y<*1+ajV
zMSyn)n$6g=ozgfzEr}ERns;YU>cNN5C+KE$-@>zJ9vb#F
z@W8cOcP14>0Vc3``S9<~<`32Azc4D8Jox8@?INQnNe3xN290V@lRuK&@
z2W#z%E(&c9lkWZy6@QzR$xLDu=$WyOVbx!ysD&UFyw3+?CW9OvlR*XFEgWtAqv3OI
zILJ{XEh+W0nIIyc_}tIF^t(oKUaZutQ30S@9{ujvLMD(wTi0MZWRNX48Kf-}R2FE_
zNe1no(hwzs%IV3Ve6D&NxT|OdCC^}iD_R2fU_5+f@Ti|yvi*?^8ZJ7_-#1-det|hA
zuLV1S?`xS73GwNgX4g<6S`KUQ2hi)*gfY{1<+^va$sPAMP;Yn5EkDcWP@`hFh6Du#
zlR;~BSZK7+`6EOlE7m*KxF=g2Rl)pluwzbNf=#YNIvHPG7%iIoxckd74?e%ZEOQbH
zx$0y6tj@$=ed}4+#dwQM;%!3mYoai)5fL%<<$TOcqXxdkhH7JJ_ZhBC>CxpJpxYo7
zQPH6yunTx}v<4ILE?%sDst_x~)YiFc`mJ~1xyC@2AO8)jEPC(L=Sn|-Ui#>bT!SGG
zCP{jzjOUUvZCMA)2i1Fs!flJTZ0@7d=2HPR(^m;m1+Y`~bp#u%pqavifjR%QvKfp1
zna7GJ6o#K9yW2jv8WBe9igoT24rE%AD8MCd@iw>W?t9N_dXYf
zUFb8kwEe_j;uM1GrBI<#;S6Yi+tseue^ZY~ArbrX8}3pVBqs?ybt=jn-_h6RO>qSa
zr-!Lz>)Y9rW-X%(>$9kb)UPUeB
z0&cLQ9+^mFEg+QI;MNzP?C>x3jVmFcg%}-2*wD{6#)?fRh91g}}96
zW3*m$^H(tEGF`FwQZtg?U-j6r1S(RO7SSFYiQM1)+gMF
zbWJ48C3MdFIkcElvuL((5^@hsr(jZ97WgkkZiQluZ}>}H3x|9+dE3+uo-K9HclN&-
zmDf|cDjd2VDMz=Ebtq$i>lsWDh9gxV>ofTFsaN2M-`EZ_!N>tsg
ztaO>K!gxG9mGe>~byli^t02u!n+HGCTAhm^UC%FV
zQKzRdwxebdW&LK@R`&I064%yuQaML)iS=f1s4^KOy4{RD==?Ih?w@g9lNQ{VJj}kZ
z{GE+fz4QXi08?};=B<_dc@TvUt626U#$h~jyQlVGE27f74e?}34HrTxDP9>jPjxCe
zN^mQim{>7?+CfTEEStmSf0?iq2{WRJx<;VyvS*0gXtNq<6vvI@70I9zwr)WY#2YZx
zfo-dGnGxT5>AecOh7Ur=Up=N;0F?-{xl7)@>FgC=6!jqC0MR^Tfq=;pl8T5{IOmKc
zg%H^r1HMPs1Jk=pu0H)NElnlXQ_(H*e2!LPqKvPaXN`GtFo!K*8yi$Qxr;dlZ1n
zBN%F%uWBV*3cQxDioX@Ux5F{`t`<3qno9U30KeLtWC}c
zO3ILr0wdKN#%Gi^y07(o1a#t+9|}zE(=3FTf?_9w(9hCh+{hrIr*O0afc0p35?#ok
z6bmf;U@N6U1~NOqe6WBxIF8K!1bO@&o}vbW<29fQmViF2n*E(BJabRS`r2O+m{wd7
zG2I4v2ofiy@$HS{Wa;4D&h@}!ql7OTBSVnvDkRBmow5uvh6-OgeqdNvX~ki{jEMw99sa5-Vr)
zl-@qauI*?z9;JuM6B=fdo)FEjM!c@8n8PN~_VMgwE=1C_ji$?dL?R|!uByi}%DFZ5
z>+R+&&MoG(+Pr|&79l=DwI5c7Yj;GC=!dntHbVP2#iqeZQ0R=XIaN>(H|sB$q$|*C
z1pfA|0CcOhQS4m*W)q|eEhaT&gSvG`2>;&Nx;W`y9v4w
z`rs2j$sQu8A#F)8#XigrEDW%34fY%Ghh74kv>?pCZlG!a$d|A88wvv8cwf*iBSpn&D@9&t5
z(hBsoB(W}O@DU=g30{ZT+9x@&P_{NdaMrA+Uiy|o*f(z7w%T!yv@==pY&|y;9$CDI
z$nptC86DNRecxZ63sQ+LwGKh_&y4uXtkFCe=#jelP4x+&$aGwTMMOQ9FeJg92*X&$(rgPO@tGW9_tuWu_eE
zdWBC9ACGZR)&Kk*RH!Y#&@4i@k85ZhpGU?us$<-pzH!U%dclRa3-l@<0Rh
z+w7$VWvUZI$RKme4Vkl8tC<&SF^1@b7IR+EOk&;}Rfx|1xs@i1g?|f6Z7oXbXNfiJyl~TL5sJpXOlv`+0)?ch9L4QQf!Rf<=ybV40&}
z&X}=nL^PaHO&j6dG`L=#%YERtrj`-u8V5_&`Dn!&Id_ZKpKd#We|PK%0dYe-v0kqQ
z)Fn$C@VMJ4HHX6nitY4OVk$lf+i;+X@;$3rj3jvHx-bo0RJFHYCa
zb}ugJ3tWK6c9d5Q9T&GFyeDzs5J|ohKGYgKQPAPD`353WV*FF8S8D^VZgr>23HGXh
z&?EIUdtINh04xR)t58PS^TpNMD0*OI1sf>*(q-*-$14uqvaU=gDuH#RV_rp}e#RZQ
zi!UdcGvRKK@MdAcs^iQwD6&?Fo^QT67aK62mSR)NFYJ^!qG+c2
zw>dn$MN}X{@4p#<`k^3Q(2oQ#CZlzF9F5tG1nf5D>q83a$}J?0A$I?mvJJr_5p9jyA8_kY?48YB>jV+RVKHh9#k2;@1Vk?9aXWJ
zP-VnPykvBOsD^_imJz*6zPZ+xQ`r^PSROXlONO;svvH%<5XQh
z$VJV@8M8^zRxo+>z;1Ym4DuLL_ymhb-KljYjos}p=+XO5_X|%+sUd5`tHY3P5<+#N
zEa8md1OEgRW}MUjOX6!fdZ8h=Y)^+X3L~0f`WRqd{R$z+N9`~Db$1Ca`kdCsZwZKJ
zte-=S4zH1h%n`?7jCm`eg51iP+0`1UVix9^&Ygut{5DzbvGZEJl3(}Bz|Tbt4qw!)
zQzyT=h2igOMg$W>f<5!)U)~u=s5#=^`Tkukzmr5wn8e7AOSLp#7?$?yOVoFBcw@x)
zUSCFDXTWC+nl!tj%_o>r3|9mAOxB%jY6T!#vg6bW5ea187MZo2J&rY0(X`QgRk
z#wn3hlR;#`yTQuFs(s%xt8Y9VUo}M@cKlu-g)H)kuNE
z8pBGjoIM!RhH=k$GA|e|m9=y)HzZpP#&b8;LxxGE{^i+PdfkUL*2n?CWJbP7n{CqR
z>cd9?Fb{{U8U=FYAoOv*(aa{pxaEY7SgpTu>2BP_F0%-AjlZRXUf@US*RCf70yWHn&wZ3}$soh0|D5++R59|$b2axp!
zeBSP&K?PnB9Zo!{xEtkM)`_lvSo`p-2r7I2%$w&fvS`czTT6Ns
z!57M-98bI~ZM~sxVKPYkeDMONI#ZQDGU9ZiDq>pV>De_69v5n=4vuHeL4f_QS49T#
zLYC?B?^lhJsyuMeh5M)~=I~ItfT-&PlTaort5?Bo2UY&2cJ9|{UL(M}zPp`nj?`*}
ze70}hUiE_1*gR4Ro@Fp|g6vzEX1^aGLhOa{!S19}4Z}0T3dy%*khkk1Ij7icipP~)
z5@N2y>N-6(B&FW?Zi*}HkwK41+UHALi*39KkOdffd4SRGV?q+{iY~!rHi>3*HFGiU
z_0ZWJ{`JrW@oL;0^TRExq73(|gOi$6A{}$@FwZugQuKYkNV`@zi-)xJuPQEp4)RwW%#-X+>@giWRnr Z
z5oERKN?$Ygs?e#CMqXz~984I-SYqQ<6Cz>6*lR2e7I`ifK6maHa0ABho3mCBBZq~-
z7w;=cgeU;kIGqr3
zOXndJ|EXW75)eW*82=-ti^?Ph85Ch2jH_!F~y7De6r!2
z6b)h8`8K)|
zL4NS2AoyVVBDQ;{JwnCw>4RM|t>lueCkpFNyxtm;f3NB&-9tZr{}Nb};JrI@l#K!m
zxMq%)PaPBazJL}#1e{H5IDol
zvG2RC1jq7#r0avz9YW`--z8^Q4^uWi?T+`VeiFLD)W|}=JLR$NVMN#tC)E{^!lahA
z`etC$b4mPyM5B!TbO4rEzrg%LLnZ(@yG91FR`o?q)2>&2rq#DoGB7g5D>Zp2ehyQ9
zF|XxJ*&%kRw`(!vbL#{34bmqRH&Gvtz%)%Y&C=UQ_$BaL3@LcTYzV1S3sNFY#u(l_44M6a{Dk0v8R5&5Fw-Zd#XAxlZE<6`sp>aw=w1Js
zZ2pEJk+6fQsgLgL?r!sq`270rD$yRD9(unc_;+gR9=&$ht2%M2Y|tDU6V-NT6gSQ8
z`&qsvlpXiFDBr{W7_MHY9cN=VY2{wO%`J4B|0&nFp63kWla)3$N9mlFV+^Xw*v^!Q
zSaH)lt39oaQalRj8h}@9c7Qnu(^#V?e0!aI&6O@lg3*m;)L=E^oi@uz{?)+knH252
zPZhv2ZAqtn7K#sNgqi`QF1Gmskltc}o#uxmhKgUos>;BPs~&G38p&TuJYM~za49EU*NsYy6**Pl@&(
zlD-+6Z@jdHr;+3ax8V2RT$3r93^gQ!GS!io+Bn5H@VMv)64wCH2+u?Y>5tr1?3VRx
zbo1DC74y)|b!BY!%#rS~i@WubAyh>aTie;Bj0Jb4;qT%DxMVcYSCul%(Mia&h=;qg
zYs)mLR!^4$m|Xng1Fvog5Zhi4I`(_QJ;)#s!PJmYSOU`=QSgMcmlTgpeY5U6onp=J
zY_jUfpndx3%iGr%UAs_`uFWhsF%5~MTo^PLX8EGJ>@=eg+7Ms3+a%af_^sydrkl*R
zYkz^p1Ib1=q4i?+k;-S&Qk9!WvIIEFVKBD2w003q;#nZk!~F4kMDb7triWlN0m>ycdfK;|8DQ#9w
zqygMsWMf5v8+YdGzB8M9fq4TL)EYPV{T=;PzA$G%I
z{O-ASrcRVvs7h%66eWHyil~V30t
zIot*0*S*8_9mRfai-mP~zd)M#n4hp&}3ecO#vD3D&Z9F`U=_+QC=gW%(|GLeDW>%vUTmb;UhtS1I8o8RRnILV90B
zFi+#K^q2fLYB{AQXK$l*Z})SvsEE|_37&5ekH_zK>L{x9clq$QJqWX$r?Im=W^UR-
zEp%KX5~0P#GITYDOX8V`Fx{Jc5XA=&(<9U3zeHAN8?OLS4I>~RyLJw;o$bEnk%(s|
zCTP$CxbX)vXdv)Se&seim8o<%)MY@ySPSO1{UZy5;^)KO438q|836{_DiB>+>Oh(y
zB?&;_SgfcWzS9EVzKyo0B5WU7EI7oHIF7(`#z{xk@Ons^#tZNPU<>=gB|}2w)r9k6
z&-@xMwwRUeP*?4+MkJ7w+_^IERN-AS+Xt3wgC4%3nSASWh1!A};x0d>S!eZ7ViYAz
z{i-YWC=;0t(>W9;eaSvIqS(h8Q28OqtD-a@)+KvuYeimqK_|iSl)%dzx_nn#P@n+%
z^yw!>Z-W*0Mwi=$a}-c1Lr+QqF`v?77x;sNqfO0+9KseT6I!}C(S0em!QT%Kn
zucEUjnh0+6ebXtUJcexjv;h&rDhaU;!NgrKylkHp!CbD(_c?qDK1oimu*T)|zq)-W
za^v&+K(Pmb_SL(P_1PIX2LY-3wTeE@d7znhiF;fuG5y^>b4Uqv<^Gs7zi3OWl+DAG
zOWN{c(V8?;OZ1zg(=*3P*lboZ4NC(#9*Fg%65_1W%q^cQcv0Cu<>jG#djUv;Kw1uk
zvJv>raf(rGue1k(6X*>x2e8NI8{TIc%RF1XPp`1m(0k}~!*K7yQb2Jc??l?VFBv4e
zOkFBf(*VwdR6nyWYNPL?CtPU@l|$i~W0RtgzRWz+r?TvzHUzoAVN{h@JMDb>5LXKBuW-z3aViiC9TEZr6yJHY=)D#
z0;oRtH=i6L%I0@@24g?f$@1@RbA5vhswf)Htr=20ek(G-
zPE(m%DOon00ex>D#0pIg(=vBJ`88FJp)28K5&
z73u@`DzDa^593Un@jzF5KSI$el0nfZTn$VUqbg(3@mM%P7RmBW;qrurag3OZz}>o!
z&NqC%_}GD;koXAT51F;mim2mm=a(()&(zsW>U7^>HF!{3)g#iEp4gTlksmn!F0e>D
zF8(C~u?QzTa33~FlH4Me5qwoMCGzSG@BKyEQvJ?NYnpAF-U1CmR!6``Ad7G!AbgVP
z+u^%RK%A=Iz#fm;+y}WKc2=25kEHrOqav6s_C*_H3G+({u@ZUBu${12i5$v5IGE)K
z0ER7w1abp+=1<+WhIbW!cRoY5S#99FWYAn10YPdkc&q<=ix>?4t3|BRL7f=I@eIh7
zxm>fmtd^nACjFg;O_ziA-ivYG`loXDvtOu`6z4F!_f=;a-&i3{8`i|G5N=~{MsVpp
zUKgbR0&9=itwkiB+-8Xty#cai%wc-O^zva*|0UbUGM=|zZRCY1WE(Y!
zX5dhfr>Z@8eS^ho0@E>h9R_5dE66htpu|AtUd5u*d
z`t74m|C4muas`y?%p$KX^YyYZtmalAh8a*Vw+i)+u+!|I!hr-!cYY#9ts#Q#^%aK?
z4rv!?Y2T|QT?_dav3-m?0y6h*5fHN-G|0au_57XBD99uKl=8O34;bTXdWQV4|pE1u}=x
z-30+nJ1g{!Rxe2kddp&=Uvcg`JF<-I-d;ZC*OZ(Qv
z{xcG-Cc!{Lg%lHOV~Sn>wmOF~R49b!kBGKNBYK%k)4}u-A5M5dwEV=kIaktNl({Jd
z?Is83xzpE=lX!)n!Yf45RQ6iRaKjvu+TQuszf@hwl_)RXT1vcqS+$sCcIqC9cc^^(
zMaGA0DF>#yBH;wy_clxHPqNuUceRy^=WQ-
zZ2X3G(`H#MCB6;f^|hNn8`iJIIg_39M{5K0Q7k}tA4BMf#!375XQay&()*RQknJBF
zYM+l~=E}{Pf)@{Y&e!@Zy(=++GoT+6WN+4|cQmS&g|6Cut?&qBokt#%fxsv%|
z^t14fYz^`ZKv=?bs;QpI_RnPM3ByGrz!m*=GVjnZ$V*2AnNm29=A_p0?X8^{Plf>X(F+eUu7=pBnyqA}>
z9(08MhWez8aWyAi5R}Z(Ew>8gMI|q
ze@k`#Pt#T0;4nTyLhBDR_GyRCJcI|6LGm5>1haB?kQNrf+2?mRl&EwL$d2}Bz!ap?
zHjhBdf|`@^mxGRF9ZSj^FMO5uZaq<=lT&9$yhJ=DP_aMX~FdJKEFv@D_;k|
z>b9Lf*!*|aIM7E6!9wT){5xtcx3xcHoxU9Pz?;X(ds8%C4(un4Mu5W(=wLOOBh{WP
z%Y5!^a>!rgydY)4jGTiyyyltnPcpR?&*4%V^8)sWXI@E>B4zx^AgUw)E7JMt+`diA
z^Qb7A^iXH01b$|A8u!{4dB9UWO=N-)wZOkQ3ufeiyI~=(qW*`j3;?hr{&kz(L_E56
z0>$b+J(?}_wMzXm+H;IO@Zd>pjM83L@B7C}@%Q`6LK>i=0sJH*Q!MHzHk%8uMh?I0RsYmu@k_tap%E)_4Q^6MEJ}j6z8F9)
z-A2Q4Dr69zpb3WmtIhL$)
zMoLczP_s;GaNaSuSqba&U;AE*b`zduDvFaR&mexwXMl8RK>da9MY8~Q43+&;A_=kE
z6uPa^B(74JX@dknv<`-OvELJa
z`I|}b_e_O9?Ek-B;fqXeWCSp|5H81Oyh4RH0uX
zG*t%dE!n~&cY*9)AS!HkQU7X9liYHxuIKJ&AJ#kJl>Xm2gw1-=?{Q^Lp41yt3PEeZ
zFVw;XfYfp9MEkCFQAeq#Jc%owVQ)8m)wS6+UDFd2+dYK~NuHB5S*m|cxu4@u39Xr~
zWKL9^j-I9>s$!?vrma_kBHHXf?3o)!mlfIQcbDa-D45^lOi>hN&{22yLVBzo*}ks2
zzSkpxOalV@Kzw(U;DLFVCAb$0ZZ%$+68U=9sWIvX=`&(&aD}DpYvPQY9BDT2HgnIT
ziWzoO6WE*Cc&`v+txyJ-7~wD^1S@;O9Zd#td!OBWTR3o+Yuq!qHxdIRMZ_;)CkrMN
zvVE0u8cI&qFk?YStA{6nJhJBVcyxjvf_+6EI%!XE`QV?jpYY^RYbrx5wO;#Nw3AO=
zm<09in|Nff??d9*3zxt20YM)QlaAXg
zOVL!>&hXn#eSPQe3r%U)6K{XFHa8J)qT&5Gz_MTgMR&lDPLtwI1`oE$AXRW~m9f^}
zDYg7dG1tGTA7MyQnb(drV@f<{7O6>F!MO!l2h6xr9=iZKQ}Jby47wha5aJIc^a1A5
zmN|e^LJtKt;M-lrUuj3MD(#Usa#TTu72Q-heL3Al{eSG1{gJEokNV*MR5AJA^#uNq
zz5k7;@b^FeJ-huK7DUE}Y7pSFdvT=mFf{~5Hqw`{uEweUCI56?nLSO#o#v|S?p%Ev
z*rcAAhxl`!3g#Z=2fBwBW8KDH3-UoIy*8>|U9lm=-G5vC(*L4&Orw^YSDvXW8@+zF
z2@Q*8&SY1F8HoLYOnePv=u@I3Aq$J33GIY1HlG?LSbOsrDyX0RZdN^b)f_D{Wl5dk
zue7@ooAU8V#+HQx?4{r+?fUVuna2$GIxF(IZgYT60Jt;L+)IS@$uNFblc_1iScwm2
zfY7|O1W3&@QpHE$x9$ydDYX53YE5@{ch}nDMe)=pDHX}&
zqwLB4xLbk*HFl`O6$T}|7}rvT4iDX%9LZuq5Y;0Zwl;<($5&ieg~NC#kBicVuN#`z
zd(^{y-fLFxg+_f}KGbl9GplI^VorKH6lw*RcpTV86ut0Z`z$`DkYK&A;76m(le+$}
z_scOkmc^4Eo6MtIE91=UFyo{T=w18s0Nwy^n_?Wut*?9;$3JnTd@Wr$Q8nx>WyUzY
z=P9ZO@*SbEar~zO=4=AmE-U38m&=KFFjV20O&k{E8rdzGpSb!o_d=_LF~XMa3(LF#
zG&q#5qsQNE-v*D`7yTGYM|2(_onPWcUooh|?M3_2zaFe^;@Shd4|+d6cD@3de%1LT
zHZ9bOB~tLi2JB&PHZ7jM;KB7zMRre0!mO^zuTFKzeF)%L6=)fno`q)+W3k
zL0rN#)Y*$5reM01HwA&I_E!fpq*K>IjfjGTX&)SNhPkbbAKTR`HA&l6@0H+I(5+O$
z03RQ3ev{rHQZ=ysJl!TH)0}oM_4y^+Y;9ftwVRpf53+*xL=D1T0hAEj4rjStDa4k&
z+cs%B^(V&0wjfE=z#5GcJEDe<5nerA?e=p~y(K>pK`WGW8T
z3{e%8PMzEq#nM-Ea|dJ)6uw*(yy)$xQ@gVl=#S2;T*`~>&H1x>7?}(Q_Rzi*yb^ho
z=npw?9P(Iwv(LQ?I3+2yhZliDwM8E?=(W1`BaQk$JLaFb?w_ep{!_x^-@RuYgp)Ac
zW=~fgyV$NA#`WIwm)6(;BYF5km8V>e+XDVbjnrAr)mI}zCq{~%Z2Q{;0Eo?_#)&8_
z#cp}M3STw1f@9Inx7OE^F9i#B)N5jYxVE-@=%eF7sG~hVyLJ@={%}hf{A*Mx88rP6
zMGUGT^&p9;Sim=hAWb$2^4}zoKivD@Tm!uB;x}Xb>sQVl>;U1xaP`(dai65MH)PN!
z0`fcafAltzp#xLL@aQBB77uec-A)67Ibiy_(K;jB*2oq9keX30UE2ppfz^6(3x@Z1
zlb=fMx8r2j`wtz6x`a06NErVvBLu75E>VSKFoFxFkL7W(eYcM*#T5dNf`8RR~c7Pvha_-+{
zs()hv{9h9yf4=heKP5!omib#&;&$WU4dL2u!#z7bn_R-#E35i0sw7PnrT
zG^vg1G4PkzhIfRhyyd-e=A&9TR2ima1_uQsSUSO7zLAovgBKpHpN=R}eOYO9S#M85
z>hl-jmnSvqkv(0ZzrGxx45)|>3(Ea_Sj5l$e_*hp(Pmq+zZ$pRyMBK&Zb2b_KY#f@
zaZdYBR8IY;Ho?!4_c!P?m^Yv$O|g)J8Pvgf4OP
zpt#NwO=qD(Ds{yEy)dLpII%y{FNhh1f5Sewz)&(6;5V`AC1a_>st-;KQEkkURw(P2?#`wew&
z*E{XwAzM73)K)p1hhSk(n8(NI5-JZhS0PNII8qa5d1{f3M|%BTsFR0o!5zyDk*CQE
zY;pz6os}ha+Sk-K2{yzo!wk8*M>q3O%Aqu*fp-LbOj0|9GoZ3PGoyW)ekuEm9ewM?
zln+TI9%UDW6Gvq76koJ|uF}0k?X(SI_U}izhd_)*6gL@RF1W}d+$W2#ReFtA9f!nf
z8zNV)*Q(x0Ik9fnUyu-O9=A!U#oFFdun7c-Bgh~b&Hl7?uNtD~KEkXY%CQ8mky&4i
zR--5k$j4YjtH~D;jhe#-HHXg5R|Pohbou<;DOt;BE$t_=mWg`mVL)$$}kn*XTRq^w#K0Q-n)|El4>sQ233?Svx+vps6paS#}C7jttFLv+rg+kbIGTt9$fI
zCOo&=>3eVNWqn=>-k1sKHPTn>&4@;IT#-#Z-mCI-gp1tUbKly6{faKsi^Evs8cqdb
zn7XT9a1iULS?=kWJ*Zw0|)%8aD9Rf^9yi+UR#uFd%TK~LyMJhE-jLnx$Foh;^(0eSk
z{h|F?93*xd8fCA{Jgap6<2!rz@uJxEyR#oH3p)$alcH3I^R=lWZcn~BbDLu$+3X&%
zM5(VXx30F1$+J)osGzMm=ULu#b2eA7W$xziK0U6eV_Kk@r{(QYen-6>DGi&%OIR4O
z%pGX%yXXB@dgHA9)`^7n$2UHM+O_z-h3k-B1aTzM>?_e3cQ9**Z*G`ff;r<>Hrp$g
zGhTnz*^M_SdUvWMk>}y!I#b-j1%deN?IjB{HaA~rd>~48nXZt@eE0y>GVvX987t!O
zT=(e%4QSTWdqF`$jMw_F@bwwz=avxo_=d6Fv
zek%J-H^;iqZH0Yn&0R#bw!K1z!!6zGnQ@q|C(Zm;pr!v`e)ZQf!Fu9R5)a^)G)(Ww1rfX5=XW(b@g)BY(R1_K$p==K9}TGOkps
zZ+xyADBb=fiGna>nmJn)IMyJEv;vhVRCvZz-{cN&Cx24F3
z4|ER#kps{F`g)Kh=WE{=P&-Fn0X;lN?s=>u>M{nQS
ziUK`R>9eN|Po$iCtAk4oA81s?Kw5%d@ngL^AsmFwOBHohc<<#w6gzNpQ^;Pn2
zYcli`SF}f3HsgJaSEji_)d@h762~Ahcm~BZv7~VZeXE~s)o7%=+$+!HN&3~NEvMqo
zBvc3_$%pA!&uOTT22rd4(|xkVZAPduWgfjw^>9#NOG70io$4RjM9+HYyX9SR2e~lK
zJiT|!{gi~A!8VW`JSUJcB2|vc1l-V8nA@QcVbvVB2PE?_65ws==iTzVYBc0<8=2@h
zZ^sfFF-p}e`8lOSAQe^V1RWJ?80ceVVQBYwU!ntkvMHmDQ5ACx@ixGIQ>!Al?3#h&
z&Gdt{QeGk5#dID|3$KA3Ztte9YilsxLstOE>g1bDam!|TH>5y6X=C&*%DBqzrk0QM
z!y85+?0wDx`kXZj45$3Wa=UoMml5MsvxXJ8;IV?l^b|O;vJkb)rDkz30QrO-UR*
zZ@e&LBUMU|WU+H+4S2j07l5rBd_APKm1m`c_szbW?y$`Mj9$Pyf`{)
z+n(-ow&eAS{M9|C0O0ML#e}N1ytX
zlr~FZcPKZIa#f#AgO}fR#xq8BdPfVXK%abtS^k3W8{72VkE|KLUhlkZzDoUcQq+Ja
z*x#8+=v*)DrzE{b<3lAvzCP|pQ7e5w>dZzAp8oRxY46IT*<9DX-NCHrWUiX3v>G*3
zt0_9DjT$yeYsywbLZq~)Af%g`+XmfRwosJTSk#nIA=_MS?NCE1N+fEY5-LI@?$>qK
zIqRNt*IoPUv+n8n=lqwo-gmv<@IK#{=lKoK*I(yfkPGOF6R!@2KJtv9M##TiX3#yB
z+)c)sRuyHsRp9smG@|^GLwB3;Qc<$T6ebCE8STfW#^gmum7s5Z9EqU8t;5Xy{MC=Q
z7D~!rnY=TW6HYro3PkVXz}XQ*&IsN6jv|3gvB_^Qn@qoqm=Wsg+$s*4LsOrM$~M&#MRv?>ESb5l8CZWH~=WYt+Bji@tB}kMVO=S|6uM9>;OWH%5`=qQS%7h@_-w2@Jr
z#>E|vM0|z}uj0;u7VF_zrXhi$$wz`cn>~K=g))$ta=5}dx9QyH0LD;9?TuOl+CtT>Hasm#Uyk22U
z2RqV*qCnEKkv@8!p455WGd=soLf>a}gSOttLQ&9j>WW@gr>E+C`(vyj9#yL(YY$5k
zxFKadGBPOW>1!GzTC**3M}Q4!uZmZ@Gz^Nolpi#29i?C*gS_$f~RThzi;j`LSQvsU@Fim%-@3jGoCmA^rig@6>I!
zHD7p$v>G07=C8!_fAB8v^}~$z$#!DBEJbl;rK1(=X3ORAue
z7xBDsrCHB1_{=h_t5a;vXDZ?l{V)wr>uf}+z$dd%hv@ayxm^R!aP#3R+k9Nubb&!f
zw%04E%(b7-yiHYFz&*oCaWpd9Bf>lryo#vE}b8BN+6Ccey$ny7P
zjpSBhk0}x`#4S+ci_N;c?X&Z3)>($MRnq555*?F4g6V)djfY=MqLcB)$I6*l^T98p
zOM+YTfWCMb?4oytK|SpS(@YsZ*fW@+eylh(X?ioauHwQpIxl
zp5HkT+IwWys;ZP@v2KIMHFE
zqKFjh@Im*P0NJIvVel4YQJ;G(z}2_tSrl{BHj^RGlN-~tw#4%7
zbo^HJ|`R6URb)ky@
zdw%5|5T7joUpH9~7!aeq*rTSKE6P0faV{cndjrGg9$H2Juc>wDzg^5s`9?IJ%#Z2@
z(8&~&QRt4q1waPV(uv9g2v9k$3ZR(L8$ho#0)X?9GP5pJWvAn>R)gNdlcm0WR$v+`X{+3nEUqQHQe=)|iWaUbq
zG+ij%5kR7i`H{B~_2*1P7UU;CdbENge_5*0hZ(JX>?u;HI@&OJeZO##eh{KFSNH5W
z@9r8Y3xRPOeTSO{?=GV2hfy(hNAsdpN
zvwy}0aWp+d=XLKyyYkTQSA+J#aJHrN^FdUxNl1tC{&80%w9EJ*epoWNX6_XkQTE9n
ze-ZKFfQo3P%*v7HUn-T^J^f%%5emj!PQ%^K_7X}8Mc8iGKUu_E8uku`OI@u2uerUQ
ziaozicp>Mr%TNzj4W%ug@u>&RkgMw)dQ9M9j@5@!Ek+;p5XS>Igx@BUvj|209w%`mNTzSp
zt{)rQ5h$l^t(zLgNO6K%ap7Hg4}fxFv5sft$YdAaiS`eNhXr||d=kdHZr+km!QZS=
zy78O$$7w4%Puq~Oa~gyQsjel3O3}3dU?9O^%&DQ}pglD9<3Fb`2rybC>V
zF-WT?JXj}7A|>ghSmMP(Sg?{S)lPy+edOt8Dn2LkWHZ)!Fom(t-PKnW7l964-lb-w
z`2|8JwPF&`A`UE~NP&fKM5z>ou-Y^R8P{F86Mi22A!jWiaNlpvb{(YqG)cbhe5MRq
zI+J^2z+l}SMvl<-KVbFP!?&UCQmKCFS%uYx-6Pk|mzATSsCI^}}A!Mj-~7E?8%MtCUvgttv%W%C7|I_4dzE*rm(#
zAlbRRSL}Euxz$0ZJK-cs8;cum++BEu>7U86J}4~^VMGvrDeEKL&rOGTBGK&Y98G%A
zfw^&wegl86L<@LwU}$j@4x#!xWA2jWh31D3`#M#wm3+(>=)Et}8{o$O9nc^yw(RF5
zPCQB+{gH`HY8k8uIF-fkmKfPPQF}_EC*IcT=o|MON4DPQpCN8B%F{rYeOJbEeApBN
zVIEFwk2%rAN#&{sP(e#_tlAE-N#60f@LZXMEBNbqcJ)X4x(JECL&qt1O{*?xf>h@r~?96lIQKMcQ
zcNdVV1^{h5C6!Du+d+sB2DhPbH85~JJ1(kduK(AL+d6?c5y#!dYxQbr@V-L>m5f>2D;>tylmsf{(1X71T
zbA5eU01-7Uwr{(@P7vZb7x`gf{NM+$_e&3Wu1bGJ)w+)A_173j;sB-No;Ew=o$6>E
zR^KK_dop57)_c`uIIp%FDCKq|i=8-689{=u1!ns-e4x3qvr5P}h!SGNRsP|IFIEZ6t$r*&~xX#YhMD=$1W8
zqB|X*aEgR3K4BJLW>S)gTF=JeZ094VQjqlmhD|-!@&eL*8^YF}w)LEr%`h|4tKAi0
zc)Eb`6l-$$FfBy~W!A>>Vib@1QsbbN`8^N05#f_2I?*0q`Y~R7F=)Xrk31
z@mx^3+~+}^lq;qKH{vbT{Pt!Imh3VU0)YBzb0YNxDG?lXPsVz8d$@@#?k($qQN>HQ
zfRK43Yen^p{+A(fX?Jz+=8J9(bkJ&P?RGK{q)q*(qU!W$Wdadl}DUL!H@A(93(MH=eTK-GGAwCy~?VOhAVP^GS#IIOl>xm=<1M(g1F
zW(6UkdZ~Oy#cLPBCoBU?t8&xO?xDR{LIWEYw{5EYuEMl!s~rYmmdwN>hzS3Qs(rJx
z5q;}}E})XU{nllMHA2DSJy7Lbd&R}08**D+!)^R-20FfXy$;_tGigFH@C?w4NH<9h
zs~-qfNSmN13RPDXOaQNC(N5<08vXfepAF}&c*Z=|IESKV`O>;fOB~e8GJ!Sh37$9G
ztu6TB;`|C!9GU;R7gdLJ+aTv=*-~*^A09ih+qV+?`>uWVxPBP4|&}0f@QJd
zd56>`fQQgB?R48tElqKlUL)}{7$m{G&D?%~>ho&51GKyXAcjjUWnNq*>5HQa5gEld
zlZWymfnduQWulYNt13tgzm)>n(kdSZUjPgO68ijRFQDV%-iS>C^BKUYtB3pU2q-p7
zR|89ubH6%i{>aqyuNeRCPxwCmzw(jguN>eI{8v_SVqz*-qnr~+$_!Ju>E+B{sCin<
z43wX3bFwcNx$p#%m8p8lY3k6Be%xQOlExsR1w;j`pI0F+{|jcz@QXxydx%tf>5;@0
zty!no6QxyUIj;Ah|JK(
z6%&+j4J#aTzHTeG`dIuuAxlZBm*#vSQu(KDNZ06me?PLU@lnXS;fj+3
z|6_SSsKK;$ZZiiIN8J5_V_pgB_%QF<%-l7-^*PSqr%2WNyPkX39N$gR#4VQ;5a;WC
z&xP2GJq<1@XuMSi@JO{M0ov-Xy=K4V?|--2_aD_3edBrGR+#udG*sXCI{)my-tL`|
F{{k_0^A-RA
literal 0
HcmV?d00001
From 37a329afca4299d075cffdf1f73e215b32982164 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Tue, 22 Dec 2020 23:44:22 +0800
Subject: [PATCH 0125/1181] =?UTF-8?q?Update=20=E8=AF=A6=E7=BB=86=E7=9A=84?=
=?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=96=87=E6=A1=A3.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...2\204\350\257\264\346\230\216\346\226\207\346\241\243.md" | 5 +++++
1 file changed, 5 insertions(+)
diff --git "a/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md" "b/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md"
index e2af8cba3..4e1761275 100644
--- "a/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md"
+++ "b/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md"
@@ -22,6 +22,11 @@
+如果使用 apijson-framework，还可进一步简化流程
+
+
+
+
换句话说，使用这个项目作为后端的支持的话，是不需要对每个表写增删改查等接口的，只需在该项目连接的数据里进行表的创建，以及配置接口权限即可。无需进行过多的开发，哪怕是要改结构也仅仅只需要修改表字段而已。想想仅仅是部署一个后端项目，现在需要些的接口就基本写好了，直接调用就行了，是不是挺爽的。
说这么多，咱们直接开干吧！
From c46766c2bbce9b4ebc70d8393b9fd15fda5fe72a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Tue, 22 Dec 2020 23:44:53 +0800
Subject: [PATCH 0126/1181] =?UTF-8?q?Update=20=E8=AF=A6=E7=BB=86=E7=9A=84?=
=?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=96=87=E6=A1=A3.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md" | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git "a/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md" "b/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md"
index 4e1761275..8a4d7f7c6 100644
--- "a/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md"
+++ "b/\350\257\246\347\273\206\347\232\204\350\257\264\346\230\216\346\226\207\346\241\243.md"
@@ -22,7 +22,7 @@
-如果使用 apijson-framework，还可进一步简化流程
+如果使用 [apijson-framework](https://github.com/APIJSON/apijson-framework)，还可进一步简化流程
From 6022ec3eaee431f26fe7b372d44d75fc48d089b2 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 23 Dec 2020 15:23:44 +0800
Subject: [PATCH 0127/1181] Update README.md
---
README.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/README.md b/README.md
index 347b3108c..bde5a0061 100644
--- a/README.md
+++ b/README.md
@@ -314,10 +314,6 @@ QQ 技术群： 734652054（新）、607020115（旧）
[uliweb-apijson](https://github.com/zhangchunlin/uliweb-apijson) Python 版 APIJSON，支持 MySQL, PostgreSQL, SQL Server, Oracle, SQLite 等
-[APIJSON](https://github.com/crazytaxi824/APIJSON) Go 版 APIJSON，功能开发中...([不可用且长期未更新，期待热心开发者帮助完善或新增项目](https://github.com/Tencent/APIJSON/issues/111))
-
-[APIJSONKOTLIN](https://github.com/luckyxiaomo/APIJSONKOTLIN) Kotlin 版 APIJSON，基础框架搭建中...(不可用且长期未更新，期待热心开发者帮助完善或新增项目)
-
[APIJSONParser](https://github.com/Zerounary/APIJSONParser) 第三方 APIJSON 解析器，将 JSON 动态解析成 SQL
[ApiJsonByJFinal](https://gitee.com/zhiyuexin/ApiJsonByJFinal) 整合 APIJSON 和 JFinal 的 Demo
From 2bc5682642a8e9597af8cb181fb1632b8023f719 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 23 Dec 2020 20:03:10 +0800
Subject: [PATCH 0128/1181] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index bde5a0061..4da4a8484 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,8 @@ This source code is licensed under the Apache License Version 2.0 导航目录：导航目录：导航目录：导航目录：导航目录：导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [周边生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [周边生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 详细导航目录 [点这里](/Navigation.md)导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 详细导航目录 [点这里](/Navigation.md)导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 完整详细的导航目录 [点这里查看](/Navigation.md)导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 完整详细的导航目录 [点这里查看](/Navigation.md)导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 完整详细的导航目录 [点这里查看](/Navigation.md)导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 完整详细的导航目录 [点这里查看](/Navigation.md)导航目录： 项目简介 [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 完整详细的导航目录 [点这里查看](/Navigation.md) 导航目录： [项目简介](#--apijson) 上手使用 [社区生态](#%E6%8A%80%E6%9C%AF%E4%BA%A4%E6%B5%81) 完整详细的导航目录 [点这里查看](/Navigation.md) 导航目录： [项目简介](#--apijson) [上手使用](#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) 社区生态 完整详细的导航目录 [点这里查看](/Navigation.md) where = new HashMap();
- where.put("method", requestMethod.name());
- if (key != null) {
- where.put(key, value);
- }
- if (version > 0) {
- where.put(JSONRequest.KEY_VERSION + "{}", ">=" + version);
- }
- config.setWhere(where);
- config.setOrder(JSONRequest.KEY_VERSION + (version > 0 ? "+" : "-"));
- config.setCount(1);
-
- //too many connections error: 不try-catch，可以让客户端看到是服务器内部异常
- JSONObject result = getSQLExecutor().execute(config, false);
- return getJSONObject(result, "structure");//解决返回值套了一层 "structure":{}
+ public JSONObject getStructure(@NotNull String table, String method, String tag, int version) throws Exception {
+ // TODO 目前只使用 Request 而不使用 Response，所以这里写死用 REQUEST_MAP，以后可能 Response 表也会与 Request 表合并，用字段来区分
+ String cacheKey = AbstractVerifier.getCacheKeyForRequest(method, tag);
+ SortedMap versionedMap = AbstractVerifier.REQUEST_MAP.get(cacheKey);
+
+ JSONObject result = versionedMap == null ? null : versionedMap.get(Integer.valueOf(version));
+ if (result == null) { // version <= 0 时使用最新，version > 0 时使用 > version 的最接近版本（最小版本）
+ Set> set = versionedMap == null ? null : versionedMap.entrySet();
+
+ if (set != null && set.isEmpty() == false) {
+ Entry maxEntry = null;
+
+ for (Entry entry : set) {
+ if (entry == null || entry.getKey() == null || entry.getValue() == null) {
+ continue;
+ }
+
+ if (version <= 0 || version == entry.getKey()) { // 这里应该不会出现相等，因为上面 versionedMap.get(Integer.valueOf(version))
+ maxEntry = entry;
+ break;
+ }
+
+ if (entry.getKey() < version) {
+ break;
+ }
+
+ maxEntry = entry;
+ }
+
+ result = maxEntry == null ? null : maxEntry.getValue();
+ }
+
+ if (result != null) { // 加快下次查询，查到值的话组合情况其实是有限的，不属于恶意请求
+ if (versionedMap == null) {
+ versionedMap = new TreeMap<>(new Comparator() {
+
+ @Override
+ public int compare(Integer o1, Integer o2) {
+ return o2 == null ? -1 : o2.compareTo(o1); // 降序
+ }
+ });
+ }
+
+ versionedMap.put(Integer.valueOf(version), result);
+ AbstractVerifier.REQUEST_MAP.put(cacheKey, versionedMap);
+ }
+ }
+
+ if (result == null) {
+ if (AbstractVerifier.REQUEST_MAP.isEmpty() == false) {
+ return null; // 已使用 REQUEST_MAP 缓存全部，但没查到
+ }
+
+ //获取指定的JSON结构 <<<<<<<<<<<<<<
+ SQLConfig config = createSQLConfig().setMethod(GET).setTable(table);
+ config.setPrepared(false);
+ config.setColumn(Arrays.asList("structure"));
+
+ Map where = new HashMap();
+ where.put("method", method);
+ where.put(JSONRequest.KEY_TAG, tag);
+
+ if (version > 0) {
+ where.put(JSONRequest.KEY_VERSION + "{}", ">=" + version);
+ }
+ config.setWhere(where);
+ config.setOrder(JSONRequest.KEY_VERSION + (version > 0 ? "+" : "-"));
+ config.setCount(1);
+
+ //too many connections error: 不try-catch，可以让客户端看到是服务器内部异常
+ result = getSQLExecutor().execute(config, false);
+
+ // version, method, tag 组合情况太多了，JDK 里又没有 LRUCache，所以要么启动时一次性缓存全部后面只用缓存，要么每次都查数据库
+ // versionedMap.put(Integer.valueOf(version), result);
+ // AbstractVerifier.REQUEST_MAP.put(cacheKey, versionedMap);
+ }
+
+ return getJSONObject(result, "structure"); //解决返回值套了一层 "structure":{}
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
index 9783918f6..8d133a16d 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -34,11 +34,13 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.SortedMap;
import java.util.regex.Pattern;
import javax.activation.UnsupportedDataTypeException;
@@ -83,9 +85,17 @@ public abstract class AbstractVerifier implements Verifier, IdCallback {
// >
// >
+ @NotNull
public static final Map> SYSTEM_ACCESS_MAP;
+ @NotNull
public static final Map> ACCESS_MAP;
+
+ // >
+ // >
+ @NotNull
+ public static final Map> REQUEST_MAP;
+ @NotNull
public static final Map COMPILE_MAP;
static {
SYSTEM_ACCESS_MAP = new HashMap>();
@@ -110,6 +120,8 @@ public abstract class AbstractVerifier implements Verifier, IdCallback {
}
ACCESS_MAP = new HashMap<>(SYSTEM_ACCESS_MAP);
+
+ REQUEST_MAP = new HashMap<>(ACCESS_MAP.size()*6); // 单个与批量增删改
COMPILE_MAP = new HashMap();
}
@@ -689,7 +701,7 @@ public static JSONObject verifyResponse(@NotNull final RequestMethod method, fin
+ "\n response = \n" + JSON.toJSONString(response));
if (target == null || response == null) {// || target.isEmpty() {
- Log.i(TAG, "verifyRequest target == null || response == null >> return response;");
+ Log.i(TAG, "verifyResponse target == null || response == null >> return response;");
return response;
}
@@ -1424,5 +1436,9 @@ public static void verifyRepeat(String table, String key, Object value, long exc
}
}
+ public static String getCacheKeyForRequest(String method, String tag) {
+ return method + " " + tag;
+ }
+
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/Parser.java b/APIJSONORM/src/main/java/apijson/orm/Parser.java
index e8c285872..4e09c5738 100755
--- a/APIJSONORM/src/main/java/apijson/orm/Parser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/Parser.java
@@ -74,7 +74,7 @@ JSONObject parseCorrectRequest(RequestMethod method, String tag, int version, St
JSONObject parseCorrectResponse(String table, JSONObject response) throws Exception;
- JSONObject getStructure(String table, String key, String value, int version) throws Exception;
+ JSONObject getStructure(String table, String method, String tag, int version) throws Exception;
From 71f904313d04459745c1e1588397688da6b44c30 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 26 Dec 2020 19:44:21 +0800
Subject: [PATCH 0157/1181] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=8F=B7=E8=87=B3=204.4.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APIJSONORM/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
index 3756b076f..5342770e1 100755
--- a/APIJSONORM/pom.xml
+++ b/APIJSONORM/pom.xml
@@ -5,7 +5,7 @@
apijson.orm
apijson-orm
- 4.4.0
+ 4.4.5
jar
APIJSONORM
From 2b19a123d46b4e4939e78d6139dc36368fc0c203 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 26 Dec 2020 23:20:44 +0800
Subject: [PATCH 0158/1181] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=20@column=20=E6=94=AF=E6=8C=81=20(balance)*100=20=E5=92=8C=20l?=
=?UTF-8?q?ength(content)%2=3D0=20=E8=BF=99=E7=A7=8D=20=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=20=E6=88=96=20SQL=20=E5=87=BD=E6=95=B0=20=E5=90=8E=E6=8B=BC?=
=?UTF-8?q?=E6=8E=A5=E6=95=B0=E5=AD=97=E6=AF=94=E8=BE=83=E8=A1=A8=E8=BE=BE?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/apijson/orm/AbstractSQLConfig.java | 35 ++++++++++---------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index d621f17e8..a8d50dd2e 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -957,11 +957,14 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
method = expression.substring(0, start);
boolean distinct = i <= 0 && method.startsWith(PREFFIX_DISTINCT);
- if (StringUtil.isName(distinct ? method.substring(PREFFIX_DISTINCT.length()) : method) == false) {
+ String fun = distinct ? method.substring(PREFFIX_DISTINCT.length()) : method;
+
+ if (fun.isEmpty() == false && StringUtil.isName(fun) == false) {
throw new IllegalArgumentException("字符 " + method + " 不合法！"
+ "预编译模式下 @column:\"column0,column1:alias;function0(arg0,arg1,...);function1(...):alias...\""
+ " 中SQL函数名 function 必须符合正则表达式 ^[0-9a-zA-Z_]+$ ！");
}
+
}
boolean isColumn = start < 0;
@@ -1043,23 +1046,23 @@ else if (StringUtil.isName(origin)) {
}
else {
String suffix = expression.substring(end + 1, expression.length()); //:contactCount
- String alias = suffix.startsWith(":") ? suffix.substring(1) : null; //contactCount
-
- if (StringUtil.isEmpty(alias, true)) {
- if (suffix.isEmpty() == false) {
- throw new IllegalArgumentException("GET请求: 预编译模式下 @column:value 中 value里面用 ; 分割的每一项"
- + " function(arg0,arg1,...):alias 中 alias 如果有就必须是1个单词！并且不要有多余的空格！");
- }
- }
- else {
- if (StringUtil.isEmpty(alias, true) == false && StringUtil.isName(alias) == false) {
- throw new IllegalArgumentException("GET请求: 预编译模式下 @column:value 中 value里面用 ; 分割的每一项"
- + " function(arg0,arg1,...):alias 中 alias 必须是1个单词！并且不要有多余的空格！");
- }
+ int index = suffix.lastIndexOf(":");
+ String alias = index < 0 ? "" : suffix.substring(index + 1); //contactCount
+ suffix = index < 0 ? suffix : suffix.substring(0, index);
+
+ if (alias.isEmpty() == false && StringUtil.isName(alias) == false) {
+ throw new IllegalArgumentException("字符串 " + alias + " 不合法！"
+ + "预编译模式下 @column:value 中 value里面用 ; 分割的每一项"
+ + " function(arg0,arg1,...):alias 中 alias 必须是1个单词！并且不要有多余的空格！");
+ }
+
+ if (suffix.isEmpty() == false && (((String) suffix).contains("--") || PATTERN_RANGE.matcher((String) suffix).matches() == false)) {
+ throw new UnsupportedOperationException("字符串 " + suffix + " 不合法！"
+ + "预编译模式下 @column:\"column?value;function(arg0,arg1,...)?value...\""
+ + " 中 ?value 必须符合正则表达式 " + PATTERN_RANGE + " 且不包含连续减号 -- ！不允许多余的空格！");
}
-
- String origin = method + "(" + StringUtil.getString(ckeys) + ")";
+ String origin = method + "(" + StringUtil.getString(ckeys) + ")" + suffix;
// if (isKeyPrefix()) {
// keys[i] = origin + " AS " + quote + (isMain() ? "" : tableAlias + ".") + (StringUtil.isEmpty(alias, true) ? method : alias) + quote;
// }
From d7905fff56967787c0401bb4c4936b1846f3846e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 26 Dec 2020 23:27:52 +0800
Subject: [PATCH 0159/1181] =?UTF-8?q?@column=20=E5=92=8C=20@having=20?=
=?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=B3=A8=E9=87=8A=E7=AC=A6=20/*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/apijson/orm/AbstractSQLConfig.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index a8d50dd2e..e6f3fd9cc 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -592,10 +592,10 @@ public String getHavingString(boolean hasPrefix) {
suffix = expression.substring(end + 1, expression.length());
- if (isPrepared() && (((String) suffix).contains("--") || PATTERN_RANGE.matcher((String) suffix).matches() == false)) {
+ if (isPrepared() && (((String) suffix).contains("--") || ((String) suffix).contains("/*") || PATTERN_RANGE.matcher((String) suffix).matches() == false)) {
throw new UnsupportedOperationException("字符串 " + suffix + " 不合法！"
+ "预编译模式下 @having:\"column?value;function(arg0,arg1,...)?value...\""
- + " 中 ?value 必须符合正则表达式 " + PATTERN_RANGE + " 且不包含连续减号 -- ！不允许多余的空格！");
+ + " 中 ?value 必须符合正则表达式 " + PATTERN_RANGE + " 且不包含连续减号 -- 或注释符 /* ！不允许多余的空格！");
}
String[] ckeys = StringUtil.split(expression.substring(start + 1, end));
@@ -1056,10 +1056,10 @@ else if (StringUtil.isName(origin)) {
+ " function(arg0,arg1,...):alias 中 alias 必须是1个单词！并且不要有多余的空格！");
}
- if (suffix.isEmpty() == false && (((String) suffix).contains("--") || PATTERN_RANGE.matcher((String) suffix).matches() == false)) {
+ if (suffix.isEmpty() == false && (((String) suffix).contains("--") || ((String) suffix).contains("/*") || PATTERN_RANGE.matcher((String) suffix).matches() == false)) {
throw new UnsupportedOperationException("字符串 " + suffix + " 不合法！"
+ "预编译模式下 @column:\"column?value;function(arg0,arg1,...)?value...\""
- + " 中 ?value 必须符合正则表达式 " + PATTERN_RANGE + " 且不包含连续减号 -- ！不允许多余的空格！");
+ + " 中 ?value 必须符合正则表达式 " + PATTERN_RANGE + " 且不包含连续减号 -- 或注释符 /* ！不允许多余的空格！");
}
String origin = method + "(" + StringUtil.getString(ckeys) + ")" + suffix;
From 3e86b0921069a5fad7358cb45932beae781c2f87 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Dec 2020 00:00:39 +0800
Subject: [PATCH 0160/1181] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20PUT=20=E8=AF=B7?=
=?UTF-8?q?=E6=B1=82=E4=BC=A0=20@key:[]=20=E8=A2=AB=E5=BD=93=E6=88=90?=
=?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E7=84=B6=E5=90=8E=E8=A7=A3=E6=9E=90?=
=?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../apijson/orm/AbstractObjectParser.java | 24 ++++++++++++-------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
index 6bcc06e7a..f33534d19 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -222,36 +222,42 @@ public AbstractObjectParser parse() throws Exception {
key = entry.getKey();
try {
- if (value instanceof JSONObject && key.startsWith("@") == false && key.endsWith("@") == false) { //JSONObject，往下一级提取
- if (childMap != null) {//添加到childMap，最后再解析
+ if (key.startsWith("@") || key.endsWith("@")) {
+ if (onParse(key, value) == false) {
+ invalidate();
+ }
+ }
+ else if (value instanceof JSONObject) { // JSONObject，往下一级提取
+ if (childMap != null) { // 添加到childMap，最后再解析
childMap.put(key, (JSONObject)value);
}
- else { //直接解析并替换原来的，[]:{} 内必须直接解析，否则会因为丢掉count等属性，并且total@:"/[]/total"必须在[]:{} 后！
+ else { // 直接解析并替换原来的，[]:{} 内必须直接解析，否则会因为丢掉count等属性，并且total@:"/[]/total"必须在[]:{} 后！
response.put(key, onChildParse(index, key, (JSONObject)value));
index ++;
}
}
- else if ((method == POST || method == PUT) && value instanceof JSONArray && JSONRequest.isTableArray(key)) { //JSONArray，批量新增或修改，往下一级提取
+ else if ((method == POST || method == PUT) && value instanceof JSONArray
+ && JSONRequest.isTableArray(key)) { // JSONArray，批量新增或修改，往下一级提取
onTableArrayParse(key, (JSONArray) value);
}
else if (method == PUT && value instanceof JSONArray
- && (whereList == null || whereList.contains(key) == false)) { //PUT JSONArray
+ && (whereList == null || whereList.contains(key) == false)) { // PUT JSONArray
onPUTArrayParse(key, (JSONArray) value);
}
- else {//JSONArray或其它Object，直接填充
+ else { // JSONArray或其它Object，直接填充
if (onParse(key, value) == false) {
invalidate();
}
}
} catch (Exception e) {
if (tri == false) {
- throw e;//不忽略错误，抛异常
+ throw e; // 不忽略错误，抛异常
}
- invalidate();//忽略错误，还原request
+ invalidate(); // 忽略错误，还原request
}
}
- //非Table内的函数会被滞后在onChildParse后调用！ onFunctionResponse("-");
+ // 非Table内的函数会被滞后在onChildParse后调用！ onFunctionResponse("-");
}
if (isTable) {
From 5cf01bc44f0dd392f43197dc33386849b12cc52b Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Dec 2020 01:33:42 +0800
Subject: [PATCH 0161/1181] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20REQUEST=5FMAP=20?=
=?UTF-8?q?=E7=BC=93=E5=AD=98=E4=B8=AD=E7=9A=84=20strcuture=20=E5=9C=A8?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8F=82=E6=95=B0=E6=8A=9B=E5=BC=82=E5=B8=B8?=
=?UTF-8?q?=E5=90=8E=E6=9C=AA=E8=A2=AB=E8=BF=98=E5=8E=9F=EF=BC=8C=E5=AF=BC?=
=?UTF-8?q?=E8=87=B4=E5=90=8E=E7=BB=AD=E8=A7=A3=E6=9E=90=E4=B8=A2=E4=BA=86?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/apijson/orm/AbstractVerifier.java | 350 +++++++++---------
1 file changed, 176 insertions(+), 174 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
index 8d133a16d..c19c94acf 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -34,7 +34,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -89,7 +88,7 @@ public abstract class AbstractVerifier implements Verifier, IdCallback {
public static final Map> SYSTEM_ACCESS_MAP;
@NotNull
public static final Map> ACCESS_MAP;
-
+
// >
// >
@NotNull
@@ -120,7 +119,7 @@ public abstract class AbstractVerifier implements Verifier, IdCallback {
}
ACCESS_MAP = new HashMap<>(SYSTEM_ACCESS_MAP);
-
+
REQUEST_MAP = new HashMap<>(ACCESS_MAP.size()*6); // 单个与批量增删改
COMPILE_MAP = new HashMap();
@@ -773,220 +772,223 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
target.remove(DISALLOW.name());
+ try { // 避免中间抛异常导致 target 未 put 进 remove 掉的键值对
- //移除字段<<<<<<<<<<<<<<<<<<<
- String[] removes = StringUtil.split(remove);
- if (removes != null && removes.length > 0) {
- for (String r : removes) {
- real.remove(r);
+ //移除字段<<<<<<<<<<<<<<<<<<<
+ String[] removes = StringUtil.split(remove);
+ if (removes != null && removes.length > 0) {
+ for (String r : removes) {
+ real.remove(r);
+ }
}
- }
- //移除字段>>>>>>>>>>>>>>>>>>>
-
- //判断必要字段是否都有<<<<<<<<<<<<<<<<<<<
- String[] musts = StringUtil.split(must);
- List mustList = musts == null ? new ArrayList() : Arrays.asList(musts);
- for (String s : mustList) {
- if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不能缺少 " + s + " 等[" + must + "]内的任何字段！");
+ //移除字段>>>>>>>>>>>>>>>>>>>
+
+ //判断必要字段是否都有<<<<<<<<<<<<<<<<<<<
+ String[] musts = StringUtil.split(must);
+ List mustList = musts == null ? new ArrayList() : Arrays.asList(musts);
+ for (String s : mustList) {
+ if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不能缺少 " + s + " 等[" + must + "]内的任何字段！");
+ }
}
- }
- String[] necessarys = StringUtil.split(necessary);
- List necessaryList = necessarys == null ? new ArrayList() : Arrays.asList(necessarys);
- for (String s : necessaryList) {
- if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不能缺少 " + s + " 等[" + necessary + "]内的任何字段！");
+ String[] necessarys = StringUtil.split(necessary);
+ List necessaryList = necessarys == null ? new ArrayList() : Arrays.asList(necessarys);
+ for (String s : necessaryList) {
+ if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不能缺少 " + s + " 等[" + necessary + "]内的任何字段！");
+ }
}
- }
- //判断必要字段是否都有>>>>>>>>>>>>>>>>>>>
+ //判断必要字段是否都有>>>>>>>>>>>>>>>>>>>
- Set objKeySet = new HashSet(); //不能用tableKeySet，仅判断 Table:{} 会导致 key:{ Table:{} } 绕过判断
+ Set objKeySet = new HashSet(); //不能用tableKeySet，仅判断 Table:{} 会导致 key:{ Table:{} } 绕过判断
- //解析内容<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ //解析内容<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- Set> set = new LinkedHashSet<>(target.entrySet());
- if (set.isEmpty() == false) {
+ Set> set = new LinkedHashSet<>(target.entrySet());
+ if (set.isEmpty() == false) {
- String key;
- Object tvalue;
- Object rvalue;
- for (Entry entry : set) {
- key = entry == null ? null : entry.getKey();
- if (key == null) {
- continue;
- }
- tvalue = entry.getValue();
- rvalue = real.get(key);
- if (callback.onParse(key, tvalue, rvalue) == false) {
- continue;
- }
-
- if (tvalue instanceof JSONObject) { //JSONObject，往下一级提取
- if (rvalue != null && rvalue instanceof JSONObject == false) {
- throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 OBJECT ，结构为 {} !");
+ String key;
+ Object tvalue;
+ Object rvalue;
+ for (Entry entry : set) {
+ key = entry == null ? null : entry.getKey();
+ if (key == null) {
+ continue;
}
- tvalue = callback.onParseJSONObject(key, (JSONObject) tvalue, (JSONObject) rvalue);
-
- objKeySet.add(key);
- } else if (tvalue instanceof JSONArray) { //JSONArray
- if (rvalue != null && rvalue instanceof JSONArray == false) {
- throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 ARRAY ，结构为 [] !");
+ tvalue = entry.getValue();
+ rvalue = real.get(key);
+ if (callback.onParse(key, tvalue, rvalue) == false) {
+ continue;
}
- tvalue = callback.onParseJSONArray(key, (JSONArray) tvalue, (JSONArray) rvalue);
- if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
+ if (tvalue instanceof JSONObject) { //JSONObject，往下一级提取
+ if (rvalue != null && rvalue instanceof JSONObject == false) {
+ throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 OBJECT ，结构为 {} !");
+ }
+ tvalue = callback.onParseJSONObject(key, (JSONObject) tvalue, (JSONObject) rvalue);
+
objKeySet.add(key);
+ } else if (tvalue instanceof JSONArray) { //JSONArray
+ if (rvalue != null && rvalue instanceof JSONArray == false) {
+ throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 ARRAY ，结构为 [] !");
+ }
+ tvalue = callback.onParseJSONArray(key, (JSONArray) tvalue, (JSONArray) rvalue);
+
+ if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
+ objKeySet.add(key);
+ }
+ } else {//其它Object
+ tvalue = callback.onParseObject(key, tvalue, rvalue);
}
- } else {//其它Object
- tvalue = callback.onParseObject(key, tvalue, rvalue);
- }
- if (tvalue != null) {//可以在target中加上一些不需要客户端传的键值对
- real.put(key, tvalue);
+ if (tvalue != null) {//可以在target中加上一些不需要客户端传的键值对
+ real.put(key, tvalue);
+ }
}
- }
- }
+ }
- //解析内容>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+ //解析内容>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- Set rkset = real.keySet(); //解析内容并没有改变rkset
+ Set rkset = real.keySet(); //解析内容并没有改变rkset
- //解析不允许的字段<<<<<<<<<<<<<<<<<<<
- List refuseList = new ArrayList();
- if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
- for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
- if (key != null && key.startsWith("@") == false
- && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
- refuseList.add(key);
+ //解析不允许的字段<<<<<<<<<<<<<<<<<<<
+ List refuseList = new ArrayList();
+ if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
+ for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
+ if (key != null && key.startsWith("@") == false
+ && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
+ refuseList.add(key);
+ }
+ }
+ } else {
+ String[] refuses = StringUtil.split(refuse);
+ if (refuses != null && refuses.length > 0) {
+ refuseList.addAll(Arrays.asList(refuses));
}
}
- } else {
- String[] refuses = StringUtil.split(refuse);
- if (refuses != null && refuses.length > 0) {
- refuseList.addAll(Arrays.asList(refuses));
- }
- }
- List disallowList = new ArrayList();
- if ("!".equals(disallow)) {//所有非necessary，改成 !necessary 更好
- for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
- if (key != null && key.startsWith("@") == false
- && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
- disallowList.add(key);
+ List disallowList = new ArrayList();
+ if ("!".equals(disallow)) {//所有非necessary，改成 !necessary 更好
+ for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
+ if (key != null && key.startsWith("@") == false
+ && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
+ disallowList.add(key);
+ }
+ }
+ } else {
+ String[] disallows = StringUtil.split(disallow);
+ if (disallows != null && disallows.length > 0) {
+ disallowList.addAll(Arrays.asList(disallows));
}
}
- } else {
- String[] disallows = StringUtil.split(disallow);
- if (disallows != null && disallows.length > 0) {
- disallowList.addAll(Arrays.asList(disallows));
- }
- }
- //解析不允许的字段>>>>>>>>>>>>>>>>>>>
-
+ //解析不允许的字段>>>>>>>>>>>>>>>>>>>
- //判断不允许传的key<<<<<<<<<<<<<<<<<<<<<<<<<
- for (String rk : rkset) {
- if (refuseList.contains(rk)) { //不允许的字段
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不允许传 " + rk + " 等" + StringUtil.getString(refuseList) + "内的任何字段！");
- }
- if (disallowList.contains(rk)) { //不允许的字段
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不允许传 " + rk + " 等" + StringUtil.getString(disallowList) + "内的任何字段！");
- }
- if (rk == null) { //无效的key
- real.remove(rk);
- continue;
- }
+ //判断不允许传的key<<<<<<<<<<<<<<<<<<<<<<<<<
+ for (String rk : rkset) {
+ if (refuseList.contains(rk)) { //不允许的字段
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不允许传 " + rk + " 等" + StringUtil.getString(refuseList) + "内的任何字段！");
+ }
+ if (disallowList.contains(rk)) { //不允许的字段
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不允许传 " + rk + " 等" + StringUtil.getString(disallowList) + "内的任何字段！");
+ }
- Object rv = real.get(rk);
+ if (rk == null) { //无效的key
+ real.remove(rk);
+ continue;
+ }
- //不允许传远程函数，只能后端配置
- if (rk.endsWith("()") && rv instanceof String) {
- throw new UnsupportedOperationException(method + " 请求，" + rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
- }
+ Object rv = real.get(rk);
- //不在target内的 key:{}
- if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
- if (rv instanceof JSONObject) {
- throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");
+ //不允许传远程函数，只能后端配置
+ if (rk.endsWith("()") && rv instanceof String) {
+ throw new UnsupportedOperationException(method + " 请求，" + rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
}
- if ((method == RequestMethod.POST || method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {
- throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");
+
+ //不在target内的 key:{}
+ if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
+ if (rv instanceof JSONObject) {
+ throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");
+ }
+ if ((method == RequestMethod.POST || method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {
+ throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");
+ }
}
}
- }
- //判断不允许传的key>>>>>>>>>>>>>>>>>>>>>>>>>
-
+ //判断不允许传的key>>>>>>>>>>>>>>>>>>>>>>>>>
- //校验与修改Request<<<<<<<<<<<<<<<<<
- //在tableKeySet校验后操作，避免 导致put/add进去的Table 被当成原Request的内容
- real = operate(TYPE, type, real, creator);
- real = operate(VERIFY, verify, real, creator);
- real = operate(INSERT, insert, real, creator);
- real = operate(UPDATE, update, real, creator);
- real = operate(REPLACE, replace, real, creator);
- //校验与修改Request>>>>>>>>>>>>>>>>>
+ //校验与修改Request<<<<<<<<<<<<<<<<<
+ //在tableKeySet校验后操作，避免 导致put/add进去的Table 被当成原Request的内容
+ real = operate(TYPE, type, real, creator);
+ real = operate(VERIFY, verify, real, creator);
+ real = operate(INSERT, insert, real, creator);
+ real = operate(UPDATE, update, real, creator);
+ real = operate(REPLACE, replace, real, creator);
+ //校验与修改Request>>>>>>>>>>>>>>>>>
- String db = real.getString(apijson.JSONObject.KEY_DATABASE);
- String sh = real.getString(apijson.JSONObject.KEY_SCHEMA);
- if (StringUtil.isEmpty(db, false)) {
- db = database;
- }
- if (StringUtil.isEmpty(sh, false)) {
- sh = schema;
- }
- String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, name);
- String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
- //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
- //校验存在<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
- String[] exists = StringUtil.split(exist);
- if (exists != null && exists.length > 0) {
- long exceptId = real.getLongValue(finalIdKey);
- for (String e : exists) {
- verifyExist(name, e, real.get(e), exceptId, creator);
+ String db = real.getString(apijson.JSONObject.KEY_DATABASE);
+ String sh = real.getString(apijson.JSONObject.KEY_SCHEMA);
+ if (StringUtil.isEmpty(db, false)) {
+ db = database;
}
- }
- //校验存在>>>>>>>>>>>>>>>>>>>
-
- //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
- //校验重复<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
- String[] uniques = StringUtil.split(unique);
- if (uniques != null && uniques.length > 0) {
- long exceptId = real.getLongValue(finalIdKey);
- for (String u : uniques) {
- verifyRepeat(name, u, real.get(u), exceptId, finalIdKey, creator);
+ if (StringUtil.isEmpty(sh, false)) {
+ sh = schema;
}
- }
- //校验重复>>>>>>>>>>>>>>>>>>>
-
-
- //还原 <<<<<<<<<<
- target.put(TYPE.name(), type);
- target.put(VERIFY.name(), verify);
- target.put(INSERT.name(), insert);
- target.put(UPDATE.name(), update);
- target.put(REPLACE.name(), replace);
+ String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, name);
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+
+ //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
+ //校验存在<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
+ String[] exists = StringUtil.split(exist);
+ if (exists != null && exists.length > 0) {
+ long exceptId = real.getLongValue(finalIdKey);
+ for (String e : exists) {
+ verifyExist(name, e, real.get(e), exceptId, creator);
+ }
+ }
+ //校验存在>>>>>>>>>>>>>>>>>>>
+
+ //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
+ //校验重复<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
+ String[] uniques = StringUtil.split(unique);
+ if (uniques != null && uniques.length > 0) {
+ long exceptId = real.getLongValue(finalIdKey);
+ for (String u : uniques) {
+ verifyRepeat(name, u, real.get(u), exceptId, finalIdKey, creator);
+ }
+ }
+ //校验重复>>>>>>>>>>>>>>>>>>>
- target.put(EXIST.name(), exist);
- target.put(UNIQUE.name(), unique);
- target.put(REMOVE.name(), remove);
- target.put(MUST.name(), must);
- target.put(REFUSE.name(), refuse);
- target.put(NECESSARY.name(), necessary);
- target.put(DISALLOW.name(), disallow);
- //还原 >>>>>>>>>>
+ }
+ finally {
+ //还原 <<<<<<<<<<
+ target.put(TYPE.name(), type);
+ target.put(VERIFY.name(), verify);
+ target.put(INSERT.name(), insert);
+ target.put(UPDATE.name(), update);
+ target.put(REPLACE.name(), replace);
+
+ target.put(EXIST.name(), exist);
+ target.put(UNIQUE.name(), unique);
+ target.put(REMOVE.name(), remove);
+ target.put(MUST.name(), must);
+ target.put(REFUSE.name(), refuse);
+ target.put(NECESSARY.name(), necessary);
+ target.put(DISALLOW.name(), disallow);
+ //还原 >>>>>>>>>>
+ }
Log.i(TAG, "parse return real = " + JSON.toJSONString(real));
return real;
@@ -1439,6 +1441,6 @@ public static void verifyRepeat(String table, String key, Object value, long exc
public static String getCacheKeyForRequest(String method, String tag) {
return method + " " + tag;
}
-
+
}
From 991b5fbbccf3fb28e9817e697c87220d4ab357a4 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Dec 2020 01:45:05 +0800
Subject: [PATCH 0162/1181] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20REFUSE=20?=
=?UTF-8?q?=E5=80=BC=E4=B8=BA=20"!"=20=E6=97=B6=E5=9B=A0=E4=B8=BA=E6=B2=A1?=
=?UTF-8?q?=E6=9C=89=E5=8C=B9=E9=85=8D=20MUST=EF=BC=8C=E8=80=8C=E6=98=AF?=
=?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BA=86=20NECESSARY=20=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?=E5=88=A4=E6=96=AD=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
index c19c94acf..d7c796e33 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -863,7 +863,7 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
if (key != null && key.startsWith("@") == false
- && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
+ && mustList.contains(key) == false && objKeySet.contains(key) == false) {
refuseList.add(key);
}
}
From 945f6e4b0a0e18351c8e752e7d501782b04dbbcf Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Dec 2020 01:46:08 +0800
Subject: [PATCH 0163/1181] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=8F=B7=E4=B8=BA=204.4.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APIJSONORM/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
index 5342770e1..c0505510c 100755
--- a/APIJSONORM/pom.xml
+++ b/APIJSONORM/pom.xml
@@ -5,7 +5,7 @@
apijson.orm
apijson-orm
- 4.4.5
+ 4.4.6
jar
APIJSONORM
From 5a51f8825d284bc4e58b9bf79d3cc6de100881f8 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 27 Dec 2020 02:02:45 +0800
Subject: [PATCH 0164/1181] Update pom.xml
---
APIJSONORM/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
index c0505510c..09a9fcf4e 100755
--- a/APIJSONORM/pom.xml
+++ b/APIJSONORM/pom.xml
@@ -5,7 +5,7 @@
apijson.orm
apijson-orm
- 4.4.6
+ 4.4.7
jar
APIJSONORM
From f4f887cd7ae3b1cfeaad8a40e84bd41887dadf18 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Mon, 28 Dec 2020 00:37:29 +0800
Subject: [PATCH 0165/1181] Update README.md
---
README.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/README.md b/README.md
index a77f891ab..bb212a895 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,11 @@ APIJSON 是一种专为 API 而生的 JSON 网络传输协议 以及 基于这
apijson.orm
apijson-orm
- 4.4.7
+ 4.4.8
jar
APIJSONORM
From 62e5c0b7aeb3e6b2c8cae21218f14c8d72ba46cf Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 30 Dec 2020 11:09:01 +0800
Subject: [PATCH 0184/1181] Update Document.md
---
Document.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/Document.md b/Document.md
index 86869c255..7b299146f 100644
--- a/Document.md
+++ b/Document.md
@@ -20,6 +20,7 @@
请求：
{
"User":{
+ "id":38710
}
}
{
From 3a7371281aef2371508fb42e772248b4b72b4408 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 30 Dec 2020 21:51:56 +0800
Subject: [PATCH 0186/1181] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index b08d7700d..3b0a59bcb 100644
--- a/README.md
+++ b/README.md
@@ -136,6 +136,8 @@ https://github.com/TommyLemon/StaticResources/tree/master/APIJSON/Share/GiteeGVP
https://my.oschina.net/u/4570368/blog/4818203
@@ -227,8 +228,6 @@ https://github.com/Tencent/APIJSON/issues/36
-[更多 APIJSON 使用者](https://github.com/Tencent/APIJSON/issues/73)
-
### 贡献者们
主项目 APIJSON 的贡献者们和 生态周边项目 的作者们：
From 92e9c99466caf4afb9494b2d6777613ba93db21b Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 2 Jan 2021 00:22:05 +0800
Subject: [PATCH 0189/1181] Update README.md
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6245d313c..c47193d7b 100644
--- a/README.md
+++ b/README.md
@@ -213,7 +213,8 @@ https://github.com/Tencent/APIJSON/issues/36
### 使用登记
-如果您在使用 APIJSON，请让我们知道，您的使用对我们非常重要：https://github.com/Tencent/APIJSON/issues/187 （按登记顺序排列）
+如果您在使用 APIJSON，请让我们知道，您的使用对我们非常重要(按登记顺序排列)：
+https://github.com/Tencent/APIJSON/issues/187
From e6e446d90b6a992c892f3aa3d47ceb6721fe6d33 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:04:51 +0800
Subject: [PATCH 0190/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6cc84c028..b5ac367e1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,6 +29,13 @@ APIJSON 持续招募贡献者，即使是在 Issue 中回答问题，或者做
APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢和支持，希望你能够成为 APIJSON 的核心贡献者，
加入 APIJSON ，共同打造一个更棒的自动化 ORM 库！🍾🎉
+#### 为什么一定要贡献代码？
+贡献代码可以避免你碰到以下麻烦：
+1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
+2.你需要自己维护你的代码，如果项目更新了，你需要下载新代码并合并你自己的更改
+3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
+##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Rueqest]() 来贡献代码。
+
## Issue 提交
From 4a53cdeead512f5ad6a0437cf541c4cde8c984b7 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:05:09 +0800
Subject: [PATCH 0191/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b5ac367e1..f981096dc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
2.你需要自己维护你的代码，如果项目更新了，你需要下载新代码并合并你自己的更改
3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
-##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Rueqest]() 来贡献代码。
+##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Rueqest] 来贡献代码。
From 8256d78765dd820851c9a207f53e5575509d5275 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:05:29 +0800
Subject: [PATCH 0192/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f981096dc..c6c6e047e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
2.你需要自己维护你的代码，如果项目更新了，你需要下载新代码并合并你自己的更改
3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
-##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Rueqest] 来贡献代码。
+##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Rueqest](/CONTRIBUTING.md#pull-request) 来贡献代码。
From 6b6eec3ade74e8c24355807731c0dff7a82e823f Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:05:57 +0800
Subject: [PATCH 0193/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c6c6e047e..3807fc94e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@
- [CoolGeo2016](https://github.com/CoolGeo2016)
- [1906522096](https://github.com/1906522096)
-其中特别致谢:
+##### 其中特别致谢:
justinfengchen 提交的 6 个 Commits, 对 APIJSON 做出了 3,130 增加和 0 处删减(截止 2020/11/04 日)；
ruoranw 提交的 18 个 Commits, 对 APIJSON 做出了 328 增加和 520 处删减(截止 2020/11/04 日)；
Zerounary 提交的 6 个 Commits, 对 APIJSON 做出了 1,104 增加和 1 处删减(截止 2020/11/04 日)。
From b20a86894e10d7cd76e84ca7fe72ea74533b2f36 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:06:17 +0800
Subject: [PATCH 0194/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3807fc94e..e8a57a972 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
2.你需要自己维护你的代码，如果项目更新了，你需要下载新代码并合并你自己的更改
3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
-##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Rueqest](/CONTRIBUTING.md#pull-request) 来贡献代码。
+##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
From ec94a395eba3a32f9b46c1520179d5371c301072 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:07:36 +0800
Subject: [PATCH 0195/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8a57a972..d962fb402 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
#### 为什么一定要贡献代码？
贡献代码可以避免你碰到以下麻烦：
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
-2.你需要自己维护你的代码，如果项目更新了，你需要下载新代码并合并你自己的更改
+2.你需要自己维护你的代码，如果项目更新了，你需要下载新代码再合并你自己的更改
3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
From f63f72eed7d6a35d241c8cfa6e7dbdcf9170b0a3 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:08:06 +0800
Subject: [PATCH 0196/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d962fb402..d40739431 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
#### 为什么一定要贡献代码？
贡献代码可以避免你碰到以下麻烦：
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
-2.你需要自己维护你的代码，如果项目更新了，你需要下载新代码再合并你自己的更改
+2.你需要自己维护你的代码，每次项目更新时，你需要下载新代码再合并你自己的更改
3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
From 10d64016821f7092976ad338d50e23740fb2261e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:08:57 +0800
Subject: [PATCH 0197/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d40739431..28a0cd8e8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
#### 为什么一定要贡献代码？
贡献代码可以避免你碰到以下麻烦：
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
-2.你需要自己维护你的代码，每次项目更新时，你需要下载新代码再合并你自己的更改
+2.你需要自己维护你的代码，每次升级版本时，你需要下载新代码再合并你自己的更改
3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
From cae5a287c5de8bc224ea81c92f564aeff5a52488 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:09:33 +0800
Subject: [PATCH 0198/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 28a0cd8e8..640c732f1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
2.你需要自己维护你的代码，每次升级版本时，你需要下载新代码再合并你自己的更改
3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
-##### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
+#### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
From c87605e9485af09bcc262802e00c4cd4a5f29e1d Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:10:00 +0800
Subject: [PATCH 0199/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 640c732f1..266ee6858 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@
- [CoolGeo2016](https://github.com/CoolGeo2016)
- [1906522096](https://github.com/1906522096)
-##### 其中特别致谢:
+#### 其中特别致谢:
justinfengchen 提交的 6 个 Commits, 对 APIJSON 做出了 3,130 增加和 0 处删减(截止 2020/11/04 日)；
ruoranw 提交的 18 个 Commits, 对 APIJSON 做出了 328 增加和 520 处删减(截止 2020/11/04 日)；
Zerounary 提交的 6 个 Commits, 对 APIJSON 做出了 1,104 增加和 1 处删减(截止 2020/11/04 日)。
@@ -29,7 +29,7 @@ APIJSON 持续招募贡献者，即使是在 Issue 中回答问题，或者做
APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢和支持，希望你能够成为 APIJSON 的核心贡献者，
加入 APIJSON ，共同打造一个更棒的自动化 ORM 库！🍾🎉
-#### 为什么一定要贡献代码？
+### 为什么一定要贡献代码？
贡献代码可以避免你碰到以下麻烦：
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
2.你需要自己维护你的代码，每次升级版本时，你需要下载新代码再合并你自己的更改
From bc69af1354281dd7a86bad2788ece573d08f2426 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:11:44 +0800
Subject: [PATCH 0200/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 266ee6858..d379bca40 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,8 +32,8 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
### 为什么一定要贡献代码？
贡献代码可以避免你碰到以下麻烦：
1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
-2.你需要自己维护你的代码，每次升级版本时，你需要下载新代码再合并你自己的更改
-3.作者和其它贡献者可能不兼容你更改的代码，导致和你的代码在功能甚至编译上出错
+2.作者和其它贡献者可能不兼容你更改的代码，导致升级版本后在功能甚至编译上出错
+3.你需要自己维护你的代码，每次升级版本时，你需要下载新代码再合并你自己的更改
#### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
From 26705d0a12c8dac884f24492f8380c2aa77ff749 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:12:50 +0800
Subject: [PATCH 0201/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d379bca40..f1f2f2bc4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,9 +31,9 @@ APIJSON 已开发近 4 年，在此感谢所有开发者对于 APIJSON 的喜欢
### 为什么一定要贡献代码？
贡献代码可以避免你碰到以下麻烦：
-1.你的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
-2.作者和其它贡献者可能不兼容你更改的代码，导致升级版本后在功能甚至编译上出错
-3.你需要自己维护你的代码，每次升级版本时，你需要下载新代码再合并你自己的更改
+1.你在 APIJSON 上更改的代码其他人看不到，不能帮你发现 Bug，更不可能帮你修复 Bug 甚至优化代码
+2.作者和其它贡献者可能不兼容你更改的代码，导致你的项目在升级 APIJSON 版本后在功能甚至编译上出错
+3.你需要自己维护你的代码，每次升级 APIJSON 版本时，你都需要下载 APIJSON 新代码再合并你自己的更改
#### 所以为了让你自己的更改始终能跟上项目版本，得到他人给予的可靠且持续的维护，强烈建议 [提交 Pull Request](/CONTRIBUTING.md#pull-request) 来贡献代码。
From 84b3295c64ad986ff43a83bcdd0ade4170df2ab9 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 3 Jan 2021 15:20:05 +0800
Subject: [PATCH 0202/1181] Update CONTRIBUTING.md
---
CONTRIBUTING.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f1f2f2bc4..dce6401fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -95,3 +95,10 @@ $ git rebase
/
#### Commit 信息提交
Commit 信息请遵循 [Commit 消息约定](./CONTRIBUTING_COMMIT.md)，以便可以自动生成 `CHANGELOG` 。具体格式请参考 Commit 文档规范。
+
+#### 详细的图文步骤可参考
+GitHub - 对项目做出贡献 /
Commit 信息请遵循 [Commit 消息约定](./CONTRIBUTING_COMMIT.md)，以便可以自动生成 `CHANGELOG` 。具体格式请参考 Commit 文档规范。
-#### 详细的图文步骤可参考
+#### 详细的图文步骤可参考以下任意一篇
GitHub - 对项目做出贡献 /
Commit 信息请遵循 [Commit 消息约定](./CONTRIBUTING_COMMIT.md)，以便可以自动生成 `CHANGELOG` 。具体格式请参考 Commit 文档规范。
+
Date: Tue, 12 Jan 2021 16:59:02 +0800
Subject: [PATCH 0216/1181] Optimize some code
---
.../main/java/apijson/orm/AbstractParser.java | 8 ++------
APIJSONORM/src/main/java/apijson/orm/Logic.java | 16 ++++++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
index 3ab9225b3..3168cf856 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -709,12 +709,8 @@ public JSONObject getStructure(@NotNull String table, String method, String tag,
if (result != null) { // 加快下次查询，查到值的话组合情况其实是有限的，不属于恶意请求
if (versionedMap == null) {
- versionedMap = new TreeMap<>(new Comparator() {
-
- @Override
- public int compare(Integer o1, Integer o2) {
- return o2 == null ? -1 : o2.compareTo(o1); // 降序
- }
+ versionedMap = new TreeMap<>((o1, o2) -> {
+ return o2 == null ? -1 : o2.compareTo(o1); // 降序
});
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/Logic.java b/APIJSONORM/src/main/java/apijson/orm/Logic.java
index 593800270..b795ae961 100755
--- a/APIJSONORM/src/main/java/apijson/orm/Logic.java
+++ b/APIJSONORM/src/main/java/apijson/orm/Logic.java
@@ -108,12 +108,16 @@ public static int getType(char logicChar) {
public static int getType(String logicChar) {
int type = -1;
if (logicChar != null && logicChar.length() == 1) {
- if ("|".equals(logicChar)) {
- type = 0;
- } else if ("&".equals(logicChar)) {
- type = 1;
- } else if ("!".equals(logicChar)) {
- type = 2;
+ switch (logicChar) {
+ case "|":
+ type = 0;
+ break;
+ case "&":
+ type = 1;
+ break;
+ case "!":
+ type = 2;
+ break;
}
}
return type;
From 1530864c259e1a46429e3a52af5b768daa9df4c4 Mon Sep 17 00:00:00 2001
From: "ganyu.gy"
Date: Tue, 12 Jan 2021 17:03:02 +0800
Subject: [PATCH 0217/1181] Upgrade fastjson
---
APIJSONORM/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
index 975c97d66..80ec99bd8 100755
--- a/APIJSONORM/pom.xml
+++ b/APIJSONORM/pom.xml
@@ -22,7 +22,7 @@
com.alibaba
fastjson
- 1.2.74
+ 1.2.75
From 6c13d3211ca084cbc0df1fa099e2aff978ab1f10 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Tue, 12 Jan 2021 20:45:51 +0800
Subject: [PATCH 0218/1181] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index cf2c46a56..e1f27e704 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,8 @@ https://github.com/Tencent/APIJSON/issues/36
测试及自动生成代码工具
-
-
-
-
-
-
-
-
-
-
-
-
-
+ height="60" width="60" >
+
+
+
+
+
+
+
+
+
+
+
+
-
+ height="60" width="60" >
+
+ height="60" width="60" >
-
+ height="60" width="60" >
+
-
+ height="60" width="60" >
+
-
-
+ height="60" width="60" >
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
[More APIJSON Users](https://github.com/Tencent/APIJSON/issues/73)
@@ -321,34 +322,35 @@ If you have any questions or suggestions, you can [create an issue](https://gith
Here are the contributers of this project and authors of other projects for ecosystem of APIJSON:
-
-
-
-
-
-
-
-
-
-
-
+ height="60" width="60" >
+
+
+
+
+
+
+
+
+
+
+
+
-
+ height="60" width="60" >
+
+ height="60" width="60" >
-
+ height="60" width="60" >
+
-
+ height="60" width="60" >
+
-
-
+ height="60" width="60" >
+
+
Thanks to all contributers of APIJSON!
From 0bde019ba6857efef536b82f45e601c9b39d366f Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 16 Jan 2021 14:08:18 +0800
Subject: [PATCH 0225/1181] Update README.md
---
README.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7ae81ccf8..4c196c4e7 100644
--- a/README.md
+++ b/README.md
@@ -290,7 +290,11 @@ https://github.com/Tencent/APIJSON/blob/master/Roadmap.md
如果你解决了某些bug，或者新增了一些功能，欢迎 [贡献代码](https://github.com/Tencent/APIJSON/pulls)，感激不尽~
https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
-QQ 技术群： 734652054（新）、607020115（旧）
+
QQ 技术群 ： 734652054（新）、607020115（旧）
+
+如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/94)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了企业或项目](https://github.com/Tencent/APIJSON/issues/187)，
+
贡献者微信群 ，注意联系 LonelyExplorer，加好友描述中附上贡献链接，谢谢
+
### 相关推荐
[APIJSON, 让接口和文档见鬼去吧！](https://my.oschina.net/tommylemon/blog/805459)
From 15522c7ea18a59b1c9daad813283030164a9c773 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 16 Jan 2021 14:10:39 +0800
Subject: [PATCH 0226/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 4c196c4e7..525f0d137 100644
--- a/README.md
+++ b/README.md
@@ -292,7 +292,7 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
QQ 技术群 ： 734652054（新）、607020115（旧）
-如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/94)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了企业或项目](https://github.com/Tencent/APIJSON/issues/187)，
+如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/94)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，
贡献者微信群 ，注意联系 LonelyExplorer，加好友描述中附上贡献链接，谢谢
From ad95f7d876b8f4c25b27d6d5292dcff7f4454210 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 16 Jan 2021 14:13:03 +0800
Subject: [PATCH 0227/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 525f0d137..fbcd32851 100644
--- a/README.md
+++ b/README.md
@@ -292,7 +292,7 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
QQ 技术群 ： 734652054（新）、607020115（旧）
-如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/94)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，
+如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，
贡献者微信群 ，注意联系 LonelyExplorer，加好友描述中附上贡献链接，谢谢
From 06822beeb47202e05b7274feef58e0e79355f469 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 16 Jan 2021 14:20:45 +0800
Subject: [PATCH 0228/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index fbcd32851..cdd439fbd 100644
--- a/README.md
+++ b/README.md
@@ -292,7 +292,7 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
QQ 技术群 ： 734652054（新）、607020115（旧）
-如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，
+如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，可以加
贡献者微信群 ，注意联系 LonelyExplorer，加好友描述中附上贡献链接，谢谢
From b64e7601fa34c768d534b9f012d3731941096aa2 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 16 Jan 2021 14:25:44 +0800
Subject: [PATCH 0229/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index cdd439fbd..3b59d3e28 100644
--- a/README.md
+++ b/README.md
@@ -292,7 +292,7 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
QQ 技术群 ： 734652054（新）、607020115（旧）
-如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，可以加
+如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940)、[开发了可用的生态项目](https://github.com/zhangchunlin/uliweb-apijson)， 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，可以加
贡献者微信群 ，注意联系 LonelyExplorer，加好友描述中附上贡献链接，谢谢
From 57057244719c848b7af8e29801f6e99cadc537f4 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 16 Jan 2021 14:27:35 +0800
Subject: [PATCH 0230/1181] Update README.md
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 3b59d3e28..2a490bfa0 100644
--- a/README.md
+++ b/README.md
@@ -292,7 +292,8 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
QQ 技术群 ： 734652054（新）、607020115（旧）
-如果你为 APIJSON [提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940)、[开发了可用的生态项目](https://github.com/zhangchunlin/uliweb-apijson)， 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，可以加
+如果你为 APIJSON 做出了以下任何一个贡献：
+[提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940)、[开发了可用的生态项目](https://github.com/zhangchunlin/uliweb-apijson) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，可以加
贡献者微信群 ，注意联系 LonelyExplorer，加好友描述中附上贡献链接，谢谢
From 05917c19d4479a8dcea10980fdbc513708757729 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 16 Jan 2021 14:28:04 +0800
Subject: [PATCH 0231/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2a490bfa0..0041f2b18 100644
--- a/README.md
+++ b/README.md
@@ -292,7 +292,7 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
QQ 技术群 ： 734652054（新）、607020115（旧）
-如果你为 APIJSON 做出了以下任何一个贡献：
+如果你为 APIJSON 做出了以下任何一个贡献：
[提交了 PR 且被合并](https://github.com/Tencent/APIJSON/pull/92)、[提交了优质 Issue](https://github.com/Tencent/APIJSON/issues/189)、[发表了优质文章](https://blog.csdn.net/qq_41829492/article/details/88670940)、[开发了可用的生态项目](https://github.com/zhangchunlin/uliweb-apijson) 或 [登记了你的公司](https://github.com/Tencent/APIJSON/issues/187)，可以加
贡献者微信群 ，注意联系 LonelyExplorer，加好友描述中附上贡献链接，谢谢
From 1f529277fa151e3ff3b73af4781f64e116ff24ac Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 17 Jan 2021 00:14:10 +0800
Subject: [PATCH 0232/1181] =?UTF-8?q?fastjson=20=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E9=99=8D=E5=88=B0=201.2.74=EF=BC=9B=E9=A1=B9=E7=9B=AE=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8D=87=E5=88=B0=204.5.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APIJSONORM/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
index 80ec99bd8..7d280e34d 100755
--- a/APIJSONORM/pom.xml
+++ b/APIJSONORM/pom.xml
@@ -5,13 +5,12 @@
apijson.orm
apijson-orm
-
4.4.8
+
4.5.1
jar
APIJSONORM
APIJSON ORM Library
-
UTF-8
UTF-8
@@ -19,10 +18,11 @@
+
com.alibaba
fastjson
- 1.2.75
+ 1.2.74
From 8fd88e0af62cb164ec3f07b4dcdf765f256b79bb Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 17 Jan 2021 01:54:03 +0800
Subject: [PATCH 0233/1181] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=AB=98=E5=B9=B6?=
=?UTF-8?q?=E5=8F=91=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=82=E6=95=B0=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E8=A7=84=E5=88=99=E5=8F=AF=E8=83=BD=E5=9B=A0=E4=B8=BA?=
=?UTF-8?q?=E6=89=A7=E8=A1=8C=E8=BF=87=E7=A8=8B=20remove=20=E4=BA=86?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E6=93=8D=E4=BD=9C=E5=85=B3=E9=94=AE=E8=AF=8D?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=A0=A1=E9=AA=8C=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/apijson/orm/AbstractVerifier.java | 365 +++++++++---------
1 file changed, 175 insertions(+), 190 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
index d7c796e33..2e14f0881 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -82,6 +82,9 @@ public abstract class AbstractVerifier
implements Verifier, IdCallback {
private static final String TAG = "AbstractVerifier";
+ // 共享 STRUCTURE_MAP 则不能 remove 等做任何变更，否则在并发情况下可能会出错，加锁效率又低，所以这里改为忽略对应的 key
+ public static final List OPERATION_KEY_LIST;
+
// >
// >
@NotNull
@@ -97,6 +100,21 @@ public abstract class AbstractVerifier implements Verifier, IdCallback {
@NotNull
public static final Map COMPILE_MAP;
static {
+ OPERATION_KEY_LIST = new ArrayList<>();
+ OPERATION_KEY_LIST.add(TYPE.name());
+ OPERATION_KEY_LIST.add(VERIFY.name());
+ OPERATION_KEY_LIST.add(INSERT.name());
+ OPERATION_KEY_LIST.add(UPDATE.name());
+ OPERATION_KEY_LIST.add(REPLACE.name());
+ OPERATION_KEY_LIST.add(EXIST.name());
+ OPERATION_KEY_LIST.add(UNIQUE.name());
+ OPERATION_KEY_LIST.add(REMOVE.name());
+ OPERATION_KEY_LIST.add(MUST.name());
+ OPERATION_KEY_LIST.add(REFUSE.name());
+ OPERATION_KEY_LIST.add(NECESSARY.name());
+ OPERATION_KEY_LIST.add(DISALLOW.name());
+
+
SYSTEM_ACCESS_MAP = new HashMap>();
SYSTEM_ACCESS_MAP.put(Access.class.getSimpleName(), getAccessMap(Access.class.getAnnotation(MethodAccess.class)));
@@ -742,7 +760,7 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
return null;
}
- //获取配置<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ // 获取配置<<<<<<<<<<<<<<<<<<<<<<<<<<<<
JSONObject type = target.getJSONObject(TYPE.name());
JSONObject verify = target.getJSONObject(VERIFY.name());
JSONObject insert = target.getJSONObject(INSERT.name());
@@ -757,238 +775,204 @@ public static JSONObject parse(@NotNull final RequestMethod method, String name,
String necessary = StringUtil.getNoBlankString(target.getString(NECESSARY.name()));
String disallow = StringUtil.getNoBlankString(target.getString(DISALLOW.name()));
- target.remove(TYPE.name());
- target.remove(VERIFY.name());
- target.remove(INSERT.name());
- target.remove(UPDATE.name());
- target.remove(REPLACE.name());
-
- target.remove(EXIST.name());
- target.remove(UNIQUE.name());
- target.remove(REMOVE.name());
- target.remove(MUST.name());
- target.remove(REFUSE.name());
- target.remove(NECESSARY.name());
- target.remove(DISALLOW.name());
-
-
- try { // 避免中间抛异常导致 target 未 put 进 remove 掉的键值对
- //移除字段<<<<<<<<<<<<<<<<<<<
- String[] removes = StringUtil.split(remove);
- if (removes != null && removes.length > 0) {
- for (String r : removes) {
- real.remove(r);
- }
+ // 移除字段<<<<<<<<<<<<<<<<<<<
+ String[] removes = StringUtil.split(remove);
+ if (removes != null && removes.length > 0) {
+ for (String r : removes) {
+ real.remove(r);
}
- //移除字段>>>>>>>>>>>>>>>>>>>
-
- //判断必要字段是否都有<<<<<<<<<<<<<<<<<<<
- String[] musts = StringUtil.split(must);
- List mustList = musts == null ? new ArrayList() : Arrays.asList(musts);
- for (String s : mustList) {
- if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不能缺少 " + s + " 等[" + must + "]内的任何字段！");
- }
+ }
+ // 移除字段>>>>>>>>>>>>>>>>>>>
+
+ // 判断必要字段是否都有<<<<<<<<<<<<<<<<<<<
+ String[] musts = StringUtil.split(must);
+ List mustList = musts == null ? new ArrayList() : Arrays.asList(musts);
+ for (String s : mustList) {
+ if (real.get(s) == null) { // 可能传null进来，这里还会通过 real.containsKey(s) == false) {
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不能缺少 " + s + " 等[" + must + "]内的任何字段！");
}
+ }
- String[] necessarys = StringUtil.split(necessary);
- List necessaryList = necessarys == null ? new ArrayList() : Arrays.asList(necessarys);
- for (String s : necessaryList) {
- if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不能缺少 " + s + " 等[" + necessary + "]内的任何字段！");
- }
+ String[] necessarys = StringUtil.split(necessary);
+ List necessaryList = necessarys == null ? new ArrayList() : Arrays.asList(necessarys);
+ for (String s : necessaryList) {
+ if (real.get(s) == null) {//可能传null进来，这里还会通过 real.containsKey(s) == false) {
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不能缺少 " + s + " 等[" + necessary + "]内的任何字段！");
}
- //判断必要字段是否都有>>>>>>>>>>>>>>>>>>>
-
+ }
+ //判断必要字段是否都有>>>>>>>>>>>>>>>>>>>
- Set objKeySet = new HashSet(); //不能用tableKeySet，仅判断 Table:{} 会导致 key:{ Table:{} } 绕过判断
- //解析内容<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ Set objKeySet = new HashSet(); //不能用tableKeySet，仅判断 Table:{} 会导致 key:{ Table:{} } 绕过判断
- Set> set = new LinkedHashSet<>(target.entrySet());
- if (set.isEmpty() == false) {
+ //解析内容<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- String key;
- Object tvalue;
- Object rvalue;
- for (Entry entry : set) {
- key = entry == null ? null : entry.getKey();
- if (key == null) {
- continue;
- }
- tvalue = entry.getValue();
- rvalue = real.get(key);
- if (callback.onParse(key, tvalue, rvalue) == false) {
- continue;
- }
+ Set> set = new LinkedHashSet<>(target.entrySet());
+ if (set.isEmpty() == false) {
- if (tvalue instanceof JSONObject) { //JSONObject，往下一级提取
- if (rvalue != null && rvalue instanceof JSONObject == false) {
- throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 OBJECT ，结构为 {} !");
- }
- tvalue = callback.onParseJSONObject(key, (JSONObject) tvalue, (JSONObject) rvalue);
+ String key;
+ Object tvalue;
+ Object rvalue;
+ for (Entry entry : set) {
+ key = entry == null ? null : entry.getKey();
+ if (key == null || OPERATION_KEY_LIST.contains(key)) {
+ continue;
+ }
+ tvalue = entry.getValue();
+ rvalue = real.get(key);
+ if (callback.onParse(key, tvalue, rvalue) == false) {
+ continue;
+ }
- objKeySet.add(key);
- } else if (tvalue instanceof JSONArray) { //JSONArray
- if (rvalue != null && rvalue instanceof JSONArray == false) {
- throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 ARRAY ，结构为 [] !");
- }
- tvalue = callback.onParseJSONArray(key, (JSONArray) tvalue, (JSONArray) rvalue);
+ if (tvalue instanceof JSONObject) { //JSONObject，往下一级提取
+ if (rvalue != null && rvalue instanceof JSONObject == false) {
+ throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 OBJECT ，结构为 {} !");
+ }
+ tvalue = callback.onParseJSONObject(key, (JSONObject) tvalue, (JSONObject) rvalue);
- if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
- objKeySet.add(key);
- }
- } else {//其它Object
- tvalue = callback.onParseObject(key, tvalue, rvalue);
+ objKeySet.add(key);
+ } else if (tvalue instanceof JSONArray) { //JSONArray
+ if (rvalue != null && rvalue instanceof JSONArray == false) {
+ throw new UnsupportedDataTypeException(key + ":value 的value不合法！类型必须是 ARRAY ，结构为 [] !");
}
+ tvalue = callback.onParseJSONArray(key, (JSONArray) tvalue, (JSONArray) rvalue);
- if (tvalue != null) {//可以在target中加上一些不需要客户端传的键值对
- real.put(key, tvalue);
+ if ((method == RequestMethod.POST || method == RequestMethod.PUT) && JSONRequest.isArrayKey(key)) {
+ objKeySet.add(key);
}
+ } else {//其它Object
+ tvalue = callback.onParseObject(key, tvalue, rvalue);
}
+ if (tvalue != null) {//可以在target中加上一些不需要客户端传的键值对
+ real.put(key, tvalue);
+ }
}
- //解析内容>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+ }
+ //解析内容>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- Set rkset = real.keySet(); //解析内容并没有改变rkset
- //解析不允许的字段<<<<<<<<<<<<<<<<<<<
- List refuseList = new ArrayList();
- if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
- for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
- if (key != null && key.startsWith("@") == false
- && mustList.contains(key) == false && objKeySet.contains(key) == false) {
- refuseList.add(key);
- }
- }
- } else {
- String[] refuses = StringUtil.split(refuse);
- if (refuses != null && refuses.length > 0) {
- refuseList.addAll(Arrays.asList(refuses));
+ Set rkset = real.keySet(); //解析内容并没有改变rkset
+
+ //解析不允许的字段<<<<<<<<<<<<<<<<<<<
+ List refuseList = new ArrayList();
+ if ("!".equals(refuse)) {//所有非 must，改成 !must 更好
+ for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
+ if (key != null && key.startsWith("@") == false
+ && mustList.contains(key) == false && objKeySet.contains(key) == false) {
+ refuseList.add(key);
}
}
+ } else {
+ String[] refuses = StringUtil.split(refuse);
+ if (refuses != null && refuses.length > 0) {
+ refuseList.addAll(Arrays.asList(refuses));
+ }
+ }
- List disallowList = new ArrayList();
- if ("!".equals(disallow)) {//所有非necessary，改成 !necessary 更好
- for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
- if (key != null && key.startsWith("@") == false
- && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
- disallowList.add(key);
- }
- }
- } else {
- String[] disallows = StringUtil.split(disallow);
- if (disallows != null && disallows.length > 0) {
- disallowList.addAll(Arrays.asList(disallows));
+ List disallowList = new ArrayList();
+ if ("!".equals(disallow)) {//所有非necessary，改成 !necessary 更好
+ for (String key : rkset) {//对@key放行，@role,@column,自定义@position等
+ if (key != null && key.startsWith("@") == false
+ && necessaryList.contains(key) == false && objKeySet.contains(key) == false) {
+ disallowList.add(key);
}
}
- //解析不允许的字段>>>>>>>>>>>>>>>>>>>
+ } else {
+ String[] disallows = StringUtil.split(disallow);
+ if (disallows != null && disallows.length > 0) {
+ disallowList.addAll(Arrays.asList(disallows));
+ }
+ }
+ //解析不允许的字段>>>>>>>>>>>>>>>>>>>
- //判断不允许传的key<<<<<<<<<<<<<<<<<<<<<<<<<
- for (String rk : rkset) {
- if (refuseList.contains(rk)) { //不允许的字段
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不允许传 " + rk + " 等" + StringUtil.getString(refuseList) + "内的任何字段！");
- }
- if (disallowList.contains(rk)) { //不允许的字段
- throw new IllegalArgumentException(method + "请求，" + name
- + " 里面不允许传 " + rk + " 等" + StringUtil.getString(disallowList) + "内的任何字段！");
- }
+ //判断不允许传的key<<<<<<<<<<<<<<<<<<<<<<<<<
+ for (String rk : rkset) {
+ if (refuseList.contains(rk)) { //不允许的字段
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不允许传 " + rk + " 等" + StringUtil.getString(refuseList) + "内的任何字段！");
+ }
+ if (disallowList.contains(rk)) { //不允许的字段
+ throw new IllegalArgumentException(method + "请求，" + name
+ + " 里面不允许传 " + rk + " 等" + StringUtil.getString(disallowList) + "内的任何字段！");
+ }
- if (rk == null) { //无效的key
- real.remove(rk);
- continue;
- }
+ if (rk == null) { //无效的key
+ real.remove(rk);
+ continue;
+ }
- Object rv = real.get(rk);
+ Object rv = real.get(rk);
- //不允许传远程函数，只能后端配置
- if (rk.endsWith("()") && rv instanceof String) {
- throw new UnsupportedOperationException(method + " 请求，" + rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
- }
+ //不允许传远程函数，只能后端配置
+ if (rk.endsWith("()") && rv instanceof String) {
+ throw new UnsupportedOperationException(method + " 请求，" + rk + " 不合法！非开放请求不允许传远程函数 key():\"fun()\" ！");
+ }
- //不在target内的 key:{}
- if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
- if (rv instanceof JSONObject) {
- throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");
- }
- if ((method == RequestMethod.POST || method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {
- throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");
- }
+ //不在target内的 key:{}
+ if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
+ if (rv instanceof JSONObject) {
+ throw new UnsupportedOperationException(method + " 请求，" +name + " 里面不允许传 " + rk + ":{} ！");
+ }
+ if ((method == RequestMethod.POST || method == RequestMethod.PUT) && rv instanceof JSONArray && JSONRequest.isArrayKey(rk)) {
+ throw new UnsupportedOperationException(method + " 请求，" + name + " 里面不允许 " + rk + ":[] 等未定义的 Table[]:[{}] 批量操作键值对！");
}
}
- //判断不允许传的key>>>>>>>>>>>>>>>>>>>>>>>>>
+ }
+ //判断不允许传的key>>>>>>>>>>>>>>>>>>>>>>>>>
- //校验与修改Request<<<<<<<<<<<<<<<<<
- //在tableKeySet校验后操作，避免 导致put/add进去的Table 被当成原Request的内容
- real = operate(TYPE, type, real, creator);
- real = operate(VERIFY, verify, real, creator);
- real = operate(INSERT, insert, real, creator);
- real = operate(UPDATE, update, real, creator);
- real = operate(REPLACE, replace, real, creator);
- //校验与修改Request>>>>>>>>>>>>>>>>>
+ //校验与修改Request<<<<<<<<<<<<<<<<<
+ //在tableKeySet校验后操作，避免 导致put/add进去的Table 被当成原Request的内容
+ real = operate(TYPE, type, real, creator);
+ real = operate(VERIFY, verify, real, creator);
+ real = operate(INSERT, insert, real, creator);
+ real = operate(UPDATE, update, real, creator);
+ real = operate(REPLACE, replace, real, creator);
+ //校验与修改Request>>>>>>>>>>>>>>>>>
- String db = real.getString(apijson.JSONObject.KEY_DATABASE);
- String sh = real.getString(apijson.JSONObject.KEY_SCHEMA);
- if (StringUtil.isEmpty(db, false)) {
- db = database;
- }
- if (StringUtil.isEmpty(sh, false)) {
- sh = schema;
- }
- String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, name);
- String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
-
- //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
- //校验存在<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
- String[] exists = StringUtil.split(exist);
- if (exists != null && exists.length > 0) {
- long exceptId = real.getLongValue(finalIdKey);
- for (String e : exists) {
- verifyExist(name, e, real.get(e), exceptId, creator);
- }
- }
- //校验存在>>>>>>>>>>>>>>>>>>>
-
- //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
- //校验重复<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
- String[] uniques = StringUtil.split(unique);
- if (uniques != null && uniques.length > 0) {
- long exceptId = real.getLongValue(finalIdKey);
- for (String u : uniques) {
- verifyRepeat(name, u, real.get(u), exceptId, finalIdKey, creator);
- }
- }
- //校验重复>>>>>>>>>>>>>>>>>>>
+ String db = real.getString(apijson.JSONObject.KEY_DATABASE);
+ String sh = real.getString(apijson.JSONObject.KEY_SCHEMA);
+ if (StringUtil.isEmpty(db, false)) {
+ db = database;
+ }
+ if (StringUtil.isEmpty(sh, false)) {
+ sh = schema;
+ }
+ String idKey = idCallback == null ? null : idCallback.getIdKey(db, sh, name);
+ String finalIdKey = StringUtil.isEmpty(idKey, false) ? apijson.JSONObject.KEY_ID : idKey;
+ //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
+ //校验存在<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
+ String[] exists = StringUtil.split(exist);
+ if (exists != null && exists.length > 0) {
+ long exceptId = real.getLongValue(finalIdKey);
+ for (String e : exists) {
+ verifyExist(name, e, real.get(e), exceptId, creator);
+ }
}
- finally {
- //还原 <<<<<<<<<<
- target.put(TYPE.name(), type);
- target.put(VERIFY.name(), verify);
- target.put(INSERT.name(), insert);
- target.put(UPDATE.name(), update);
- target.put(REPLACE.name(), replace);
-
- target.put(EXIST.name(), exist);
- target.put(UNIQUE.name(), unique);
- target.put(REMOVE.name(), remove);
- target.put(MUST.name(), must);
- target.put(REFUSE.name(), refuse);
- target.put(NECESSARY.name(), necessary);
- target.put(DISALLOW.name(), disallow);
- //还原 >>>>>>>>>>
+ //校验存在>>>>>>>>>>>>>>>>>>>
+
+ //TODO放在operate前？考虑性能、operate修改后再验证的值是否和原来一样
+ //校验重复<<<<<<<<<<<<<<<<<<< TODO 格式改为 id;version,tag 兼容多个字段联合主键
+ String[] uniques = StringUtil.split(unique);
+ if (uniques != null && uniques.length > 0) {
+ long exceptId = real.getLongValue(finalIdKey);
+ for (String u : uniques) {
+ verifyRepeat(name, u, real.get(u), exceptId, finalIdKey, creator);
+ }
}
+ //校验重复>>>>>>>>>>>>>>>>>>>
+
Log.i(TAG, "parse return real = " + JSON.toJSONString(real));
return real;
@@ -1019,9 +1003,10 @@ private static JSONObject operate(Operation opt, JSONObject targetChild, JSONObj
for (Entry e : set) {
tk = e == null ? null : e.getKey();
- if (tk == null) {
+ if (tk == null || OPERATION_KEY_LIST.contains(tk)) {
continue;
}
+
tv = e.getValue();
if (opt == TYPE) {
From 7c3171934799022b69bdc9f494b1bf3d142e8665 Mon Sep 17 00:00:00 2001
From: Xiaoguang Sun
Date: Wed, 20 Jan 2021 12:20:41 +0800
Subject: [PATCH 0234/1181] Add javax.activation dependencies to pom.xml
Add javax.activation dependencies to pom.xml so it could be built with
newer version of JDK starting from 11 which removed the deprecated Java
EE and CORBA Modules according to JEP 320
Signed-off-by: Xiaoguang Sun
---
APIJSONORM/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml
index 7d280e34d..6802c6753 100755
--- a/APIJSONORM/pom.xml
+++ b/APIJSONORM/pom.xml
@@ -24,6 +24,11 @@
fastjson
1.2.74
+
+ javax.activation
+ activation
+ 1.1.1
+
From 2d7222e8aeb16f6ff1a36afc4b7aecfa3d0e914b Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Wed, 20 Jan 2021 14:22:42 +0800
Subject: [PATCH 0235/1181] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E6=9D=A5=E8=87=AA=E7=9F=A5=E4=B9=8E=E7=9A=84=E8=B4=A1=E7=8C=AE?=
=?UTF-8?q?=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 0041f2b18..73b68f069 100644
--- a/README.md
+++ b/README.md
@@ -245,6 +245,7 @@ https://github.com/Tencent/APIJSON/issues/187
English
通用文档
视频教程
- 在线体验
+ 在线体验
From d48cbb369ca9e6c48425cbf5e301ac74a5058ec7 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Thu, 21 Jan 2021 16:31:44 +0800
Subject: [PATCH 0238/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 9877451d9..6d9909813 100644
--- a/README.md
+++ b/README.md
@@ -276,7 +276,7 @@ https://github.com/Tencent/APIJSON/issues/187
https://github.com/Tencent/APIJSON/blob/master/Roadmap.md
理论上所有支持 SQL 与 JDBC/ODBC 的软件，都可以用本项目对接 CRUD，待测试:
+
+
+
-还有为 APIJSON 扫描代码贡献 Bug 的 奇安信代码卫士 和 源伞科技
+还有为 APIJSON 扫描代码贡献 Bug 的 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe) 和 [源伞科技](https://www.sourcebrella.com)
+
感谢大家的贡献。
From e9b9e95b61d1c94d2420f59012396ac6c8f7499d Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 14:58:17 +0800
Subject: [PATCH 0243/1181] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 64f06eb30..804405fe4 100644
--- a/README.md
+++ b/README.md
@@ -270,8 +270,8 @@ https://github.com/Tencent/APIJSON/issues/187
还有为 APIJSON 扫描代码贡献 Bug 的 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe) 和 [源伞科技](https://www.sourcebrella.com)
感谢大家的贡献。
From 1750932d7797b4a2416fa17ac5f556a73233293a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 15:00:27 +0800
Subject: [PATCH 0244/1181] Update README.md
---
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 804405fe4..235e64571 100644
--- a/README.md
+++ b/README.md
@@ -268,10 +268,12 @@ https://github.com/Tencent/APIJSON/issues/187
-
-
-
-
-
-
-
-
-
-
-
-
-
+ height="54" width="54" >
+
+
+
+
+
+
+
+
+
+
+
+
+
From 8a19f3738a5d297f021388e1d99d5d776cf77bb9 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 15:05:16 +0800
Subject: [PATCH 0246/1181] Update README.md
---
README.md | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index adbeba662..cd585559b 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,7 @@ https://github.com/Tencent/APIJSON/issues/187
### 贡献者们
主项目 APIJSON 的贡献者们和 生态周边项目 的作者们：
+
@@ -276,6 +277,7 @@ https://github.com/Tencent/APIJSON/issues/187
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
From d2c47d482f6112564226d979b7a72e9f66592d34 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 15:08:45 +0800
Subject: [PATCH 0248/1181] Update README.md
---
README.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/README.md b/README.md
index bf6a01b20..1216588cd 100644
--- a/README.md
+++ b/README.md
@@ -234,7 +234,6 @@ https://github.com/Tencent/APIJSON/issues/187
### 贡献者们
主项目 APIJSON 的贡献者们和 生态周边项目 的作者们：
-
@@ -271,7 +270,6 @@ https://github.com/Tencent/APIJSON/issues/187
还有为 APIJSON 扫描代码贡献 Bug 的 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe) 和 [源伞科技](https://www.sourcebrella.com)
-
From 37287d4eebbebabefb4f511ea3dce701f042db9a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 15:11:14 +0800
Subject: [PATCH 0249/1181] Update README.md
---
README.md | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 1216588cd..5737163be 100644
--- a/README.md
+++ b/README.md
@@ -218,17 +218,17 @@ https://github.com/Tencent/APIJSON/issues/36
如果您在使用 APIJSON，请让我们知道，您的使用对我们非常重要(按登记顺序排列)：
https://github.com/Tencent/APIJSON/issues/187
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
From 9e215311c41b201739f749fef64d64c24c115591 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 15:15:07 +0800
Subject: [PATCH 0250/1181] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 5737163be..b161d29b6 100644
--- a/README.md
+++ b/README.md
@@ -223,10 +223,10 @@ https://github.com/Tencent/APIJSON/issues/187
-
-
+
+
From ffb19c86ea07b17708d8658f52c88f06452d1a62 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 15:17:02 +0800
Subject: [PATCH 0251/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b161d29b6..d10a74d25 100644
--- a/README.md
+++ b/README.md
@@ -225,8 +225,8 @@ https://github.com/Tencent/APIJSON/issues/187
-
+
From d2cf5bc3d25f426ebe22c94fac6210d79132d51e Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 15:23:35 +0800
Subject: [PATCH 0252/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d10a74d25..31f3d4940 100644
--- a/README.md
+++ b/README.md
@@ -272,7 +272,7 @@ https://github.com/Tencent/APIJSON/issues/187
还有为 APIJSON 扫描代码贡献 Bug 的 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe) 和 [源伞科技](https://www.sourcebrella.com)
From 9b82b5ed4768bd9bb30029ec44c5803968c458eb Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 23:43:23 +0800
Subject: [PATCH 0253/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 31f3d4940..7d6f552bc 100644
--- a/README.md
+++ b/README.md
@@ -269,7 +269,7 @@ https://github.com/Tencent/APIJSON/issues/187
-还有为 APIJSON 扫描代码贡献 Bug 的 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe) 和 [源伞科技](https://www.sourcebrella.com)
+还有为 APIJSON 扫描代码贡献 Issue 的 [奇安信代码卫士](https://github.com/QiAnXinCodeSafe) 和 [源伞科技](https://www.sourcebrella.com)
From 1bf71489e3039a0d376264c9328d705e91147a6a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 23 Jan 2021 23:45:16 +0800
Subject: [PATCH 0254/1181] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7d6f552bc..1d66d754f 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ https://github.com/Tencent/APIJSON/wiki
* **解决十大痛点** (APIJSON 大幅提振开发效率、强力杜绝联调扯皮、巧妙规避文档缺陷、非常节省流量带宽 等)
* **开发提速巨大** (CRUD 零代码热更新自动化，APIJSONBoot 对比 SSM、SSH 等保守估计可提速 20 倍以上)
* **腾讯官方开源** (使用 GitHub、Gitee、工蜂 等平台的官方账号开源，微信公众号、腾讯云+社区 等官方公告)
-* **社区影响力大** (GitHub 9.6K Star 在 350W Java 项目中排名前 150，远超 FLAG, BAT 等国内外绝大部分开源项目)
+* **社区影响力大** (GitHub 9.8K Star 在 350W Java 项目中排名前 150，远超 FLAG, BAT 等国内外绝大部分开源项目)
* **各项荣誉成就** (腾讯开源五个第一、腾讯首个 GVP 获奖项目、腾讯后端项目 Star 第一、GitHub Java 周榜第一 等)
* **多样用户案例** (腾讯内部用户包含 互娱、音乐、云与智慧，外部用户包含 500 强上市公司、数千亿资本国企 等)
* **适用场景广泛** (社交聊天、阅读资讯、影音视频、办公学习 等各种 App、网站、公众号、小程序 等非金融类项目)
From f05df3a1887999769ac6db18cfa8f314a5585165 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 24 Jan 2021 01:29:22 +0800
Subject: [PATCH 0255/1181] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=82=E5=B8=B8?=
=?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=9C=AA=E5=8F=8A=E6=97=B6=E9=87=8A?=
=?UTF-8?q?=E6=94=BE=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/apijson/orm/AbstractSQLExecutor.java | 254 ++++++++++--------
1 file changed, 143 insertions(+), 111 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
index ccfe38f8c..92508640d 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
@@ -176,127 +176,142 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
+ "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
ResultSet rs = null;
+ List
resultList = null;
+ Map childMap = null;
- if (unknowType) {
- Statement statement = getStatement(config);
- rs = execute(statement, sql);
+ try {
+ if (unknowType) {
+ Statement statement = getStatement(config);
+ rs = execute(statement, sql);
+
+ result = new JSONObject(true);
+ int updateCount = statement.getUpdateCount();
+ result.put(JSONResponse.KEY_COUNT, updateCount);
+ result.put("update", updateCount >= 0);
+ //导致后面 rs.getMetaData() 报错 Operation not allowed after ResultSet closed result.put("moreResults", statement.getMoreResults());
+ }
+ else {
+ switch (config.getMethod()) {
+ case HEAD:
+ case HEADS:
+ rs = executeQuery(config);
- result = new JSONObject(true);
- int updateCount = statement.getUpdateCount();
- result.put(JSONResponse.KEY_COUNT, updateCount);
- result.put("update", updateCount >= 0);
- //导致后面 rs.getMetaData() 报错 Operation not allowed after ResultSet closed result.put("moreResults", statement.getMoreResults());
- }
- else {
- switch (config.getMethod()) {
- case HEAD:
- case HEADS:
- rs = executeQuery(config);
+ executedSQLCount ++;
- executedSQLCount ++;
+ result = rs.next() ? AbstractParser.newSuccessResult()
+ : AbstractParser.newErrorResult(new SQLException("数据库错误, rs.next() 失败！"));
+ result.put(JSONResponse.KEY_COUNT, rs.getLong(1));
+ return result;
- result = rs.next() ? AbstractParser.newSuccessResult()
- : AbstractParser.newErrorResult(new SQLException("数据库错误, rs.next() 失败！"));
- result.put(JSONResponse.KEY_COUNT, rs.getLong(1));
+ case POST:
+ case PUT:
+ case DELETE:
+ executedSQLCount ++;
- rs.close();
- return result;
+ int updateCount = executeUpdate(config);
- case POST:
- case PUT:
- case DELETE:
- executedSQLCount ++;
+ result = AbstractParser.newResult(updateCount > 0 ? JSONResponse.CODE_SUCCESS : JSONResponse.CODE_NOT_FOUND
+ , updateCount > 0 ? JSONResponse.MSG_SUCCEED : "没权限访问或对象不存在！");
- int updateCount = executeUpdate(config);
+ //id,id{}至少一个会有，一定会返回，不用抛异常来阻止关联写操作时前面错误导致后面无条件执行！
+ result.put(JSONResponse.KEY_COUNT, updateCount);//返回修改的记录数
+ if (config.getId() != null) {
+ result.put(config.getIdKey(), config.getId());
+ } else {
+ result.put(config.getIdKey() + "[]", config.getWhere(config.getIdKey() + "{}", true));
+ }
+ return result;
- result = AbstractParser.newResult(updateCount > 0 ? JSONResponse.CODE_SUCCESS : JSONResponse.CODE_NOT_FOUND
- , updateCount > 0 ? JSONResponse.MSG_SUCCEED : "没权限访问或对象不存在！");
+ case GET:
+ case GETS:
+ result = getCacheItem(sql, position, config.getCache());
+ Log.i(TAG, ">>> select result = getCache('" + sql + "', " + position + ") = " + result);
+ if (result != null) {
+ cachedSQLCount ++;
- //id,id{}至少一个会有，一定会返回，不用抛异常来阻止关联写操作时前面错误导致后面无条件执行！
- result.put(JSONResponse.KEY_COUNT, updateCount);//返回修改的记录数
- if (config.getId() != null) {
- result.put(config.getIdKey(), config.getId());
- } else {
- result.put(config.getIdKey() + "[]", config.getWhere(config.getIdKey() + "{}", true));
- }
- return result;
+ Log.d(TAG, "\n\n select result != null >> return result;" + "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n");
+ return result;
+ }
- case GET:
- case GETS:
- result = getCacheItem(sql, position, config.getCache());
- Log.i(TAG, ">>> select result = getCache('" + sql + "', " + position + ") = " + result);
- if (result != null) {
- cachedSQLCount ++;
+ rs = executeQuery(config); //FIXME SQL Server 是一次返回两个结果集，包括查询结果和执行计划，需要 moreResults
- Log.d(TAG, "\n\n select result != null >> return result;" + "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n");
- return result;
- }
-
- rs = executeQuery(config); //FIXME SQL Server 是一次返回两个结果集，包括查询结果和执行计划，需要 moreResults
+ if (config.isExplain() == false) { //只有 SELECT 才能 EXPLAIN
+ executedSQLCount ++;
+ }
+ break;
- if (config.isExplain() == false) { //只有 SELECT 才能 EXPLAIN
- executedSQLCount ++;
+ default://OPTIONS, TRACE等
+ Log.e(TAG, "select sql = " + sql + " ; method = " + config.getMethod() + " >> return null;");
+ return null;
}
- break;
-
- default://OPTIONS, TRACE等
- Log.e(TAG, "select sql = " + sql + " ; method = " + config.getMethod() + " >> return null;");
- return null;
}
- }
- // final boolean cache = config.getCount() != 1;
- List resultList = new ArrayList<>();
- // Log.d(TAG, "select cache = " + cache + "; resultList" + (resultList == null ? "=" : "!=") + "null");
+ // final boolean cache = config.getCount() != 1;
+ resultList = new ArrayList<>();
+ // Log.d(TAG, "select cache = " + cache + "; resultList" + (resultList == null ? "=" : "!=") + "null");
- int index = -1;
+ int index = -1;
- ResultSetMetaData rsmd = rs.getMetaData();
- final int length = rsmd.getColumnCount();
+ ResultSetMetaData rsmd = rs.getMetaData();
+ final int length = rsmd.getColumnCount();
- //
- Map childMap = new HashMap<>(); //要存到cacheMap
- // WHERE id = ? AND ... 或 WHERE ... AND id = ? 强制排序 remove 再 put，还是重新 getSQL吧
+ //
+ childMap = new HashMap<>(); //要存到cacheMap
+ // WHERE id = ? AND ... 或 WHERE ... AND id = ? 强制排序 remove 再 put，还是重新 getSQL吧
- boolean hasJoin = config.hasJoin();
- int viceColumnStart = length + 1; //第一个副表字段的index
- while (rs.next()) {
- index ++;
- Log.d(TAG, "\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n select while (rs.next()){ index = " + index + "\n\n");
+ boolean hasJoin = config.hasJoin();
+ int viceColumnStart = length + 1; //第一个副表字段的index
+ while (rs.next()) {
+ index ++;
+ Log.d(TAG, "\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n select while (rs.next()){ index = " + index + "\n\n");
- JSONObject item = new JSONObject(true);
+ JSONObject item = new JSONObject(true);
- for (int i = 1; i <= length; i++) {
+ for (int i = 1; i <= length; i++) {
- // if (hasJoin && viceColumnStart > length && config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
- // viceColumnStart = i;
- // }
+ // if (hasJoin && viceColumnStart > length && config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
+ // viceColumnStart = i;
+ // }
- // bugfix-修复非常规数据库字段，获取表名失败导致输出异常
- if (config.isExplain() == false && hasJoin && viceColumnStart > length) {
- List column = config.getColumn();
+ // bugfix-修复非常规数据库字段，获取表名失败导致输出异常
+ if (config.isExplain() == false && hasJoin && viceColumnStart > length) {
+ List column = config.getColumn();
- if (column != null && column.isEmpty() == false) {
- viceColumnStart = column.size() + 1;
- }
- else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
- viceColumnStart = i;
+ if (column != null && column.isEmpty() == false) {
+ viceColumnStart = column.size() + 1;
+ }
+ else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
+ viceColumnStart = i;
+ }
}
+
+ item = onPutColumn(config, rs, rsmd, index, item, i, config.isExplain() == false && hasJoin && i >= viceColumnStart ? childMap : null);
}
- item = onPutColumn(config, rs, rsmd, index, item, i, config.isExplain() == false && hasJoin && i >= viceColumnStart ? childMap : null);
- }
+ resultList = onPutTable(config, rs, rsmd, resultList, index, item);
- resultList = onPutTable(config, rs, rsmd, resultList, index, item);
+ Log.d(TAG, "\n select while (rs.next()) { resultList.put( " + index + ", result); "
+ + "\n >>>>>>>>>>>>>>>>>>>>>>>>>>> \n\n");
+ }
- Log.d(TAG, "\n select while (rs.next()) { resultList.put( " + index + ", result); "
- + "\n >>>>>>>>>>>>>>>>>>>>>>>>>>> \n\n");
+ }
+ finally {
+ if (rs != null) {
+ try {
+ rs.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
- rs.close();
+ if (resultList == null) {
+ return null;
+ }
if (unknowType || config.isExplain()) {
if (config.isExplain()) {
@@ -397,41 +412,51 @@ protected void executeAppJoin(SQLConfig config, List resultList, Map
+ "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
//执行副表的批量查询 并 缓存到 childMap
- ResultSet rs = executeQuery(jc);
+ ResultSet rs = null;
+ try {
+ rs = executeQuery(jc);
- int index = -1;
+ int index = -1;
- ResultSetMetaData rsmd = rs.getMetaData();
- final int length = rsmd.getColumnCount();
+ ResultSetMetaData rsmd = rs.getMetaData();
+ final int length = rsmd.getColumnCount();
- JSONObject result;
- String cacheSql;
- while (rs.next()) { //FIXME 同时有 @ APP JOIN 和 < 等 SQL JOIN 时，next = false 总是无法进入循环，导致缓存失效，可能是连接池或线程问题
- index ++;
- Log.d(TAG, "\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n executeAppJoin while (rs.next()){ index = " + index + "\n\n");
+ JSONObject result;
+ String cacheSql;
+ while (rs.next()) { //FIXME 同时有 @ APP JOIN 和 < 等 SQL JOIN 时，next = false 总是无法进入循环，导致缓存失效，可能是连接池或线程问题
+ index ++;
+ Log.d(TAG, "\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n executeAppJoin while (rs.next()){ index = " + index + "\n\n");
- result = new JSONObject(true);
+ result = new JSONObject(true);
- for (int i = 1; i <= length; i++) {
+ for (int i = 1; i <= length; i++) {
- result = onPutColumn(jc, rs, rsmd, index, result, i, null);
- }
+ result = onPutColumn(jc, rs, rsmd, index, result, i, null);
+ }
- //每个 result 都要用新的 SQL 来存 childResultMap = onPutTable(config, rs, rsmd, childResultMap, index, result);
+ //每个 result 都要用新的 SQL 来存 childResultMap = onPutTable(config, rs, rsmd, childResultMap, index, result);
- Log.d(TAG, "\n executeAppJoin while (rs.next()) { resultList.put( " + index + ", result); "
- + "\n >>>>>>>>>>>>>>>>>>>>>>>>>>> \n\n");
+ Log.d(TAG, "\n executeAppJoin while (rs.next()) { resultList.put( " + index + ", result); "
+ + "\n >>>>>>>>>>>>>>>>>>>>>>>>>>> \n\n");
- //缓存到 childMap
- cc.putWhere(j.getKey(), result.get(j.getKey()), false);
- cacheSql = cc.getSQL(false);
- childMap.put(cacheSql, result);
+ //缓存到 childMap
+ cc.putWhere(j.getKey(), result.get(j.getKey()), false);
+ cacheSql = cc.getSQL(false);
+ childMap.put(cacheSql, result);
- Log.d(TAG, ">>> executeAppJoin childMap.put('" + cacheSql + "', result); childMap.size() = " + childMap.size());
+ Log.d(TAG, ">>> executeAppJoin childMap.put('" + cacheSql + "', result); childMap.size() = " + childMap.size());
+ }
+ }
+ finally {
+ if (rs != null) {
+ try {
+ rs.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
-
- rs.close();
-
long endTime = System.currentTimeMillis();
Log.d(TAG, "\n\n executeAppJoin endTime = " + endTime + "; duration = " + (endTime - startTime)
@@ -576,6 +601,13 @@ else if (value instanceof Clob) { //SQL Server TEXT 类型 居然走这个
s = br.readLine();
}
value = sb.toString();
+
+ try {
+ br.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
}
if (castToJson == false) {
From bbcf05e01c724894a5ba0dcddd49a14bbfeb5346 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 24 Jan 2021 01:55:59 +0800
Subject: [PATCH 0256/1181] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=90=E4=BA=9B?=
=?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=A7=A3=E6=9E=90=20=E5=BC=95?=
=?UTF-8?q?=E7=94=A8=E8=B5=8B=E5=80=BC=20=E5=87=BA=E9=94=99=20throw=20Null?=
=?UTF-8?q?PointerException=20=E6=88=96=20IndexOutOfBoundsException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/apijson/orm/AbstractParser.java | 152 +++++++++---------
.../src/main/java/apijson/orm/SQLConfig.java | 2 +-
2 files changed, 78 insertions(+), 76 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
index 3168cf856..85bbb4c1e 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -462,7 +462,7 @@ public static JSONObject parseRequest(String request) throws Exception {
@Override
public JSONObject parseCorrectRequest(RequestMethod method, String tag, int version, String name, @NotNull JSONObject request
, int maxUpdateCount, SQLCreator creator) throws Exception {
-
+
if (RequestMethod.isPublicMethod(method)) {
return request;//需要指定JSON结构的get请求可以改为post请求。一般只有对安全性要求高的才会指定，而这种情况用明文的GET方式几乎肯定不安全
}
@@ -486,10 +486,10 @@ public JSONObject parseCorrectRequest(RequestMethod method, String tag, int vers
JSONObject target = object;
if (object.containsKey(tag) == false) { //tag 是 Table 名或 Table[]
-
+
boolean isArrayKey = tag.endsWith(":[]"); // JSONRequest.isArrayKey(tag);
String key = isArrayKey ? tag.substring(0, tag.length() - 3) : tag;
-
+
if (apijson.JSONObject.isTableKey(key)) {
if (isArrayKey) { //自动为 tag = Comment:[] 的 { ... } 新增键值对 "Comment[]":[] 为 { "Comment[]":[], ... }
target.put(key + "[]", new JSONArray());
@@ -500,15 +500,15 @@ public JSONObject parseCorrectRequest(RequestMethod method, String tag, int vers
}
}
}
-
+
//获取指定的JSON结构 >>>>>>>>>>>>>>
-
+
//JSONObject clone 浅拷贝没用，Structure.parse 会导致 structure 里面被清空，第二次从缓存里取到的就是 {}
return getVerifier().verifyRequest(method, name, target, request, maxUpdateCount, getGlobleDatabase(), getGlobleSchema(), creator);
}
-
-
+
+
/**新建带状态内容的JSONObject
* @param code
* @param msg
@@ -533,7 +533,7 @@ public static JSONObject extendResult(JSONObject object, int code, String msg) {
if (object.containsKey(JSONResponse.KEY_CODE) == false) {
object.put(JSONResponse.KEY_CODE, code);
}
-
+
String m = StringUtil.getString(object.getString(JSONResponse.KEY_MSG));
if (m.isEmpty() == false) {
msg = m + " ;\n " + StringUtil.getString(msg);
@@ -679,14 +679,14 @@ public JSONObject getStructure(@NotNull String table, String method, String tag,
// TODO 目前只使用 Request 而不使用 Response，所以这里写死用 REQUEST_MAP，以后可能 Response 表也会与 Request 表合并，用字段来区分
String cacheKey = AbstractVerifier.getCacheKeyForRequest(method, tag);
SortedMap versionedMap = AbstractVerifier.REQUEST_MAP.get(cacheKey);
-
+
JSONObject result = versionedMap == null ? null : versionedMap.get(Integer.valueOf(version));
if (result == null) { // version <= 0 时使用最新，version > 0 时使用 > version 的最接近版本（最小版本）
Set> set = versionedMap == null ? null : versionedMap.entrySet();
-
+
if (set != null && set.isEmpty() == false) {
Entry maxEntry = null;
-
+
for (Entry entry : set) {
if (entry == null || entry.getKey() == null || entry.getValue() == null) {
continue;
@@ -700,30 +700,30 @@ public JSONObject getStructure(@NotNull String table, String method, String tag,
if (entry.getKey() < version) {
break;
}
-
+
maxEntry = entry;
}
-
+
result = maxEntry == null ? null : maxEntry.getValue();
}
-
+
if (result != null) { // 加快下次查询，查到值的话组合情况其实是有限的，不属于恶意请求
if (versionedMap == null) {
versionedMap = new TreeMap<>((o1, o2) -> {
return o2 == null ? -1 : o2.compareTo(o1); // 降序
});
}
-
+
versionedMap.put(Integer.valueOf(version), result);
AbstractVerifier.REQUEST_MAP.put(cacheKey, versionedMap);
}
}
-
+
if (result == null) {
if (AbstractVerifier.REQUEST_MAP.isEmpty() == false) {
return null; // 已使用 REQUEST_MAP 缓存全部，但没查到
}
-
+
//获取指定的JSON结构 <<<<<<<<<<<<<<
SQLConfig config = createSQLConfig().setMethod(GET).setTable(table);
config.setPrepared(false);
@@ -732,7 +732,7 @@ public JSONObject getStructure(@NotNull String table, String method, String tag,
Map where = new HashMap();
where.put("method", method);
where.put(JSONRequest.KEY_TAG, tag);
-
+
if (version > 0) {
where.put(JSONRequest.KEY_VERSION + "{}", ">=" + version);
}
@@ -742,12 +742,12 @@ public JSONObject getStructure(@NotNull String table, String method, String tag,
//too many connections error: 不try-catch，可以让客户端看到是服务器内部异常
result = getSQLExecutor().execute(config, false);
-
+
// version, method, tag 组合情况太多了，JDK 里又没有 LRUCache，所以要么启动时一次性缓存全部后面只用缓存，要么每次都查数据库
// versionedMap.put(Integer.valueOf(version), result);
// AbstractVerifier.REQUEST_MAP.put(cacheKey, versionedMap);
}
-
+
return getJSONObject(result, "structure"); //解决返回值套了一层 "structure":{}
}
@@ -807,10 +807,10 @@ public JSONObject onObjectParse(final JSONObject request
int index = parentPath.lastIndexOf("]/");
if (index >= 0) {
int total = rp.getIntValue(JSONResponse.KEY_COUNT);
-
+
String pathPrefix = parentPath.substring(0, index) + "]/";
putQueryResult(pathPrefix + JSONResponse.KEY_TOTAL, total);
-
+
//详细的分页信息，主要为 PC 端提供
int count = arrayConfig.getCount();
int page = arrayConfig.getPage();
@@ -818,7 +818,7 @@ public JSONObject onObjectParse(final JSONObject request
if (max < 0) {
max = 0;
}
-
+
JSONObject pagination = new JSONObject(true);
pagination.put(JSONResponse.KEY_TOTAL, total);
pagination.put(JSONRequest.KEY_COUNT, count);
@@ -929,51 +929,52 @@ public JSONArray onArrayParse(JSONObject request, String parentPath, String name
request.remove(JSONRequest.KEY_JOIN);
Log.d(TAG, "onArrayParse query = " + query + "; count = " + count + "; page = " + page + "; join = " + join);
- if (request.isEmpty()) {//如果条件成立，说明所有的 parentPath/name:request 中request都无效！！！
+ if (request.isEmpty()) { // 如果条件成立，说明所有的 parentPath/name:request 中request都无效！！！ 后续都不执行，没必要还原数组关键词浪费性能
Log.e(TAG, "onArrayParse request.isEmpty() >> return null;");
return null;
}
+ JSONArray response = null;
+ try {
+ int size = count2 == 0 ? max : count2;//count为每页数量，size为第page页实际数量，max(size) = count
+ Log.d(TAG, "onArrayParse size = " + size + "; page = " + page);
- int size = count2 == 0 ? max : count2;//count为每页数量，size为第page页实际数量，max(size) = count
- Log.d(TAG, "onArrayParse size = " + size + "; page = " + page);
-
-
- //key[]:{Table:{}}中key equals Table时 提取Table
- int index = isSubquery || name == null ? -1 : name.lastIndexOf("[]");
- String childPath = index <= 0 ? null : Pair.parseEntry(name.substring(0, index), true).getKey(); // Table-key1-key2...
- //判断第一个key，即Table是否存在，如果存在就提取
- String[] childKeys = StringUtil.split(childPath, "-", false);
- if (childKeys == null || childKeys.length <= 0 || request.containsKey(childKeys[0]) == false) {
- childKeys = null;
- }
+ //key[]:{Table:{}}中key equals Table时 提取Table
+ int index = isSubquery || name == null ? -1 : name.lastIndexOf("[]");
+ String childPath = index <= 0 ? null : Pair.parseEntry(name.substring(0, index), true).getKey(); // Table-key1-key2...
+ //判断第一个key，即Table是否存在，如果存在就提取
+ String[] childKeys = StringUtil.split(childPath, "-", false);
+ if (childKeys == null || childKeys.length <= 0 || request.containsKey(childKeys[0]) == false) {
+ childKeys = null;
+ }
- //Table<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- JSONArray response = new JSONArray();
- SQLConfig config = createSQLConfig()
- .setMethod(requestMethod)
- .setCount(size)
- .setPage(page)
- .setQuery(query2)
- .setJoinList(onJoinParse(join, request));
- JSONObject parent;
- //生成size个
- for (int i = 0; i < (isSubquery ? 1 : size); i++) {
- parent = onObjectParse(request, isSubquery ? parentPath : path, isSubquery ? name : "" + i, config.setType(SQLConfig.TYPE_ITEM).setPosition(i), isSubquery);
- if (parent == null || parent.isEmpty()) {
- break;
+ //Table<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ response = new JSONArray();
+ SQLConfig config = createSQLConfig()
+ .setMethod(requestMethod)
+ .setCount(size)
+ .setPage(page)
+ .setQuery(query2)
+ .setJoinList(onJoinParse(join, request));
+
+ JSONObject parent;
+ //生成size个
+ for (int i = 0; i < (isSubquery ? 1 : size); i++) {
+ parent = onObjectParse(request, isSubquery ? parentPath : path, isSubquery ? name : "" + i, config.setType(SQLConfig.TYPE_ITEM).setPosition(i), isSubquery);
+ if (parent == null || parent.isEmpty()) {
+ break;
+ }
+ //key[]:{Table:{}}中key equals Table时 提取Table
+ response.add(getValue(parent, childKeys)); //null有意义
}
- //key[]:{Table:{}}中key equals Table时 提取Table
- response.add(getValue(parent, childKeys)); //null有意义
- }
- //Table>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+ //Table>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- /*
- * 支持引用取值后的数组
+ /*
+ * 支持引用取值后的数组
{
"User-id[]": {
"User": {
@@ -986,18 +987,19 @@ public JSONArray onArrayParse(JSONObject request, String parentPath, String name
}
}
}
- */
- Object fo = childKeys == null || response.isEmpty() ? null : response.get(0);
- if (fo instanceof Boolean || fo instanceof Number || fo instanceof String) { //[{}] 和 [[]] 都没意义
- putQueryResult(path, response);
- }
-
+ */
+ Object fo = childKeys == null || response.isEmpty() ? null : response.get(0);
+ if (fo instanceof Boolean || fo instanceof Number || fo instanceof String) { //[{}] 和 [[]] 都没意义
+ putQueryResult(path, response);
+ }
+ } finally {
- //后面还可能用到，要还原
- request.put(JSONRequest.KEY_QUERY, query);
- request.put(JSONRequest.KEY_COUNT, count);
- request.put(JSONRequest.KEY_PAGE, page);
- request.put(JSONRequest.KEY_JOIN, join);
+ //后面还可能用到，要还原
+ request.put(JSONRequest.KEY_QUERY, query);
+ request.put(JSONRequest.KEY_COUNT, count);
+ request.put(JSONRequest.KEY_PAGE, page);
+ request.put(JSONRequest.KEY_JOIN, join);
+ }
if (Log.DEBUG) {
Log.i(TAG, "onArrayParse return response = \n" + JSON.toJSONString(response) + "\n>>>>>>>>>>>>>>>\n\n\n");
@@ -1142,8 +1144,9 @@ else if (join != null){
private static final List JOIN_COPY_KEY_LIST;
- static {//TODO 不全
+ static { // TODO 不全
JOIN_COPY_KEY_LIST = new ArrayList();
+ JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_ROLE);
JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_DATABASE);
JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_SCHEMA);
JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_COLUMN);
@@ -1151,14 +1154,13 @@ else if (join != null){
JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_GROUP);
JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_HAVING);
JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_ORDER);
+ JOIN_COPY_KEY_LIST.add(JSONRequest.KEY_RAW);
}
- /**
- * 取指定json对象的id集合
+ /**取指定 JSON 对象的 id 集合
* @param table
* @param key
* @param obj
- * @param targetKey
* @return null ? 全部 : 有限的数组
*/
private JSONObject getJoinObject(String table, JSONObject obj, String key) {
@@ -1171,8 +1173,8 @@ private JSONObject getJoinObject(String table, JSONObject obj, String key) {
return null;
}
- //取出所有join条件
- JSONObject requestObj = new JSONObject(true);//(JSONObject) obj.clone();//
+ // 取出所有 join 条件
+ JSONObject requestObj = new JSONObject(true); // (JSONObject) obj.clone();
Set set = new LinkedHashSet<>(obj.keySet());
for (String k : set) {
if (StringUtil.isEmpty(k, true)) {
@@ -1190,7 +1192,7 @@ private JSONObject getJoinObject(String table, JSONObject obj, String key) {
continue;
}
throw new UnsupportedOperationException(table + "." + k + " 不合法！" + JSONRequest.KEY_JOIN
- + " 关联的Table中只能有1个 key@:value ！");
+ + " 关联的Table中只能有1个 key@:value ！"); // TODO 支持 join on
}
if (k.contains("()") == false) { //不需要远程函数
@@ -1393,7 +1395,7 @@ public Object getValueByPath(String valuePath) {
if (parent != null) {
Log.i(TAG, "getValueByPath >> get from queryResultMap >> return parent.get(keys[keys.length - 1]);");
- target = parent.get(keys[keys.length - 1]); //值为null应该报错NotExistExeption，一般都是id关联，不可为null，否则可能绕过安全机制
+ target = keys == null || keys.length <= 0 ? parent : parent.get(keys[keys.length - 1]); //值为null应该报错NotExistExeption，一般都是id关联，不可为null，否则可能绕过安全机制
if (target != null) {
Log.i(TAG, "getValueByPath >> getValue >> return target = " + target);
return target;
diff --git a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java
index ed466e2cf..7e73bdd18 100755
--- a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java
@@ -112,7 +112,7 @@ public interface SQLConfig {
SQLConfig setId(Object id);
RequestRole getRole();
- SQLConfig setRole(RequestRole role);
+ SQLConfig setRole(RequestRole role); // TODO 提供 String 类型的，方便扩展
public boolean isDistinct();
public SQLConfig setDistinct(boolean distinct);
From b7d1fef19286e30692ff628f78875e130d1583ca Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 24 Jan 2021 02:55:03 +0800
Subject: [PATCH 0257/1181] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E7=9A=84=E8=A7=A3=E6=9E=90?=
=?UTF-8?q?=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/apijson/orm/AbstractObjectParser.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
index f33534d19..8fcd78d80 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -177,7 +177,7 @@ public AbstractObjectParser parse() throws Exception {
functionMap = null;//must init
childMap = null;//must init
- Set> set = new LinkedHashSet>(request.entrySet());
+ Set> set = request.isEmpty() ? null : new LinkedHashSet>(request.entrySet());
if (set != null && set.isEmpty() == false) {//判断换取少几个变量的初始化是否值得？
if (isTable) {//非Table下必须保证原有顺序！否则 count,page 会丢, total@:"/[]/total" 会在[]:{}前执行！
customMap = new LinkedHashMap();
@@ -261,17 +261,17 @@ else if (method == PUT && value instanceof JSONArray
}
if (isTable) {
- if (sqlRequest.get(JSONRequest.KEY_DATABASE) == null && parser.getGlobleDatabase() != null) {
+ if (parser.getGlobleDatabase() != null && sqlRequest.get(JSONRequest.KEY_DATABASE) == null) {
sqlRequest.put(JSONRequest.KEY_DATABASE, parser.getGlobleDatabase());
}
- if (sqlRequest.get(JSONRequest.KEY_SCHEMA) == null && parser.getGlobleSchema() != null) {
+ if (parser.getGlobleSchema() != null && sqlRequest.get(JSONRequest.KEY_SCHEMA) == null) {
sqlRequest.put(JSONRequest.KEY_SCHEMA, parser.getGlobleSchema());
}
if (isSubquery == false) { //解决 SQL 语法报错，子查询不能 EXPLAIN
- if (sqlRequest.get(JSONRequest.KEY_EXPLAIN) == null && parser.getGlobleExplain() != null) {
+ if (parser.getGlobleExplain() != null && sqlRequest.get(JSONRequest.KEY_EXPLAIN) == null) {
sqlRequest.put(JSONRequest.KEY_EXPLAIN, parser.getGlobleExplain());
}
- if (sqlRequest.get(JSONRequest.KEY_CACHE) == null && parser.getGlobleCache() != null) {
+ if (parser.getGlobleCache() != null && sqlRequest.get(JSONRequest.KEY_CACHE) == null) {
sqlRequest.put(JSONRequest.KEY_CACHE, parser.getGlobleCache());
}
}
From 893d3b3fd9cb617b2bcfa17b503b097dede1dfdc Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 24 Jan 2021 22:43:13 +0800
Subject: [PATCH 0258/1181] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A8=E8=8D=90?=
=?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20APIJSON=20=E6=8E=A5=E5=8F=A3=E8=B0=83?=
=?UTF-8?q?=E8=AF=95=E5=AE=9E=E8=B7=B5=EF=BC=8C=E6=84=9F=E8=B0=A2=E8=85=BE?=
=?UTF-8?q?=E8=AE=AF=E5=90=8C=E4=BA=8B=E7=9A=84=E8=B4=A1=E7=8C=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 1d66d754f..4981da0d3 100644
--- a/README.md
+++ b/README.md
@@ -325,6 +325,8 @@ https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md
[学习自动化接口APIJSON](https://www.jianshu.com/p/981a2a630c7b)
+[APIJSON 接口调试实践](https://github.com/Tencent/APIJSON/issues/189)
+
[APIJSON使用例子总结](https://blog.csdn.net/weixin_41077841/article/details/110518007)
[APIJSON 自动化接口和文档的快速开发神器 （一）](https://blog.csdn.net/qq_41829492/article/details/88670940)
From bb4896d208e813a3f5eec21f60e1c083621b1f92 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 30 Jan 2021 19:56:35 +0800
Subject: [PATCH 0259/1181] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=87=8F=E5=B0=91?=
=?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=20newSQLConfig=20=E5=8F=8A?=
=?UTF-8?q?=20getSQL=20=E7=AD=89=E6=AD=A5=E9=AA=A4=E6=9D=A5=E5=A4=A7?=
=?UTF-8?q?=E5=B9=85=E6=8F=90=E5=8D=87=E6=95=B0=E7=BB=84=E5=86=85=E4=B8=BB?=
=?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../apijson/orm/AbstractObjectParser.java | 248 +++++++++++-------
.../main/java/apijson/orm/AbstractParser.java | 22 +-
.../java/apijson/orm/AbstractSQLExecutor.java | 32 ++-
.../main/java/apijson/orm/SQLExecutor.java | 2 +
4 files changed, 189 insertions(+), 115 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
index 8fcd78d80..2ac9447e6 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -60,6 +60,8 @@ public AbstractObjectParser setParser(AbstractParser parser) {
protected final int type;
protected final List joinList;
protected final boolean isTable;
+ protected final boolean isArrayMainTable;
+ protected final boolean isReuse;
protected final String path;
protected final String name;
protected final String table;
@@ -96,6 +98,8 @@ public AbstractObjectParser(@NotNull JSONObject request, String parentPath, Stri
this.table = entry.getKey();
this.alias = entry.getValue();
this.isTable = apijson.JSONObject.isTableKey(table);
+ this.isArrayMainTable = isSubquery == false && this.isTable && this.type == SQLConfig.TYPE_ITEM_CHILD_0 && RequestMethod.isGetMethod(method, true);
+ this.isReuse = isArrayMainTable && arrayConfig != null && arrayConfig.getPosition() > 0;
this.objectCount = 0;
this.arrayCount = 0;
@@ -118,6 +122,15 @@ public AbstractObjectParser(@NotNull JSONObject request, String parentPath, Stri
Log.d(TAG, "AbstractObjectParser isEmpty = " + isEmpty + "; tri = " + tri + "; drop = " + drop);
}
+ protected int position;
+ public int getPosition() {
+ return position;
+ }
+ public AbstractObjectParser setPosition(int position) {
+ this.position = position;
+ return this;
+ }
+
private boolean invalidate = false;
public void invalidate() {
@@ -260,7 +273,7 @@ else if (method == PUT && value instanceof JSONArray
// 非Table内的函数会被滞后在onChildParse后调用！ onFunctionResponse("-");
}
- if (isTable) {
+ if (isReuse == false && isTable) {
if (parser.getGlobleDatabase() != null && sqlRequest.get(JSONRequest.KEY_DATABASE) == null) {
sqlRequest.put(JSONRequest.KEY_DATABASE, parser.getGlobleDatabase());
}
@@ -297,96 +310,96 @@ else if (method == PUT && value instanceof JSONArray
*/
@Override
public boolean onParse(@NotNull String key, @NotNull Object value) throws Exception {
- if (key.endsWith("@")) {//StringUtil.isPath((String) value)) {
-
- if (value instanceof JSONObject) { // SQL 子查询对象，JSONObject -> SQLConfig.getSQL
- String replaceKey = key.substring(0, key.length() - 1);//key{}@ getRealKey
-
- JSONObject subquery = (JSONObject) value;
- String range = subquery.getString(JSONRequest.KEY_SUBQUERY_RANGE);
- if (range != null && JSONRequest.SUBQUERY_RANGE_ALL.equals(range) == false && JSONRequest.SUBQUERY_RANGE_ANY.equals(range) == false) {
- throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [" + JSONRequest.SUBQUERY_RANGE_ALL + ", " + JSONRequest.SUBQUERY_RANGE_ANY + "] 中的一个！");
- }
-
+ if (key.endsWith("@")) { // StringUtil.isPath((String) value)) {
+ String replaceKey = key.substring(0, key.length() - 1);
+
+ // [] 内主表 position > 0 时，用来生成 SQLConfig 的键值对全都忽略，不解析
+// if (isReuse == false || replaceKey.endsWith("()") || (replaceKey.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(replaceKey) == false)) {
+ if (value instanceof JSONObject) { // key{}@ getRealKey, SQL 子查询对象，JSONObject -> SQLConfig.getSQL
+
+ JSONObject subquery = (JSONObject) value;
+ String range = subquery.getString(JSONRequest.KEY_SUBQUERY_RANGE);
+ if (range != null && JSONRequest.SUBQUERY_RANGE_ALL.equals(range) == false && JSONRequest.SUBQUERY_RANGE_ANY.equals(range) == false) {
+ throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [" + JSONRequest.SUBQUERY_RANGE_ALL + ", " + JSONRequest.SUBQUERY_RANGE_ANY + "] 中的一个！");
+ }
- JSONArray arr = parser.onArrayParse(subquery, path, key, true);
- JSONObject obj = arr == null || arr.isEmpty() ? null : arr.getJSONObject(0);
- if (obj == null) {
- throw new Exception("服务器内部错误，解析子查询 " + path + "/" + key + ":{ } 为 Subquery 对象失败！");
- }
+ JSONArray arr = parser.onArrayParse(subquery, path, key, true);
- String from = subquery.getString(JSONRequest.KEY_SUBQUERY_FROM);
- JSONObject arrObj = from == null ? null : obj.getJSONObject(from);
- if (arrObj == null) {
- throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象 " + from + ":{} 不存在！");
- }
- //
- SQLConfig cfg = (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
- if (cfg == null) {
- throw new NotExistException(TAG + ".onParse cfg == null");
- }
-
- Subquery s = new Subquery();
- s.setPath(path);
- s.setOriginKey(key);
- s.setOriginValue(subquery);
-
- s.setFrom(from);
- s.setRange(range);
- s.setKey(replaceKey);
- s.setConfig(cfg);
+ JSONObject obj = arr == null || arr.isEmpty() ? null : arr.getJSONObject(0);
+ if (obj == null) {
+ throw new Exception("服务器内部错误，解析子查询 " + path + "/" + key + ":{ } 为 Subquery 对象失败！");
+ }
- key = replaceKey;
- value = s; //(range == null || range.isEmpty() ? "" : "range") + "(" + cfg.getSQL(false) + ") ";
+ String from = subquery.getString(JSONRequest.KEY_SUBQUERY_FROM);
+ JSONObject arrObj = from == null ? null : obj.getJSONObject(from);
+ if (arrObj == null) {
+ throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象 " + from + ":{} 不存在！");
+ }
+ //
+ SQLConfig cfg = (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
+ if (cfg == null) {
+ throw new NotExistException(TAG + ".onParse cfg == null");
+ }
- parser.putQueryResult(AbstractParser.getAbsPath(path, key), s); //字符串引用保证不了安全性 parser.getSQL(cfg));
- }
- else if (value instanceof String) { // 引用赋值路径
+ Subquery s = new Subquery();
+ s.setPath(path);
+ s.setOriginKey(key);
+ s.setOriginValue(subquery);
- // System.out.println("getObject key.endsWith(@) >> parseRelation = " + parseRelation);
- String replaceKey = key.substring(0, key.length() - 1);//key{}@ getRealKey
- String targetPath = AbstractParser.getValuePath(type == TYPE_ITEM
- ? path : parentPath, new String((String) value));
+ s.setFrom(from);
+ s.setRange(range);
+ s.setKey(replaceKey);
+ s.setConfig(cfg);
- //先尝试获取，尽量保留缺省依赖路径，这样就不需要担心路径改变
- Object target = onReferenceParse(targetPath);
- Log.i(TAG, "onParse targetPath = " + targetPath + "; target = " + target);
+ key = replaceKey;
+ value = s; //(range == null || range.isEmpty() ? "" : "range") + "(" + cfg.getSQL(false) + ") ";
- if (target == null) {//String#equals(null)会出错
- Log.d(TAG, "onParse target == null >> return true;");
- return true;
+ parser.putQueryResult(AbstractParser.getAbsPath(path, key), s); //字符串引用保证不了安全性 parser.getSQL(cfg));
}
- if (target instanceof Map) { //target可能是从requestObject里取出的 {}
- if (isTable || targetPath.endsWith("[]/" + JSONResponse.KEY_INFO) == false) {
- Log.d(TAG, "onParse target instanceof Map >> return false;");
- return false; //FIXME 这个判断现在来看是否还有必要？为啥不允许为 JSONObject ？以前可能因为防止二次遍历再解析，现在只有一次遍历
+ else if (value instanceof String) { // //key{}@ getRealKey, 引用赋值路径
+ // System.out.println("getObject key.endsWith(@) >> parseRelation = " + parseRelation);
+ String targetPath = AbstractParser.getValuePath(type == TYPE_ITEM
+ ? path : parentPath, new String((String) value));
+
+ //先尝试获取，尽量保留缺省依赖路径，这样就不需要担心路径改变
+ Object target = onReferenceParse(targetPath);
+ Log.i(TAG, "onParse targetPath = " + targetPath + "; target = " + target);
+
+ if (target == null) {//String#equals(null)会出错
+ Log.d(TAG, "onParse target == null >> return true;");
+ return true;
}
- }
- if (targetPath.equals(target)) {//必须valuePath和保证getValueByPath传进去的一致！
- Log.d(TAG, "onParse targetPath.equals(target) >>");
-
- //非查询关键词 @key 不影响查询，直接跳过
- if (isTable && (key.startsWith("@") == false || JSONRequest.TABLE_KEY_LIST.contains(key))) {
- Log.e(TAG, "onParse isTable && (key.startsWith(@) == false"
- + " || JSONRequest.TABLE_KEY_LIST.contains(key)) >> return null;");
- return false;//获取不到就不用再做无效的query了。不考虑 Table:{Table:{}}嵌套
- } else {
- Log.d(TAG, "onParse isTable(table) == false >> return true;");
- return true;//舍去，对Table无影响
+ if (target instanceof Map) { //target可能是从requestObject里取出的 {}
+ if (isTable || targetPath.endsWith("[]/" + JSONResponse.KEY_INFO) == false) {
+ Log.d(TAG, "onParse target instanceof Map >> return false;");
+ return false; //FIXME 这个判断现在来看是否还有必要？为啥不允许为 JSONObject ？以前可能因为防止二次遍历再解析，现在只有一次遍历
+ }
}
- }
-
- //直接替换原来的key@:path为key:target
- Log.i(TAG, "onParse >> key = replaceKey; value = target;");
- key = replaceKey;
- value = target;
- Log.d(TAG, "onParse key = " + key + "; value = " + value);
- }
- else {
- throw new IllegalArgumentException(path + "/" + key + ":value 中 value 必须为 依赖路径String 或 SQL子查询JSONObject ！");
- }
+ if (targetPath.equals(target)) {//必须valuePath和保证getValueByPath传进去的一致！
+ Log.d(TAG, "onParse targetPath.equals(target) >>");
+
+ //非查询关键词 @key 不影响查询，直接跳过
+ if (isTable && (key.startsWith("@") == false || JSONRequest.TABLE_KEY_LIST.contains(key))) {
+ Log.e(TAG, "onParse isTable && (key.startsWith(@) == false"
+ + " || JSONRequest.TABLE_KEY_LIST.contains(key)) >> return null;");
+ return false;//获取不到就不用再做无效的query了。不考虑 Table:{Table:{}}嵌套
+ } else {
+ Log.d(TAG, "onParse isTable(table) == false >> return true;");
+ return true;//舍去，对Table无影响
+ }
+ }
+ //直接替换原来的key@:path为key:target
+ Log.i(TAG, "onParse >> key = replaceKey; value = target;");
+ key = replaceKey;
+ value = target;
+ Log.d(TAG, "onParse key = " + key + "; value = " + value);
+ }
+ else {
+ throw new IllegalArgumentException(path + "/" + key + ":value 中 value 必须为 依赖路径String 或 SQL子查询JSONObject ！");
+ }
+// }
}
if (key.endsWith("()")) {
@@ -426,7 +439,9 @@ else if (isTable && key.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(k
customMap.put(key, value);
}
else {
+ // 导致副表从 1 开始都不查了 if (isReuse == false) {
sqlRequest.put(key, value);
+ // }
}
return true;
@@ -640,8 +655,8 @@ public AbstractObjectParser setSQLConfig() throws Exception {
@Override
public AbstractObjectParser setSQLConfig(int count, int page, int position) throws Exception {
- if (isTable == false) {
- return this;
+ if (isTable == false || isReuse) {
+ return setPosition(position);
}
if (sqlConfig == null) {
@@ -676,28 +691,30 @@ public AbstractObjectParser executeSQL() throws Exception {
//执行SQL操作数据库
if (isTable == false) {//提高性能
sqlReponse = new JSONObject(sqlRequest);
- } else {
- try {
- sqlReponse = onSQLExecute();
- }
- catch (NotExistException e) {
- // Log.e(TAG, "getObject try { response = getSQLObject(config2); } catch (Exception e) {");
- // if (e instanceof NotExistException) {//非严重异常，有时候只是数据不存在
- // // e.printStackTrace();
- sqlReponse = null;//内部吃掉异常，put到最外层
- // requestObject.put(JSONResponse.KEY_MSG
- // , StringUtil.getString(requestObject.get(JSONResponse.KEY_MSG)
- // + "; query " + path + " cath NotExistException:"
- // + newErrorResult(e).getString(JSONResponse.KEY_MSG)));
- // } else {
- // throw e;
- // }
+ }
+ else {
+ try {
+ sqlReponse = onSQLExecute();
+
+ }
+ catch (NotExistException e) {
+ // Log.e(TAG, "getObject try { response = getSQLObject(config2); } catch (Exception e) {");
+ // if (e instanceof NotExistException) {//非严重异常，有时候只是数据不存在
+ // // e.printStackTrace();
+ sqlReponse = null;//内部吃掉异常，put到最外层
+ // requestObject.put(JSONResponse.KEY_MSG
+ // , StringUtil.getString(requestObject.get(JSONResponse.KEY_MSG)
+ // + "; query " + path + " cath NotExistException:"
+ // + newErrorResult(e).getString(JSONResponse.KEY_MSG)));
+ // } else {
+ // throw e;
+ // }
+ }
}
if (drop) {//丢弃Table，只为了向下提供条件
sqlReponse = null;
}
- }
return this;
}
@@ -799,10 +816,39 @@ public Object onReferenceParse(@NotNull String path) {
@Override
public JSONObject onSQLExecute() throws Exception {
- JSONObject result = parser.executeSQL(sqlConfig, isSubquery);
- if (isSubquery == false && result != null) {
- parser.putQueryResult(path, result);//解决获取关联数据时requestObject里不存在需要的关联数据
+ int position = getPosition();
+
+ JSONObject result;
+ if (isArrayMainTable && position > 0) { // 数组主表使用专门的缓存数据
+ result = parser.getArrayMainCacheItem(parentPath.substring(0, parentPath.lastIndexOf("[]") + 2), position);
}
+ else {
+ result = parser.executeSQL(sqlConfig, isSubquery);
+
+ if (isArrayMainTable && position == 0 && result != null) { // 提取并缓存数组主表的列表数据
+ @SuppressWarnings("unchecked")
+ List list = (List) result.remove(SQLExecutor.KEY_RAW_LIST);
+ if (list != null) {
+ String arrayPath = parentPath.substring(0, parentPath.lastIndexOf("[]") + 2);
+
+ for (int i = 1; i < list.size(); i++) { // 从 1 开始，0 已经处理过
+ JSONObject obj = parser.parseCorrectResponse(table, list.get(i));
+ list.set(i, obj);
+
+ if (obj != null) {
+ parser.putQueryResult(arrayPath + "/" + i + "/" + table, obj); //解决获取关联数据时requestObject里不存在需要的关联数据
+ }
+ }
+
+ parser.putArrayMainCache(arrayPath, list);
+ }
+ }
+
+ if (isSubquery == false && result != null) {
+ parser.putQueryResult(path, result);//解决获取关联数据时requestObject里不存在需要的关联数据
+ }
+ }
+
return result;
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
index 85bbb4c1e..1f0880128 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -14,7 +14,6 @@
import java.sql.Savepoint;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -792,8 +791,8 @@ public JSONObject onObjectParse(final JSONObject request
JSONObject response = null;
- if (op != null) {//TODO SQL查询结果为空时，functionMap和customMap还有没有意义？
- if (arrayConfig == null) {//Common
+ if (op != null) {//SQL查询结果为空时，functionMap和customMap没有意义
+ if (arrayConfig == null) { //Common
response = op.setSQLConfig().executeSQL().response();
}
else {//Array Item Child
@@ -1431,6 +1430,20 @@ public static JSONObject getJSONObject(JSONObject object, String key) {
public static final String KEY_CONFIG = "config";
+
+ protected Map> arrayMainCacheMap = new HashMap<>();
+ public void putArrayMainCache(String arrayPath, List mainTableDataList) {
+ arrayMainCacheMap.put(arrayPath, mainTableDataList);
+ }
+ public List getArrayMainCache(String arrayPath) {
+ return arrayMainCacheMap.get(arrayPath);
+ }
+ public JSONObject getArrayMainCacheItem(String arrayPath, int position) {
+ List list = getArrayMainCache(arrayPath);
+ return list == null || position >= list.size() ? null : list.get(position);
+ }
+
+
/**执行 SQL 并返回 JSONObject
* @param config
@@ -1451,8 +1464,9 @@ public JSONObject executeSQL(SQLConfig config, boolean isSubquery) throws Except
}
try {
- boolean explain = config.isExplain();
JSONObject result;
+
+ boolean explain = config.isExplain();
if (explain) { //如果先执行 explain，则 execute 会死循环，所以只能先执行非 explain
config.setExplain(false); //对下面 config.getSQL(false); 生效
JSONObject res = getSQLExecutor().execute(config, false);
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
index 92508640d..47c2d46e5 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLExecutor.java
@@ -155,7 +155,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
config.setPrepared(prepared);
if (StringUtil.isEmpty(sql, true)) {
- Log.e(TAG, "select StringUtil.isEmpty(sql, true) >> return null;");
+ Log.e(TAG, "execute StringUtil.isEmpty(sql, true) >> return null;");
return null;
}
@@ -169,7 +169,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
long startTime = System.currentTimeMillis();
Log.d(TAG, "\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+ "\n已生成 " + generatedSQLCount + " 条 SQL"
- + "\nselect startTime = " + startTime
+ + "\nexecute startTime = " + startTime
+ "\ndatabase = " + StringUtil.getString(config.getDatabase())
+ "; schema = " + StringUtil.getString(config.getSchema())
+ "; sql = \n" + sql
@@ -225,11 +225,11 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
case GET:
case GETS:
result = getCacheItem(sql, position, config.getCache());
- Log.i(TAG, ">>> select result = getCache('" + sql + "', " + position + ") = " + result);
+ Log.i(TAG, ">>> execute result = getCache('" + sql + "', " + position + ") = " + result);
if (result != null) {
cachedSQLCount ++;
- Log.d(TAG, "\n\n select result != null >> return result;" + "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n");
+ Log.d(TAG, "\n\n execute result != null >> return result;" + "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n");
return result;
}
@@ -241,7 +241,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
break;
default://OPTIONS, TRACE等
- Log.e(TAG, "select sql = " + sql + " ; method = " + config.getMethod() + " >> return null;");
+ Log.e(TAG, "execute sql = " + sql + " ; method = " + config.getMethod() + " >> return null;");
return null;
}
}
@@ -266,7 +266,7 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
int viceColumnStart = length + 1; //第一个副表字段的index
while (rs.next()) {
index ++;
- Log.d(TAG, "\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n select while (rs.next()){ index = " + index + "\n\n");
+ Log.d(TAG, "\n\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n execute while (rs.next()){ index = " + index + "\n\n");
JSONObject item = new JSONObject(true);
@@ -293,7 +293,7 @@ else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
resultList = onPutTable(config, rs, rsmd, resultList, index, item);
- Log.d(TAG, "\n select while (rs.next()) { resultList.put( " + index + ", result); "
+ Log.d(TAG, "\n execute while (rs.next()) { resultList.put( " + index + ", result); "
+ "\n >>>>>>>>>>>>>>>>>>>>>>>>>>> \n\n");
}
@@ -345,12 +345,24 @@ else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
}
putCache(sql, resultList, config.getCache());
- Log.i(TAG, ">>> select putCache('" + sql + "', resultList); resultList.size() = " + resultList.size());
+ Log.i(TAG, ">>> execute putCache('" + sql + "', resultList); resultList.size() = " + resultList.size());
+ // 数组主表对象额外一次返回全部，方便 Parser 缓存来提高性能
+
+ result = position >= resultList.size() ? new JSONObject() : resultList.get(position);
+ if (position == 0 && resultList.size() > 1 && result != null && result.isEmpty() == false) {
+ // 不是 main 不会直接执行，count=1 返回的不会超过 1 && config.isMain() && config.getCount() != 1
+ Log.i(TAG, ">>> execute position == 0 && resultList.size() > 1 && result != null && result.isEmpty() == false"
+ + " >> result = new JSONObject(result); result.put(KEY_RAW_LIST, resultList);");
+
+ result = new JSONObject(result);
+ result.put(KEY_RAW_LIST, resultList);
+ }
+
long endTime = System.currentTimeMillis();
- Log.d(TAG, "\n\n select endTime = " + endTime + "; duration = " + (endTime - startTime)
+ Log.d(TAG, "\n\n execute endTime = " + endTime + "; duration = " + (endTime - startTime)
+ "\n return resultList.get(" + position + ");" + "\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n");
- return position >= resultList.size() ? new JSONObject() : resultList.get(position);
+ return result;
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/SQLExecutor.java b/APIJSONORM/src/main/java/apijson/orm/SQLExecutor.java
index b2b0425d5..9fe5917a7 100755
--- a/APIJSONORM/src/main/java/apijson/orm/SQLExecutor.java
+++ b/APIJSONORM/src/main/java/apijson/orm/SQLExecutor.java
@@ -22,6 +22,8 @@
*/
public interface SQLExecutor {
+ String KEY_RAW_LIST = "@RAW@LIST"; // 避免和字段命名冲突，不用 $RAW@LIST$ 是因为 $ 会在 fastjson 内部转义，浪费性能
+
/**保存缓存
* @param sql
* @param map
From 2d193df9992aee4ed1fc020b34fbc5c87a330e4a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 31 Jan 2021 01:24:53 +0800
Subject: [PATCH 0260/1181] Update Document.md
---
Document.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Document.md b/Document.md
index ab37d9f31..09d127be1 100644
--- a/Document.md
+++ b/Document.md
@@ -371,6 +371,6 @@ DELETE: requestIdArray = (Collection) config.getWhere(visitorIdkey + "{}", true);//不能是 &{}， |{} 不要传，直接{}
if (requestId != null) {
if (requestIdArray == null) {
requestIdArray = new JSONArray();
From 6831cb6a6d9b0db24b612628d5dc31243493b7a4 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 31 Jan 2021 04:20:26 +0800
Subject: [PATCH 0267/1181] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=AE=89=E5=85=A8?=
=?UTF-8?q?=EF=BC=9A=E5=AF=B9=20DELETE=20=E5=92=8C=20PUT=20=E5=BC=BA?=
=?UTF-8?q?=E5=88=B6=E5=8A=A0=20LIMIT=EF=BC=9B=E7=AE=80=E5=8C=96=E5=8C=85?=
=?UTF-8?q?=E5=90=AB=E9=80=89=E9=A1=B9=E7=9A=84=E5=86=99=E6=B3=95=EF=BC=9A?=
=?UTF-8?q?=E8=A7=A3=E5=86=B3=20"key<>":=20"a"=20=E8=BF=99=E7=A7=8D?=
=?UTF-8?q?=E5=8C=85=E5=90=AB=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=E6=8A=A5=E9=94=99=20Data=20truncation:=20Invalid=20JS?=
=?UTF-8?q?ON=20text=EF=BC=8C=E5=8E=9F=E6=9D=A5=E5=BF=85=E9=A1=BB=E9=87=8C?=
=?UTF-8?q?=E9=9D=A2=E5=86=8D=E7=94=A8=20""=20=E5=8C=85=E8=A3=85=E4=B8=80?=
=?UTF-8?q?=E6=AC=A1=EF=BC=8CJSON=20=E4=B8=AD=E8=BF=98=E5=BE=97=E8=BD=AC?=
=?UTF-8?q?=E4=B9=89=EF=BC=8C=E7=8E=B0=E5=9C=A8=E7=9B=B4=E6=8E=A5=E5=86=99?=
=?UTF-8?q?=E5=8D=B3=E5=8F=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../apijson/orm/AbstractObjectParser.java | 4 +--
.../java/apijson/orm/AbstractSQLConfig.java | 29 +++++++++++++------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
index 2ac9447e6..b40c9ca0b 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -650,7 +650,7 @@ public SQLConfig newSQLConfig(boolean isProcedure) throws Exception {
*/
@Override
public AbstractObjectParser setSQLConfig() throws Exception {
- return setSQLConfig(1, 0, 0);
+ return setSQLConfig(RequestMethod.isQueryMethod(method) ? 1 : 0, 0, 0);
}
@Override
@@ -668,7 +668,7 @@ public AbstractObjectParser setSQLConfig(int count, int page, int position) thro
return this;
}
}
- sqlConfig.setCount(count).setPage(page).setPosition(position);
+ sqlConfig.setCount(sqlConfig.getCount() <= 0 ? count : sqlConfig.getCount()).setPage(page).setPosition(position);
parser.onVerifyRole(sqlConfig);
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index 169fe6d4e..e6b08a494 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1284,11 +1284,11 @@ public String getLimitString() {
public static String getLimitString(int page, int count, boolean isTSQL) {
int offset = getOffset(page, count);
- if (isTSQL) {
+ if (isTSQL) { // OFFSET FECTH 中所有关键词都不可省略
return " OFFSET " + offset + " ROWS FETCH FIRST " + count + " ROWS ONLY";
}
- return " LIMIT " + count + " OFFSET " + offset;
+ return " LIMIT " + count + (offset <= 0 ? "" : " OFFSET " + offset); // DELETE, UPDATE 不支持 OFFSET
}
//WHERE <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -2179,20 +2179,23 @@ public String getContainString(String key, Object[] childs, int type) throws Ill
String condition = "";
if (childs != null) {
for (int i = 0; i < childs.length; i++) {
- if (childs[i] != null) {
- if (childs[i] instanceof JSON) {
+ Object c = childs[i];
+ if (c != null) {
+ if (c instanceof JSON) {
throw new IllegalArgumentException(key + "<>:value 中value类型不能为JSON！");
}
condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR));
if (isPostgreSQL()) {
- condition += (getKey(key) + " @> " + getValue(newJSONArray(childs[i]))); //operator does not exist: jsonb @> character varying "[" + childs[i] + "]");
+ condition += (getKey(key) + " @> " + getValue(newJSONArray(c))); //operator does not exist: jsonb @> character varying "[" + c + "]");
}
else if (isOracle()) {
- condition += ("json_textcontains(" + getKey(key) + ", '$', " + getValue(childs[i].toString()) + ")");
+ condition += ("json_textcontains(" + getKey(key) + ", '$', " + getValue(c.toString()) + ")");
}
else {
- condition += ("json_contains(" + getKey(key) + ", " + getValue(childs[i].toString()) + ")");
+ boolean isNum = c instanceof Number;
+ String v = (isNum ? "" : "\"") + childs[i] + (isNum ? "" : "\"");
+ condition += ("json_contains(" + getKey(key) + ", " + getValue(v) + ")");
}
}
}
@@ -2390,9 +2393,9 @@ public static String getSQL(AbstractSQLConfig config) throws Exception {
case POST:
return "INSERT INTO " + tablePath + config.getColumnString() + " VALUES" + config.getValuesString();
case PUT:
- return "UPDATE " + tablePath + config.getSetString() + config.getWhereString(true);
+ return "UPDATE " + tablePath + config.getSetString() + config.getWhereString(true) + config.getLimitString();
case DELETE:
- return "DELETE FROM " + tablePath + config.getWhereString(true);
+ return "DELETE FROM " + tablePath + config.getWhereString(true) + config.getLimitString();
default:
String explain = (config.isExplain() ? (config.isSQLServer() || config.isOracle() ? "SET STATISTICS PROFILE ON " : "EXPLAIN ") : "");
if (config.isTest() && RequestMethod.isGetMethod(config.getMethod(), true)) {
@@ -2635,6 +2638,10 @@ public static SQLConfig newSQLConfig(RequestMethod method, String table, String
throw new NotExistException(TAG + ": newSQLConfig idIn instanceof List >> 去掉无效 id 后 newIdIn.isEmpty()");
}
idIn = newIdIn;
+
+ if (method == DELETE || method == PUT) {
+ config.setCount(newIdIn.size());
+ }
}
//对id和id{}处理，这两个一定会作为条件
@@ -2670,6 +2677,10 @@ else if (id instanceof Subquery) {}
throw new NotExistException(TAG + ": newSQLConfig idIn != null && (((List) idIn).contains(id) == false");
}
}
+
+ if (method == DELETE || method == PUT) {
+ config.setCount(1);
+ }
}
From a406242a81f2b303a1c55e6a4f5c3c835e62e53a Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sun, 31 Jan 2021 19:35:52 +0800
Subject: [PATCH 0268/1181] =?UTF-8?q?=E3=80=90=E6=80=A7=E8=83=BD=E3=80=91?=
=?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=93=E5=AD=98=E5=8F=8A=E5=A4=8D=E7=94=A8?=
=?UTF-8?q?=E6=95=B0=E7=BB=84=E4=B8=BB=E8=A1=A8=20ObjectParser=20=E6=9D=A5?=
=?UTF-8?q?=E5=A4=A7=E5=B9=85=E6=8F=90=E5=8D=87=E6=9F=A5=E8=AF=A2=E6=95=B0?=
=?UTF-8?q?=E7=BB=84=E7=9A=84=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../apijson/orm/AbstractObjectParser.java | 457 ++++++++--------
.../main/java/apijson/orm/AbstractParser.java | 41 +-
.../java/apijson/orm/AbstractSQLConfig.java | 501 +++++++++---------
.../main/java/apijson/orm/ObjectParser.java | 8 +-
.../src/main/java/apijson/orm/Parser.java | 2 +-
5 files changed, 528 insertions(+), 481 deletions(-)
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
index b40c9ca0b..f5a2e079f 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -61,12 +61,6 @@ public AbstractObjectParser setParser(AbstractParser parser) {
protected final List joinList;
protected final boolean isTable;
protected final boolean isArrayMainTable;
- protected final boolean isReuse;
- protected final String path;
- protected final String name;
- protected final String table;
- protected final String alias;
-
protected final boolean tri;
/**
@@ -80,26 +74,23 @@ public AbstractObjectParser setParser(AbstractParser parser) {
* @param name
* @throws Exception
*/
- public AbstractObjectParser(@NotNull JSONObject request, String parentPath, String name, SQLConfig arrayConfig, boolean isSubquery) throws Exception {
+ public AbstractObjectParser(@NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
+ , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
if (request == null) {
throw new IllegalArgumentException(TAG + ".ObjectParser request == null!!!");
}
this.request = request;
this.parentPath = parentPath;
+
this.arrayConfig = arrayConfig;
this.isSubquery = isSubquery;
this.type = arrayConfig == null ? 0 : arrayConfig.getType();
this.joinList = arrayConfig == null ? null : arrayConfig.getJoinList();
- this.name = name;
- this.path = AbstractParser.getAbsPath(parentPath, name);
-
- apijson.orm.Entry entry = Pair.parseEntry(name, true);
- this.table = entry.getKey();
- this.alias = entry.getValue();
- this.isTable = apijson.JSONObject.isTableKey(table);
- this.isArrayMainTable = isSubquery == false && this.isTable && this.type == SQLConfig.TYPE_ITEM_CHILD_0 && RequestMethod.isGetMethod(method, true);
- this.isReuse = isArrayMainTable && arrayConfig != null && arrayConfig.getPosition() > 0;
+
+ this.isTable = isTable; // apijson.JSONObject.isTableKey(table);
+ this.isArrayMainTable = isArrayMainTable; // isSubquery == false && this.isTable && this.type == SQLConfig.TYPE_ITEM_CHILD_0 && RequestMethod.isGetMethod(method, true);
+// this.isReuse = isReuse; // isArrayMainTable && arrayConfig != null && arrayConfig.getPosition() > 0;
this.objectCount = 0;
this.arrayCount = 0;
@@ -117,11 +108,10 @@ public AbstractObjectParser(@NotNull JSONObject request, String parentPath, Stri
request.remove(KEY_DROP);
}
-
- Log.d(TAG, "AbstractObjectParser table = " + table + "; isTable = " + isTable);
- Log.d(TAG, "AbstractObjectParser isEmpty = " + isEmpty + "; tri = " + tri + "; drop = " + drop);
}
+
+
protected int position;
public int getPosition() {
return position;
@@ -148,6 +138,12 @@ public boolean isBreakParse() {
return breakParse || isInvalidate();
}
+ protected String name;
+ protected String table;
+ protected String alias;
+ protected boolean isReuse;
+ protected String parentName;
+ protected String path;
protected JSONObject response;
protected JSONObject sqlRequest;
@@ -177,118 +173,135 @@ public boolean isBreakParse() {
* @throws Exception
*/
@Override
- public AbstractObjectParser parse() throws Exception {
+ public AbstractObjectParser parse(String name, boolean isReuse) throws Exception {
if (isInvalidate() == false) {
+ this.isReuse = isReuse;
+ this.name = name;
+ this.path = AbstractParser.getAbsPath(parentPath, name);
+
+ apijson.orm.Entry tentry = Pair.parseEntry(name, true);
+ this.table = tentry.getKey();
+ this.alias = tentry.getValue();
+
+ Log.d(TAG, "AbstractObjectParser parentPath = " + parentPath + "; name = " + name + "; table = " + table + "; alias = " + alias);
+ Log.d(TAG, "AbstractObjectParser type = " + type + "; isTable = " + isTable + "; isArrayMainTable = " + isArrayMainTable);
+ Log.d(TAG, "AbstractObjectParser isEmpty = " + request.isEmpty() + "; tri = " + tri + "; drop = " + drop);
+
breakParse = false;
response = new JSONObject(true);//must init
+ sqlReponse = null;//must init
- sqlRequest = new JSONObject(true);//must init
+ if (isReuse == false) {
+ sqlRequest = new JSONObject(true);//must init
- sqlReponse = null;//must init
- customMap = null;//must init
- functionMap = null;//must init
- childMap = null;//must init
-
- Set> set = request.isEmpty() ? null : new LinkedHashSet>(request.entrySet());
- if (set != null && set.isEmpty() == false) {//判断换取少几个变量的初始化是否值得？
- if (isTable) {//非Table下必须保证原有顺序！否则 count,page 会丢, total@:"/[]/total" 会在[]:{}前执行！
- customMap = new LinkedHashMap();
- childMap = new LinkedHashMap();
- }
- functionMap = new LinkedHashMap>();//必须执行
-
-
- //条件<<<<<<<<<<<<<<<<<<<
- List whereList = null;
- if (method == PUT) { //这里只有PUTArray需要处理 || method == DELETE) {
- String[] combine = StringUtil.split(request.getString(KEY_COMBINE));
- if (combine != null) {
- String w;
- for (int i = 0; i < combine.length; i++) { //去除 &,|,! 前缀
- w = combine[i];
- if (w != null && (w.startsWith("&") || w.startsWith("|") || w.startsWith("!"))) {
- combine[i] = w.substring(1);
+ customMap = null;//must init
+ functionMap = null;//must init
+ childMap = null;//must init
+
+ Set> set = request.isEmpty() ? null : new LinkedHashSet>(request.entrySet());
+ if (set != null && set.isEmpty() == false) {//判断换取少几个变量的初始化是否值得？
+ if (isTable) {//非Table下必须保证原有顺序！否则 count,page 会丢, total@:"/[]/total" 会在[]:{}前执行！
+ customMap = new LinkedHashMap();
+ childMap = new LinkedHashMap();
+ }
+ functionMap = new LinkedHashMap>();//必须执行
+
+ //条件<<<<<<<<<<<<<<<<<<<
+ List whereList = null;
+ if (method == PUT) { //这里只有PUTArray需要处理 || method == DELETE) {
+ String[] combine = StringUtil.split(request.getString(KEY_COMBINE));
+ if (combine != null) {
+ String w;
+ for (int i = 0; i < combine.length; i++) { //去除 &,|,! 前缀
+ w = combine[i];
+ if (w != null && (w.startsWith("&") || w.startsWith("|") || w.startsWith("!"))) {
+ combine[i] = w.substring(1);
+ }
}
}
+ //Arrays.asList()返回值不支持add方法！
+ whereList = new ArrayList(Arrays.asList(combine != null ? combine : new String[]{}));
+ whereList.add(apijson.JSONRequest.KEY_ID);
+ whereList.add(apijson.JSONRequest.KEY_ID_IN);
}
- //Arrays.asList()返回值不支持add方法！
- whereList = new ArrayList(Arrays.asList(combine != null ? combine : new String[]{}));
- whereList.add(apijson.JSONRequest.KEY_ID);
- whereList.add(apijson.JSONRequest.KEY_ID_IN);
- }
- //条件>>>>>>>>>>>>>>>>>>>
+ //条件>>>>>>>>>>>>>>>>>>>
- String key;
- Object value;
- int index = 0;
+ String key;
+ Object value;
+ int index = 0;
- for (Entry entry : set) {
- if (isBreakParse()) {
- break;
- }
+ for (Entry entry : set) {
+ if (isBreakParse()) {
+ break;
+ }
- value = entry.getValue();
- if (value == null) {
- continue;
- }
- key = entry.getKey();
+ value = entry.getValue();
+ if (value == null) {
+ continue;
+ }
+ key = entry.getKey();
- try {
- if (key.startsWith("@") || key.endsWith("@")) {
- if (onParse(key, value) == false) {
- invalidate();
+ try {
+ if (key.startsWith("@") || key.endsWith("@")) {
+ if (onParse(key, value) == false) {
+ invalidate();
+ }
}
- }
- else if (value instanceof JSONObject) { // JSONObject，往下一级提取
- if (childMap != null) { // 添加到childMap，最后再解析
- childMap.put(key, (JSONObject)value);
+ else if (value instanceof JSONObject) { // JSONObject，往下一级提取
+ if (childMap != null) { // 添加到childMap，最后再解析
+ childMap.put(key, (JSONObject)value);
+ }
+ else { // 直接解析并替换原来的，[]:{} 内必须直接解析，否则会因为丢掉count等属性，并且total@:"/[]/total"必须在[]:{} 后！
+ response.put(key, onChildParse(index, key, (JSONObject)value));
+ index ++;
+ }
}
- else { // 直接解析并替换原来的，[]:{} 内必须直接解析，否则会因为丢掉count等属性，并且total@:"/[]/total"必须在[]:{} 后！
- response.put(key, onChildParse(index, key, (JSONObject)value));
- index ++;
+ else if ((method == POST || method == PUT) && value instanceof JSONArray
+ && JSONRequest.isTableArray(key)) { // JSONArray，批量新增或修改，往下一级提取
+ onTableArrayParse(key, (JSONArray) value);
}
- }
- else if ((method == POST || method == PUT) && value instanceof JSONArray
- && JSONRequest.isTableArray(key)) { // JSONArray，批量新增或修改，往下一级提取
- onTableArrayParse(key, (JSONArray) value);
- }
- else if (method == PUT && value instanceof JSONArray
- && (whereList == null || whereList.contains(key) == false)) { // PUT JSONArray
- onPUTArrayParse(key, (JSONArray) value);
- }
- else { // JSONArray或其它Object，直接填充
- if (onParse(key, value) == false) {
- invalidate();
+ else if (method == PUT && value instanceof JSONArray
+ && (whereList == null || whereList.contains(key) == false)) { // PUT JSONArray
+ onPUTArrayParse(key, (JSONArray) value);
}
+ else { // JSONArray或其它Object，直接填充
+ if (onParse(key, value) == false) {
+ invalidate();
+ }
+ }
+ } catch (Exception e) {
+ if (tri == false) {
+ throw e; // 不忽略错误，抛异常
+ }
+ invalidate(); // 忽略错误，还原request
}
- } catch (Exception e) {
- if (tri == false) {
- throw e; // 不忽略错误，抛异常
- }
- invalidate(); // 忽略错误，还原request
}
- }
- // 非Table内的函数会被滞后在onChildParse后调用！ onFunctionResponse("-");
- }
-
- if (isReuse == false && isTable) {
- if (parser.getGlobleDatabase() != null && sqlRequest.get(JSONRequest.KEY_DATABASE) == null) {
- sqlRequest.put(JSONRequest.KEY_DATABASE, parser.getGlobleDatabase());
- }
- if (parser.getGlobleSchema() != null && sqlRequest.get(JSONRequest.KEY_SCHEMA) == null) {
- sqlRequest.put(JSONRequest.KEY_SCHEMA, parser.getGlobleSchema());
}
- if (isSubquery == false) { //解决 SQL 语法报错，子查询不能 EXPLAIN
- if (parser.getGlobleExplain() != null && sqlRequest.get(JSONRequest.KEY_EXPLAIN) == null) {
- sqlRequest.put(JSONRequest.KEY_EXPLAIN, parser.getGlobleExplain());
+
+ if (isTable) {
+ if (parser.getGlobleDatabase() != null && sqlRequest.get(JSONRequest.KEY_DATABASE) == null) {
+ sqlRequest.put(JSONRequest.KEY_DATABASE, parser.getGlobleDatabase());
}
- if (parser.getGlobleCache() != null && sqlRequest.get(JSONRequest.KEY_CACHE) == null) {
- sqlRequest.put(JSONRequest.KEY_CACHE, parser.getGlobleCache());
+ if (parser.getGlobleSchema() != null && sqlRequest.get(JSONRequest.KEY_SCHEMA) == null) {
+ sqlRequest.put(JSONRequest.KEY_SCHEMA, parser.getGlobleSchema());
+ }
+ if (isSubquery == false) { //解决 SQL 语法报错，子查询不能 EXPLAIN
+ if (parser.getGlobleExplain() != null && sqlRequest.get(JSONRequest.KEY_EXPLAIN) == null) {
+ sqlRequest.put(JSONRequest.KEY_EXPLAIN, parser.getGlobleExplain());
+ }
+ if (parser.getGlobleCache() != null && sqlRequest.get(JSONRequest.KEY_CACHE) == null) {
+ sqlRequest.put(JSONRequest.KEY_CACHE, parser.getGlobleCache());
+ }
}
}
}
+
+ if (isTable) { // 非Table内的函数会被滞后在onChildParse后调用
+ onFunctionResponse("-");
+ }
+
}
if (isInvalidate()) {
@@ -311,95 +324,93 @@ else if (method == PUT && value instanceof JSONArray
@Override
public boolean onParse(@NotNull String key, @NotNull Object value) throws Exception {
if (key.endsWith("@")) { // StringUtil.isPath((String) value)) {
- String replaceKey = key.substring(0, key.length() - 1);
-
// [] 内主表 position > 0 时，用来生成 SQLConfig 的键值对全都忽略，不解析
-// if (isReuse == false || replaceKey.endsWith("()") || (replaceKey.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(replaceKey) == false)) {
- if (value instanceof JSONObject) { // key{}@ getRealKey, SQL 子查询对象，JSONObject -> SQLConfig.getSQL
+ if (value instanceof JSONObject) { // key{}@ getRealKey, SQL 子查询对象，JSONObject -> SQLConfig.getSQL
+ String replaceKey = key.substring(0, key.length() - 1);
- JSONObject subquery = (JSONObject) value;
- String range = subquery.getString(JSONRequest.KEY_SUBQUERY_RANGE);
- if (range != null && JSONRequest.SUBQUERY_RANGE_ALL.equals(range) == false && JSONRequest.SUBQUERY_RANGE_ANY.equals(range) == false) {
- throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [" + JSONRequest.SUBQUERY_RANGE_ALL + ", " + JSONRequest.SUBQUERY_RANGE_ANY + "] 中的一个！");
- }
+ JSONObject subquery = (JSONObject) value;
+ String range = subquery.getString(JSONRequest.KEY_SUBQUERY_RANGE);
+ if (range != null && JSONRequest.SUBQUERY_RANGE_ALL.equals(range) == false && JSONRequest.SUBQUERY_RANGE_ANY.equals(range) == false) {
+ throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [" + JSONRequest.SUBQUERY_RANGE_ALL + ", " + JSONRequest.SUBQUERY_RANGE_ANY + "] 中的一个！");
+ }
- JSONArray arr = parser.onArrayParse(subquery, path, key, true);
+ JSONArray arr = parser.onArrayParse(subquery, path, key, true);
- JSONObject obj = arr == null || arr.isEmpty() ? null : arr.getJSONObject(0);
- if (obj == null) {
- throw new Exception("服务器内部错误，解析子查询 " + path + "/" + key + ":{ } 为 Subquery 对象失败！");
- }
+ JSONObject obj = arr == null || arr.isEmpty() ? null : arr.getJSONObject(0);
+ if (obj == null) {
+ throw new Exception("服务器内部错误，解析子查询 " + path + "/" + key + ":{ } 为 Subquery 对象失败！");
+ }
- String from = subquery.getString(JSONRequest.KEY_SUBQUERY_FROM);
- JSONObject arrObj = from == null ? null : obj.getJSONObject(from);
- if (arrObj == null) {
- throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象 " + from + ":{} 不存在！");
- }
- //
- SQLConfig cfg = (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
- if (cfg == null) {
- throw new NotExistException(TAG + ".onParse cfg == null");
- }
+ String from = subquery.getString(JSONRequest.KEY_SUBQUERY_FROM);
+ JSONObject arrObj = from == null ? null : obj.getJSONObject(from);
+ if (arrObj == null) {
+ throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象 " + from + ":{} 不存在！");
+ }
+ //
+ SQLConfig cfg = (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
+ if (cfg == null) {
+ throw new NotExistException(TAG + ".onParse cfg == null");
+ }
+
+ Subquery s = new Subquery();
+ s.setPath(path);
+ s.setOriginKey(key);
+ s.setOriginValue(subquery);
+
+ s.setFrom(from);
+ s.setRange(range);
+ s.setKey(replaceKey);
+ s.setConfig(cfg);
- Subquery s = new Subquery();
- s.setPath(path);
- s.setOriginKey(key);
- s.setOriginValue(subquery);
+ key = replaceKey;
+ value = s; //(range == null || range.isEmpty() ? "" : "range") + "(" + cfg.getSQL(false) + ") ";
+
+ parser.putQueryResult(AbstractParser.getAbsPath(path, key), s); //字符串引用保证不了安全性 parser.getSQL(cfg));
+ }
+ else if (value instanceof String) { // //key{}@ getRealKey, 引用赋值路径
+ String replaceKey = key.substring(0, key.length() - 1);
- s.setFrom(from);
- s.setRange(range);
- s.setKey(replaceKey);
- s.setConfig(cfg);
+ // System.out.println("getObject key.endsWith(@) >> parseRelation = " + parseRelation);
+ String targetPath = AbstractParser.getValuePath(type == TYPE_ITEM ? path : parentPath, new String((String) value));
- key = replaceKey;
- value = s; //(range == null || range.isEmpty() ? "" : "range") + "(" + cfg.getSQL(false) + ") ";
+ //先尝试获取，尽量保留缺省依赖路径，这样就不需要担心路径改变
+ Object target = onReferenceParse(targetPath);
+ Log.i(TAG, "onParse targetPath = " + targetPath + "; target = " + target);
- parser.putQueryResult(AbstractParser.getAbsPath(path, key), s); //字符串引用保证不了安全性 parser.getSQL(cfg));
+ if (target == null) {//String#equals(null)会出错
+ Log.d(TAG, "onParse target == null >> return true;");
+ return true;
}
- else if (value instanceof String) { // //key{}@ getRealKey, 引用赋值路径
- // System.out.println("getObject key.endsWith(@) >> parseRelation = " + parseRelation);
- String targetPath = AbstractParser.getValuePath(type == TYPE_ITEM
- ? path : parentPath, new String((String) value));
-
- //先尝试获取，尽量保留缺省依赖路径，这样就不需要担心路径改变
- Object target = onReferenceParse(targetPath);
- Log.i(TAG, "onParse targetPath = " + targetPath + "; target = " + target);
-
- if (target == null) {//String#equals(null)会出错
- Log.d(TAG, "onParse target == null >> return true;");
- return true;
+ if (target instanceof Map) { //target可能是从requestObject里取出的 {}
+ if (isTable || targetPath.endsWith("[]/" + JSONResponse.KEY_INFO) == false) {
+ Log.d(TAG, "onParse target instanceof Map >> return false;");
+ return false; //FIXME 这个判断现在来看是否还有必要？为啥不允许为 JSONObject ？以前可能因为防止二次遍历再解析，现在只有一次遍历
}
- if (target instanceof Map) { //target可能是从requestObject里取出的 {}
- if (isTable || targetPath.endsWith("[]/" + JSONResponse.KEY_INFO) == false) {
- Log.d(TAG, "onParse target instanceof Map >> return false;");
- return false; //FIXME 这个判断现在来看是否还有必要？为啥不允许为 JSONObject ？以前可能因为防止二次遍历再解析，现在只有一次遍历
- }
+ }
+ if (targetPath.equals(target)) {//必须valuePath和保证getValueByPath传进去的一致！
+ Log.d(TAG, "onParse targetPath.equals(target) >>");
+
+ //非查询关键词 @key 不影响查询，直接跳过
+ if (isTable && (key.startsWith("@") == false || JSONRequest.TABLE_KEY_LIST.contains(key))) {
+ Log.e(TAG, "onParse isTable && (key.startsWith(@) == false"
+ + " || JSONRequest.TABLE_KEY_LIST.contains(key)) >> return null;");
+ return false;//获取不到就不用再做无效的query了。不考虑 Table:{Table:{}}嵌套
+ } else {
+ Log.d(TAG, "onParse isTable(table) == false >> return true;");
+ return true;//舍去，对Table无影响
}
- if (targetPath.equals(target)) {//必须valuePath和保证getValueByPath传进去的一致！
- Log.d(TAG, "onParse targetPath.equals(target) >>");
-
- //非查询关键词 @key 不影响查询，直接跳过
- if (isTable && (key.startsWith("@") == false || JSONRequest.TABLE_KEY_LIST.contains(key))) {
- Log.e(TAG, "onParse isTable && (key.startsWith(@) == false"
- + " || JSONRequest.TABLE_KEY_LIST.contains(key)) >> return null;");
- return false;//获取不到就不用再做无效的query了。不考虑 Table:{Table:{}}嵌套
- } else {
- Log.d(TAG, "onParse isTable(table) == false >> return true;");
- return true;//舍去，对Table无影响
- }
- }
+ }
- //直接替换原来的key@:path为key:target
- Log.i(TAG, "onParse >> key = replaceKey; value = target;");
- key = replaceKey;
- value = target;
- Log.d(TAG, "onParse key = " + key + "; value = " + value);
- }
- else {
- throw new IllegalArgumentException(path + "/" + key + ":value 中 value 必须为 依赖路径String 或 SQL子查询JSONObject ！");
- }
-// }
+ //直接替换原来的key@:path为key:target
+ Log.i(TAG, "onParse >> key = replaceKey; value = target;");
+ key = replaceKey;
+ value = target;
+ Log.d(TAG, "onParse key = " + key + "; value = " + value);
+ }
+ else {
+ throw new IllegalArgumentException(path + "/" + key + ":value 中 value 必须为 依赖路径String 或 SQL子查询JSONObject ！");
+ }
}
if (key.endsWith("()")) {
@@ -410,21 +421,24 @@ else if (value instanceof String) { // //key{}@ getRealKey, 引用赋值路径
String k = key.substring(0, key.length() - 2);
String type; //远程函数比较少用，一般一个Table:{}内用到也就一两个，所以这里用 "-","0","+" 更直观，转用 -1,0,1 对性能提升不大。
- if (k.endsWith("-")) { //不能封装到functionMap后批量执行，否则会导致非Table内的 key-():function() 在onChildParse后执行！
+ boolean isMinus = k.endsWith("-");
+ if (isMinus) { //不能封装到functionMap后批量执行，否则会导致非Table内的 key-():function() 在onChildParse后执行！
type = "-";
k = k.substring(0, k.length() - 1);
- parseFunction(k, (String) value, parentPath, name, request);
+ if (isTable == false) {
+ parseFunction(k, (String) value, parentPath, name, request);
+ }
+ }
+ else if (k.endsWith("+")) {
+ type = "+";
+ k = k.substring(0, k.length() - 1);
}
else {
- if (k.endsWith("+")) {
- type = "+";
- k = k.substring(0, k.length() - 1);
- }
- else {
- type = "0";
- }
+ type = "0";
+ }
+ if (isMinus == false || isTable) {
//远程函数比较少用，一般一个Table:{}内用到也就一两个，所以这里循环里new出来对性能影响不大。
Map map = functionMap.get(type);
if (map == null) {
@@ -439,9 +453,7 @@ else if (isTable && key.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(k
customMap.put(key, value);
}
else {
- // 导致副表从 1 开始都不查了 if (isReuse == false) {
sqlRequest.put(key, value);
- // }
}
return true;
@@ -590,7 +602,7 @@ public void onTableArrayParse(String key, JSONArray value) throws Exception {
String idKey = parser.createSQLConfig().getIdKey(); //Table[]: [{}] arrayConfig 为 null
boolean isNeedVerifyContent = parser.isNeedVerifyContent();
-
+
for (int i = 0; i < valueArray.size(); i++) { //只要有一条失败，则抛出异常，全部失败
//TODO 改成一条多 VALUES 的 SQL 性能更高，报错也更会更好处理，更人性化
JSONObject item;
@@ -693,28 +705,27 @@ public AbstractObjectParser executeSQL() throws Exception {
sqlReponse = new JSONObject(sqlRequest);
}
else {
- try {
- sqlReponse = onSQLExecute();
-
- }
- catch (NotExistException e) {
- // Log.e(TAG, "getObject try { response = getSQLObject(config2); } catch (Exception e) {");
- // if (e instanceof NotExistException) {//非严重异常，有时候只是数据不存在
- // // e.printStackTrace();
- sqlReponse = null;//内部吃掉异常，put到最外层
- // requestObject.put(JSONResponse.KEY_MSG
- // , StringUtil.getString(requestObject.get(JSONResponse.KEY_MSG)
- // + "; query " + path + " cath NotExistException:"
- // + newErrorResult(e).getString(JSONResponse.KEY_MSG)));
- // } else {
- // throw e;
- // }
- }
+ try {
+ sqlReponse = onSQLExecute();
}
-
- if (drop) {//丢弃Table，只为了向下提供条件
- sqlReponse = null;
+ catch (NotExistException e) {
+ // Log.e(TAG, "getObject try { response = getSQLObject(config2); } catch (Exception e) {");
+ // if (e instanceof NotExistException) {//非严重异常，有时候只是数据不存在
+ // // e.printStackTrace();
+ sqlReponse = null;//内部吃掉异常，put到最外层
+ // requestObject.put(JSONResponse.KEY_MSG
+ // , StringUtil.getString(requestObject.get(JSONResponse.KEY_MSG)
+ // + "; query " + path + " cath NotExistException:"
+ // + newErrorResult(e).getString(JSONResponse.KEY_MSG)));
+ // } else {
+ // throw e;
+ // }
}
+ }
+
+ if (drop) {//丢弃Table，只为了向下提供条件
+ sqlReponse = null;
+ }
return this;
}
@@ -799,10 +810,16 @@ public void onChildResponse() throws Exception {
if (set != null) {
int index = 0;
for (Entry entry : set) {
- if (entry != null) {
- response.put(entry.getKey(), onChildParse(index, entry.getKey(), entry.getValue()));
- index ++;
+ Object child = entry == null ? null : onChildParse(index, entry.getKey(), entry.getValue());
+ if (child == null
+ || (child instanceof JSONObject && ((JSONObject) child).isEmpty())
+ || (child instanceof JSONArray && ((JSONArray) child).isEmpty())
+ ) {
+ continue;
}
+
+ response.put(entry.getKey(), child );
+ index ++;
}
}
}
@@ -834,21 +851,21 @@ public JSONObject onSQLExecute() throws Exception {
for (int i = 1; i < list.size(); i++) { // 从 1 开始，0 已经处理过
JSONObject obj = parser.parseCorrectResponse(table, list.get(i));
list.set(i, obj);
-
+
if (obj != null) {
parser.putQueryResult(arrayPath + "/" + i + "/" + table, obj); //解决获取关联数据时requestObject里不存在需要的关联数据
}
}
-
+
parser.putArrayMainCache(arrayPath, list);
}
}
-
+
if (isSubquery == false && result != null) {
parser.putQueryResult(path, result);//解决获取关联数据时requestObject里不存在需要的关联数据
}
}
-
+
return result;
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
index 1f0880128..55ca32b0c 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -752,6 +752,8 @@ public JSONObject getStructure(@NotNull String table, String method, String tag,
+ protected Map arrayObjectParserCacheMap = new HashMap<>();
+
// protected SQLConfig itemConfig;
/**获取单个对象，该对象处于parentObject内
* @param parentPath parentObject的路径
@@ -774,9 +776,10 @@ public JSONObject onObjectParse(final JSONObject request
}
int type = arrayConfig == null ? 0 : arrayConfig.getType();
+ int position = arrayConfig == null ? 0 : arrayConfig.getPosition();
String[] arr = StringUtil.split(parentPath, "/");
- if (arrayConfig == null || arrayConfig.getPosition() == 0) {
+ if (position == 0) {
int d = arr == null ? 1 : arr.length + 1;
if (queryDepth < d) {
queryDepth = d;
@@ -786,12 +789,24 @@ public JSONObject onObjectParse(final JSONObject request
}
}
}
+
+ boolean isTable = apijson.JSONObject.isTableKey(name);
+ boolean isArrayMainTable = isSubquery == false && isTable && type == SQLConfig.TYPE_ITEM_CHILD_0 && arrayConfig != null && RequestMethod.isGetMethod(arrayConfig.getMethod(), true);
+ boolean isReuse = isArrayMainTable && position > 0;
- ObjectParser op = createObjectParser(request, parentPath, name, arrayConfig, isSubquery).parse();
-
-
+ ObjectParser op = null;
+ if (isReuse) { // 数组主表使用专门的缓存数据
+ op = arrayObjectParserCacheMap.get(parentPath.substring(0, parentPath.lastIndexOf("[]") + 2));
+ }
+
+ if (op == null) {
+ op = createObjectParser(request, parentPath, arrayConfig, isSubquery, isTable, isArrayMainTable);
+ }
+ op = op.parse(name, isReuse);
+
JSONObject response = null;
if (op != null) {//SQL查询结果为空时，functionMap和customMap没有意义
+
if (arrayConfig == null) { //Common
response = op.setSQLConfig().executeSQL().response();
}
@@ -799,9 +814,12 @@ public JSONObject onObjectParse(final JSONObject request
int query = arrayConfig.getQuery();
//total 这里不能用arrayConfig.getType()，因为在createObjectParser.onChildParse传到onObjectParse时已被改掉
- if (type == SQLConfig.TYPE_ITEM_CHILD_0 && query != JSONRequest.QUERY_TABLE
- && arrayConfig.getPosition() == 0) {
+ if (type == SQLConfig.TYPE_ITEM_CHILD_0 && query != JSONRequest.QUERY_TABLE && position == 0) {
+
+ RequestMethod method = op.getMethod();
JSONObject rp = op.setMethod(RequestMethod.HEAD).setSQLConfig().executeSQL().getSqlReponse();
+ op.setMethod(method);
+
if (rp != null) {
int index = parentPath.lastIndexOf("]/");
if (index >= 0) {
@@ -842,14 +860,21 @@ public JSONObject onObjectParse(final JSONObject request
response = null;//不再往后查询
} else {
response = op
- .setSQLConfig(arrayConfig.getCount(), arrayConfig.getPage(), arrayConfig.getPosition())
+ .setSQLConfig(arrayConfig.getCount(), arrayConfig.getPage(), position)
.executeSQL()
.response();
// itemConfig = op.getConfig();
}
}
- op.recycle();
+ if (isArrayMainTable) {
+ if (position == 0) { // 提取并缓存数组主表的列表数据
+ arrayObjectParserCacheMap.put(parentPath.substring(0, parentPath.lastIndexOf("[]") + 2), op);
+ }
+ }
+// else {
+// op.recycle();
+// }
op = null;
}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index e6b08a494..6defdd1e1 100755
--- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -84,7 +84,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
// * 和 / 不能同时出现，防止 /* */ 段注释！ # 和 -- 不能出现，防止行注释！ ; 不能出现，防止隔断SQL语句！空格不能出现，防止 CRUD,DROP,SHOW TABLES等语句！
private static final Pattern PATTERN_RANGE;
private static final Pattern PATTERN_FUNCTION;
-
+
/**
* 表名映射，隐藏真实表名，对安全要求很高的表可以这么做
*/
@@ -96,8 +96,8 @@ public abstract class AbstractSQLConfig implements SQLConfig {
static { // 凡是 SQL 边界符、分隔符、注释符 都不允许，例如 ' " ` ( ) ; # -- ，以免拼接 SQL 时被注入意外可执行指令
PATTERN_RANGE = Pattern.compile("^[0-9%,!=\\<\\>/\\.\\+\\-\\*\\^]+$"); // ^[a-zA-Z0-9_*%!=<>(),"]+$ 导致 exists(select*from(Comment)) 通过！
PATTERN_FUNCTION = Pattern.compile("^[A-Za-z0-9%,:_@&~!=\\<\\>\\|\\[\\]\\{\\} /\\.\\+\\-\\*\\^\\?\\$]+$"); //TODO 改成更好的正则，校验前面为单词，中间为操作符，后面为值
-
-
+
+
TABLE_KEY_MAP = new HashMap();
TABLE_KEY_MAP.put(Table.class.getSimpleName(), Table.TABLE_NAME);
TABLE_KEY_MAP.put(Column.class.getSimpleName(), Column.TABLE_NAME);
@@ -530,13 +530,13 @@ public String getHavingString(boolean hasPrefix) {
if (keys == null || keys.length <= 0) {
return StringUtil.isEmpty(joinHaving, true) ? "" : (hasPrefix ? " HAVING " : "") + joinHaving;
}
-
+
String quote = getQuote();
String tableAlias = getAliasWithQuote();
List raw = getRaw();
boolean containRaw = raw != null && raw.contains(KEY_HAVING);
-
+
String expression;
String method;
//暂时不允许 String prefix;
@@ -560,7 +560,7 @@ public String getHavingString(boolean hasPrefix) {
+ "} catch (Exception e) = " + e.getMessage());
}
}
-
+
if (expression.length() > 50) {
throw new UnsupportedOperationException("@having:value 的 value 中字符串 " + expression + " 不合法！"
+ "不允许传超过 50 个字符的函数或表达式！请用 @raw 简化传参！");
@@ -958,13 +958,13 @@ public String getColumnString(boolean inSQLJoin) throws Exception {
method = expression.substring(0, start);
boolean distinct = i <= 0 && method.startsWith(PREFFIX_DISTINCT);
String fun = distinct ? method.substring(PREFFIX_DISTINCT.length()) : method;
-
+
if (fun.isEmpty() == false && StringUtil.isName(fun) == false) {
throw new IllegalArgumentException("字符 " + method + " 不合法！"
+ "预编译模式下 @column:\"column0,column1:alias;function0(arg0,arg1,...);function1(...):alias...\""
+ " 中SQL函数名 function 必须符合正则表达式 ^[0-9a-zA-Z_]+$ ！");
}
-
+
}
boolean isColumn = start < 0;
@@ -1049,13 +1049,13 @@ else if (StringUtil.isName(origin)) {
int index = suffix.lastIndexOf(":");
String alias = index < 0 ? "" : suffix.substring(index + 1); //contactCount
suffix = index < 0 ? suffix : suffix.substring(0, index);
-
+
if (alias.isEmpty() == false && StringUtil.isName(alias) == false) {
throw new IllegalArgumentException("字符串 " + alias + " 不合法！"
+ "预编译模式下 @column:value 中 value里面用 ; 分割的每一项"
+ " function(arg0,arg1,...):alias 中 alias 必须是1个单词！并且不要有多余的空格！");
}
-
+
if (suffix.isEmpty() == false && (((String) suffix).contains("--") || ((String) suffix).contains("/*") || PATTERN_RANGE.matcher((String) suffix).matches() == false)) {
throw new UnsupportedOperationException("字符串 " + suffix + " 不合法！"
+ "预编译模式下 @column:\"column?value;function(arg0,arg1,...)?value...\""
@@ -2393,9 +2393,9 @@ public static String getSQL(AbstractSQLConfig config) throws Exception {
case POST:
return "INSERT INTO " + tablePath + config.getColumnString() + " VALUES" + config.getValuesString();
case PUT:
- return "UPDATE " + tablePath + config.getSetString() + config.getWhereString(true) + config.getLimitString();
+ return "UPDATE " + tablePath + config.getSetString() + config.getWhereString(true) + (config.isMySQL() ? config.getLimitString() : "");
case DELETE:
- return "DELETE FROM " + tablePath + config.getWhereString(true) + config.getLimitString();
+ return "DELETE FROM " + tablePath + config.getWhereString(true) + (config.isMySQL() ? config.getLimitString() : ""); // PostgreSQL 不允许 LIMIT
default:
String explain = (config.isExplain() ? (config.isSQLServer() || config.isOracle() ? "SET STATISTICS PROFILE ON " : "EXPLAIN ") : "");
if (config.isTest() && RequestMethod.isGetMethod(config.getMethod(), true)) {
@@ -2615,15 +2615,9 @@ public static SQLConfig newSQLConfig(RequestMethod method, String table, String
String userIdKey = callback.getUserIdKey(database, schema, table);
String userIdInKey = userIdKey + "{}";
- Object idIn = request.get(idInKey); //可能是 id{}:">0"
-
- if (method == POST && request.get(idKey) == null) {
- Object newId = callback.newId(method, database, schema, table); // null 表示数据库自增 id
- if (newId != null) {
- request.put(idKey, newId);
- }
- }
+ //对id和id{}处理，这两个一定会作为条件
+ Object idIn = request.get(idInKey); //可能是 id{}:">0"
if (idIn instanceof List) { // 排除掉 0, 负数, 空字符串 等无效 id 值
List ids = ((List) idIn);
List newIdIn = new ArrayList<>();
@@ -2638,14 +2632,18 @@ public static SQLConfig newSQLConfig(RequestMethod method, String table, String
throw new NotExistException(TAG + ": newSQLConfig idIn instanceof List >> 去掉无效 id 后 newIdIn.isEmpty()");
}
idIn = newIdIn;
-
+
if (method == DELETE || method == PUT) {
config.setCount(newIdIn.size());
}
}
-
- //对id和id{}处理，这两个一定会作为条件
+
Object id = request.get(idKey);
+ boolean hasId = id != null;
+ if (method == POST && hasId == false) {
+ id = callback.newId(method, database, schema, table); // null 表示数据库自增 id
+ }
+
if (id != null) { //null无效
if (id instanceof Number) {
if (((Number) id).longValue() <= 0) { //一定没有值
@@ -2677,7 +2675,7 @@ else if (id instanceof Subquery) {}
throw new NotExistException(TAG + ": newSQLConfig idIn != null && (((List) idIn).contains(id) == false");
}
}
-
+
if (method == DELETE || method == PUT) {
config.setCount(1);
}
@@ -2695,271 +2693,276 @@ else if (id instanceof Subquery) {}
String raw = request.getString(KEY_RAW);
String json = request.getString(KEY_JSON);
- //强制作为条件且放在最前面优化性能
- request.remove(idKey);
- request.remove(idInKey);
- //关键词
- request.remove(KEY_ROLE);
- request.remove(KEY_EXPLAIN);
- request.remove(KEY_CACHE);
- request.remove(KEY_DATABASE);
- request.remove(KEY_SCHEMA);
- request.remove(KEY_COMBINE);
- request.remove(KEY_FROM);
- request.remove(KEY_COLUMN);
- request.remove(KEY_GROUP);
- request.remove(KEY_HAVING);
- request.remove(KEY_ORDER);
- request.remove(KEY_RAW);
- request.remove(KEY_JSON);
-
- String[] rawArr = StringUtil.split(raw);
- config.setRaw(rawArr == null || rawArr.length <= 0 ? null : new ArrayList<>(Arrays.asList(rawArr)));
-
- Map tableWhere = new LinkedHashMap();//保证顺序好优化 WHERE id > 1 AND name LIKE...
-
- //已经remove了id和id{}，以及@key
- Set set = request.keySet(); //前面已经判断request是否为空
- if (method == POST) { //POST操作
- if (idIn != null) {
- throw new IllegalArgumentException("POST 请求中不允许传 " + idInKey + " !");
- }
-
- if (set != null && set.isEmpty() == false) { //不能直接return，要走完下面的流程
- String[] columns = set.toArray(new String[]{});
-
- Collection valueCollection = request.values();
- Object[] values = valueCollection == null ? null : valueCollection.toArray();
-
- if (values == null || values.length != columns.length) {
- throw new Exception("服务器内部错误:\n" + TAG
- + " newSQLConfig values == null || values.length != columns.length !");
+ try {
+ //强制作为条件且放在最前面优化性能
+ request.remove(idKey);
+ request.remove(idInKey);
+ //关键词
+ request.remove(KEY_ROLE);
+ request.remove(KEY_EXPLAIN);
+ request.remove(KEY_CACHE);
+ request.remove(KEY_DATABASE);
+ request.remove(KEY_SCHEMA);
+ request.remove(KEY_COMBINE);
+ request.remove(KEY_FROM);
+ request.remove(KEY_COLUMN);
+ request.remove(KEY_GROUP);
+ request.remove(KEY_HAVING);
+ request.remove(KEY_ORDER);
+ request.remove(KEY_RAW);
+ request.remove(KEY_JSON);
+
+ String[] rawArr = StringUtil.split(raw);
+ config.setRaw(rawArr == null || rawArr.length <= 0 ? null : new ArrayList<>(Arrays.asList(rawArr)));
+
+ Map tableWhere = new LinkedHashMap();//保证顺序好优化 WHERE id > 1 AND name LIKE...
+
+ //已经remove了id和id{}，以及@key
+ Set set = request.keySet(); //前面已经判断request是否为空
+ if (method == POST) { //POST操作
+ if (idIn != null) {
+ throw new IllegalArgumentException("POST 请求中不允许传 " + idInKey + " !");
}
- column = (id == null ? "" : idKey + ",") + StringUtil.getString(columns); //set已经判断过不为空
- List> valuess = new ArrayList<>(1);
- List
- 
+ 
+
+
