1,群推参数从配置文件中取

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

@@ -14,6 +14,7 @@ import com.weface.entity.UserTagEntity;
 import com.weface.entity.UserMenusEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
@@ -26,6 +27,8 @@ import java.util.*;
 @Component
 public class MenuService {
 
+    @Autowired
+    private GeTuiService geTuiService;
 
     /**
      * 从map中解析标签并收集关系表数据
@@ -88,9 +91,9 @@ public class MenuService {
         //获取token
         String kk_sh_token = "kk_sh_token";
         try {
-            String authToken = GeTuiUtils.getAuthToken(kk_sh_token);
+            String authToken = geTuiService.getAuthToken(kk_sh_token);
             //将token以及用户ID封装调用画像查询接口
-            String result = GeTuiUtils.queryTagKKSH(gidList, authToken);
+            String result = geTuiService.queryTagKKSH(gidList, authToken);
             JSONObject jsonObject = JSONObject.parseObject(result);
             //判断返回json内是否包含要解析的userTag
             if (jsonObject.containsKey("userTag")) {
@@ -125,9 +128,9 @@ public class MenuService {
     private List<Map<String, Object>> getSBTags(List<String> gidList, List<MenuTagsEntity> tags) throws Exception {
         String kk_sb_token = "kk_sb_token";
         //获取token
-        String authToken = GeTuiUtils.getAuthToken(kk_sb_token);
+        String authToken = geTuiService.getAuthToken(kk_sb_token);
         //将token以及用户ID封装调用画像查询接口
-        String result = GeTuiUtils.queryTagKKSB(gidList, authToken);
+        String result = geTuiService.queryTagKKSB(gidList, authToken);
         JSONObject jsonObject = JSONObject.parseObject(result);
         //判断返回json内是否包含要解析的userTag
         if (jsonObject.containsKey("userTag")) {

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.component.GeTuiService;
 import com.weface.dto.InformForm;
 import com.weface.dto.MsgDTO;
 import com.weface.dto.PushDTO;
@@ -24,6 +24,9 @@ public class PushController {
 
     @Autowired
     private PushService pushService;
+    @Autowired
+    private GeTuiService geTuiService;
+
 
     @PostMapping("list")
     public CommonResult pushList(@RequestBody PushDTO param) throws Exception {
@@ -37,6 +40,6 @@ public class PushController {
 
     @PostMapping("/all")
     public CommonResult pushAll(@Validated({Default.class}) InformForm informForm) {
-        return GeTuiUtils.listPush(informForm);
+        return geTuiService.listPush(informForm);
     }
 }

src/main/resources/application.yml

@@ -32,7 +32,8 @@ getui:
   apps: {
     kkwj: { appkey: "vIBAFNAEk88qekbfS3miE8",mastersecret: "JojRk0duJd6oXiHIyFPqj",appId: "LhnWI1t7hc7ABsYbWokXD6",baseUrl: "http://api.getui.com/apiex.htm" },
     kkmz: { appkey: "ywXeatlN0k5vDkHDQCqb87",mastersecret: "Jt4Rj3b3YA6qJkOmkN8HG3",appId: "739bQ9FSze62zjgXsZtAF4",baseUrl: "http://api.getui.com/apiex.htm" },
-    kksh: { appkey: "rdLx5zumRK7oEme8MheAh8",mastersecret: "mekLZ4frLu7RHtKsN9mQn",appId: "CYol79N33N71BV6dcjrqj3",baseUrl: "http://api.getui.com/apiex.htm" }
+    kksh: { appkey: "rdLx5zumRK7oEme8MheAh8",mastersecret: "mekLZ4frLu7RHtKsN9mQn",appId: "CYol79N33N71BV6dcjrqj3",baseUrl: "http://api.getui.com/apiex.htm" },
+    kksb: { appkey: "2tLtJhcpij7lu3ksutgpU3",mastersecret: "b8MSgB7j8PAImc3eN0yuL9",appId: "Ued41NRq7j9Nh1qI81gQ54",baseUrl: "http://api.getui.com/apiex.htm" }
   }
 
 #mybatis

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

@@ -2,11 +2,10 @@ 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.GeTuiService;
 import com.weface.component.MenuService;
 import com.weface.component.MessageTemplate;
+import com.weface.config.GeTuiApp;
 import com.weface.dto.InformForm;
 import com.weface.entity.MenuTagsEntity;
 import com.weface.entity.UserTagEntity;
@@ -19,6 +18,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -40,6 +40,12 @@ class PushMessageApplicationTests {
     @Autowired
     private MenuTagsService menuTagsService;
 
+    @Autowired
+    private GeTuiService geTuiService;
+
+    @Resource
+    private GeTuiApp geTuiApp;
+
     @Test
     void contextLoads() {
     }
@@ -96,11 +102,11 @@ class PushMessageApplicationTests {
     void testConventTemplate() throws UnsupportedEncodingException {
         InformForm informForm = new InformForm();
 
-        String[] alias = {"kksh_10131492"};
-//        String[] alias = {"kksh_59354"};
+//        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");
+        String token = geTuiService.getAuthToken("kk_sh_token_ge_tui");
+//        String token = geTuiService.getAuthToken("kk_sb_token_ge_tui");
 
         informForm.setTitle("河南一名小学生确诊阳性！");
         informForm.setBody("1月23日新增一例本土确诊病例！为11岁小学生");
@@ -121,8 +127,8 @@ class PushMessageApplicationTests {
         pushMessage.setTransmission(transmission);
 
         messageTemplate.setPush_message(pushMessage);
-//        String s = GeTuiUtils.singlePushAlias(4, messageTemplate, GeTuiUtils.KK_SH_APP_ID, token);
-        String s = GeTuiUtils.singlePushAlias(1, messageTemplate, GeTuiUtils.KK_SB_APP_ID, token);
+        String s = geTuiService.singlePushAlias(4, messageTemplate, geTuiService.getAppId("kksh"), token);
+//        String s = geTuiService.singlePushAlias(1, messageTemplate, geTuiService.getAppId("kksb"), token);
         System.out.println(s);
     }
 
@@ -139,9 +145,9 @@ class PushMessageApplicationTests {
         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);
+        String url = GeTuiService.GE_TUI_BASE_URL + geTuiService.getAppId("kksh") + "/push/all";
+        String kk_sh_token_ge_tui = geTuiService.getAuthToken("kk_sh_token_ge_tui");
+        String s = geTuiService.generalPost(url, kk_sh_token_ge_tui, map);
         System.out.println(s);
     }