增加动态sender配置

Author: Kooooooma

src/MailBean.php

@@ -51,11 +51,16 @@ class MailBean
      */
     public $attachments;
 
+    /**
+     * Array 当前邮件发送时的 sender 配置信息
+     */
+    public $senderConfig;
+
     public function __construct(Array $mailInfo = array())
     {
-        if ( !empty($mailInfo) ) {
+        if (!empty($mailInfo)) {
             $rf = new \ReflectionObject($this);
-            foreach ( $mailInfo as $propName => $value ) {
+            foreach ($mailInfo as $propName => $value) {
                 $property = $rf->getProperty($propName);
                 $property->setValue($this, $value);
             }
@@ -136,13 +141,13 @@ public function getCC()
 
     public function setCC($cc)
     {
-        if ( is_string($cc) ) {
+        if (is_string($cc)) {
             $this->cc[$cc] = '';
-        } else if ( is_array($cc) ) {
-            foreach ( $cc as $key => $val ) {
-                if ( is_numeric($key) ) {
+        } else if (is_array($cc)) {
+            foreach ($cc as $key => $val) {
+                if (is_numeric($key)) {
                     $this->cc[$val] = '';
-                } else if ( is_string($key) ) {
+                } else if (is_string($key)) {
                     $this->cc[$key] = $val;
                 }
             }
@@ -158,13 +163,13 @@ public function getBCC()
 
     public function setBCC($bcc)
     {
-        if ( is_string($bcc) ) {
+        if (is_string($bcc)) {
             $this->bcc[$bcc] = '';
-        } else if ( is_array($bcc) ) {
-            foreach ( $bcc as $key => $val ) {
-                if ( is_numeric($key) ) {
+        } else if (is_array($bcc)) {
+            foreach ($bcc as $key => $val) {
+                if (is_numeric($key)) {
                     $this->bcc[$val] = '';
-                } else if ( is_string($key) ) {
+                } else if (is_string($key)) {
                     $this->bcc[$key] = $val;
                 }
             }
@@ -180,13 +185,13 @@ public function getTo()
 
     public function setTo($to)
     {
-        if ( is_string($to) ) {
+        if (is_string($to)) {
             $this->to[$to] = '';
-        } else if ( is_array($to) ) {
-            foreach ( $to as $key => $val ) {
-                if ( is_numeric($key) ) {
+        } else if (is_array($to)) {
+            foreach ($to as $key => $val) {
+                if (is_numeric($key)) {
                     $this->to[$val] = '';
-                } else if ( is_string($key) ) {
+                } else if (is_string($key)) {
                     $this->to[$key] = $val;
                 }
             }
@@ -202,13 +207,13 @@ public function getReplyTo()
 
     public function setReplyTo($replyTo)
     {
-        if ( is_string($replyTo) ) {
+        if (is_string($replyTo)) {
             $this->replyTo[$replyTo] = '';
-        } else if ( is_array($replyTo) ) {
-            foreach ( $replyTo as $key => $val ) {
-                if ( is_numeric($key) ) {
+        } else if (is_array($replyTo)) {
+            foreach ($replyTo as $key => $val) {
+                if (is_numeric($key)) {
                     $this->replyTo[$val] = '';
-                } else if ( is_string($key) ) {
+                } else if (is_string($key)) {
                     $this->replyTo[$key] = $val;
                 }
             }
@@ -228,6 +233,17 @@ public function setAttachments($attachments)
         return $this;
     }
 
+    public function getSenderConfig()
+    {
+        return $this->senderConfig;
+    }
+
+    public function setSenderConfig($config)
+    {
+        $this->senderConfig = $config;
+        return $this;
+    }
+
     public function toString()
     {
         $result = array();

src/Sender/Sender.php

@@ -73,7 +73,10 @@ class Sender extends ISender
     public function __construct()
     {
         $this->class = Mailer::$config->sender['class'];
+    }
 
+    public function initSenderConfig()
+    {
         if ( isset(Mailer::$config->sender[$this->class]) ) {
             foreach ( Mailer::$config->sender[$this->class] as $config => $value ) {
                 $this->{$config} = $value;
@@ -100,9 +103,16 @@ public function consume($debug = false)
 
         $driver->consume(function($payload, $debug) {
             if ( $debug ) Mailer::log($payload);
-            $payload = json_decode($payload, true);
 
+            $payload = json_decode($payload, true);
             $this->mailBean = new MailBean($payload);
+
+            $senderConfig = $this->mailBean->getSenderConfig();
+            if (!empty($senderConfig)) {
+                Mailer::$config->setSenderConfig($senderConfig);
+                $this->initSenderConfig();
+            }
+
             return $this->doSend();
         }, $debug);
     }

tests/TestAsyncSend.php

@@ -29,7 +29,7 @@ public function testASyncSend()
         $mailer = new Mailer();
 
         $mailer::$config->setDriverConfig(array(
-            'bootstrap.servers' => '172.17.0.6:9092',
+            'bootstrap.servers' => '192.168.1.6:9092',
             'message.send.max.retries' => 3,
             'client.id' => 'TicketsMailKafka',
             'topic' => 'tickets-email',
@@ -42,6 +42,16 @@ public function testASyncSend()
             ->setTo(array('komazhang@foxmail.com', 'zhangqiang@easemob.com'))
             ->setReplyTo('501729495@qq.com');
 
+        $mailBean->setSenderConfig(array(
+            'auth' => true,
+            'username' => 'ticket.support@easemob.com',
+            'password' => 'password',
+            'host' => 'smtp.exmail.qq.com',
+            'port' => 587,
+            'secure' => 'tsl',
+            'autoTSL' => true
+        ));
+
         $ret = $mailer->send($mailBean, true);
 
         var_dump($ret);

tests/testConsumer.php

@@ -9,22 +9,24 @@
 $mailer = new \PHPMailerShell\Mailer();
 
 $mailer::$config->setDriverConfig(array(
-    'bootstrap.servers' => '172.17.0.6:9092',
+    'bootstrap.servers' => '192.168.1.6:9092',
     'group.id' => 'TicketMailConsumer',
     'topic'    => ['tickets-email'], //注意对于消费者而言，topic是一个数组,
-    'offset'   => 'latest', //latest, beginning
+    'offset'   => 'beginning', //latest, beginning
     'timeout'  => 12*1000
 ));
 
-$mailer::$config->setSenderConfig(array(
-    'auth' => true,
-    'username' => 'ticket.support@easemob.com',
-    'password' => 'password',
-    'host' => 'smtp.exmail.qq.com',
-    'port' => 587,
-    'secure' => 'tsl',
-    'autoTSL' => true
-));
+
+//这里可以不使用全局设置，那么在每个mailBean中必须填充sender配置项
+//$mailer::$config->setSenderConfig(array(
+//    'auth' => true,
+//    'username' => 'ticket.support@easemob.com',
+//    'password' => 'password',
+//    'host' => 'smtp.exmail.qq.com',
+//    'port' => 587,
+//    'secure' => 'tsl',
+//    'autoTSL' => true
+//));
 
 try {
     $mailer->consume();