From 6d821cbdf527a4b3ee2e93f8d625ecade86ba45b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:23:18 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 6412692..af963df 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
@@ -58,8 +58,8 @@
public static String allPushIOS(List<String> deviceTokenList, MessageInfo info, String url, int type)
throws Exception {
- if (Constant.IS_TEST)
- return null;
+ // if (Constant.IS_TEST)
+ // return null;
Gson gson = new Gson();
PushLogHelper.iosInfo("IOS鎺ㄩ�佽澶囨暟涓�:" + deviceTokenList.size());
@@ -97,9 +97,10 @@
throw new Exception("鑾峰彇鐭摼鍑洪敊");
json = IOSPushFactory.createWEEXPush(shortUrl, info.getTitle(), info.getContent());
} else if (type == PushTypeEnum.baichuan.getCode()) {
- String shortUrl = HttpUtil.getShortLink(url);
- if (StringUtil.isNullOrEmpty(shortUrl))
- throw new Exception("鑾峰彇鐭摼鍑洪敊");
+ String shortUrl = url;
+ // HttpUtil.getShortLink(url);
+ // if (StringUtil.isNullOrEmpty(shortUrl))
+ // throw new Exception("鑾峰彇鐭摼鍑洪敊");
json = IOSPushFactory.createBaiChuanPush(shortUrl, info.getTitle(), info.getContent());
} else if (type == PushTypeEnum.welfare.getCode()) {
json = IOSPushFactory.createWelfarePush(info.getTitle(), info.getContent());
--
Gitblit v1.8.0