远程函数：新增支持从当前请求的全局对象及 Parser 全局缓存取参数值

TommyLemon · TommyLemon · commit 47439d1add67 · 2023-08-20T22:45:15.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/Log.java b/APIJSONORM/src/main/java/apijson/Log.java
@@ -14,7 +14,7 @@ public class Log {
 
 	public static boolean DEBUG = true;
 
-	public static final String VERSION = "6.1.0";
+	public static final String VERSION = "6.2.1";
 	public static final String KEY_SYSTEM_INFO_DIVIDER = "\n---|-----APIJSON SYSTEM INFO-----|---\n";
 
 	public static final String OS_NAME;
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java
@@ -162,7 +162,22 @@ public AbstractFunctionParser setCurrentObject(@NotNull JSONObject currentObject
 	 * @param <T>
 	 */
 	public <T extends Object> T getArgVal(String path) {
-		return getArgVal(getCurrentObject(), path);
+		return getArgVal(path, false);
+	}
+	/**根据路径取值
+	 * @param path
+	 * @param tryAll false-仅当前对象，true-本次请求的全局对象以及 Parser 缓存值
+	 * @return
+	 * @param <T>
+	 */
+	public <T extends Object> T getArgVal(String path, boolean tryAll) {
+		T val = getArgVal(getCurrentObject(), path);
+		if (tryAll == false || val != null) {
+			return val;
+		}
+
+		Parser<?> p = getParser();
+		return p == null ? null : (T) p.getValueByPath(path);
 	}
 	/**根据路径从对象 obj 中取值
 	 * @param obj
