From ed05d0e27515d4fb054284e77af94c5d0ebed3c1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 03 Nov 2023 15:52:03 +0800
Subject: [PATCH] chore:推送接口提交

---
 screen-api/src/main/java/com/moral/api/controller/AppUserController.java |   42 +++++++++++++++++++++++++++++++-----------
 screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java         |    4 ++--
 screen-api/src/main/java/com/moral/api/vo/WxMssVo.java                   |    6 ++++--
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
index 444a080..b3091dc 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSON;
 import com.moral.api.service.UserService;
 
 import com.moral.api.utils.HttpClientUtil;
@@ -67,8 +68,8 @@
 
     @GetMapping("pushOneUser")
     @ApiOperation(value = "���������������������")
-    public  ResultMessage pushOneUser(String openid){
-        String body = push("oOCWi6yfVapaK25Jnkk7jKSbMLyw");
+    public  ResultMessage pushOneUser(){
+        String body = push("oOCWi6-_hnzSvrMT8HX5D7Dz7tEA");
         return ResultMessage.ok(body);
     }
 
@@ -76,20 +77,39 @@
     public String push(String openid) {
         RestTemplate restTemplate = new RestTemplate();
         //������������������������������������������������access_token������������������������������access_token������������������������������
+        //���������������
         String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + HttpClientUtil.getAccessToken();
+//        String url = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token=" + HttpClientUtil.getAccessToken();
+//        String url = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token=" + HttpClientUtil.getAccessToken();
+//        String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + HttpClientUtil.getAccessToken();
+          //���������������
+//        String url = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=" + HttpClientUtil.getAccessToken();
+
+
         //���������������������
         WxMssVo wxMssVo = new WxMssVo();
         wxMssVo.setTouser(openid);//���������openid���������������������������������������������������������������������
-        wxMssVo.setTemplate_id("sClgB85aEG1hgaiXpnJBopo5LJX6r91DUsyikOmUgv8");//������������������id
-        wxMssVo.setPage("pages/index/index");
+        wxMssVo.setTemplate_id("YNqUZ1MgMvwY3G-NENVbcmIBR5dUotSdnwcz96CWrho");//������������������id
+        wxMssVo.setLang("zh_CN");
+        wxMssVo.setMiniprogramState("formal");
+//        wxMssVo.setPage("pages/index/index");
 
-        Map<String, String> m = new HashMap<>(3);
-        m.put("time2", "2023-10-23");
-        m.put("thing3", "������");
-        m.put("thing7", "������������������");
-        m.put("character_string8", "������������������");
-        m.put("phrase10", "������������������");
-        wxMssVo.setData(m);
+        Map<String, Object> m = new HashMap<>();
+        HashMap<String, Object> map1 = new HashMap<>();
+        HashMap<String, Object> map2 = new HashMap<>();
+        HashMap<String, Object> map3 = new HashMap<>();
+        HashMap<String, Object> map4 = new HashMap<>();
+        map1.put("value","���������2");
+        map2.put("value","ouyanglun");
+        map3.put("value","���������1");
+        map4.put("value","2023-10-16");
+        m.put("thing18", map1);
+        m.put("character_string1", map2);
+        m.put("thing2", map3);
+        m.put("date4", map4);
+        wxMssVo.setData(JSON.toJSON(m));
+
+
         ResponseEntity<String> responseEntity =
                 restTemplate.postForEntity(url, wxMssVo, String.class);
         return responseEntity.getBody();
diff --git a/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java b/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java
index 198c652..d6fa1a0 100644
--- a/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java
+++ b/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java
@@ -143,8 +143,8 @@
     public static String getAccessToken() {
         RestTemplate restTemplate = new RestTemplate();
         Map<String, String> params = new HashMap<>();
-        params.put("APPID", "wx7c54942dfc87f4d8");  //
-        params.put("APPSECRET", "5873a729c365b65ab42bb5fc82d2ed49");  //
+        params.put("APPID", "wxf95fb77e0b1f8c09");  //
+        params.put("APPSECRET", "acf3be9facf7f26bb8286c9b4eff93d0");  //
         ResponseEntity<String> responseEntity = restTemplate.getForEntity(
                 "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={APPID}&secret={APPSECRET}", String.class, params);
         String body = responseEntity.getBody();
diff --git a/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
index 706aa87..2520ace 100644
--- a/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
+++ b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
@@ -8,6 +8,8 @@
 public class WxMssVo {
     private String touser;//������openid
     private String template_id;//������������������id
-    private String page = "pages/index/index";//���������������������������
-    private Map<String, String> data;//������������
+//    private String page = "pages/index/index";//���������������������������
+    private Object data;//������������
+    private  String miniprogramState;
+    private  String lang;
 }

--
Gitblit v1.8.0