远程函数：新增支持 JavaScript 脚本，方便动态配置业务逻辑以及作为 Serveless 服务

Author: TommyLemon

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>apijson.framework</groupId>
 	<artifactId>apijson-framework</artifactId>
-	<version>5.4.0</version>
+	<version>5.5.0</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONFramework</name>
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>5.4.0</version>
+			<version>5.5.0</version>
             <type>jar</type>
 		</dependency>
 

src/main/java/apijson/framework/APIJSONConstant.java

@@ -28,6 +28,7 @@
 import apijson.orm.model.PgAttribute;
 import apijson.orm.model.PgClass;
 import apijson.orm.model.Request;
+import apijson.orm.model.Script;
 import apijson.orm.model.SysColumn;
 import apijson.orm.model.SysTable;
 import apijson.orm.model.Table;
@@ -61,6 +62,7 @@ public class APIJSONConstant {
 	public static final String DOCUMENT_;
 	public static final String EXTENDED_PROPERTY_;
 	public static final String FUNCTION_;
+	public static final String SCRIPT_;
 	public static final String PG_ATTRIBUTE_;
 	public static final String PG_CLASS_;
 	public static final String REQUEST_;
@@ -79,6 +81,7 @@ public class APIJSONConstant {
 		DOCUMENT_ = Document.class.getSimpleName();
 		EXTENDED_PROPERTY_ = ExtendedProperty.class.getSimpleName();
 		FUNCTION_ = Function.class.getSimpleName();
+		SCRIPT_ = Script.class.getSimpleName();
 		PG_ATTRIBUTE_ = PgAttribute.class.getSimpleName();
 		PG_CLASS_ = PgClass.class.getSimpleName();
 		REQUEST_ = Request.class.getSimpleName();

src/main/java/apijson/framework/APIJSONFunctionParser.java

@@ -22,6 +22,7 @@
 import static apijson.RequestMethod.POST;
 import static apijson.RequestMethod.PUT;
 import static apijson.framework.APIJSONConstant.FUNCTION_;
+import static apijson.framework.APIJSONConstant.SCRIPT_;
 
 import java.io.IOException;
 import java.rmi.ServerException;
@@ -145,24 +146,94 @@ public static <T extends Object> JSONObject init(boolean shutdownWhenServerError
 
 		boolean isAll = table == null || table.isEmpty();
 
-		JSONObject function = isAll ? new JSONRequest() : table;
-		if (Log.DEBUG == false) {
-			function.put(APIJSONConstant.KEY_DEBUG, 0);
-		}
-		
-		JSONRequest functionItem = new JSONRequest();
-		functionItem.put(FUNCTION_, function);
-
-		JSONObject request = new JSONObject(); 
-		request.putAll(functionItem.toArray(0, 0, FUNCTION_));
+		//JSONObject function = isAll ? new JSONRequest() : table;
+		//if (Log.DEBUG == false) {
+		//	function.put(APIJSONConstant.KEY_DEBUG, 0);
+		//}
+		//
+		//JSONRequest functionItem = new JSONRequest();
+		//functionItem.put(FUNCTION_, function);
+        //
+        //JSONObject script = isAll ? new JSONRequest() : table;
+        ////if (Log.DEBUG == false) {
+        ////    script.put(APIJSONConstant.KEY_DEBUG, 0);
+        ////}
+        //{   // name{}@ <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+        //    JSONRequest nameInAt = new JSONRequest();
+        //    nameInAt.put("from", "Function");
+        //    {   // Function <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+        //        JSONRequest fun = new JSONRequest();
+        //        fun.setColumn("name");
+        //        nameInAt.put("Function", fun);
+        //    }   // Function >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        //
+        //    script.put("simple", 0);
+        //    script.put("name{}@", nameInAt);
+        //}   // name{}@ >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        //
+		//JSONRequest scriptItem = new JSONRequest();
+        //scriptItem.put(SCRIPT_, script);
+        //
+		JSONObject request = new JSONObject();
+		//request.putAll(functionItem.toArray(0, 0, FUNCTION_));
+		//request.putAll(scriptItem.toArray(0, 0, SCRIPT_));
+
+        // TODO 用这个来优化
+        {   // [] <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+            JSONRequest item = new JSONRequest();
+
+            {   // Function <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+                JSONObject function = isAll ? new JSONRequest() : table;
+                if (Log.DEBUG == false) {
+                    function.put(APIJSONConstant.KEY_DEBUG, 0);
+                }
+                item.put("Function", function);
+            }   // Function >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+            {   // Script <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+                JSONRequest script = new JSONRequest();
+                script.put("name@", "/Function/name");
+                script.put("simple", 0);
+                item.put("Script", script);
+            }   // Script >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+            request.putAll(item.toArray(0, 0));
+        }   // [] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
 		JSONObject response = creator.createParser().setMethod(GET).setNeedVerify(true).parseResponse(request);
 		if (JSONResponse.isSuccess(response) == false) {
 			onServerError("\n\n\n\n\n !!!! 查询远程函数异常 !!!\n" + response.getString(JSONResponse.KEY_MSG) + "\n\n\n\n\n", shutdownWhenServerError);
 		}
 
-		JSONArray list = response.getJSONArray(FUNCTION_ + "[]");
+        JSONArray scriptList = response.getJSONArray("[]"); // .getJSONArray(SCRIPT_ + "[]");
+        if (scriptList != null && scriptList.isEmpty() == false) {
+            if (isAll) {
+                SCRIPT_MAP = new LinkedHashMap<>();
+            }
+
+            for (int i = 0; i < scriptList.size(); i++) {
+                JSONObject item = scriptList.getJSONObject(i);
+                item = item == null ? null : item.getJSONObject(SCRIPT_);
+                if (item == null) {
+                    continue;
+                }
+
+                String n = item == null ? null : item.getString("name");
+                if (StringUtil.isName(n) == false) {
+                    onServerError("Script 表字段 name 的值 " + n + " 不合法！必须为合法的方法名字符串！", shutdownWhenServerError);
+                }
+
+                String s = item == null ? null : item.getString("script");
+                if (StringUtil.isEmpty(s, true)) {
+                    onServerError("Script 表字段 script 的值 " + s + " 不合法！不能为空！", shutdownWhenServerError);
+                }
+
+                SCRIPT_MAP.put(n, item);
+            }
+        }
+
+		JSONArray list = scriptList; // response.getJSONArray(FUNCTION_ + "[]");
 		int size = list == null ? 0 : list.size();
 		if (isAll && size <= 0) {
 			Log.w(TAG, "init isAll && size <= 0，，没有可用的远程函数");
@@ -177,6 +248,7 @@ public static <T extends Object> JSONObject init(boolean shutdownWhenServerError
 
 		for (int i = 0; i < size; i++) {
 			JSONObject item = list.getJSONObject(i);
+            item = item == null ? null : item.getJSONObject(FUNCTION_);
 			if (item == null) {
 				continue;
 			}