From 84c07b26025cb0790d089b0d397f80b941bcdf88 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 03 八月 2019 10:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java b/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java
index a04afc5..3b723a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java
@@ -15,7 +15,7 @@
import net.sf.json.JSONObject;
public class PushUtils {
-
+
@Resource
private PushService pushService;
@@ -29,11 +29,10 @@
* @throws Exception
*/
public static int allPushXiaoMi(MessageInfo info, JSONObject json, PushRecord pushRecord) throws Exception {
-
- if(Constant.IS_TEST)
+
+ if (Constant.IS_TEST)
return 1;
-
JSONObject mapXm = JSONObject.fromObject(json);
String android = XiaoMiPushUtil.allPushAndroidForXM(info, mapXm);
@@ -67,6 +66,9 @@
* Constant.systemCommonConfig.getIosBundleId());
*/
+ if (Constant.IS_TEST)
+ return 1;
+
String IOS = IOSPushUtil.allPushIOS(deviceTokenList, info, url, type);
LogHelper.userInfo("IOS鐨勬帹閫佹棩蹇楋細" + IOS);
pushRecord.setIosPushId(IOS);
@@ -86,7 +88,7 @@
* @return
*/
public static int singlePushXiaoMi(MessageInfo info, JSONObject json, PushRecord pushRecord) {
- if(Constant.IS_TEST)
+ if (Constant.IS_TEST)
return 1;
JSONObject mapXm = JSONObject.fromObject(json);
@@ -114,6 +116,8 @@
*/
public static String singlePushIOS(MessageInfo info, PushRecord pushRecord, String url, int type,
List<String> deviceTokenList) {
+ if (Constant.IS_TEST)
+ return null;
if (deviceTokenList != null && deviceTokenList.size() > 0) {
for (String deviceToken : deviceTokenList) {
if (!StringUtil.isNullOrEmpty(deviceToken)) {
--
Gitblit v1.8.0