Merge branch 'dev' into 'master'

Dev

See merge request !12

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

 package com.weface.component;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.ConvertException;
 import cn.hutool.core.lang.Snowflake;
@@ -104,7 +105,7 @@ public class MenuService {
                 }
                 return all;
             } else {
-                log.error("返回值内不包含需要解析的数据" + jsonObject.toJSONString());
+                log.error("看看生活:返回值内不包含需要解析的数据{}", jsonObject.toJSONString());
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -133,7 +134,7 @@ public class MenuService {
             JSONArray userTag = jsonObject.getJSONArray("userTag");
             return getUserTagByTag(userTag, 2, tags);
         } else {
-            log.error("返回值内不包含需要解析的数据" + jsonObject.toJSONString());
+            log.error("看看社保:返回值内不包含需要解析的数据{}", jsonObject.toJSONString());
         }
         return null;
     }
@@ -185,7 +186,7 @@ public class MenuService {
             }
 
             //如果调用的是看看生活的用户标签失败时,尝试调取看看社保用户标签
-            if (type == 1) {
+            if (type == 1 && CollUtil.isNotEmpty(gidList)) {
                 List<Map<String, Object>> sbTags = getSBTags(gidList, tags);
                 if (sbTags != null && sbTags.size() > 0) {
                     userTags.addAll(sbTags);

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

@@ -75,11 +75,10 @@ public class MessageTemplate implements Serializable {
     @AllArgsConstructor
     public static class PushMessage implements Serializable {
         private static final long serialVersionUID = 1L;
-
         //手机端通知展示时间段，格式为毫秒时间戳段，两个时间的时间差必须大于10分钟，例如："1590547347000-1590633747000"
         private String duration;
         //纯透传消息内容，安卓和iOS均支持，与notification、revoke 三选一，都填写时报错，长度 ≤ 3072
-        private String transmission;
+        private Transmission transmission;
         //消息模板
         private Notification notification;
         //撤回消息时使用(仅撤回个推通道消息)，与notification、transmission三选一，都填写时报错(消息撤回请勿填写策略参数)
@@ -109,6 +108,23 @@ public class MessageTemplate implements Serializable {
             private String thread_id;
         }
 
+        @Data
+        @NoArgsConstructor
+        @AllArgsConstructor
+        public static class Transmission {
+            private String title;
+            private String content;
+            private String url;
+            //0:h5 1:app原生
+            private String push_type;
+            //跳转功能名称
+            private String className;
+            //功能标题
+            private String classTitle;
+            //是否需要登录
+            private String needLogin;
+        }
+
         @Data
         public static class Revoke {
             private String old_task_id;

src/main/java/com/weface/controller/PushController.java

 package com.weface.controller;
 
 import com.weface.code.CommonResult;
+import com.weface.component.GeTuiUtils;
+import com.weface.dto.InformForm;
 import com.weface.dto.MsgDTO;
 import com.weface.dto.PushDTO;
 import com.weface.service.PushService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.groups.Default;
+
 /**
  * @author Administrator
  */
@@ -29,4 +34,9 @@ public class PushController {
     public CommonResult pushSingle(@RequestBody MsgDTO param) {
         return pushService.pushSingle(param);
     }
+
+    @PostMapping("/all")
+    public CommonResult pushAll(@Validated({Default.class}) InformForm informForm) {
+        return GeTuiUtils.listPush(informForm);
+    }
 }

src/main/java/com/weface/dto/InformForm.java

+package com.weface.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author : Administrator
+ */
+@Data
+public class InformForm {
+    //标题
+    @NotBlank
+    private String title;
+    //内容
+    @NotBlank
+    private String body;
+    //跳转url
+    private String url;
+    //推送类型 0:h5 1:原生
+    private String push_type;
+    //跳转功能名称
+    private String className;
+    //功能标题
+    private String classTitle;
+    //是否需要登录
+    private String needLogin;
+    //请求应用名称首字母小写 例:看看生活->kksh
+    @NotBlank
+    private String equipmentType;
+    //推送设备 4 android 1: ios
+    private Integer device;
+    //定速推送，例如100，个推控制下发速度在100条/秒左右，0表示不限速
+    private Integer speed;
+
+}

src/main/resources/application.yml

@@ -64,4 +64,4 @@ gexiang:
     maxIdle: 50
     minIdle: 10
   user_tag_id: 251696
-  push_max_size: 10000
+  push_max_size: 80000

src/test/java/com/weface/PushMessageApplicationTests.java

 package com.weface;
 
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.http.HtmlUtil;
+import com.weface.code.CommonResult;
 import com.weface.component.GeTuiUtils;
 import com.weface.component.MenuService;
 import com.weface.component.MessageTemplate;
+import com.weface.dto.InformForm;
 import com.weface.entity.MenuTagsEntity;
 import com.weface.entity.UserTagEntity;
 import com.weface.entity.UserMenusEntity;
@@ -15,7 +19,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -87,30 +93,56 @@ class PushMessageApplicationTests {
     }
 
     @Test
-    void testConventTemplate() {
-        //String[] alias = {"kksh_10255318"};
-        //String[] alias = {"kksh_10131492"};
-        String[] alias = {"kksh_59354"};
-        String token = GeTuiUtils.getAuthToken("kk_sh_token_ge_tui");
+    void testConventTemplate() throws UnsupportedEncodingException {
+        InformForm informForm = new InformForm();
+
+        String[] alias = {"kksh_10131492"};
+//        String[] alias = {"kksh_59354"};
+
+//        String token = GeTuiUtils.getAuthToken("kk_sh_token_ge_tui");
+        String token = GeTuiUtils.getAuthToken("kk_sb_token_ge_tui");
+
+        informForm.setTitle("河南一名小学生确诊阳性！");
+        informForm.setBody("1月23日新增一例本土确诊病例！为11岁小学生");
+        informForm.setUrl("https://kk.weface.com.cn/news/page/?id=c0933d0e2fc85f7333b6202dff0e611c&type=hot&from=101");
+
         MessageTemplate messageTemplate = new MessageTemplate();
+        messageTemplate.setAudience(new MessageTemplate.Audience(alias));
 
-        MessageTemplate.Settings settings = new MessageTemplate.Settings();
-        settings.setTtl(3600000);
-        messageTemplate.setSettings(settings);
+        messageTemplate.setSettings(new MessageTemplate.Settings(3600000, 0));
 
         MessageTemplate.PushMessage pushMessage = new MessageTemplate.PushMessage();
-        MessageTemplate.PushMessage.Notification notification = new MessageTemplate.PushMessage.Notification();
-        notification.setTitle("看看生活提醒");
-        notification.setBody("看看生活->让领钱更简单");
-        notification.setClick_type("url");
-        notification.setUrl("https://www.baidu.com/");
-        notification.setChannel_level(4);
-        pushMessage.setNotification(notification);
+
+        MessageTemplate.PushMessage.Transmission transmission = new MessageTemplate.PushMessage.Transmission();
+        transmission.setTitle(informForm.getTitle());
+        transmission.setContent(informForm.getBody());
+        transmission.setUrl(informForm.getUrl());
+
+        pushMessage.setTransmission(transmission);
+
         messageTemplate.setPush_message(pushMessage);
-        String s = GeTuiUtils.singlePushAlias(alias, messageTemplate, token);
+//        String s = GeTuiUtils.singlePushAlias(4, messageTemplate, GeTuiUtils.KK_SH_APP_ID, token);
+        String s = GeTuiUtils.singlePushAlias(1, messageTemplate, GeTuiUtils.KK_SB_APP_ID, token);
         System.out.println(s);
+    }
 
 
+    @Test
+    void testRevoke() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("request_id", String.valueOf(IdUtil.getSnowflake(1, 1).nextId()));
+        map.put("audience", "all");
+
+        Map<String, Object> push_message = new HashMap<>();
+        HashMap<String, Object> revoke = new HashMap<>();
+        revoke.put("old_task_id", "RASA_0127_011f801354c5236738787cdda86cf232");
+        revoke.put("force", false);
+        push_message.put("revoke", revoke);
+        map.put("push_message", push_message);
+        String url = GeTuiUtils.GE_TUI_BASE_URL + GeTuiUtils.KK_SH_APP_ID + "/push/all";
+        String kk_sh_token_ge_tui = GeTuiUtils.getAuthToken("kk_sh_token_ge_tui");
+        String s = GeTuiUtils.generalPost(url, kk_sh_token_ge_tui, map);
+        System.out.println(s);
     }
 
 }