From 61d5e010c957c76f4d8c6f63d1744e15e0fd1eb5 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 10 Aug 2020 15:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8Ftoken=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/co/yixiang/mp/bean/WxMaLiveInfo.java    | 11 +++++++++++
 .../java/co/yixiang/mp/config/WxMaConfiguration.java  |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/bean/WxMaLiveInfo.java b/yshop-weixin/src/main/java/co/yixiang/mp/bean/WxMaLiveInfo.java
index a141934b..45eb617f 100644
--- a/yshop-weixin/src/main/java/co/yixiang/mp/bean/WxMaLiveInfo.java
+++ b/yshop-weixin/src/main/java/co/yixiang/mp/bean/WxMaLiveInfo.java
@@ -17,8 +17,19 @@ public class WxMaLiveInfo implements Serializable {
     @Data
     public static class RoomInfo implements Serializable {
         private static final long serialVersionUID = 7745775280267417154L;
+        /**
+         * 直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符
+         */
         private String name;
+        /**
+         * 直播房间id
+         */
         private Integer roomid;
+        /**
+         * 背景图，填入mediaID（mediaID获取后，三天内有效）；图片mediaID的获取，
+         * 请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html；
+         * 直播间背景图，图片规则：建议像素1080*1920，大小不超过2M
+         */
         private String coverImg;
         private String shareImg;
         private Integer liveStatus;
diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMaConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMaConfiguration.java
index 2534bcaf..73c07ed7 100644
--- a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMaConfiguration.java
+++ b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMaConfiguration.java
@@ -12,6 +12,8 @@ import co.yixiang.utils.ShopKeyUtils;
 import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
 import java.util.Map;
 
 /**
@@ -42,12 +44,13 @@ public class WxMaConfiguration {
             config.setSecret(RedisUtil.get(ShopKeyUtils.getWxAppSecret()));
             config.setToken(RedisUtil.get(ShopKeyUtils.getWechatMaToken()));
             config.setAesKey(RedisUtil.get(ShopKeyUtils.getWechatMaEncodingAESKey()));
-            WxMaService service = new WxMaServiceImpl();
+            wxMaService = new WxMaServiceImpl();
+            wxMaService.setWxMaConfig(config);
             maServices.put(ShopKeyUtils.getYshopWeiXinMaSevice(), wxMaService);
             routers.put(ShopKeyUtils.getYshopWeiXinMaSevice(), newRouter(wxMaService));
             //增加标识
             redisUtils.set(ShopKeyUtils.getYshopWeiXinMaSevice(),"yshop");
-            service.setWxMaConfig(config);
+
         }
         return wxMaService;
     }