userList2 = JSON.parseArray(item.getString("User[]"), User.class);
if (userList2 == null) {
- userList2 = new JSONArray();
+ userList2 = new ArrayList<>();
}
- JSONObject item2;
+ User item2;
for (int i2 = 0; i2 < userList2.size(); i2 ++) {
- item2 = userList2.getJSONObject(i2);
+ item2 = userList2.get(i2);
if (item2 == null) {
continue;
}
System.out.println("\nitem2 = userList2[" + i2 + "] = \n" + item2 + "\n\n");
- //TODO 你的代码
+ // TODO 你的代码
- long id = item2.getLongValue("id");
+ long id = item2.getId();
System.out.println("item2.id = " + id);
- String name = item2.getString("name");
+ String name = item2.getName();
System.out.println("item2.name = " + name);
}
- } //User[]>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+ } //User[] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- { //[]<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ { // [] <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
JSONArray list2 = item.getJSONArray("[]");
if (list2 == null) {
list2 = new JSONArray();
@@ -422,71 +491,56 @@ public static void response(String resultJson) {
continue;
}
System.out.println("\nitem2 = list2[" + i2 + "] = \n" + item2 + "\n\n");
- //TODO 你的代码
+ // TODO 你的代码
- { //Comment<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- JSONObject comment = item2.getJSONObject("Comment");
+ { // Comment <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ Comment comment = item2.getObject("Comment", Comment.class);
if (comment == null) {
- comment = new JSONObject();
+ comment = new Comment();
}
- long id = comment.getLongValue("id");
+ long id = comment.getId();
System.out.println("comment.id = " + id);
- long toId = comment.getLongValue("toId");
+ long toId = comment.getToId();
System.out.println("comment.toId = " + toId);
- long userId = comment.getLongValue("userId");
+ long userId = comment.getUserId();
System.out.println("comment.userId = " + userId);
- long momentId = comment.getLongValue("momentId");
+ long momentId = comment.getMomentId();
System.out.println("comment.momentId = " + momentId);
- String date = comment.getString("date");
+ Long date = comment.getDate();
System.out.println("comment.date = " + date);
- String content = comment.getString("content");
+ String content = comment.getContent();
System.out.println("comment.content = " + content);
- } //Comment>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+ } //Comment >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- { //User<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- JSONObject user = item2.getJSONObject("User");
+ { // User <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+ User user = item2.getObject("User", User.class);
if (user == null) {
- user = new JSONObject();
+ user = new User();
}
- long id = user.getLongValue("id");
+ long id = user.getId();
System.out.println("user.id = " + id);
- String name = user.getString("name");
+ String name = user.getName();
System.out.println("user.name = " + name);
- } //User>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+ } //User >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
}
- } //[]>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
- }
- } //[]>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
+ } //[] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- { //list<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
- JSONArray list = response.getJSONArray("list");
- if (list == null) {
- list = new JSONArray();
}
+ } //[] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- Object item;
- for (int i = 0; i < list.size(); i ++) {
- item = list.get(i);
- if (item == null) {
- continue;
- }
- System.out.println("\nitem = list[" + i + "] = \n" + item + "\n\n");
- //TODO 你的代码
-
- }
- } //list>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
+ boolean ok = response.getBooleanValue("ok");
+ System.out.println("response.ok = " + ok);
int code = response.getIntValue("code");
System.out.println("response.code = " + code);
String msg = response.getString("msg");
System.out.println("response.msg = " + msg);
+
}
+
}
From 566f40e6fc256bdf7b3ac278f8ddfce5d8ec26d2 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Tue, 28 Apr 2020 17:26:42 +0800
Subject: [PATCH 0003/1294] =?UTF-8?q?Server=EF=BC=9A=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84=E4=B8=80?=
=?UTF-8?q?=E4=B8=AA=E6=8B=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../APIJSONORM/src/main/java/apijson/orm/Operation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Operation.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Operation.java
index b4b9e13ca..c8e7f7f20 100755
--- a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Operation.java
+++ b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/Operation.java
@@ -34,7 +34,7 @@ public enum Operation {
/**TODO 是否应该把数组类型写成 BOOLEANS, NUMBERS 等复数单词，以便抽取 enum ？扩展用 VERIFY 或 INSERT/UPDATE 远程函数等
* 验证是否符合预设的类型:
- * BOOLEAN, NUMBER, DECIMAL, STRING, URL, DATE, TIME, DATETIME, OBJECT, ARRAY ]
+ * BOOLEAN, NUMBER, DECIMAL, STRING, URL, DATE, TIME, DATETIME, OBJECT, ARRAY
* 或它们的数组
* BOOLEAN[], NUMBER[], DECIMAL[], STRING[], URL[], DATE[], TIME[], DATETIME[], OBJECT[], ARRAY[]
* 结构是
From b7818ff493283b835691861034e8a1a2df2ebc26 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Tue, 28 Apr 2020 17:44:31 +0800
Subject: [PATCH 0004/1294] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2397b3524..45f8f6071 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ APIJSON是一种专为API而生的 JSON网络传输协议 以及 基于这套协
- 一图胜前言 - 部分基础功能概览
+ 一图胜千言 - 部分基础功能概览
From 5ebfa8df72928ec44f7df210120e4aa0c508dbd7 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 2 May 2020 02:31:45 +0800
Subject: [PATCH 0005/1294] =?UTF-8?q?Server=EF=BC=9A=E8=B0=83=E6=95=B4=20^?=
=?UTF-8?q?=20SIDE=20JOIN(ANTI=20JOIN)=20=E7=9A=84=E5=AE=9E=E7=8E=B0?=
=?UTF-8?q?=E4=B8=BA=20!=20(A=20&=20B)=EF=BC=8C=E5=92=8C=E5=8E=9F=E6=9D=A5?=
=?UTF-8?q?=E7=9A=84=E5=AE=9E=E7=8E=B0=20(A=20&=20!=20B)=20|=20(B=20&=20!?=
=?UTF-8?q?=20A)=20=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=8D=E4=B8=80?=
=?UTF-8?q?=E8=87=B4=EF=BC=8C=E4=B8=80=E8=88=AC=E6=95=B0=E9=87=8F=E6=9B=B4?=
=?UTF-8?q?=E5=A4=9A=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/apijson/orm/AbstractSQLConfig.java | 37 ++++++++-----------
1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index 349ecfb8b..d8aecdee4 100755
--- a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1387,36 +1387,31 @@ else if ("!".equals(ce.getKey())) {
newWs += AND;
}
- if ("^".equals(j.getJoinType())) { // (A & ! B) | (B & ! A)
- newWs += " ( ( " + ws + ( StringUtil.isEmpty(ws, true) ? "" : AND + NOT ) + " ( " + js + " ) ) "
- + OR
- + " ( " + js + AND + NOT + " ( " + ws + " ) ) ) ";
-
- newPvl.addAll(pvl);
- newPvl.addAll(jc.getPreparedValueList());
- newPvl.addAll(jc.getPreparedValueList());
- newPvl.addAll(pvl);
+ if ("^".equals(j.getJoinType())) { // ! (A & B)
+ newWs += " ( " + getCondition(
+ true,
+ ( StringUtil.isEmpty(ws, true) ? "" : ws + AND ) + " ( " + js + " ) "
+ ) + " ) ";
}
else {
logic = Logic.getType(j.getJoinType());
- newWs += " ( "
- + getCondition(
- Logic.isNot(logic),
- ws
- + ( StringUtil.isEmpty(ws, true) ? "" : (Logic.isAnd(logic) ? AND : OR) )
- + " ( " + js + " ) "
- )
- + " ) ";
-
- newPvl.addAll(pvl);
- newPvl.addAll(jc.getPreparedValueList());
+ newWs += " ( " + getCondition(
+ Logic.isNot(logic),
+ ( StringUtil.isEmpty(ws, true) ? "" : ws + (Logic.isAnd(logic) ? AND : OR) ) + " ( " + js + " ) "
+ ) + " ) ";
}
+
+ newPvl.addAll(pvl);
+ newPvl.addAll(jc.getPreparedValueList());
changed = true;
break;
default:
- throw new UnsupportedOperationException("join:value 中 value 里的 " + j.getJoinType() + "/" + j.getPath() + "错误！不支持 " + j.getJoinType() + " 等 [@ APP, < LEFT, > RIGHT, | FULL, & INNER, ! OUTTER, ^ SIDE, * CROSS] 之外的JOIN类型 !");
+ throw new UnsupportedOperationException(
+ "join:value 中 value 里的 " + j.getJoinType() + "/" + j.getPath() + "错误！不支持 " + j.getJoinType()
+ + " 等 [@ APP, < LEFT, > RIGHT, | FULL, & INNER, ! OUTTER, ^ SIDE, * CROSS] 之外的JOIN类型 !"
+ );
}
}
From bd96636047dbd3fd5989368e13848762adab0265 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 2 May 2020 02:37:16 +0800
Subject: [PATCH 0006/1294] =?UTF-8?q?Revert=20"Server=EF=BC=9A=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=20^=20SIDE=20JOIN(ANTI=20JOIN)=20=E7=9A=84=E5=AE=9E?=
=?UTF-8?q?=E7=8E=B0=E4=B8=BA=20!=20(A=20&=20B)=EF=BC=8C=E5=92=8C=E5=8E=9F?=
=?UTF-8?q?=E6=9D=A5=E7=9A=84=E5=AE=9E=E7=8E=B0=20(A=20&=20!=20B)=20|=20(B?=
=?UTF-8?q?=20&=20!=20A)=20=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=8D?=
=?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C=E4=B8=80=E8=88=AC=E6=95=B0=E9=87=8F?=
=?UTF-8?q?=E6=9B=B4=E5=A4=9A=EF=BC=81"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 5ebfa8df72928ec44f7df210120e4aa0c508dbd7.
---
.../java/apijson/orm/AbstractSQLConfig.java | 37 +++++++++++--------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index d8aecdee4..349ecfb8b 100755
--- a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1387,31 +1387,36 @@ else if ("!".equals(ce.getKey())) {
newWs += AND;
}
- if ("^".equals(j.getJoinType())) { // ! (A & B)
- newWs += " ( " + getCondition(
- true,
- ( StringUtil.isEmpty(ws, true) ? "" : ws + AND ) + " ( " + js + " ) "
- ) + " ) ";
+ if ("^".equals(j.getJoinType())) { // (A & ! B) | (B & ! A)
+ newWs += " ( ( " + ws + ( StringUtil.isEmpty(ws, true) ? "" : AND + NOT ) + " ( " + js + " ) ) "
+ + OR
+ + " ( " + js + AND + NOT + " ( " + ws + " ) ) ) ";
+
+ newPvl.addAll(pvl);
+ newPvl.addAll(jc.getPreparedValueList());
+ newPvl.addAll(jc.getPreparedValueList());
+ newPvl.addAll(pvl);
}
else {
logic = Logic.getType(j.getJoinType());
- newWs += " ( " + getCondition(
- Logic.isNot(logic),
- ( StringUtil.isEmpty(ws, true) ? "" : ws + (Logic.isAnd(logic) ? AND : OR) ) + " ( " + js + " ) "
- ) + " ) ";
+ newWs += " ( "
+ + getCondition(
+ Logic.isNot(logic),
+ ws
+ + ( StringUtil.isEmpty(ws, true) ? "" : (Logic.isAnd(logic) ? AND : OR) )
+ + " ( " + js + " ) "
+ )
+ + " ) ";
+
+ newPvl.addAll(pvl);
+ newPvl.addAll(jc.getPreparedValueList());
}
-
- newPvl.addAll(pvl);
- newPvl.addAll(jc.getPreparedValueList());
changed = true;
break;
default:
- throw new UnsupportedOperationException(
- "join:value 中 value 里的 " + j.getJoinType() + "/" + j.getPath() + "错误！不支持 " + j.getJoinType()
- + " 等 [@ APP, < LEFT, > RIGHT, | FULL, & INNER, ! OUTTER, ^ SIDE, * CROSS] 之外的JOIN类型 !"
- );
+ throw new UnsupportedOperationException("join:value 中 value 里的 " + j.getJoinType() + "/" + j.getPath() + "错误！不支持 " + j.getJoinType() + " 等 [@ APP, < LEFT, > RIGHT, | FULL, & INNER, ! OUTTER, ^ SIDE, * CROSS] 之外的JOIN类型 !");
}
}
From 1eebd7b01ab40ef41e8b4c511edbdc6b2d4f37e4 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 2 May 2020 03:02:41 +0800
Subject: [PATCH 0007/1294] =?UTF-8?q?Server=EF=BC=9A=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=92=A4=E5=9B=9E=20^=20SIDE=20JOIN=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E7=9A=84=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index 349ecfb8b..6476ae3d4 100755
--- a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1387,6 +1387,7 @@ else if ("!".equals(ce.getKey())) {
newWs += AND;
}
+ //MySQL 因为 NULL 值处理问题，(A & ! B) | (B & ! A) 与 ! (A & B) 返回结果不一样，后者往往更多
if ("^".equals(j.getJoinType())) { // (A & ! B) | (B & ! A)
newWs += " ( ( " + ws + ( StringUtil.isEmpty(ws, true) ? "" : AND + NOT ) + " ( " + js + " ) ) "
+ OR
From 5ef8a5edcb1d52c6e6fab4a974bfd2878e309e12 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 2 May 2020 03:03:26 +0800
Subject: [PATCH 0008/1294] =?UTF-8?q?Server=EF=BC=9A=E5=BC=95=E5=85=A5=20U?=
=?UTF-8?q?nitAuto=20=E8=87=AA=E5=8A=A8=E5=8C=96=E5=8D=95=E5=85=83?=
=?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=B7=A5=E5=85=B7=20MethodUtil=20=E5=8F=8A?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=92=8C=E8=BF=9C=E7=A8=8B?=
=?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../apijson/framework/APIJSONController.java | 9 +
.../framework/APIJSONFunctionParser.java | 145 +++
.../java/apijson/framework/MethodUtil.java | 862 ++++++++++++++++++
3 files changed, 1016 insertions(+)
create mode 100644 APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/MethodUtil.java
diff --git a/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONController.java b/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONController.java
index 5dd45951a..73b23bca3 100755
--- a/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONController.java
+++ b/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONController.java
@@ -34,6 +34,7 @@
import javax.servlet.http.HttpSession;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import apijson.Log;
@@ -223,4 +224,12 @@ public Object logout(@NotNull HttpSession session) {
}
+ public JSONObject invokeMethod(String request) {
+ return MethodUtil.invokeMethod(request);
+ }
+
+ public JSONObject listMethod(String request) {
+ return MethodUtil.listMethod(request);
+ }
+
}
diff --git a/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONFunctionParser.java b/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONFunctionParser.java
index 5d924262b..1f045c455 100755
--- a/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONFunctionParser.java
+++ b/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/APIJSONFunctionParser.java
@@ -16,6 +16,7 @@
import static apijson.framework.APIJSONConstant.FUNCTION_;
+import java.io.IOException;
import java.rmi.ServerException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -33,6 +34,7 @@
import apijson.RequestMethod;
import apijson.RequestRole;
import apijson.StringUtil;
+import apijson.framework.MethodUtil.Argument;
import apijson.orm.AbstractFunctionParser;
import apijson.orm.JSONRequest;
import apijson.orm.ParserCreator;
@@ -292,6 +294,149 @@ public Object verifyAccess(@NotNull JSONObject request) throws Exception {
+ /**获取方法参数的定义
+ * @param request
+ * @return
+ * @throws IOException
+ * @throws ClassNotFoundException
+ * @throws IllegalArgumentException
+ */
+ public String getMethodArguments(@NotNull JSONObject request) throws IllegalArgumentException, ClassNotFoundException, IOException {
+ return getMethodArguments(request, "methodArgs");
+ }
+ /**获取方法参数的定义
+ * @param request
+ * @param requestKey
+ * @param methodArgs
+ * @return
+ * @throws IllegalArgumentException
+ * @throws ClassNotFoundException
+ * @throws IOException
+ */
+ public String getMethodArguments(@NotNull JSONObject request, String methodArgsKey) throws IllegalArgumentException, ClassNotFoundException, IOException {
+ String argsStr = request.getString(methodArgsKey);
+ if (StringUtil.isEmpty(argsStr, true)) {
+ JSONObject obj = request.getJSONObject("request");
+ argsStr = obj == null ? null : obj.getString(methodArgsKey);
+ }
+ List methodArgs = JSON.parseArray(removeComment(argsStr), Argument.class);
+ if (methodArgs == null || methodArgs.isEmpty()) {
+ return "";
+ }
+
+ Class[] types = new Class[methodArgs.size()];
+ Object[] args = new Object[methodArgs.size()];
+ MethodUtil.initTypesAndValues(methodArgs, types, args, true);
+
+ String s = "";
+ if (types != null) {
+ String sn;
+ for (int i = 0; i < types.length; i++) {
+ sn = types[i] == null ? null : types[i].getSimpleName();
+ if (sn == null) {
+ sn = Object.class.getSimpleName();
+ }
+
+ if (i > 0) {
+ s += ",";
+ }
+
+ if (MethodUtil.CLASS_MAP.containsKey(sn)) {
+ s += sn;
+ }
+ else {
+ s += types[i].getName();
+ }
+ }
+ }
+ return s;
+ }
+
+
+ /**获取方法的定义
+ * @param request
+ * @return
+ * @throws IOException
+ * @throws ClassNotFoundException
+ * @throws IllegalArgumentException
+ */
+ public String getMethodDefination(@NotNull JSONObject request)
+ throws IllegalArgumentException, ClassNotFoundException, IOException {
+// request.put("arguments", removeComment(request.getString("methodArgs")));
+ return getMethodDefination(request, "method", "arguments", "type", "exceptions", "Java");
+ }
+ /**获取方法的定义
+ * @param request
+ * @param method
+ * @param arguments
+ * @param type
+ * @return method(argType0,argType1...): returnType
+ * @throws IOException
+ * @throws ClassNotFoundException
+ * @throws IllegalArgumentException
+ */
+ public String getMethodDefination(@NotNull JSONObject request, String method, String arguments, String type, String exceptions, String language)
+ throws IllegalArgumentException, ClassNotFoundException, IOException {
+ String n = request.getString(method);
+ if (StringUtil.isEmpty(n, true)) {
+ throw new NullPointerException("getMethodDefination StringUtil.isEmpty(methodArgs, true) !");
+ }
+ String a = request.getString(arguments);
+ String t = request.getString(type);
+ String e = request.getString(exceptions);
+
+ if (language == null) {
+ language = "";
+ }
+ switch (language) {
+ case "TypeScript":
+ return n + "(" + (StringUtil.isEmpty(a, true) ? "" : a) + ")" + (StringUtil.isEmpty(t, true) ? "" : ": " + t) + (StringUtil.isEmpty(e, true) ? "" : " throws " + e);
+ case "Go":
+ return n + "(" + (StringUtil.isEmpty(a, true) ? "" : a ) + ")" + (StringUtil.isEmpty(t, true) ? "" : " " + t) + (StringUtil.isEmpty(e, true) ? "" : " throws " + e);
+ default:
+ //类型可能很长，Eclipse, Idea 代码提示都是类型放后面 return (StringUtil.isEmpty(t, true) ? "" : t + " ") + n + "(" + (StringUtil.isEmpty(a, true) ? "" : a) + ")";
+ return n + "(" + (StringUtil.isEmpty(a, true) ? "" : a) + ")" + (StringUtil.isEmpty(t, true) ? "" : ": " + t) + (StringUtil.isEmpty(e, true) ? "" : " throws " + e);
+ }
+ }
+
+ /**
+ * methodArgs 和 classArgs 都可以带注释
+ */
+ public String getMethodRequest(@NotNull JSONObject request) {
+ String req = request.getString("request");
+ if (StringUtil.isEmpty(req, true) == false) {
+ return req;
+ }
+
+ req = "{";
+ Boolean isStatic = request.getBoolean("static");
+ String methodArgs = request.getString("methodArgs");
+ String classArgs = request.getString("classArgs");
+
+ boolean comma = false;
+ if (isStatic != null && isStatic) {
+ req += "\n \"static\": " + true;
+ comma = true;
+ }
+ if (StringUtil.isEmpty(methodArgs, true) == false) {
+ req += (comma ? "," : "") + "\n \"methodArgs\": " + methodArgs;
+ comma = true;
+ }
+ if (StringUtil.isEmpty(classArgs, true) == false) {
+ req += (comma ? "," : "") + "\n \"classArgs\": " + classArgs;
+ }
+ req += "\n}";
+ return req;
+ }
+
+ // public static JSONObject removeComment(String json) {
+ // return JSON.parseObject(removeComment(json));
+ // }
+ public static String removeComment(String json) {
+ return json == null ? null: json.replaceAll("(//.*)|(/\\*[\\s\\S]*?\\*/)", "");
+ }
+
+
public double plus(@NotNull JSONObject request, String i0, String i1) {
return request.getDoubleValue(i0) + request.getDoubleValue(i1);
diff --git a/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/MethodUtil.java b/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/MethodUtil.java
new file mode 100644
index 000000000..956827d91
--- /dev/null
+++ b/APIJSON-Java-Server/APIJSONFramework/src/main/java/apijson/framework/MethodUtil.java
@@ -0,0 +1,862 @@
+package apijson.framework;
+
+import java.io.File;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.ParserConfig;
+import com.alibaba.fastjson.util.TypeUtils;
+
+public class MethodUtil {
+
+
+ public interface Callback {
+ JSONObject newSuccessResult();
+ JSONObject newErrorResult(Exception e);
+ }
+
+ public static String KEY_CODE = "code";
+ public static String KEY_MSG = "msg";
+
+ public static int CODE_SUCCESS = 200;
+ public static int CODE_SERVER_ERROR = 500;
+ public static String MSG_SUCCESS = "success";
+ public static Callback CALLBACK = new Callback() {
+
+ @Override
+ public JSONObject newSuccessResult() {
+ JSONObject result = new JSONObject(true);
+ result.put(KEY_CODE, CODE_SUCCESS);
+ result.put(KEY_MSG, MSG_SUCCESS);
+ return result;
+ }
+
+ @Override
+ public JSONObject newErrorResult(Exception e) {
+ JSONObject result = new JSONObject(true);
+ result.put(KEY_CODE, CODE_SERVER_ERROR);
+ result.put(KEY_MSG, e.getMessage());
+ return result;
+ }
+ };
+
+ // Map>
+ public static final Map, Map> INSTANCE_MAP;
+ public static final Map> PRIMITIVE_CLASS_MAP;
+ public static final Map> BASE_CLASS_MAP;
+ public static final Map> CLASS_MAP;
+ static {
+ INSTANCE_MAP = new HashMap<>();
+
+ PRIMITIVE_CLASS_MAP = new HashMap>();
+ BASE_CLASS_MAP = new HashMap>();
+ CLASS_MAP = new HashMap>();
+
+ PRIMITIVE_CLASS_MAP.put(boolean.class.getSimpleName(), boolean.class);
+ PRIMITIVE_CLASS_MAP.put(int.class.getSimpleName(), int.class);
+ PRIMITIVE_CLASS_MAP.put(long.class.getSimpleName(), long.class);
+ PRIMITIVE_CLASS_MAP.put(float.class.getSimpleName(), float.class);
+ PRIMITIVE_CLASS_MAP.put(double.class.getSimpleName(), double.class);
+ BASE_CLASS_MAP.putAll(PRIMITIVE_CLASS_MAP);
+
+ BASE_CLASS_MAP.put(Boolean.class.getSimpleName(), Boolean.class);
+ BASE_CLASS_MAP.put(Integer.class.getSimpleName(), Integer.class);
+ BASE_CLASS_MAP.put(Long.class.getSimpleName(), Long.class);
+ BASE_CLASS_MAP.put(Float.class.getSimpleName(), Float.class);
+ BASE_CLASS_MAP.put(Double.class.getSimpleName(), Double.class);
+ BASE_CLASS_MAP.put(Number.class.getSimpleName(), Number.class);
+ BASE_CLASS_MAP.put(String.class.getSimpleName(), String.class);
+ BASE_CLASS_MAP.put(Object.class.getSimpleName(), Object.class);
+ CLASS_MAP.putAll(BASE_CLASS_MAP);
+
+ CLASS_MAP.put(boolean[].class.getSimpleName(), boolean[].class);
+ CLASS_MAP.put(int[].class.getSimpleName(), int[].class);
+ CLASS_MAP.put(long[].class.getSimpleName(), long[].class);
+ CLASS_MAP.put(float[].class.getSimpleName(), float[].class);
+ CLASS_MAP.put(double[].class.getSimpleName(), double[].class);
+ CLASS_MAP.put(Array.class.getSimpleName(), Array.class);
+ CLASS_MAP.put(Boolean[].class.getSimpleName(), Boolean[].class);
+ CLASS_MAP.put(Integer[].class.getSimpleName(), Integer[].class);
+ CLASS_MAP.put(Long[].class.getSimpleName(), Long[].class);
+ CLASS_MAP.put(Float[].class.getSimpleName(), Float[].class);
+ CLASS_MAP.put(Double[].class.getSimpleName(), Double[].class);
+ CLASS_MAP.put(Number[].class.getSimpleName(), Number[].class);
+ CLASS_MAP.put(String[].class.getSimpleName(), String[].class);
+ CLASS_MAP.put(Object[].class.getSimpleName(), Object[].class);
+ CLASS_MAP.put(Array[].class.getSimpleName(), Array[].class);
+
+ CLASS_MAP.put(Collection.class.getSimpleName(), Collection.class);//不允许指定
+ CLASS_MAP.put(List.class.getSimpleName(), List.class);//不允许指定
+ CLASS_MAP.put(ArrayList.class.getSimpleName(), ArrayList.class);//不允许指定
+ CLASS_MAP.put(Map.class.getSimpleName(), Map.class);//不允许指定
+ CLASS_MAP.put(HashMap.class.getSimpleName(), HashMap.class);//不允许指定
+ CLASS_MAP.put(Set.class.getSimpleName(), Set.class);//不允许指定
+ CLASS_MAP.put(HashSet.class.getSimpleName(), HashSet.class);//不允许指定
+
+ CLASS_MAP.put(JSON.class.getSimpleName(), JSON.class);//必须有，Map中没有getLongValue等方法
+ CLASS_MAP.put(JSONObject.class.getSimpleName(), JSONObject.class);//必须有，Map中没有getLongValue等方法
+ CLASS_MAP.put(JSONArray.class.getSimpleName(), JSONArray.class);//必须有，Collection中没有getJSONObject等方法
+ }
+
+
+
+ /**获取方法列表
+ * @param request :
+ {
+ "sync": true, //同步到数据库
+ "package": "apijson.demo.server",
+ "class": "DemoFunction",
+ "method": "plus",
+ "types": ["Integer", "String", "com.alibaba.fastjson.JSONObject"]
+ //不返回的话，这个接口没意义 "return": true, //返回 class list，方便调试
+ }
+ * @return
+ */
+ public static JSONObject listMethod(String request) {
+ JSONObject result;
+
+ try {
+ JSONObject req = JSON.parseObject(request);
+ if (req == null) {
+ req = new JSONObject(true);
+ }
+ boolean sync = req.getBooleanValue("sync");
+ // boolean returnList = req.getBooleanValue("return");
+ String pkgName = req.getString("package");
+ String clsName = req.getString("class");
+ String methodName = req.getString("method");
+ JSONArray methodArgTypes = null;
+
+ boolean allMethod = isEmpty(methodName, true);
+
+ Class[] argTypes = null;
+ if (allMethod == false) {
+ methodArgTypes = req.getJSONArray("types");
+ if (methodArgTypes != null && methodArgTypes.isEmpty() == false) {
+ argTypes = new Class[methodArgTypes.size()];
+
+ for (int i = 0; i < methodArgTypes.size(); i++) {
+ argTypes[i] = getType(methodArgTypes.getString(i), null, true);
+ }
+ }
+ }
+
+ JSONArray list = getMethodListGroupByClass(pkgName, clsName, methodName, argTypes);
+ result = CALLBACK.newSuccessResult();
+ // if (returnList) {
+ result.put("classList", list); //序列化 Class 只能拿到 name result.put("Class[]", JSON.parseArray(JSON.toJSONString(classlist)));
+ // }
+ } catch (Exception e) {
+ e.printStackTrace();
+ result = CALLBACK.newErrorResult(e);
+ }
+
+ return result;
+ }
+
+
+
+ /**执行方法
+ * @param request
+ * @return {@link #invokeMethod(String, Object)}
+ */
+ public static JSONObject invokeMethod(String request) {
+ return invokeMethod(request, null);
+ }
+ /**执行方法
+ * @param request
+ * @return {@link #invokeMethod(JSONObject, Object)}
+ */
+ public static JSONObject invokeMethod(JSONObject request) {
+ return invokeMethod(request, null);
+ }
+ /**执行方法
+ * @param request
+ * @param instance
+ * @return {@link #invokeMethod(JSONObject, Object)}
+ */
+ public static JSONObject invokeMethod(String request, Object instance) {
+ return invokeMethod(JSON.parseObject(request), instance);
+ }
+ /**执行方法
+ * @param req :
+ {
+ "package": "apijson.demo.server",
+ "class": "DemoFunction",
+ "classArgs": [
+ null,
+ null,
+ 0,
+ null
+ ],
+ "method": "plus",
+ "methodArgs": [
+ {
+ "type": "Integer", //可缺省，自动根据 value 来判断
+ "value": 1
+ },
+ {
+ "type": "String",
+ "value": "APIJSON"
+ },
+ {
+ "type": "JSONObject", //可缺省，JSONObject 已缓存到 CLASS_MAP
+ "value": {}
+ },
+ {
+ "type": "apijson.demo.server.model.User", //不可缺省，且必须全称
+ "value": {
+ "id": 1,
+ "name": "Tommy"
+ }
+ }
+ ]
+ }
+ * @param instance 默认自动 new，传非 null 值一般是因为 Spring 自动注入的 Service, Component, Mapper 等不能自己 new
+ * @return
+ */
+ public static JSONObject invokeMethod(JSONObject req, Object instance) {
+ if (req == null) {
+ req = new JSONObject(true);
+ }
+ String pkgName = req.getString("package");
+ String clsName = req.getString("class");
+ String methodName = req.getString("method");
+
+ JSONObject result;
+ try {
+ Class clazz = getInvokeClass(pkgName, clsName);
+ if (clazz == null) {
+ throw new ClassNotFoundException("找不到 " + dot2Separator(pkgName) + "/" + clsName + " 对应的类！");
+ }
+
+ if (instance == null && req.getBooleanValue("static") == false) {
+ instance = getInvokeInstance(clazz, getArgList(req, "classArgs"));
+ }
+
+ JSONObject ir = getInvokeResult(clazz, instance, methodName, getArgList(req, "methodArgs"));
+
+ result = CALLBACK.newSuccessResult();
+ result.put("invoke", ir == null ? null : ir.get("invoke"));
+ result.put("types", ir == null ? null : ir.get("types"));
+ result.put("args", ir == null ? null : ir.get("args"));
+ result.put("instance", instance);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ if (e instanceof NoSuchMethodException) {
+ e = new IllegalArgumentException("字符 " + methodName + " 对应的方法不在 " + pkgName + "/" + clsName + " 内！"
+ + "\n请检查函数名和参数数量是否与已定义的函数一致！\n" + e.getMessage());
+ }
+ if (e instanceof InvocationTargetException) {
+ Throwable te = ((InvocationTargetException) e).getTargetException();
+ if (isEmpty(te.getMessage(), true) == false) { //到处把函数声明throws Exception改成throws Throwable挺麻烦
+ e = te instanceof Exception ? (Exception) te : new Exception(te.getMessage());
+ }
+ e = new IllegalArgumentException("字符 " + methodName + " 对应的方法传参类型错误！"
+ + "\n请检查 key:value 中value的类型是否满足已定义的函数的要求！\n" + e.getMessage());
+ }
+ result = CALLBACK.newErrorResult(e);
+ result.put("throw", e.getClass().getTypeName());
+ result.put("cause", e.getCause());
+ result.put("trace", e.getStackTrace());
+ }
+
+ return result;
+ }
+
+
+ public static List getArgList(JSONObject req, String arrKey) {
+ JSONArray arr = req == null ? null : JSON.parseArray(req.getString(arrKey));
+
+ List list = null;
+ if (arr != null && arr.isEmpty() == false) {
+ list = new ArrayList<>();
+ for (Object item : arr) {
+ if (item instanceof Boolean || item instanceof Number || item instanceof Collection) {
+ list.add(new Argument(null, item));
+ }
+ else if (item instanceof String) {
+ String str = (String) item;
+ int index = str.indexOf(":");
+ String type = index < 0 ? null : str.substring(0, index);
+ String value = index < 0 ? str : str.substring(index + 1);
+ list.add(new Argument(type, value));
+ }
+ else { //null 合法，也要加，按顺序调用的
+ list.add(item == null ? null : JSON.parseObject(JSON.toJSONString(item), Argument.class));
+ }
+ }
+ }
+ return list;
+ }
+
+
+
+ /**获取类
+ * @param pkgName
+ * @param clsName
+ * @return
+ * @throws Exception
+ */
+ public static Class getInvokeClass(String pkgName, String clsName) throws Exception {
+ return findClass(pkgName, clsName, false);
+ }
+
+ /**获取示例
+ * @param clazz
+ * @param pkgName
+ * @param clsName
+ * @param classArgs
+ * @return
+ * @throws Exception
+ */
+ public static Object getInvokeInstance(Class clazz, List classArgs) throws Exception {
+ //new 出实例
+ Map clsMap = INSTANCE_MAP.get(clazz);
+ if (clsMap == null) {
+ clsMap = new HashMap<>();
+ INSTANCE_MAP.put(clazz, clsMap);
+ }
+
+ String key = classArgs == null || classArgs.isEmpty() ? "" : JSON.toJSONString(classArgs);
+ Object instance = clsMap.get(key); //必须精确对应值，否则去除缓存的和需要的很可能不符
+
+ if (instance == null) {
+ if (classArgs == null || classArgs.isEmpty()) {
+ instance = clazz.newInstance();
+ }
+ else { //通过构造方法
+ boolean exactContructor = false; //指定某个构造方法，只要某一项 type 不为空就是
+ for (int i = 0; i < classArgs.size(); i++) {
+ Argument obj = classArgs.get(i);
+ if (obj != null && isEmpty(obj.getType(), true) == false) {
+ exactContructor = true;
+ break;
+ }
+ }
+
+ Class[] classArgTypes = new Class[classArgs.size()];
+ Object[] classArgValues = new Object[classArgs.size()];
+ initTypesAndValues(classArgs, classArgTypes, classArgValues, exactContructor);
+
+ if (exactContructor) { //指定某个构造方法
+ Constructor constructor = clazz.getConstructor(classArgTypes);
+ instance = constructor.newInstance(classArgValues);
+ }
+ else { //尝试参数数量一致的构造方法
+ Constructor[] constructors = clazz.getConstructors();
+ if (constructors != null) {
+ for (int i = 0; i < constructors.length; i++) {
+ if (constructors[i] != null && constructors[i].getParameterCount() == classArgValues.length) {
+ try {
+ instance = constructors[i].newInstance(classArgValues);
+ break;
+ }
+ catch (Exception e) {}
+ }
+ }
+ }
+ }
+
+ }
+
+ if (instance == null) { //通过默认方法
+ throw new NullPointerException("找不到 " + dot2Separator(clazz.getName()) + " 以及 classArgs 对应的构造方法！");
+ }
+
+ clsMap.put(key, instance);
+ }
+
+ return instance;
+ }
+
+ /**获取方法
+ * @param clazz
+ * @param methodName
+ * @param methodArgs
+ * @return
+ * @throws Exception
+ */
+ public static Method getInvokeMethod(Class clazz, String methodName, List methodArgs) throws Exception {
+ Objects.requireNonNull(clazz);
+ Objects.requireNonNull(methodName);
+
+ //method argument, types and values
+ Class[] types = null;
+ Object[] args = null;
+
+ if (methodArgs != null && methodArgs.isEmpty() == false) {
+ types = new Class[methodArgs.size()];
+ args = new Object[methodArgs.size()];
+ initTypesAndValues(methodArgs, types, args, true);
+ }
+
+ return clazz.getMethod(methodName, types);
+ }
+
+ /**执行方法并返回结果
+ * @param instance
+ * @param methodName
+ * @param methodArgs
+ * @return
+ * @throws Exception
+ */
+ public static JSONObject getInvokeResult(Class clazz, Object instance, String methodName, List methodArgs) throws Exception {
+ Objects.requireNonNull(clazz);
+ Objects.requireNonNull(methodName);
+
+ //method argument, types and values
+ Class[] types = null;
+ Object[] args = null;
+
+ if (methodArgs != null && methodArgs.isEmpty() == false) {
+ types = new Class[methodArgs.size()];
+ args = new Object[methodArgs.size()];
+ initTypesAndValues(methodArgs, types, args, true);
+ }
+
+ JSONObject result = new JSONObject();
+ result.put("invoke", clazz.getMethod(methodName, types).invoke(instance, args));
+ result.put("types", types);
+ result.put("args", args);
+ return result;
+ }
+
+
+ /**获取用 Class 分组的 Method 二级嵌套列表
+ * @param pkgName
+ * @param clsName
+ * @param methodName
+ * @param argTypes
+ * @return
+ * @throws Exception
+ */
+ public static JSONArray getMethodListGroupByClass(String pkgName, String clsName
+ , String methodName, Class[] argTypes) throws Exception {
+
+ boolean allMethod = isEmpty(methodName, true);
+
+ List> classlist = findClassList(pkgName, clsName, true);
+ JSONArray list = null;
+ if (classlist != null) {
+ list = new JSONArray(classlist.size());
+
+ for (Class cls : classlist) {
+ if (cls == null) {
+ continue;
+ }
+
+ JSONObject clsObj = new JSONObject(true);
+
+ clsObj.put("name", cls.getSimpleName());
+ clsObj.put("type", trimType(cls.getGenericSuperclass()));
+ clsObj.put("package", dot2Separator(cls.getPackage().getName()));
+
+ JSONArray methodList = null;
+ if (allMethod == false && argTypes != null && argTypes.length > 0) {
+ Object mObj = parseMethodObject(cls.getMethod(methodName, argTypes));
+ if (mObj != null) {
+ methodList = new JSONArray(1);
+ methodList.add(mObj);
+ }
+ }
+ else {
+ Method[] methods = cls.getDeclaredMethods(); //父类的就用父类去获取 cls.getMethods();
+ if (methods != null && methods.length > 0) {
+ methodList = new JSONArray(methods.length);
+
+ for (Method m : methods) {
+ if (m == null) {
+ continue;
+ }
+ if (allMethod || methodName.equals(m.getName())) {
+ methodList.add(parseMethodObject(m));
+ }
+ }
+ }
+ }
+ clsObj.put("methodList", methodList); //太多不需要的信息，导致后端返回慢、前端卡 UI clsObj.put("Method[]", JSON.parseArray(methods));
+
+ list.add(clsObj);
+ }
+
+ }
+
+ return list;
+ }
+
+
+
+ public static String dot2Separator(String name) {
+ return name == null ? null : name.replaceAll("\\.", File.separator);
+ }
+
+ // private void initTypesAndValues(JSONArray methodArgs, Class[] types, Object[] args)
+ // throws IllegalArgumentException, ClassNotFoundException, IOException {
+ // initTypesAndValues(methodArgs, types, args, false);
+ // }
+
+ public static void initTypesAndValues(List methodArgs, Class[] types, Object[] args, boolean defaultType)
+ throws IllegalArgumentException, ClassNotFoundException {
+ if (methodArgs == null || methodArgs.isEmpty()) {
+ return;
+ }
+ if (types == null || args == null) {
+ throw new IllegalArgumentException("types == null || args == null !");
+ }
+ if (types.length != methodArgs.size() || args.length != methodArgs.size()) {
+ throw new IllegalArgumentException("methodArgs.isEmpty() || types.length != methodArgs.size() || args.length != methodArgs.size() !");
+ }
+
+ Argument argObj;
+
+ String typeName;
+ Object value;
+ for (int i = 0; i < methodArgs.size(); i++) {
+ argObj = methodArgs.get(i);
+
+ typeName = argObj == null ? null : argObj.getType();
+ value = argObj == null ? null : argObj.getValue();
+
+ // if (typeName != null && value != null && value.getClass().equals(CLASS_MAP.get(typeName)) == false) {
+ //// if ("double".equals(typeName)) {
+ // value = TypeUtils.cast(value, CLASS_MAP.get(typeName), new ParserConfig());
+ //// }
+ //// else if (PRIMITIVE_CLASS_MAP.containsKey(typeName)) {
+ //// value = JSON.parse(JSON.toJSONString(value));
+ //// } else {
+ //// value = JSON.parseObject(JSON.toJSONString(value), Class.forName(typeName));
+ //// }
+ // }
+
+ types[i] = getType(typeName, value, defaultType);
+
+ if (value != null && types[i] != null && value.getClass().equals(types[i]) == false) {
+ value = TypeUtils.cast(value, types[i], new ParserConfig());
+ }
+
+ args[i] = value;
+ }
+ }
+
+ public static JSONObject parseMethodObject(Method m) {
+ if (m == null) {
+ return null;
+ }
+ //排除 private 和 protected 等访问不到的方法，以后可以通过 IDE 插件为这些方法新增代理方法
+ /*
+ public Type $_delegate_$method(Type0 arg0, Type1 arg1...) {
+ Type returnVal = method(arg0, arg1...)
+ if (returnVal instanceof Void) {
+ return new Object[]{ watchVar0, watchVar1... } //FIXME void 方法需要指定要观察的变量
+ }
+ return returnVal;
+ }
+ */
+ int mod = m.getModifiers();
+ if (Modifier.isPrivate(mod) || Modifier.isProtected(mod)) {
+ return null;
+ }
+
+ JSONObject obj = new JSONObject(true);
+ obj.put("name", m.getName());
+ obj.put("parameterTypeList", trimTypes(m.getParameterTypes())); //不能用泛型，会导致解析崩溃 m.getGenericParameterTypes()));
+ obj.put("genericParameterTypeList", trimTypes(m.getGenericParameterTypes())); //不能用泛型，会导致解析崩溃 m.getGenericParameterTypes()));
+ obj.put("returnType", trimType(m.getReturnType())); //不能用泛型，会导致解析崩溃m.getGenericReturnType()));
+ obj.put("genericReturnType", trimType(m.getGenericReturnType())); //不能用泛型，会导致解析崩溃m.getGenericReturnType()));
+ obj.put("static", Modifier.isStatic(m.getModifiers()));
+ obj.put("exceptionTypeList", trimTypes(m.getExceptionTypes())); //不能用泛型，会导致解析崩溃m.getGenericExceptionTypes()));
+ obj.put("genericExceptionTypeList", trimTypes(m.getGenericExceptionTypes())); //不能用泛型，会导致解析崩溃m.getGenericExceptionTypes()));
+ return obj;
+ }
+
+ private static String[] trimTypes(Type[] types) {
+ if (types != null && types.length > 0) {
+ String[] names = new String[types.length];
+ for (int i = 0; i < types.length; i++) {
+ names[i] = trimType(types[i]);
+ }
+ return names;
+ }
+ return null;
+ }
+ private static String trimType(Type type) {
+ return trimType(type == null ? null : type.getTypeName());
+ }
+ private static String trimType(String name) {
+ if (name == null || "void".equals(name)) {
+ return null;
+ }
+
+ Collection>> set = CLASS_MAP.entrySet();
+ for (Entry> e : set) {
+ if (name.equals(e.getValue().getTypeName())) {
+ return e.getKey();
+ }
+ }
+
+ String child = "";
+ int index;
+ do {
+ index = name.indexOf("<");
+ if (index < 0) {
+ break;
+ }
+ child += "<" + trimType(name.substring(index + 1, name.lastIndexOf(">"))) + ">";
+ name = name.substring(0, index);
+ }
+ while (index >= 0);
+
+ if (name.startsWith("java.lang.")) {
+ name = name.substring("java.lang.".length());
+ }
+ if (name.startsWith("java.util.")) {
+ name = name.substring("java.util.".length());
+ }
+ if (name.startsWith("com.alibaba.fastjson.")) {
+ name = name.substring("com.alibaba.fastjson.".length());
+ }
+
+ return dot2Separator(name) + child;
+ }
+
+
+ // private Class getType(String name) throws ClassNotFoundException, IOException {
+ // return getType(name, null);
+ // }
+ // private Class getType(String name, Object value) throws ClassNotFoundException, IOException {
+ // return getType(name, value, false);
+ // }
+ public static Class getType(String name, Object value, boolean defaultType) throws ClassNotFoundException {
+ Class type = null;
+ if (isEmpty(name, true)) { //根据值来自动判断
+ if (value == null || defaultType == false) {
+ //nothing
+ }
+ else {
+ type = value.getClass();
+ }
+ }
+ else {
+ int index = name.indexOf("<");
+ if (index >= 0) {
+ name = name.substring(0, index);
+ }
+
+ type = CLASS_MAP.get(name);
+ if (type == null) {
+ name = dot2Separator(name);
+ index = name.lastIndexOf(File.separator);
+ type = findClass(index < 0 ? "" : name.substring(0, index), index < 0 ? name : name.substring(index + 1), defaultType);
+
+ if (type != null) {
+ CLASS_MAP.put(name, type);
+ }
+ }
+ }
+
+ if (type == null && defaultType) {
+ type = Object.class;
+ }
+
+ return type;
+ }
+
+ /**
+ * 提供直接调用的方法
+ * @param packageOrFileName
+ * @param className
+ * @param ignoreError
+ * @return
+ * @throws ClassNotFoundException
+ */
+ public static Class findClass(String packageOrFileName, String className, boolean ignoreError) throws ClassNotFoundException {
+ //根目录 Objects.requireNonNull(packageName);
+ Objects.requireNonNull(className);
+
+ //FIXME 这个方法在 jar 包里获取不到 class，主要是 ClassLoader.getResource(packageOrFileName) 取出来为 null，试了多种方法都没解决
+ try {
+ List> list = findClassList(packageOrFileName, className, ignoreError);
+ Class cls = list == null || list.isEmpty() ? null : list.get(0);
+ if (cls != null) {
+ return cls;
+ }
+ } catch(Exception e) { }
+
+ int index = className.indexOf("<");
+ if (index >= 0) {
+ className = className.substring(0, index);
+ }
+ //这个方法保证在 jar 包里能正常执行
+ return Class.forName(isEmpty(packageOrFileName, true) ? className : packageOrFileName.replaceAll("/", ".") + "." + className);
+ }
+
+ /**
+ * @param packageOrFileName
+ * @param className
+ * @param ignoreError
+ * @return
+ * @throws ClassNotFoundException
+ */
+ public static List> findClassList(String packageOrFileName, String className, boolean ignoreError) throws ClassNotFoundException {
+ List> list = new ArrayList<>();
+
+ int index = className.indexOf("<");
+ if (index >= 0) {
+ className = className.substring(0, index);
+ }
+
+ boolean allPackage = isEmpty(packageOrFileName, true);
+ boolean allName = isEmpty(className, true);
+
+ //将报名替换成目录
+ String fileName = allPackage ? File.separator : dot2Separator(packageOrFileName);
+
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ //通过 ClassLoader 来获取文件列表
+ File file;
+ try {
+ file = new File(loader.getResource(fileName).getFile());
+ } catch (Exception e) {
+ if (ignoreError) {
+ return null;
+ }
+ throw e;
+ }
+
+ File[] files;
+ // if (allPackage) { //getResource 已经过滤了
+ files = file.listFiles();
+ // }
+ // else {
+ // files = file.listFiles(new FilenameFilter() {
+ //
+ // @Override
+ // public boolean accept(File dir, String name) {
+ // if (fileName.equals(dir.getAbsolutePath())) {
+ //
+ // }
+ // return false;
+ // }
+ // });
+ // }
+
+ if (files != null) {
+ for (File f : files) {
+ if (f.isDirectory()) { //如果是目录，这进一个寻找
+ if (allPackage) {
+ //进一步寻找
+ List> childList = findClassList(f.getAbsolutePath(), className, ignoreError);
+ if (childList != null && childList.isEmpty() == false) {
+ list.addAll(childList);
+ }
+ }
+ }
+ else { //如果是class文件
+ String name = trim(f.getName());
+ if (name != null && name.endsWith(".class")) {
+ name = name.substring(0, name.length() - ".class".length());
+ if (name.isEmpty() || name.equals("package-info") || name.contains("$")) {
+ continue;
+ }
+
+ if (allName || className.equals(name)) {
+ //反射出实例
+ try {
+ Class clazz = loader.loadClass(packageOrFileName.replaceAll(File.separator, "\\.") + "." + name);
+ list.add(clazz);
+
+ if (allName == false) {
+ break;
+ }
+ } catch (Exception e) {
+ if (ignoreError == false) {
+ throw e;
+ }
+ e.printStackTrace();
+ }
+
+ }
+ }
+ }
+ }
+ }
+
+ return list;
+ }
+
+
+ /**判断字符是否为空
+ * @param s
+ * @param trim
+ * @return
+ */
+ public static boolean isEmpty(String s, boolean trim) {
+ // Log.i(TAG, "isEmpty s = " + s);
+ if (s == null) {
+ return true;
+ }
+
+ if (trim) {
+ s = s.trim();
+ }
+
+ return s.isEmpty();
+ }
+
+ /**判断字符是否为空
+ * @param s
+ * @return
+ */
+ public static String trim(String s) {
+ // Log.i(TAG, "trim s = " + s);
+ return s == null ? null : s.trim();
+ }
+
+
+ /**参数，包括类型和值
+ */
+ public static class Argument {
+ private String type;
+ private Object value;
+
+ public Argument() {
+ }
+ public Argument(String type, Object value) {
+ setType(type);
+ setValue(value);
+ }
+
+ public String getType() {
+ return type;
+ }
+ public void setType(String type) {
+ this.type = type;
+ }
+ public Object getValue() {
+ return value;
+ }
+ public void setValue(Object value) {
+ this.value = value;
+ }
+ }
+
+}
From 2b35c836476accef6d5990cc069f9bd0beed2917 Mon Sep 17 00:00:00 2001
From: TommyLemon <1184482681@qq.com>
Date: Sat, 2 May 2020 04:30:42 +0800
Subject: [PATCH 0009/1294] =?UTF-8?q?Server=EF=BC=9A=E6=96=B0=E5=A2=9E=20(?=
=?UTF-8?q?=20ANTI=20JOIN=20=E5=92=8C=20)=20FOREIGN=20JOIN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/apijson/orm/AbstractSQLConfig.java | 85 +++++++++++++------
.../src/main/java/apijson/orm/Join.java | 2 +-
2 files changed, 62 insertions(+), 25 deletions(-)
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
index 6476ae3d4..8c3d9c7c3 100755
--- a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
+++ b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java
@@ -1350,7 +1350,7 @@ else if ("!".equals(ce.getKey())) {
if (joinList != null) {
String newWs = "";
- String ws = "" + whereString;
+ String ws = whereString;
List