From ffbd3afe3806bfdbb13487f6031b938cb1ebcf9b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 30 八月 2019 14:46:29 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java
index 85fb259..ec6dae2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java
@@ -56,6 +56,9 @@
* @return
*/
public static String allPushAndroidForXM(MessageInfo info, Map<String, Object> map) {
+ if (Constant.IS_TEST)
+ return null;
+
String name = info.getPackageName();
if (!Constant.systemCommonConfig.getAndroidPackageName().equalsIgnoreCase(name)
&& !Constant.systemCommonConfig.getIosBundleId().equalsIgnoreCase(name)) {
@@ -201,7 +204,6 @@
jsonObject.put("type", "cash");
XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), system);
}
-
/**
*
--
Gitblit v1.8.0