Server:解决对表对象数量限制失效

TommyLemon · TommyLemon · commit 0e7c25188c69 · 2019-04-29T22:53:55.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java
@@ -502,7 +502,7 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
 		}
 		else {//APIJSON Object
 			if (arrayConfig == null || arrayConfig.getPosition() == 0) {
-				arrayCount ++;
+				objectCount ++;
 				int maxObjectCount = parser.getMaxObjectCount();
 				if (objectCount > maxObjectCount) {
 					throw new IllegalArgumentException(path + " 内截至 " + key + " 时表对象 TableKey:{} 的数量达到 " + objectCount + " 已超限，必须在 0-" + maxObjectCount + " 内 !");
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -322,9 +322,9 @@ public JSONObject parseResponse(JSONObject request) {
 		long duration = endTime - startTime;
 
 		if (Log.DEBUG) {
-			requestObject.put("time:start/duration/end", startTime + "/" + duration + "/" + endTime);
-			requestObject.put("query:depth/max", queryDepth + "/" + getMaxQueryDepth());
 			requestObject.put("sql:generate/cache/execute/maxExecute", sqlExecutor.getGeneratedSQLCount() + "/" + sqlExecutor.getCachedSQLCount() + "/" + sqlExecutor.getExecutedSQLCount() + "/" + getMaxSQLCount());
+			requestObject.put("depth:count/max", queryDepth + "/" + getMaxQueryDepth());
+			requestObject.put("time:start/duration/end", startTime + "/" + duration + "/" + endTime);
 		}
 
 		sqlExecutor.close();

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti`
`502`	`502`	`}`
`503`	`503`	`else {//APIJSON Object`
`504`	`504`	`if (arrayConfig == null \|\| arrayConfig.getPosition() == 0) {`
`505`		`- arrayCount ++;`
	`505`	`+ objectCount ++;`
`506`	`506`	`int maxObjectCount = parser.getMaxObjectCount();`
`507`	`507`	`if (objectCount > maxObjectCount) {`
`508`	`508`	`throw new IllegalArgumentException(path + " 内截至 " + key + " 时表对象 TableKey:{} 的数量达到 " + objectCount + " 已超限，必须在 0-" + maxObjectCount + " 内 !");`