Merge pull request #128 from toplan/dev

Dev
toplan · Jun 29, 2017 · 621ab03 · 621ab03
2 parents c33e516 + 4c9a33a
commit 621ab03
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/src/phpsms/agents/Agent.php b/src/phpsms/agents/Agent.php
@@ -163,14 +163,20 @@ public function formatMobile(array $list)
      */
     public function curlPost($url, array $params = [], array $opts = [])
     {
-        $params = $this->params($params);
-        if (!array_key_exists(CURLOPT_POSTFIELDS, $opts)) {
-            $opts[CURLOPT_POSTFIELDS] = $params;
+        $options = [
+            CURLOPT_POST    => true,
+            CURLOPT_URL     => $url,
+        ];
+        foreach ($opts as $key => $value) {
+            if ($key !== CURLOPT_POST && $key !== CURLOPT_URL) {
+                $options[$key] = $value;
+            }
+        }
+        if (!array_key_exists(CURLOPT_POSTFIELDS, $options)) {
+            $options[CURLOPT_POSTFIELDS] = $this->params($params);
         }
-        $opts[CURLOPT_POST] = true;
-        $opts[CURLOPT_URL] = $url;
 
-        return self::curl($opts);
+        return self::curl($options);
     }
 
     /**

diff --git a/src/phpsms/agents/AliyunAgent.php b/src/phpsms/agents/AliyunAgent.php
@@ -41,7 +41,7 @@ protected function createParams(array $params)
             'Version'           => '2016-09-27',
             'AccessKeyId'       => $this->accessKeyId,
             'SignatureMethod'   => 'HMAC-SHA1',
-            'Timestamp'         => date('Y-m-d\TH:i:s\Z'),
+            'Timestamp'         => gmdate('Y-m-d\TH:i:s\Z'),
             'SignatureVersion'  => '1.0',
             'SignatureNonce'    => uniqid(),
         ], $params);

diff --git a/src/phpsms/agents/LuosimaoAgent.php b/src/phpsms/agents/LuosimaoAgent.php
@@ -10,35 +10,35 @@
  */
 class LuosimaoAgent extends Agent implements ContentSms, VoiceCode
 {
+    protected static $smsUrl = 'http://sms-api.luosimao.com/v1/send.json';
+    protected static $voiceCodeUrl = 'http://voice-api.luosimao.com/v1/verify.json';
+
     public function sendContentSms($to, $content)
     {
         // 签名必须在最后面
-        if ($content && !preg_match('/】$/', $content)) {
-            preg_match('/【([0-9a-zA-Z\W]+)】/', $content, $matches);
-            if (isset($matches[0])) {
+        if ($content && preg_match('/(【[\\s\\S]*】)/', $content, $matches)) {
+            if (isset($matches[0]) && strlen($matches[0])) {
                 $content = str_replace($matches[0], '', $content) . $matches[0];
             }
         }
-        $url = 'http://sms-api.luosimao.com/v1/send.json';
-        $result = $this->curlPost($url, [
+        $result = $this->curlPost(self::$smsUrl, [
             'mobile'  => $to,
             'message' => $content,
         ], [
-            CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-            CURLOPT_USERPWD  => "api:key-$this->apikey",
+            CURLOPT_HTTPAUTH    => CURLAUTH_BASIC,
+            CURLOPT_USERPWD     => "api:key-{$this->apikey}",
         ]);
         $this->setResult($result);
     }
 
     public function sendVoiceCode($to, $code)
     {
-        $url = 'http://voice-api.luosimao.com/v1/verify.json';
-        $result = $this->curlPost($url, [
+        $result = $this->curlPost(self::$voiceCodeUrl, [
             'mobile' => $to,
             'code'   => $code,
         ], [
-            CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-            CURLOPT_USERPWD  => "api:key-$this->voiceApikey",
+            CURLOPT_HTTPAUTH    => CURLAUTH_BASIC,
+            CURLOPT_USERPWD     => "api:key-{$this->voiceApikey}",
         ]);
         $this->setResult($result);
     }