修复512 多表 gets bug、将别名从代码解析改为数据库配置

cloudAndMonkey · web-flow · commit 0d75cc74dcfc · 2023-04-17T10:32:06.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -2230,13 +2230,15 @@ protected JSONObject batchVerify(RequestMethod method, String tag, int version,
 					}
 
 					String _tag = buildTag(request, key, method, tag);
-					JSONObject requestItem = new JSONObject();
-					// key 处理别名
-					String _key = keyDelAlias(key);
-					requestItem.put(_key, obj);
 					JSONObject object = getRequestStructure(_method, _tag, version);
-					JSONObject ret = objectVerify(_method, _tag, version, name, requestItem, maxUpdateCount, creator, object);
-					jsonObject.put(key, ret.get(_key));
+					if(method == RequestMethod.CRUD && StringUtil.isEmpty(tag, true)) {
+						JSONObject requestItem = new JSONObject();
+						requestItem.put(key, obj);
+						JSONObject ret = objectVerify(_method, _tag, version, name, requestItem, maxUpdateCount, creator, object);
+						jsonObject.put(key, ret.get(key));
+					} else {
+						return objectVerify(_method, _tag, version, name, request, maxUpdateCount, creator, object);
+					}
 				} else {
 					jsonObject.put(key, obj);
 				}
@@ -2276,64 +2278,16 @@ protected void setRequestAttribute(String key, boolean isArray, String attrKey,
 		}
 	}
 
-	protected String keyDelAlias(String key) {
-		int keyIndex = key.indexOf(":");
-		if (keyIndex != -1) {
-			String _key = key.substring(0, keyIndex);
-			if (apijson.JSONObject.isTableArray(key)) {
-				_key += apijson.JSONObject.KEY_ARRAY;
-			}
-			return _key;
-		}
-		return key;
-	}
-
 	protected String buildTag(JSONObject request, String key, RequestMethod method, String tag) {
-		Object val = request.get(key);
-
 		if (method == RequestMethod.CRUD) {
 			Map<String, Object> attrMap = keyObjectAttributesMap.get(key);
 			Object _tag = attrMap == null ? null : attrMap.get(JSONRequest.KEY_TAG);
-
-			if (_tag != null) {
-				if (val instanceof JSONArray) {
-					return _tag.toString();
-				}
-
-				tag = _tag.toString();
-			} else {
-				// key 作为默认的 tag
-				if (StringUtil.isEmpty(tag)) {
-					if (val instanceof JSONArray) {
-						return keyDelAlias(key);
-					}
-
-					tag = key;
-				} else {
-					if (val instanceof JSONArray) {
-						return tag;
-					}
-				}
-			}
+			return _tag != null ? _tag.toString() : StringUtil.isEmpty(tag) ? key : tag;
 		} else {
 			if (StringUtil.isEmpty(tag, true)) {
 				throw new IllegalArgumentException("请在最外层传 tag ！一般是 Table 名，例如 \"tag\": \"User\" ");
 			}
-			if (val instanceof JSONArray) {
-				return tag;
-			}
 		}
-		
-		// 通用判断
-		// 对象, 需处理别名
-		if (val instanceof JSONObject && StringUtil.isNotEmpty(tag)) {
-			int keyIndex = tag.indexOf(":");
-			if (keyIndex != -1) {
-				return tag.substring(0, keyIndex);
-			}
-			return tag;
-		}
-
 		return tag;
 	}
 	
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java
@@ -1073,7 +1073,7 @@ public static <T extends Object> JSONObject parse(@NotNull final RequestMethod m
 			}
 
 			// 不在target内的 key:{}
-			if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {
+			if (rk.startsWith("@") == false && rk.endsWith("@") == false && objKeySet.contains(rk) == false) {
 				if (rv instanceof JSONObject) {
 					throw new UnsupportedOperationException(method + " 请求，"
                             + name + " 里面不允许传 " + rk + ":{} ！");

Original file line number	Diff line number	Diff line change
`@@ -1073,7 +1073,7 @@ public static <T extends Object> JSONObject parse(@NotNull final RequestMethod m`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`	`1075`	`// 不在target内的 key:{}`
`1076`		`- if (rk.startsWith("@") == false && objKeySet.contains(rk) == false) {`
	`1076`	`+ if (rk.startsWith("@") == false && rk.endsWith("@") == false && objKeySet.contains(rk) == false) {`
`1077`	`1077`	`if (rv instanceof JSONObject) {`
`1078`	`1078`	`throw new UnsupportedOperationException(method + " 请求，"`
`1079`	`1079`	`+ name + " 里面不允许传 " + rk + ":{} ！");`