Merge pull request #65 from lienze741/1.2.x

修改发送模板消息的小程序appid非微信appid和修正微信推送事件msgid有大写和小写不一致问题

Author: kiss291323003

src/Bean/OfficialAccount/RequestMsg.php

@@ -22,6 +22,7 @@ class RequestMsg extends SplBean
     protected $MsgType;
     protected $Content;
     protected $MsgId;
+    protected $MsgID;
     protected $Event;
     protected $EventKey;
     protected $Ticket;
@@ -125,7 +126,15 @@ public function setContent($Content): void
      */
     public function getMsgId()
     {
-        return $this->MsgId;
+        if (!empty($this->MsgId)) {
+            return $this->MsgId;
+        }
+
+        if (!empty($this->MsgID)) {
+            return $this->MsgID;
+        }
+
+        return null;
     }
 
     /**

src/OfficialAccount/TemplateMsg.php

@@ -26,7 +26,6 @@ public function send(MsgBean $templateMsg) : bool
             'ACCESS_TOKEN'=> $this->getOfficialAccount()->accessToken()->getToken()
         ]);
 
-        $templateMsg->setAppid($this->getOfficialAccount()->getConfig()->getAppId());
         $response = NetWork::postJsonForJson($url, $templateMsg->getSendMessage());
         $this->hasException($response);
         return true;