Server:优化Controller注释；Client:优化Test中CodeUtil代码

TommyLemon · TommyLemon · commit fedcfa99dbec · 2017-08-27T11:50:05.000+08:00
diff --git a/APIJSON-Android/APIJSON-ADT/APIJSONTest/src/apijson/demo/ui/CodeUtil.java b/APIJSON-Android/APIJSON-ADT/APIJSONTest/src/apijson/demo/ui/CodeUtil.java
@@ -43,14 +43,12 @@ public static String parse(final String name, final JSONObject request) {
 		if (set != null) {
 
 			Object value;
-			String pairKey;
 			for (String key : set) {
 				value = request.get(key);
 				if (value == null) {
 					continue;
 				}
 
-				pairKey = new String(key instanceof String ? "\"" + key + "\"" : key);
 				if (value instanceof JSONObject) {//APIJSON Array转为常规JSONArray
 					if (isArrayKey(key)) {//APIJSON Array转为常规JSONArray
 						response += NEWLINE + NEWLINE + "//" + key + "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<";
@@ -65,22 +63,25 @@ public static String parse(final String name, final JSONObject request) {
 
 						String prefix = key.substring(0, key.length() - 2);
 						response += NEWLINE + NEWLINE
-								+ parentKey + ".add(" +  getItemKey(key) + ".toArray("
+								+ parentKey + ".putAll(" +  getItemKey(key) + ".toArray("
 								+ count  + ", " + page + (prefix.isEmpty() ? "" : ", \"" + prefix + "\"") + "));";
 
 						response += NEWLINE + "//" + key + ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + NEWLINE;
-					} else {//常规JSONObject，往下一级提取
+					}
+					else {//常规JSONObject，往下一级提取
 						response += NEWLINE + NEWLINE + "//" + key + "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<";
 
 						response += parse(key, (JSONObject) value);
 
-						response += NEWLINE + NEWLINE + parentKey + ".put(" + pairKey + ", " + getTableKey(key) + ");";
+						response += NEWLINE + NEWLINE + parentKey + ".put(\"" + key + "\", " + getTableKey(key) + ");";
 						response += NEWLINE + "//" + key + ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + NEWLINE;
 					}
-				} else {//其它Object，直接填充
+				}
+				else {//其它Object，直接填充
 					if (value instanceof String) {
 						value = "\"" + value + "\"";
-					} else if (value instanceof JSONArray) {
+					}
+					else if (value instanceof JSONArray) {
 						String s = StringUtil.getString(value);
 						if (s.startsWith("[")) {
 							s = s.substring(1);
@@ -93,7 +94,7 @@ public static String parse(final String name, final JSONObject request) {
 						value = "new Object[]{" + s + "}";//反射获取泛型太麻烦，反正开发中还要改的
 					}
 
-					response += NEWLINE + parentKey + ".put(" + pairKey + ", " + value + ");";
+					response += NEWLINE + parentKey + ".put(\"" + key + "\", " + value + ");";
 				}
 			}
 		}
diff --git a/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server/Controller.java b/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server/Controller.java
@@ -253,7 +253,7 @@ public String delete(@RequestBody String request, HttpSession session) {
 
 
 	/**生成验证码,修改为post请求
-	 * @param phone
+	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value = "post/verify", method = org.springframework.web.bind.annotation.RequestMethod.POST)
@@ -290,7 +290,7 @@ public JSONObject postVerify(@RequestBody String request) {
 	}
 
 	/**获取验证码
-	 * @param phone
+	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value = "post_get/verify", method = org.springframework.web.bind.annotation.RequestMethod.POST)
@@ -307,8 +307,7 @@ public JSONObject getVerify(@RequestBody String request) {
 	}
 
 	/**校验验证码
-	 * @param phone
-	 * @param code
+	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value = "post_head/verify", method = org.springframework.web.bind.annotation.RequestMethod.POST)
