Server:JSONResponse中formatArrayKey和formatObjectKey都去前缀@

Author: TommyLemon

APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONResponse.java

@@ -409,18 +409,21 @@ public static String getTableName(String fullName) {
 		int index = fullName == null ? -1 : fullName.indexOf(":");
 		return index < 0 ? fullName : fullName.substring(0, index);
 	}
-	
+
 	/**获取变量名
 	 * @param fullName
 	 * @return {@link #formatKey(String, boolean, boolean, boolean)} formatColon = true, formatAt = true, formatHyphen = true, firstCase = true
 	 */
 	public static String getVariableName(String fullName) {
+		if (isArrayKey(fullName)) {
+			fullName = StringUtil.addSuffix(fullName.substring(0, fullName.length() - 2), "list");
+		}
 		return formatKey(fullName, true, true, true, true);
 	}
 
 	/**格式化数组的名称 key[] => keyList; key:alias[] => aliasList; Table-column[] => tableColumnList
 	 * @param key empty ? "list" : key + "List" 且首字母小写
-	 * @return {@link #formatKey(String, boolean, boolean, boolean)} formatColon = false, formatAt = false, formatHyphen = true, firstCase = true
+	 * @return {@link #formatKey(String, boolean, boolean, boolean)} formatColon = false, formatAt = true, formatHyphen = true, firstCase = true
 	 */
 	public static String formatArrayKey(String key) {
 		if (isArrayKey(key)) {
@@ -431,20 +434,20 @@ public static String formatArrayKey(String key) {
 			return key.substring(index + 1); //不处理自定义的
 		}
 
-		return formatKey(key, false, false, true, true); //节约性能，除了表对象 Table-column:alias[] ，一般都符合变量命名规范
+		return formatKey(key, false, true, true, true); //节约性能，除了数组对象 Table-column:alias[] ，一般都符合变量命名规范
 	}
 
 	/**格式化对象的名称 name => name; name:alias => alias
 	 * @param key name 或 name:alias
-	 * @return {@link #formatKey(String, boolean, boolean, boolean)} formatColon = false, formatAt = false, formatHyphen = false, firstCase = true
+	 * @return {@link #formatKey(String, boolean, boolean, boolean)} formatColon = false, formatAt = true, formatHyphen = false, firstCase = true
 	 */
 	public static String formatObjectKey(String key) {
 		int index = key == null ? -1 : key.indexOf(":");
 		if (index >= 0) {
 			return key.substring(index + 1); //不处理自定义的
 		}
 
-		return formatKey(key, false, false, false, true); //节约性能，除了表对象 Table:alias ，一般都符合变量命名规范
+		return formatKey(key, false, true, false, true); //节约性能，除了表对象 Table:alias ，一般都符合变量命名规范
 	}
 
 	/**格式化普通值的名称 name => name; name:alias => alias