From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 e6dff06..316cbb8 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
@@ -98,9 +98,14 @@
if (StringUtil.isNullOrEmpty(shortUrl))
throw new Exception("鑾峰彇鐭摼鍑洪敊");
json = IOSPushFactory.createBaiChuanPush(shortUrl, info.getTitle(), info.getContent());
+ } else if (type == PushController.WELFARE_CENTER) {
+ json = IOSPushFactory.createWelfarePush(info.getTitle(), info.getContent());
}
// 鍒嗙粍鎺ㄩ�� 姣�50涓澶囦负涓�缁�
+ InputStream certificate = IOSPushUtil.class.getClassLoader()
+ .getResourceAsStream("certificate/pushCertificate.p12"); // 璇诲彇.p12鏂囦欢
+ String certificatePassword = Constant.systemCommonConfig.getIosPushCertificatePwd();
if (tokenList != null && tokenList.size() > 0) {
int pageSize = 50;
int page = tokenList.size() % pageSize == 0 ? tokenList.size() / pageSize : tokenList.size() / pageSize + 1;
@@ -109,7 +114,7 @@
int end = start + pageSize;
if (end > tokenList.size())
end = tokenList.size();
- pushIOS(tokenList.subList(start, end), json);
+ pushIOS(tokenList.subList(start, end), json,certificate,certificatePassword);
}
}
@@ -117,14 +122,11 @@
return null;
}
- private static String pushIOS(List<String> deviceTokenList, JSONObject json) 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);
}
- InputStream certificate = IOSPushUtil.class.getClassLoader()
- .getResourceAsStream("certificate/pushCertificate.p12"); // 璇诲彇.p12鏂囦欢
- String certificatePassword = Constant.systemCommonConfig.getIosPushCertificatePwd();// 姝ゅ娉ㄦ剰瀵煎嚭鐨勮瘉涔﹀瘑鐮佷笉鑳戒负绌哄洜涓虹┖瀵嗙爜浼氭姤閿�
while (json.toString().getBytes().length > 256) {
// 棣栧厛鍓婂噺鍐呭锛岀劧鍚庡墛鍑忔爣棰�
String title = json.optJSONObject("aps").optJSONObject("alert").optString("title");
@@ -150,10 +152,10 @@
// true锛氳〃绀虹殑鏄骇鍝佺嚎涓婂彂甯冩帹閫佹湇鍔� false锛氳〃绀虹殑鏄骇鍝佹祴璇曟帹閫佹湇鍔�
if (Constant.IS_TEST)
pushManager.initializeConnection(
- new AppleNotificationServerBasicImpl(certificate, certificatePassword, false));
+ new AppleNotificationServerBasicImpl(certificate, certificatePWD, false));
else
pushManager
- .initializeConnection(new AppleNotificationServerBasicImpl(certificate, certificatePassword, true));
+ .initializeConnection(new AppleNotificationServerBasicImpl(certificate, certificatePWD, true));
List<Device> deviceList = new ArrayList<Device>();
for (String token : tokenList) {
@@ -217,7 +219,10 @@
* @throws Exception
*/
public static void executePushIOS(List<String> tokenList, JSONObject json) throws Exception {
- pushIOS(tokenList, json);
+ InputStream certificate = IOSPushUtil.class.getClassLoader()
+ .getResourceAsStream("certificate/pushCertificate.p12"); // 璇诲彇.p12鏂囦欢
+ String certificatePassword = Constant.systemCommonConfig.getIosPushCertificatePwd();
+ pushIOS(tokenList, json,certificate,certificatePassword);
}
/**
--
Gitblit v1.8.0