完善对 APP JOIN 同层和跨层的校验；完善对 APP JOIN 的 SQL 执行与缓存次数统计；解决同层 JOIN 新增的报错 bug；解决 APP JOIN 副表返回内部字段 @RAW@LIST；fastjson2 改为 1.2.79

Author: TommyLemon

APIJSONORM/pom.xml

@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>2.0.4</version>
+			<version>1.2.79</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.activation</groupId>

APIJSONORM/src/main/java/apijson/JSON.java

@@ -6,8 +6,9 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson2.JSONReader;
+import com.alibaba.fastjson.JSONReader;
 
 import java.util.List;
 
@@ -64,10 +65,10 @@ public static String getCorrectJson(String s, boolean isArray) {
 	 * @param json
 	 * @return
 	 */
-	private static final JSONReader.Feature[] DEFAULT_FASTJSON_FEATURES = {JSONReader.Feature.FieldBased, JSONReader.Feature.UseBigDecimalForDoubles};
+	private static final Feature[] DEFAULT_FASTJSON_FEATURES = {Feature.OrderedField, Feature.UseBigDecimal};
 	public static Object parse(Object obj) {
 		try {
-			return com.alibaba.fastjson2.JSON.parse(obj instanceof String ? (String) obj : toJSONString(obj), DEFAULT_FASTJSON_FEATURES);
+			return com.alibaba.fastjson.JSON.parse(obj instanceof String ? (String) obj : toJSONString(obj), DEFAULT_FASTJSON_FEATURES);
 		} catch (Exception e) {
 			Log.i(TAG, "parse  catch \n" + e.getMessage());
 		}
@@ -101,7 +102,7 @@ public static <T> T parseObject(String json, Class<T> clazz) {
 			Log.e(TAG, "parseObject  clazz == null >> return null;");
 		} else {
 			try {
-				return com.alibaba.fastjson2.JSON.parseObject(getCorrectJson(json), clazz, DEFAULT_FASTJSON_FEATURES);
+				return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), clazz, DEFAULT_FASTJSON_FEATURES);
 			} catch (Exception e) {
 				Log.i(TAG, "parseObject  catch \n" + e.getMessage());
 			}

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

@@ -71,7 +71,7 @@ public AbstractObjectParser setParser(AbstractParser<?> parser) {
 	 * @param parentPath
 	 * @param request
 	 * @param name
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	public AbstractObjectParser(@NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
 			, boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
@@ -400,7 +400,7 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except
 				if (arrObj == null) {
 					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象 " + from + ":{} 不存在！");
 				}
-				//				
+				//
 				SQLConfig cfg = (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
 				if (cfg == null) {
 					throw new NotExistException(TAG + ".onParse  cfg == null");
@@ -453,7 +453,7 @@ else if (value instanceof String) { // //key{}@ getRealKey, 引用赋值路径
 						Log.d(TAG, "onParse  isTable(table) == false >> return true;");
 						return true;//舍去，对Table无影响
 					}
-				} 
+				}
 
 				//直接替换原来的key@:path为key:target
 				Log.i(TAG, "onParse    >>  key = replaceKey; value = target;");
@@ -517,7 +517,7 @@ else if (isTable && key.startsWith("@") && JSONRequest.TABLE_KEY_LIST.contains(k
 	/**
 	 * @param key
 	 * @param value
-	 * @param isFirst 
+	 * @param isFirst
 	 * @return
 	 * @throws Exception
 	 */
@@ -553,7 +553,7 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
 						+ "数组 []:{} 中每个 key:{} 都必须是表 TableKey:{} 或 数组 arrayKey[]:{} ！");
 			}
 
-			if ( //避免使用 "test":{"Test":{}} 绕过限制，实现查询爆炸   isTableKey && 
+			if ( //避免使用 "test":{"Test":{}} 绕过限制，实现查询爆炸   isTableKey &&
 					(arrayConfig == null || arrayConfig.getPosition() == 0)) {
 				objectCount ++;
 				int maxObjectCount = parser.getMaxObjectCount();
@@ -577,7 +577,7 @@ public JSON onChildParse(int index, String key, JSONObject value) throws Excepti
 
 
 
-	//TODO 改用 MySQL json_add,json_remove,json_contains 等函数！ 
+	//TODO 改用 MySQL json_add,json_remove,json_contains 等函数！
 	/**PUT key:[]
 	 * @param key
 	 * @param array
@@ -757,7 +757,7 @@ public AbstractObjectParser executeSQL() throws Exception {
 		//执行SQL操作数据库
 		if (isTable == false) {//提高性能
 			sqlReponse = new JSONObject(sqlRequest);
-		} 
+		}
 		else {
 			try {
 				sqlReponse = onSQLExecute();
@@ -896,7 +896,8 @@ public JSONObject onSQLExecute() throws Exception {
 			result = parser.executeSQL(sqlConfig, isSubquery);
 
 			boolean isSimpleArray = false;
-			List<JSONObject> rawList = null;
+      // 提取并缓存数组主表的列表数据
+      List<JSONObject> rawList = (List<JSONObject>) result.remove(AbstractSQLExecutor.KEY_RAW_LIST);
 
 			if (isArrayMainTable && position == 0 && result != null) {
 
@@ -905,8 +906,7 @@ public JSONObject onSQLExecute() throws Exception {
 						&& (childMap == null || childMap.isEmpty())
 						&& (table.equals(arrayTable));
 
-				// 提取并缓存数组主表的列表数据
-				rawList = (List<JSONObject>) result.remove(AbstractSQLExecutor.KEY_RAW_LIST);
+				// APP JOIN 副表时副表返回了这个字段   rawList = (List<JSONObject>) result.remove(AbstractSQLExecutor.KEY_RAW_LIST);
 				if (rawList != null) {
 					String arrayPath = parentPath.substring(0, parentPath.lastIndexOf("[]") + 2);