Merge branch 'master' of https://github.com/easy-swoole/wechat

Author: EZ

src/MiniProgram/MiniProgram.php

@@ -17,6 +17,7 @@ class MiniProgram
     private $accessToken;
     private $qrCode;
     private $templateMsg;
+    private $subscribeMsg;
 
     public function __construct(MiniProgramConfig $config = null)
     {
@@ -105,4 +106,16 @@ public function templateMsg(): TemplateMsg
 
         return $this->templateMsg;
     }
+
+    /**
+     * @return SubscribeMsg
+     */
+    public function subscribeMsg():SubscribeMsg
+    {
+        if (!isset($this->subscribeMsg)) {
+            $this->subscribeMsg = new SubscribeMsg($this);
+        }
+
+        return $this->subscribeMsg;
+    }
 }

src/MiniProgram/SubscribeMsg.php

@@ -23,7 +23,7 @@ class SubscribeMsg extends MinProgramBase
      */
     public function getCategory()
     {
-        $token = $this->miniProgram()->accessToken()->getToken();
+        $token = $this->getMiniProgram()->accessToken()->getToken();
         $url = ApiUrl::generateURL(ApiUrl::GET_CATEGORY, [
             'ACCESS_TOKEN' => $token
         ]);
@@ -45,7 +45,7 @@ public function getCategory()
      */
     public function getPubTemplateTitleList(array $data)
     {
-        $token = $this->miniProgram()->accessToken()->getToken();
+        $token = $this->getMiniProgram()->accessToken()->getToken();
         $url = ApiUrl::generateURL(ApiUrl::GET_PUB_TEMPLATE_TITLES, [
             'ACCESS_TOKEN' => $token
         ]);
@@ -67,7 +67,7 @@ public function getPubTemplateTitleList(array $data)
      */
     public function getPubTemplateKeyWordsById(array $data)
     {
-        $token = $this->miniProgram()->accessToken()->getToken();
+        $token = $this->getMiniProgram()->accessToken()->getToken();
         $url = ApiUrl::generateURL(ApiUrl::GET_PUB_TEMPLATE_KEYWORDS, [
             'ACCESS_TOKEN' => $token
         ]);
@@ -88,7 +88,7 @@ public function getPubTemplateKeyWordsById(array $data)
      */
     public function deleteTemplate(string $priTmplId)
     {
-        $token = $this->miniProgram()->accessToken()->getToken();
+        $token = $this->getMiniProgram()->accessToken()->getToken();
         $url = ApiUrl::generateURL(ApiUrl::DEL_TEMPLATE, [
             'ACCESS_TOKEN' => $token
         ]);
@@ -109,7 +109,7 @@ public function deleteTemplate(string $priTmplId)
      */
     public function addTemplate(array $data)
     {
-        $token = $this->miniProgram()->accessToken()->getToken();
+        $token = $this->getMiniProgram()->accessToken()->getToken();
         $url = ApiUrl::generateURL(ApiUrl::ADD_TEMPLATE, [
             'ACCESS_TOKEN' => $token
         ]);
@@ -130,7 +130,7 @@ public function addTemplate(array $data)
      */
     public function getTemplateList()
     {
-        $token = $this->miniProgram()->accessToken()->getToken();
+        $token = $this->getMiniProgram()->accessToken()->getToken();
         $url = ApiUrl::generateURL(ApiUrl::GET_TEMPLATE, [
             'ACCESS_TOKEN' => $token
         ]);
@@ -152,7 +152,7 @@ public function getTemplateList()
      */
     public function sendMsg(array $data)
     {
-        $token = $this->miniProgram()->accessToken()->getToken();
+        $token = $this->getMiniProgram()->accessToken()->getToken();
         $url = ApiUrl::generateURL(ApiUrl::SUBSCRIBE_SEND, [
             'ACCESS_TOKEN' => $token
         ]);