Fix conflict.

Author: overtrue

.gitignore

@@ -5,3 +5,4 @@ sftp-config.json
 composer.lock
 .subsplit
 .php_cs.cache
+.idea

README.md

@@ -1,6 +1,6 @@
-<p align="center"><h1>Laravel mail aliyun</h1></p>
+<h1 align="center">Laravel mail aliyun</h1>
 
-:e-mail: [Aliyun DrirectMail](https://help.aliyun.com/product/29412.html) Transport for Laravel Application.
+<p align="center">:e-mail: <a href="https://help.aliyun.com/product/29412.html">Aliyun DrirectMail</a> Transport for Laravel Application.</p>
 
 ## Installing
 
@@ -12,29 +12,42 @@ $ composer require overtrue/laravel-mail-aliyun -vvv
 
 > API documention: https://help.aliyun.com/document_detail/29435.html
 
+*config/services.php*
 ```php
-// config/services.php
-    
     'directmail' => [
         'key' => env('ALIYUN_ACCESS_KEY_ID'),
-        'address_type' => 1, 
-        'from_alias' => null,  
-        'click_trace' => 0', 
-        'version' => '2015-11-23',
-        'region_id' => null',
+        'secret' => env('ALIYUN_ACCESS_KEY_SECRET'),
+        'region_id' => env('ALIYUN_REGION_ID'),
+        'from_address' => env('ALIYUN_FROM_ADDRESS'),
+        'from_alias' => env('ALIYUN_FROM_ALIAS'),
     ],
 ```
 
+AccessKeyID 和 AccessKeySecret 由阿里云官方颁发给用户的 AccessKey 信息（可以通过阿里云控制台[用户信息管理](https://usercenter.console.aliyun.com/?spm=a2c4g.11186623.2.17.12f2461dHSyXbw#/manage/ak)中查看和管理）.
+
 ## Usage
 
-Set default mail driver:
+Set default mail driver and configuration:
 
-```env
+*.env*
+```bash
 MAIL_DRIVER=directmail
+
+ALIYUN_ACCESS_KEY_ID=  #AccessKeyID
+ALIYUN_ACCESS_KEY_SECRET= #AccessKeySecret
+ALIYUN_REGION_ID= #RegionID: cn-hangzhou, ap-southeast-1, ap-southeast-2
+ALIYUN_FROM_ADDRESS= #FromAddress
+ALIYUN_FROM_ALIAS= #FromAlias
 ```
 
 Please reference the official doc: [Laravel Sending mail](https://laravel.com/docs/5.6/mail#sending-mail)
 
+## PHP 扩展包开发
+
+> 想知道如何从零开始构建 PHP 扩展包？
+>
+> 请关注我的实战课程，我会在此课程中分享一些扩展开发经验 —— [《PHP 扩展包实战教程 - 从入门到发布》](https://learnku.com/courses/creating-package)
+
 ## License
 
-MIT
+MIT

composer.json

@@ -4,7 +4,7 @@
     "type": "library",
     "require": {
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.5",
+        "laravel/framework": "^5.5 || ^6.0 || ^7.0",
         "swiftmailer/swiftmailer": "^6.1"
     },
     "license": "MIT",
@@ -13,5 +13,15 @@
             "name": "overtrue",
             "email": "anzhengchao@gmail.com"
         }
-    ]
+    ],
+    "autoload": {
+        "psr-4": {
+            "Overtrue\\LaravelMailAliyun\\": "./src"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": ["Overtrue\\LaravelMailAliyun\\DirectMailServiceProvider"]
+        }
+    }
 }

src/DirectMailServiceProvider.php

@@ -15,20 +15,15 @@
 
 /**
  * Class DirectMailServiceProvider.
- *
- * @author overtrue <i@overtrue.me>
  */
 class DirectMailServiceProvider extends ServiceProvider
 {
-    /**
-     * Register the service provider.
-     */
-    public function register()
+    public function boot()
     {
         $this->app['mail.manager']->extend('directmail', function () {
             $config = $this->app['config']->get('services.directmail', []);
 
-            return new DirectMailTransport(new Client($config), $config['key'], $config);
+            return new DirectMailTransport(new Client($config), $config['key'], $config['secret'], $config);
         });
     }
 }

src/DirectMailTransport.php

@@ -12,18 +12,16 @@
 
 use GuzzleHttp\ClientInterface;
 use Illuminate\Mail\Transport\Transport;
+use Illuminate\Support\Arr;
+use Psr\Http\Message\ResponseInterface;
 use Swift_Mime_SimpleMessage;
 
 /**
- * Class Transport.
- *
- * @author overtrue <i@overtrue.me>
+ * Class DirectMailTransport
  */
 class DirectMailTransport extends Transport
 {
     /**
-     * Guzzle client instance.
-     *
      * @var \GuzzleHttp\ClientInterface
      */
     protected $client;
@@ -33,6 +31,11 @@ class DirectMailTransport extends Transport
      */
     protected $key;
 
+    /**
+     * @var string
+     */
+    protected $secret;
+
     /**
      * @var array
      */
@@ -41,18 +44,36 @@ class DirectMailTransport extends Transport
     /**
      * @var string
      */
-    protected $url = 'https://dm.aliyuncs.com/?Action=SingleSendMail';
+    protected $regions = [
+        'cn-hangzhou' => [
+            'id' => 'cn-hangzhou',
+            'url' => 'https://dm.aliyuncs.com',
+            'version' => '2015-11-23',
+        ],
+        'ap-southeast-1' => [
+            'id' => 'ap-southeast-1',
+            'url' => 'https://dm.ap-southeast-1.aliyuncs.com',
+            'version' => '2017-06-22',
+        ],
+        'ap-southeast-2' => [
+            'id' => 'ap-southeast-2',
+            'url' => 'https://dm.ap-southeast-2.aliyuncs.com',
+            'version' => '2017-06-22',
+        ],
+    ];
 
     /**
-     * Create a new SparkPost transport instance.
+     * DirectMailTransport constructor.
      *
      * @param \GuzzleHttp\ClientInterface $client
      * @param string                      $key
+     * @param string                      $secret
      * @param array                       $options
      */
-    public function __construct(ClientInterface $client, $key, $options = [])
+    public function __construct(ClientInterface $client, string $key, string $secret, array $options = [])
     {
         $this->key = $key;
+        $this->secret = $secret;
         $this->client = $client;
         $this->options = $options;
     }
@@ -72,47 +93,47 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
     {
         $this->beforeSendPerformed($message);
 
-        $to = $this->getTo($message);
-
         $message->setBcc([]);
 
-        $this->client->post($this->url, $this->payload($message, $to));
+        $regionId = Arr::get($this->options, 'region_id', 'cn-hangzhou');
+        $region = $this->regions[$regionId];
+
+        $this->client->post($region['url'], ['form_params' => $this->payload($message, $region)]);
 
         $this->sendPerformed($message);
 
         return $this->numberOfRecipients($message);
     }
 
     /**
-     * Get the HTTP payload for sending the Mailgun message.
+     * Get the HTTP payload for sending the message.
      *
      * @param \Swift_Mime_SimpleMessage $message
-     * @param string                    $to
+     * @param array                     $region
      *
      * @return array
      */
-    protected function payload(Swift_Mime_SimpleMessage $message, $to)
+    protected function payload(Swift_Mime_SimpleMessage $message, array $region)
     {
-        $parameters = [
-            'form_params' => [
-                'AccountName' => $message->getFrom(),
-                'ReplyToAddress' => true,
-                'AddressType' => array_get($this->options, 'address_type', 1),
-                'ToAddress' => $this->getTo(),
-                'FromAlias' => array_get($this->options, 'from_alias'),
-                'Subject' => $message->getSubject(),
-                'HtmlBody' => $message->getBody(),
-                'ClickTrace' => array_get($this->options, 'click_trace', 0),
-                'Format' => 'json',
-                'Version' => array_get($this->options, 'version', '2015-11-23'),
-                'AccessKeyId' => $this->getKey(),
-                'Timestamp' => date('Y-m-d\TH:i:s\Z'),
-                'SignatureMethod' => 'HMAC-SHA1',
-                'SignatureVersion' => '1.0',
-                'SignatureNonce' => \uniqid(),
-                'RegionId' => \array_get($this->options, 'region_id'),
-            ],
-        ];
+        $parameters = array_filter([
+            'AccountName' => Arr::get($this->options, 'from_address', \config('mail.from.address', key($message->getFrom()))),
+            'ReplyToAddress' => 'true',
+            'AddressType' => Arr::get($this->options, 'address_type', 1),
+            'ToAddress' => $this->getTo($message),
+            'FromAlias' => Arr::get($this->options, 'from_alias'),
+            'Subject' => $message->getSubject(),
+            'HtmlBody' => $message->getBody(),
+            'ClickTrace' => Arr::get($this->options, 'click_trace', 0),
+            'Format' => 'json',
+            'Action' => 'SingleSendMail',
+            'Version' => $region['version'],
+            'AccessKeyId' => $this->getKey(),
+            'Timestamp' => now()->toIso8601ZuluString(),
+            'SignatureMethod' => 'HMAC-SHA1',
+            'SignatureVersion' => '1.0',
+            'SignatureNonce' => \uniqid(),
+            'RegionId' => $region['id'],
+        ]);
 
         $parameters['Signature'] = $this->makeSignature($parameters);
 
@@ -128,9 +149,15 @@ protected function makeSignature(array $parameters)
     {
         \ksort($parameters);
 
-        $signString = rawurlencode('POST&/&' . http_build_query($parameters, null, '&', PHP_QUERY_RFC3986));
+        $encoded = [];
+
+        foreach ($parameters as $key => $value) {
+            $encoded[] = \sprintf('%s=%s', rawurlencode($key), rawurlencode($value));
+        }
 
-        return base64_encode(hash_hmac('sha1', $signString, $this->getKey(), true));
+        $signString = 'POST&%2F&'.rawurlencode(\join('&', $encoded));
+
+        return base64_encode(hash_hmac('sha1', $signString, $this->getSecret().'&', true));
     }
 
     /**
@@ -148,13 +175,11 @@ protected function getTo(Swift_Mime_SimpleMessage $message)
     }
 
     /**
-     * Get the transmission ID from the response.
-     *
-     * @param \GuzzleHttp\Psr7\Response $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      *
-     * @return string
+     * @return mixed
      */
-    protected function getTransmissionId($response)
+    protected function getTransmissionId(ResponseInterface $response)
     {
         return object_get(
             json_decode($response->getBody()->getContents()),
@@ -163,8 +188,6 @@ protected function getTransmissionId($response)
     }
 
     /**
-     * Get all of the contacts for the message.
-     *
      * @param \Swift_Mime_SimpleMessage $message
      *
      * @return array
@@ -179,8 +202,6 @@ protected function allContacts(Swift_Mime_SimpleMessage $message)
     }
 
     /**
-     * Get the API key being used by the transport.
-     *
      * @return string
      */
     public function getKey()
@@ -189,14 +210,30 @@ public function getKey()
     }
 
     /**
-     * Set the API key being used by the transport.
-     *
+     * @return string
+     */
+    public function getSecret()
+    {
+        return $this->secret;
+    }
+
+    /**
      * @param string $key
      *
      * @return string
      */
-    public function setKey($key)
+    public function setKey(string $key)
     {
         return $this->key = $key;
     }
+
+    /**
+     * @param string $secret
+     *
+     * @return string
+     */
+    public function setSecret(string $secret)
+    {
+        return $this->secret = $secret;
+    }
 }