update 2.0.0

Author: xutl

Client.php

@@ -76,9 +76,6 @@ public function init()
         if ($this->secretKey === null) {
             throw new InvalidConfigException('The "secretKey" property must be set.');
         }
-        if ($this->region === null) {
-            throw new InvalidConfigException('The "region" property must be set.');
-        }
         $this->baseUrl = ($this->secureConnection ? 'https://' : 'http://') . $this->serverHost . $this->serverUri;
         $this->responseConfig['format'] = \yii\httpclient\Client::FORMAT_JSON;
         $this->on(Client::EVENT_BEFORE_SEND, [$this, 'RequestEvent']);
@@ -92,7 +89,7 @@ public function init()
     public function RequestEvent(RequestEvent $event)
     {
         $params = $event->request->getData();
-        if (!isset($params['Region'])) {
+        if (!isset($params['Region']) && !empty($this->region)) {
             $params['Region'] = $this->region;
         }
         if (!isset($params['SecretId'])) {

Qcloud.php renamed to QCloud.php

@@ -4,17 +4,75 @@
  * @copyright Copyright (c) 2012 TintSoft Technology Co. Ltd.
  * @license http://www.tintsoft.com/license/
  */
+
 namespace xutl\qcloud;
 
 use yii\base\Component;
 use yii\base\InvalidConfigException;
 
 /**
- * Class Qcloud
+ * Class QCloud
  * @package xutl\qcloud
  */
-class Qcloud extends Component
+class QCloud extends Component
 {
+    /**
+     * @var string
+     */
+    public $secretId;
+
+    /**
+     * @var string
+     */
+    public $secretKey;
+
+    /**
+     * @var bool 是否使用安全连接
+     */
+    public $secureConnection = true;
+
+    /**
+     * 请求的Uri
+     * @var string
+     */
+    public $serverUri = '/v2/index.php';
+
+    public $defaultRegion = null;
+
+    /**
+     * @inheritdoc
+     */
+    public function init()
+    {
+        parent::init();
+        if ($this->secretId === null) {
+            throw new InvalidConfigException('The "secretId" property must be set.');
+        }
+        if ($this->secretKey === null) {
+            throw new InvalidConfigException('The "secretKey" property must be set.');
+        }
+    }
+
+    /**
+     * 创建API请求
+     * @param string $service 服务名称
+     * @param string|null $region 区域名称
+     * @return \yii\httpclient\Request
+     */
+    public function createRequest($service, $region = null)
+    {
+        $serverHost = $service . '.api.qcloud.com';
+        return (new Client([
+            'serverHost' => $serverHost,
+            'secretId' => $this->secretId,
+            'secretKey' => $this->secretKey,
+            'secureConnection' => $this->secureConnection,
+            'serverUri' => $this->serverUri,
+            'region' => $region ? $region : $this->defaultRegion
+        ]))->createRequest()->setMethod('POST');
+    }
+
+
     /**
      * 用户账户
      */
@@ -134,100 +192,4 @@ class Qcloud extends Component
      * 云搜
      */
     const API_YUNSOU = 'yunsou';
-
-    /**
-     * @var string
-     */
-    public $secretId;
-
-    /**
-     * @var string
-     */
-    public $secretKey;
-
-    /**
-     * 请求的Uri
-     * @var string
-     */
-    public $serverUri = '/v2/index.php';
-
-    /**
-     * 请求方法
-     * @var string
-     */
-    public $requestMethod = "POST";
-
-    /**
-     * 服务器地址
-     * @var array
-     */
-    protected $_serverHosts = [
-        'account' => 'account.api.qcloud.com',
-        'bill' => 'bill.api.qcloud.com',
-        'bm' => 'bm.api.qcloud.com',
-        'cbs' => 'cbs.api.qcloud.com',
-        'cdb' => 'cdb.api.qcloud.com',
-        'cdn' => 'cdn.api.qcloud.com',
-        'cmem' => 'cmem.api.qcloud.com',
-        'cns' => 'cns.api.qcloud.com',
-        'cvm' => 'cvm.api.qcloud.com',
-        'eip' => 'eip.api.qcloud.com',
-        'image' => 'image.api.qcloud.com',
-        'lb' => 'lb.api.qcloud.com',
-        'live' => 'live.api.qcloud.com',
-        'market' => 'market.api.qcloud.com',
-        'monitor' => 'monitor.api.qcloud.com',
-        'scaling' => 'scaling.api.qcloud.com',
-        'sec' => 'csec.api.qcloud.com',
-        'snapshot' => 'snapshot.api.qcloud.com',
-        'tdsql' => 'tdsql.api.qcloud.com',
-        'trade' => 'trade.api.qcloud.com',
-        'vod' => 'vod.api.qcloud.com',
-        'vpc' => 'vpc.api.qcloud.com',
-        'wenzhi' => 'wenzhi.api.qcloud.com',
-        'yunsou' => 'yunsou.api.qcloud.com',
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function init()
-    {
-        parent::init();
-        if ($this->secretId === null) {
-            throw new InvalidConfigException('The "secretId" property must be set.');
-        }
-        if ($this->secretKey === null) {
-            throw new InvalidConfigException('The "secretKey" property must be set.');
-        }
-    }
-
-    /**
-     * 获取服务器主机名
-     * @param string $service
-     * @return mixed|null
-     */
-    protected function getServerHost($service)
-    {
-        return isset($this->_serverHosts[$service]) ? $this->_serverHosts[$service] : null;
-    }
-
-    /**
-     * 创建API请求
-     * @param string $service 服务名称
-     * @param string|null $region 区域名称
-     * @return Request
-     */
-    public function createRequest($service, $region = null)
-    {
-        $serverHost = $this->getServerHost($service);
-        return new Request([
-            'secretId' => $this->secretId,
-            'secretKey' => $this->secretKey,
-            'defaultRegion' => $region,
-            'requestMethod' => $this->requestMethod,
-            'serverUri' => $this->serverUri,
-            'serverHost' => $serverHost
-        ]);
-    }
 }