From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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 831dedb..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
@@ -8,21 +8,20 @@
import org.json.simple.parser.ParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.yeshi.utils.JsonUtil;
import com.xiaomi.xmpush.server.Constants;
import com.xiaomi.xmpush.server.Message;
import com.xiaomi.xmpush.server.Message.Builder;
import com.xiaomi.xmpush.server.Result;
import com.xiaomi.xmpush.server.Sender;
-import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.xinge.MessageInfo;
import com.yeshi.fanli.entity.xinge.PushRecord;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.log.PushLogHelper;
-import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.PropertiesUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -32,12 +31,12 @@
private static XiaoMiPushUtil xiaoMiPushUtil;
@Autowired
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@PostConstruct
public void init() {
xiaoMiPushUtil = this;
- xiaoMiPushUtil.systemService = this.systemService;
+ xiaoMiPushUtil.businessSystemService = this.businessSystemService;
}
// AppKey
@@ -57,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,12 +203,6 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("type", "cash");
XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), system);
- }
-
- public static int allFanLiQuanDevice(MessageInfo info, JSONObject json, PushRecord pushRecord) {
- System b_android = xiaoMiPushUtil.systemService.getSystem("ANDROID",
- Constant.systemCommonConfig.getAndroidPackageName());
- return pushApp(info, json, pushRecord, b_android);
}
/**
--
Gitblit v1.8.0