From 67afc62898aca364e7c7db7e2c1e44e1f3bf46ce Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期四, 29 十一月 2018 17:32:54 +0800
Subject: [PATCH] 后端编辑推送商品优化+队员调优

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
index 32a7c31..e24ab05 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
@@ -210,7 +210,7 @@
 	 * @param acceptData
 	 * @param out
 	 */
-	@RequestMapping(value = "/gethistory", method = RequestMethod.POST)
+	@RequestMapping(value = "/gethistory"/*, method = RequestMethod.POST*/)
 	public void getHistory(AcceptData acceptData, String deviceToken, int page, PrintWriter out) {
 
 		long count = 0;
@@ -273,21 +273,23 @@
 					String fontColor2 = "#F14242";
 					JSONArray array = new JSONArray();
 
-					JSONArray array1 = new JSONArray();
-					array1.add(fontColor1);
-					array1.add("鏈鎺ㄩ�佸叡");
+					
 
-					JSONArray array2 = new JSONArray();
-					array2.add(fontColor2);
-					array2.add(totalgoods);
+					JSONObject contentJson1 = new JSONObject();
+					contentJson1.put("color", fontColor1);
+					contentJson1.put("content", "鏈鎺ㄩ�佸叡");
+					
+					JSONObject contentJson2 = new JSONObject();
+					contentJson2.put("color", fontColor2);
+					contentJson2.put("content", totalgoods);
+					
+					JSONObject contentJson3 = new JSONObject();
+					contentJson3.put("color", fontColor1);
+					contentJson3.put("content", "涓晢鍝�");
 
-					JSONArray array3 = new JSONArray();
-					array3.add(fontColor1);
-					array3.add("涓晢鍝�");
-
-					array.add(array1);
-					array.add(array2);
-					array.add(array3);
+					array.add(contentJson1);
+					array.add(contentJson2);
+					array.add(contentJson3);
 
 					result.put("totalwords", array);
 

--
Gitblit v1.8.0