Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 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());