From e2f5b6031a7d3a46ba59dd470f54f3d2aa3f5d4f Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Thu, 30 Sep 2021 10:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=EF=BC=8C=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/WechatMPMessageServiceImpl.java  | 16 ++++++++++++----
 .../serviceimpl/WechatMessageServiceImpl.java    | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
index f9e9fee5..4cc3690a 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,8 +35,8 @@ import java.util.Map;
  * @author Chopper
  */
 @Service
+@Slf4j
 @Transactional(rollbackFor = Exception.class)
-
 public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMapper, WechatMPMessage> implements WechatMPMessageService {
     @Autowired
     private WechatAccessTokenUtil wechatAccessTokenUtil;
@@ -52,6 +53,9 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
      * post 删除模版 添加模版 获取模版id
      */
     private final String delMsgTpl = "https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate?access_token=";
+    /**
+     * post 添加模版
+     */
     private final String addTpl = "https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate?access_token=";
 
     @Override
@@ -61,6 +65,8 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
             String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
             //获取已有模版，删除
             String context = HttpUtil.get(allMsgTpl + accessToken);
+
+            log.info("获取全部模版：{}", context);
             JSONObject jsonObject = new JSONObject(context);
             WechatMessageUtil.wechatHandler(jsonObject);
             List<String> oldList = new ArrayList<>();
@@ -73,7 +79,8 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
                 oldList.forEach(templateId -> {
                     Map<String, Object> params = new HashMap<>(1);
                     params.put("priTmplId", templateId);
-                    WechatMessageUtil.wechatHandler(HttpUtil.post(delMsgTpl + accessToken, params));
+                    String message = WechatMessageUtil.wechatHandler(HttpUtil.post(delMsgTpl + accessToken, params));
+                    log.info("删除模版响应：{}", message);
                 });
             }
 
@@ -89,7 +96,7 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
                 JSONArray jsonArray = new JSONObject(keywordsItems).getJSONArray("data");
                 List<WechatMessageKeyword> keywordArray = jsonArray.toList(WechatMessageKeyword.class);
 
-                log.error("keywords:" + keywordArray);
+                log.info("keywords:" + keywordArray);
                 //存放约定好的kids
                 List<String> kids = new ArrayList<>(tplData.keyWord.size());
                 List<String> kidTexts = new ArrayList<>(tplData.keyWord.size());
@@ -110,8 +117,9 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
                 params.put("tid", tplData.getTid());
                 params.put("kidList", kids);
                 params.put("sceneDesc", tplData.getSceneDesc());
+                log.info("添加模版参数:{}", JSONUtil.toJsonStr(params));
                 String content = HttpUtils.doPostWithJson(addTpl + accessToken, params);
-                log.error(JSONUtil.toJsonStr(params));
+                log.info("添加模版响应:{}", content);
                 JSONObject tplContent = new JSONObject(content);
                 WechatMessageUtil.wechatHandler(tplContent);
 
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
index 86163771..d716ee09 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +34,7 @@ import java.util.Map;
  * @author Chopper
  */
 @Service
+@Slf4j
 @Transactional(rollbackFor = Exception.class)
 public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, WechatMessage> implements WechatMessageService {
 
@@ -51,6 +53,9 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
      * post 删除模版 添加模版 获取模版id
      */
     private final String delMsgTpl = "https://api.weixin.qq.com/cgi-bin/template/del_private_template?access_token=";
+    /**
+     * post 添加模版
+     */
     private final String addTpl = "https://api.weixin.qq.com/cgi-bin/template/api_add_template?access_token=";
 
     @Override
@@ -70,9 +75,13 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
             setIndustryParams.put("industry_id2", 5);
             String context = HttpUtils.doPostWithJson(setIndustry + accessToken, setIndustryParams);
 
+            log.info("设置行业：{}", context);
             //获取已有模版，删除
             context = HttpUtil.get(allMsgTpl + accessToken);
             JSONObject jsonObject = new JSONObject(context);
+
+
+            log.info("获取全部模版：{}", context);
             WechatMessageUtil.wechatHandler(jsonObject);
             List<String> oldList = new ArrayList<>();
             if (jsonObject.containsKey("template_list")) {
@@ -84,7 +93,8 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
                 oldList.forEach(templateId -> {
                     Map<String, Object> params = new HashMap<>(1);
                     params.put("template_id", templateId);
-                    WechatMessageUtil.wechatHandler(HttpUtil.post(delMsgTpl + accessToken, params));
+                    String message = WechatMessageUtil.wechatHandler(HttpUtil.post(delMsgTpl + accessToken, params));
+                    log.info("删除模版响应：{}", message);
                 });
             }
 
@@ -95,6 +105,8 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
                 Map<String, Object> params = new HashMap<>(1);
                 params.put("template_id_short", tplData.getMsgId());
                 String content = HttpUtils.doPostWithJson(addTpl + accessToken, params);
+                log.info("添加模版响应：{}", content);
+
                 JSONObject tplContent = new JSONObject(content);
                 WechatMessageUtil.wechatHandler(tplContent);