From cbe9871d77e3586015f26d7e7c78d254bb8ec6f6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 七月 2019 17:25:55 +0800
Subject: [PATCH] 增加订单灰度测试代码
---
fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java
index 316cbb8..507261a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java
@@ -8,19 +8,18 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.yeshi.utils.HttpUtil;
import com.google.gson.Gson;
import com.yeshi.fanli.controller.admin.PushController;
-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.StringUtil;
import com.yeshi.fanli.util.factory.IOSPushFactory;
-import org.yeshi.utils.HttpUtil;
import javapns.devices.Device;
import javapns.devices.implementations.basic.BasicDevice;
@@ -36,12 +35,12 @@
private static IOSPushUtil iosPushUtil;
@Autowired
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@PostConstruct
public void init() {
iosPushUtil = this;
- iosPushUtil.systemService = this.systemService;
+ iosPushUtil.businessSystemService = this.businessSystemService;
}
/**
@@ -57,6 +56,9 @@
*/
public static String allPushIOS(List<String> deviceTokenList, MessageInfo info, String url, int type)
throws Exception {
+
+ if (Constant.IS_TEST)
+ return null;
Gson gson = new Gson();
PushLogHelper.iosInfo("IOS鎺ㄩ�佽澶囨暟涓�:" + deviceTokenList.size());
@@ -114,7 +116,7 @@
int end = start + pageSize;
if (end > tokenList.size())
end = tokenList.size();
- pushIOS(tokenList.subList(start, end), json,certificate,certificatePassword);
+ pushIOS(tokenList.subList(start, end), json, certificate, certificatePassword);
}
}
@@ -122,7 +124,8 @@
return null;
}
- public static String pushIOS(List<String> deviceTokenList, JSONObject json,InputStream certificate,String certificatePWD) throws Exception {
+ public static String pushIOS(List<String> deviceTokenList, JSONObject json, InputStream certificate,
+ String certificatePWD) throws Exception {
List<String> tokenList = new ArrayList<String>();
for (String deviceToken : deviceTokenList) {
tokenList.add(deviceToken);
@@ -151,11 +154,9 @@
PushNotificationManager pushManager = new PushNotificationManager();
// true锛氳〃绀虹殑鏄骇鍝佺嚎涓婂彂甯冩帹閫佹湇鍔� false锛氳〃绀虹殑鏄骇鍝佹祴璇曟帹閫佹湇鍔�
if (Constant.IS_TEST)
- pushManager.initializeConnection(
- new AppleNotificationServerBasicImpl(certificate, certificatePWD, false));
+ pushManager.initializeConnection(new AppleNotificationServerBasicImpl(certificate, certificatePWD, false));
else
- pushManager
- .initializeConnection(new AppleNotificationServerBasicImpl(certificate, certificatePWD, true));
+ pushManager.initializeConnection(new AppleNotificationServerBasicImpl(certificate, certificatePWD, true));
List<Device> deviceList = new ArrayList<Device>();
for (String token : tokenList) {
@@ -222,7 +223,7 @@
InputStream certificate = IOSPushUtil.class.getClassLoader()
.getResourceAsStream("certificate/pushCertificate.p12"); // 璇诲彇.p12鏂囦欢
String certificatePassword = Constant.systemCommonConfig.getIosPushCertificatePwd();
- pushIOS(tokenList, json,certificate,certificatePassword);
+ pushIOS(tokenList, json, certificate, certificatePassword);
}
/**
--
Gitblit v1.8.0