Merge pull request #121 from wonder-game/develop

修复Tencent邮件发送功能
wonder-game · Jul 25, 2024 · 4054d04 · 4054d04
2 parents 341e0e5 + 78bf384
commit 4054d04
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/Common/CloudLib/Email/Base.php b/src/Common/CloudLib/Email/Base.php
@@ -2,7 +2,9 @@
 
 namespace WonderGame\EsUtility\Common\CloudLib\Email;
 
-abstract class Base implements EmailInterface
+use EasySwoole\Spl\SplBean;
+
+abstract class Base  extends SplBean implements EmailInterface
 {
 
 }
diff --git a/src/Common/CloudLib/Email/Tencent.php b/src/Common/CloudLib/Email/Tencent.php
@@ -24,13 +24,13 @@ class Tencent extends Base
 
     protected $subject = '';
 
-    protected $templateID = '';
+    protected $templateId = '';
 
     /**
      * 收件人
      * @var string
      */
-    protected $destination = '';
+    protected $destination = [];
 
     /**
      * 模板变量
@@ -42,25 +42,29 @@ class Tencent extends Base
      * 地域：
      * @document https://cloud.tencent.com/document/api/213/15692#.E5.9C.B0.E5.9F.9F.E5.88.97.E8.A1.A8
      * 要顺便检查下该地域的推送域名是否存在,格式为 ses.[region].tencentcloudapi.com
-     * @document https://cloud.tencent.com/document/api/1288/51055
+     * @document https://cloud.tencent.com/document/api/1288/51034
      * @var string
      */
     protected $region = '';
 
     public function send($to = [], array $params = [], bool $ingo = false)
     {
+        $type = $params['type'];
         $parentId = $ingo ? ($params['parentId'] ?: '') : null;
-        unset($params['parentId']);
+        unset($params['type'], $params['parentId']);
+
+        settype($to, 'array');
 
         try {
             $Request = new SendEmailRequest();
             $Request->fromJsonString(json_encode([
                 'FromEmailAddress' => $this->fromEmailAddress,
-                'Destination' => $this->destination,
+                'Destination' => $to ?: $this->destination,
                 'Subject' => $this->subject,
                 'Template' => [
-                    'TemplateID' => intval($this->templateID),
-                    'TemplateData' => $this->templateData,
+                    // 腾讯云的此参数要求为int
+                    'TemplateID' => (int)is_array($this->templateId) ? ($this->templateId[$type] ?? $this->templateId['-1']) : $this->templateId,
+                    'TemplateData' => json_encode($params),
                 ],
             ]));