解决校验参数拿不到 datasource, namespace, catalog 等全局关键词取值

Author: TommyLemon

APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java

@@ -720,7 +720,7 @@ public void onPUTArrayParse(@NotNull String key, @NotNull L array) throws Except
 		if (apijson.JSON.isBoolOrNumOrStr(target)) {
 			throw new NullPointerException("PUT " + path + ", " + realKey + " 类型为 " + target.getClass().getSimpleName() + "，"
 					+ "不支持 Boolean, String, Number 等类型字段使用 'key+': [] 或 'key-': [] ！"
-					+ "对应字段在数据库的值必须为 L, JSONRequest 中的一种！"
+					+ "对应字段在数据库的值必须为 JSONArray, JSONObject 中的一种！"
 					+ "值为 JSONRequest 类型时传参必须是 'key+': [{'key': value, 'key2': value2}] 或 'key-': ['key', 'key2'] ！"
 			);
 		}
@@ -734,7 +734,7 @@ public void onPUTArrayParse(@NotNull String key, @NotNull L array) throws Except
 			if (isAdd == false) {
 				throw new NullPointerException("PUT " + path + ", " + realKey + (target == null ? " 值为 null，不支持移除！"
 						: " 类型为 " + target.getClass().getSimpleName() + "，不支持这样移除！")
-						+ "对应字段在数据库的值必须为 L, JSONRequest 中的一种，且 key- 移除时，本身的值不能为 null！"
+						+ "对应字段在数据库的值必须为 JSONArray, JSONObject 中的一种，且 key- 移除时，本身的值不能为 null！"
 						+ "值为 JSONRequest 类型时传参必须是 'key+': [{'key': value, 'key2': value2}] 或 'key-': ['key', 'key2'] ！"
 				);
 			}

APIJSONORM/src/main/java/apijson/orm/AbstractParser.java

@@ -527,6 +527,28 @@ public M parseResponse(M request) {
 			return extendErrorResult(requestObject, e, requestMethod, getRequestURL(), isRoot);
 		}
 
+		try {
+			setGlobalDatabase(getString(requestObject, KEY_DATABASE));
+			setGlobalDatasource(getString(requestObject, KEY_DATASOURCE));
+			setGlobalNamespace(getString(requestObject, KEY_NAMESPACE));
+			setGlobalCatalog(getString(requestObject, KEY_CATALOG));
+			setGlobalSchema(getString(requestObject, KEY_SCHEMA));
+
+			setGlobalExplain(getBoolean(requestObject, KEY_EXPLAIN));
+			setGlobalCache(getString(requestObject, KEY_CACHE));
+
+			requestObject.remove(KEY_DATABASE);
+			requestObject.remove(KEY_DATASOURCE);
+			requestObject.remove(KEY_NAMESPACE);
+			requestObject.remove(KEY_CATALOG);
+			requestObject.remove(KEY_SCHEMA);
+
+			requestObject.remove(KEY_EXPLAIN);
+			requestObject.remove(KEY_CACHE);
+		} catch (Exception e) {
+			return extendErrorResult(requestObject, e, requestMethod, getRequestURL(), isRoot);
+		}
+
 		verifier = createVerifier().setVisitor(getVisitor());
 
 		if (RequestMethod.isPublicMethod(requestMethod) == false) {
@@ -552,28 +574,6 @@ public M parseResponse(M request) {
 			}
 		}
 
-		try {
-			setGlobalDatabase(getString(requestObject, KEY_DATABASE));
-			setGlobalDatasource(getString(requestObject, KEY_DATASOURCE));
-			setGlobalNamespace(getString(requestObject, KEY_NAMESPACE));
-			setGlobalCatalog(getString(requestObject, KEY_CATALOG));
-			setGlobalSchema(getString(requestObject, KEY_SCHEMA));
-
-			setGlobalExplain(getBoolean(requestObject, KEY_EXPLAIN));
-			setGlobalCache(getString(requestObject, KEY_CACHE));
-
-			requestObject.remove(KEY_DATABASE);
-			requestObject.remove(KEY_DATASOURCE);
-			requestObject.remove(KEY_NAMESPACE);
-			requestObject.remove(KEY_CATALOG);
-			requestObject.remove(KEY_SCHEMA);
-
-			requestObject.remove(KEY_EXPLAIN);
-			requestObject.remove(KEY_CACHE);
-		} catch (Exception e) {
-			return extendErrorResult(requestObject, e, requestMethod, getRequestURL(), isRoot);
-		}
-
 		final String requestString = JSON.toJSONString(request);//request传进去解析后已经变了
 
 		queryResultMap = new HashMap<String, Object>();