Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-common/src/main/java/cn.com.ty.lift.common/model/PushMessage.java

@@ -521,11 +521,11 @@ public class PushMessage implements Serializable {
     }
 
     /**
-     * list超过1000, 分批推送
+     * 同时推送到android和ios的指定设备token
      *
      * @param jmsMessagingTemplate jms
-     * @param toAndroid            android
-     * @param toIos                ios
+     * @param toAndroid            推到安卓平台的Token列表
+     * @param toIos                推到ios平台的Token列表
      */
     public boolean sendTokenOnPlatform(JmsMessagingTemplate jmsMessagingTemplate, ArrayList<String> toAndroid, ArrayList<String> toIos) {
         try {
@@ -545,6 +545,11 @@ public class PushMessage implements Serializable {
         }
     }
 
+    /**
+     * 同时推送android和ios全平台
+     *
+     * @param jmsMessagingTemplate jms
+     */
     public boolean sendAllOnPlatform(JmsMessagingTemplate jmsMessagingTemplate) {
         try {
             jmsMessagingTemplate.send(ValuePool.QUEUE_ANDROID_ALL, new GenericMessage<>(this));
@@ -556,6 +561,12 @@ public class PushMessage implements Serializable {
         }
     }
 
+    /**
+     * 只推送到android平台的指定设备token
+     *
+     * @param jmsMessagingTemplate jms
+     * @param toList               推到安卓平台的设备token
+     */
     public boolean sendTokenOnAndroid(JmsMessagingTemplate jmsMessagingTemplate, ArrayList<String> toList) {
         try {
             if (IterUtil.isEmpty(toList)) {
@@ -570,6 +581,12 @@ public class PushMessage implements Serializable {
         }
     }
 
+    /**
+     * 只推送到ios的指定设备token
+     * @param jmsMessagingTemplate
+     * @param toList ios设备token
+     * @return
+     */
     public boolean sendTokenOnIos(JmsMessagingTemplate jmsMessagingTemplate, ArrayList<String> toList) {
         try {
             if (IterUtil.isEmpty(toList)) {

lift-push/src/main/java/cn/com/ty/lift/push/app/XingePush.java

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 /**
  * 腾讯信鸽推动 https://xg.qq.com/docs/server_api/v3/push_api_v3.html
@@ -64,7 +65,7 @@ public class XingePush {
      */
     private boolean pushMessage(RequestBuilder requestBuilder) {
         PushAppRequest pushAppRequest = requestBuilder.createPushAppRequest();
-        if(pushAppRequest == null){
+        if(Objects.isNull(pushAppRequest)){
             return false;
         }
         String request = pushAppRequest.toString();
@@ -89,7 +90,7 @@ public class XingePush {
         log.info("Pushing PushAppRequest: {}", request);
         try {
             JSONObject pushApp = xingeApp.pushApp(request);
-            if (null == pushApp) {
+            if (Objects.isNull(pushApp)) {
                 return false;
             }
             log.info("Push complete and response: {}", pushApp.toString());