Merge branch 'bug' into 'master'

1,推送类型加上联合推送

See merge request !31

src/main/java/com/weface/component/MobPushService.java

@@ -361,8 +361,10 @@ public class MobPushService {
         int push;
         if (pushType == null || pushType == 0) {
             push = 0;
-        } else {
+        } else if (pushType == 1) {
             push = 2;
+        } else {
+            push = pushType;
         }
         List<Map<String, Object>> list = new ArrayList<>(2);
         //设置包名

src/main/java/com/weface/serviceimpl/PushLogServiceImpl.java

@@ -82,9 +82,6 @@ public class PushLogServiceImpl extends ServiceImpl<PushLogDao, PushLogEntity> i
             taskId = taskId.substring(0, 200);
         }
         pushLogEntity.setTaskId(taskId);
-        if (StringUtils.isNotEmpty(result) && result.length() > 200) {
-            result = result.substring(0, 200);
-        }
         pushLogEntity.setResult(result);
         String phone = informForm.getPhone();
         if (StringUtils.isNotEmpty(phone)) {
@@ -109,15 +106,9 @@ public class PushLogServiceImpl extends ServiceImpl<PushLogDao, PushLogEntity> i
         }
         pushLogEntity.setPushTarget(pushTarget);
         String body = informForm.getBody();
-        if (StringUtils.isNotEmpty(body) && body.length() > 200) {
-            body = body.substring(0, 200);
-        }
         pushLogEntity.setPushContent(body);
         pushLogEntity.setArriveStatus(1001);
         String jsonStr = JSONUtil.toJsonStr(informForm);
-        if (jsonStr.length() > 200) {
-            jsonStr = jsonStr.substring(0, 200);
-        }
         pushLogEntity.setBas1(jsonStr);
         pushLogEntity.setUpdateTime(new Date());
         return pushLogEntity;