Merge pull request #131 from toplan/dev

Dev

Author: toplan

src/config/phpsms.php

@@ -199,6 +199,7 @@
             'accessKeyId'       => 'your_access_key_id',
             'accessKeySecret'   => 'your_access_key_secret',
             'signName'          => 'your_sms_sign_name',
+            'regionId'          => 'cn-shenzhen',
         ],
     ],
 ];

src/phpsms/Sms.php

@@ -419,8 +419,7 @@ protected static function modifyConfig($name, array $config, $override = false)
     }
 
     /**
-     * Validate the agent name.
-     * Expected type is string, except the string of number.
+     * Validate the name of agent.
      *
      * @param string $name
      *
@@ -429,7 +428,7 @@ protected static function modifyConfig($name, array $config, $override = false)
     protected static function validateAgentName($name)
     {
         if (empty($name) || !is_string($name) || preg_match('/^[0-9]+$/', $name)) {
-            throw new PhpSmsException('Expected the parameter to be string which except the string of number.');
+            throw new PhpSmsException('Expected the name of agent to be a string which except the digital string.');
         }
     }
 

src/phpsms/agents/AliyunAgent.php

@@ -8,18 +8,19 @@
  * @property string $accessKeyId
  * @property string $accessKeySecret
  * @property string $signName
+ * @property string $regionId
  */
 class AliyunAgent extends Agent implements TemplateSms
 {
-    protected static $sendUrl = 'https://sms.aliyuncs.com';
+    protected static $sendUrl = 'https://dysmsapi.aliyuncs.com/';
 
     public function sendTemplateSms($to, $tempId, array $data)
     {
         $params = [
-            'Action'            => 'SingleSendSms',
+            'Action'            => 'SendSms',
             'SignName'          => $this->signName,
-            'ParamString'       => $this->getTempDataString($data),
-            'RecNum'            => $to,
+            'TemplateParam'     => $this->getTempDataString($data),
+            'PhoneNumbers'      => $to,
             'TemplateCode'      => $tempId,
         ];
         $this->request($params);
@@ -37,8 +38,9 @@ protected function request(array $params)
     protected function createParams(array $params)
     {
         $params = array_merge([
+            'RegionId'          => $this->regionId ?: 'cn-shenzhen',
             'Format'            => 'JSON',
-            'Version'           => '2016-09-27',
+            'Version'           => '2017-05-25',
             'AccessKeyId'       => $this->accessKeyId,
             'SignatureMethod'   => 'HMAC-SHA1',
             'Timestamp'         => gmdate('Y-m-d\TH:i:s\Z'),
@@ -77,9 +79,8 @@ protected function setResult($result)
         if ($result['request']) {
             $this->result(Agent::INFO, $result['response']);
             $result = json_decode($result['response'], true);
-            if (isset($result['Message'])) {
-                $this->result(Agent::CODE, $result['Code']);
-            } else {
+            $this->result(Agent::CODE, $result['Code']);
+            if ($result['Code'] === 'OK') {
                 $this->result(Agent::SUCCESS, true);
             }
         } else {

src/phpsms/agents/QcloudAgent.php

@@ -7,7 +7,6 @@
  *
  * @property string $appId
  * @property string $appKey
- * @property string $nationCode
  */
 class QcloudAgent extends Agent implements TemplateSms, ContentSms, VoiceCode, ContentVoice
 {