Merge remote-tracking branch 'origin/master'

src/main/java/com/ycwl/basic/service/impl/mobile/WxNotifyServiceImpl.java

@@ -43,7 +43,7 @@ public class WxNotifyServiceImpl implements WxNotifyService {
     /**
      * 缓存accessToken
      */
-    private Map<String, AccessTokenCacheEntity> cacheAccessTokenMap = new ConcurrentHashMap<>();
+    private final Map<String, AccessTokenCacheEntity> cacheAccessTokenMap = new ConcurrentHashMap<>();
 
     @Override
     public String getAccessToken() {
@@ -87,7 +87,7 @@ public class WxNotifyServiceImpl implements WxNotifyService {
         // 拼接推送的模板
         WechatMssVO wxMssVO = new WechatMssVO();
         wxMssVO.setTouser(info.getOpenId());    // 用户的openId
-        wxMssVO.setTemplate_id(wechatConfig.getTemplateId());    // 订阅消息模板id
+        wxMssVO.setTemplate_id(info.getTemplateId());    // 订阅消息模板id
         wxMssVO.setLang(info.getLang());     // 语言类型
         wxMssVO.setMiniprogram_state(info.getMiniprogram_state());   // 跳转小程序类型
         wxMssVO.setPage(info.getPage());