兼容旧版本 (#219)

* 修复国际号码 URL 错误 * 创蓝支持同时存在国内账号与国际账号 * Merge branch 'master' of github.com:overtrue/easy-sms # Conflicts: # src/Gateways/ChuanglanGateway.php * 兼容旧版本的创蓝国际号码发送
overtrue · Sep 12, 2019 · b3c16de · b3c16de
1 parent e7a56e2
commit b3c16de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,8 @@
     "type": "library",
     "require": {
         "guzzlehttp/guzzle": "^6.2",
-        "php": ">=5.6"
+        "php": ">=5.6",
+        "ext-json": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7 || ^7.5",

diff --git a/src/Gateways/ChuanglanGateway.php b/src/Gateways/ChuanglanGateway.php
@@ -70,8 +70,8 @@ public function send(PhoneNumberInterface $to, MessageInterface $message, Config
 
         if (86 != $IDDCode) {
             $params['mobile'] = $to->getIDDCode().$to->getNumber();
-            $params['account'] = $config->get('intel_account');
-            $params['password'] = $config->get('intel_password');
+            $params['account'] = $config->get('intel_account') ?: $config->get('account');
+            $params['password'] = $config->get('intel_password') ?: $config->get('password');
         }
 
         $result = $this->postJson($this->buildEndpoint($config, $IDDCode), $params);