feat 删除多余配置

Author: sabakugaara

src/Upyun/Api/Form.php

@@ -23,9 +23,7 @@ public function upload($path, $stream, $params)
             'timeout' => $this->config->timeout,
         ]);
 
-        $url = ($this->config->useSsl ? 'https://' : 'http://') . $this->endpoint;
-
-        $response = $client->request($method, $url, array(
+        $response = $client->request($method, $this->endpoint, array(
             'multipart' => array(
                 array(
                     'name' => 'policy',

src/Upyun/Api/Pretreat.php

@@ -15,8 +15,6 @@ class Pretreat
      */
     protected $config;
 
-    protected $url = 'http://p0.api.upyun.com';
-
     public function __construct(Config $config)
     {
         $this->config = $config;
@@ -42,7 +40,8 @@ public function process($source, $tasks)
         $method = 'POST';
         $signedHeaders = Signature::getHeaderSign($this->config, $method, $path);
 
-        $response = $client->request($method, $this->url . $path, [
+        $url = $this->config->getPretreatEndPoint() . $path;
+        $response = $client->request($method, $url, [
             'headers' => $signedHeaders,
             'form_params' => $params
         ]);
@@ -65,7 +64,7 @@ public function query($taskIds, $path)
         $path = $path . '?' . http_build_query($params);
 
         $method = 'GET';
-        $url = $this->url . $path;
+        $url = $this->config->getPretreatEndPoint() . $path;
         $signedHeaders = Signature::getHeaderSign($this->config, $method, $path);
         $response = $client->request($method, $url, [
             'headers' => $signedHeaders

src/Upyun/Api/Rest.php

@@ -29,7 +29,7 @@ class Rest
     public function __construct(Config $config)
     {
         $this->config   = $config;
-        $this->endpoint = Config::$restApiEndPoint . '/' . $config->bucketName;
+        $this->endpoint = $config->getProtocol() . Config::$restApiEndPoint . '/' . $config->bucketName;
     }
 
     public function request($method, $storagePath)
@@ -62,7 +62,7 @@ public function send()
             'timeout' => $this->config->timeout,
         ]);
 
-        $url = ($this->config->useSsl ? 'https://' : 'http://') . $this->endpoint . $this->storagePath;
+        $url = $this->endpoint . $this->storagePath;
         $body = null;
         if ($this->file && $this->method === 'PUT') {
             $body = $this->file;

src/Upyun/Config.php

@@ -76,11 +76,6 @@ class Config
     const ED_CNC             = 'v2.api.upyun.com';
     const ED_CTT             = 'v3.api.upyun.com';
 
-    /**
-     * 分块上传接口请求地址
-     */
-    const ED_FORM            = 'm0.api.upyun.com';
-
     /**
      * 异步云处理接口地址
      */
@@ -123,4 +118,14 @@ public function getVersion()
     {
         return $this->version;
     }
+
+    public function getPretreatEndPoint()
+    {
+        return $this->getProtocol() . self::ED_VIDEO;
+    }
+
+    public function getProtocol()
+    {
+        return $this->useSsl ? 'https://' : 'http://';
+    }
 }