解决 FunctionParser 初始化等触发 JSONRequest.put 中转 JSON 报错，删除不再需要的 @JSONFiled

TommyLemon · TommyLemon · commit 107fd3741b2b · 2025-04-17T23:58:11.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/JSON.java b/APIJSONORM/src/main/java/apijson/JSON.java
@@ -100,7 +100,11 @@ public static Object parseJSON(Object json) {
 			return parseArray(json, DEFAULT_JSON_PARSER);
 		}
 
-		throw new IllegalArgumentException("JSON 格式错误！" + s);
+		try {
+			return DEFAULT_JSON_PARSER.parseJSON(json);
+		} catch (Throwable e) {
+			throw new IllegalArgumentException("JSON 格式错误！" + e.getMessage() + "! " + s);
+		}
 	}
 
 	/**
diff --git a/APIJSONORM/src/main/java/apijson/JSONField.java b/APIJSONORM/src/main/java/apijson/JSONField.java
diff --git a/APIJSONORM/src/main/java/apijson/JSONParser.java b/APIJSONORM/src/main/java/apijson/JSONParser.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Map;
 
-/**SQL相关创建器
+/**JSON 相关解析器
  * @author Lemon
  */
 public interface JSONParser<M extends Map<String, Object>, L extends List<Object>> extends JSONCreator<M, L> {
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java
@@ -488,7 +488,8 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> Object
      * @throws Exception
      */
 	@SuppressWarnings({"unchecked", "rawtypes"})
-	public static <T, M extends Map<String, Object>, L extends List<Object>> Object invoke(@NotNull AbstractFunctionParser<T, M, L> parser, @NotNull String methodName
+	public static <T, M extends Map<String, Object>, L extends List<Object>> Object invoke(
+			@NotNull AbstractFunctionParser<T, M, L> parser, @NotNull String methodName
             , @NotNull Class<?>[] parameterTypes, @NotNull Object[] args, String returnType
             , Map<String, Object> current, ScriptExecutor scriptExecutor) throws Exception {
         if (scriptExecutor != null) {
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -256,10 +256,10 @@ public AbstractObjectParser<T, M, L> parse(String name, boolean isReuse) throws
 							break;
 						}
 
-            // key可能为JSONArray，需要进行手动转换（fastjson为低版本时允许自动转换，如1.2.21）
-            // 例如request json为 "{[]:{"page": 2, "table1":{}}}"
+						// key 可能为 JSONArray，需要进行手动转换（fastjson 为低版本时允许自动转换，如 1.2.21）
+						// 例如 request json为 "{[]:{"page": 2, "table1":{}}}"
 						Object field = entry == null ? null : entry.getKey();
-            String key = field instanceof JSONArray ? ((JSONArray) field).toJSONString() : field.toString();
+						String key = field instanceof Map ? toJSONString(field) : field.toString();
 						Object value = key == null ? null : entry.getValue();
 						if (value == null) {
 							continue;
diff --git a/APIJSONORM/src/main/java/apijson/orm/JSONRequest.java b/APIJSONORM/src/main/java/apijson/orm/JSONRequest.java
@@ -85,7 +85,8 @@ public Object put(String key, Object value) {
         try {
             target = JSON.parseJSON(value);
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            // nothing
+			e.printStackTrace();
         }
         //		if (target == null) { // "tag":"User" 报错
 		//			return null;
diff --git a/APIJSONORM/src/main/java/apijson/orm/Subquery.java b/APIJSONORM/src/main/java/apijson/orm/Subquery.java
@@ -5,8 +5,6 @@
 
 package apijson.orm;
 
-import apijson.JSONField;
-
 import java.util.List;
 import java.util.Map;
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,11 @@ public static Object parseJSON(Object json) {`
`100`	`100`	`return parseArray(json, DEFAULT_JSON_PARSER);`
`101`	`101`	`}`
`102`	`102`
`103`		`- throw new IllegalArgumentException("JSON 格式错误！" + s);`
	`103`	`+ try {`
	`104`	`+ return DEFAULT_JSON_PARSER.parseJSON(json);`
	`105`	`+ } catch (Throwable e) {`
	`106`	`+ throw new IllegalArgumentException("JSON 格式错误！" + e.getMessage() + "! " + s);`
	`107`	`+ }`
`104`	`108`	`}`
`105`	`109`
`106`	`110`	`/**`