From 50e074067ab1406a52023300239189165d9cdca7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 05 六月 2019 15:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java | 9 ++++-----
1 files changed, 4 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..6cae398 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);
@@ -86,7 +85,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);
--
Gitblit v1.8.0