From ee26d58531067afff8e036efa93cb0d57a773250 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 十二月 2018 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 1589e60..3151631 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
@@ -6,9 +6,6 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +14,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.push.DeviceTokenIOS;
import com.yeshi.fanli.entity.push.PushGoods;
@@ -24,7 +22,6 @@
import com.yeshi.fanli.entity.push.PushGoodsRecord;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.exception.push.PushGoodsGroupException;
-import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemService;
@@ -39,6 +36,9 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.JumpDetailParamsFactory;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping(value = "api/v1/push")
@@ -269,15 +269,14 @@
result.put("picture", picture);
- String fontColor1 = "#888888";
- String fontColor2 = "#F14242";
+ String fontColor1 = "#666666";
+ String fontColor2 = "#E5005C";
JSONArray array = new JSONArray();
-
JSONObject contentJson1 = new JSONObject();
contentJson1.put("color", fontColor1);
- contentJson1.put("content", "鏈鎺ㄩ�佸叡");
+ contentJson1.put("content", "鏈鎺ㄨ崘鍏�");
JSONObject contentJson2 = new JSONObject();
contentJson2.put("color", fontColor2);
--
Gitblit v1.8.0