Merge remote-tracking branch 'origin/master'

Administrator

2018-11-30 114685cc870d0e00dc157656ae9039f285d3f5f1

 fanli/src/main/java/com/yeshi/fanli/util/factory/IOSPushFactory.java

@@ -15,7 +15,7 @@
            String body = json.optJSONObject("aps").optJSONObject("alert").optString("body");

            if (StringUtil.isNullOrEmpty(body) || body.length() < 4) {

               // 削减标题

               if (!StringUtil.isNullOrEmpty(title) && body.length() > 6) {

               if (!StringUtil.isNullOrEmpty(title) && title.length() > 6) {

                  json.optJSONObject("aps").optJSONObject("alert").put("title",

                        title.substring(0, title.length() - 1));

                  continue;