From 48a18a58ef5e373fb6decf006f028361c8db60b1 Mon Sep 17 00:00:00 2001
From: delexxie <39333450+delexxie@users.noreply.github.com>
Date: Wed, 10 Apr 2019 19:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eappend=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9B=E5=AF=B9=E4=B8=8A=E4=BC=A0key=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E8=BD=AC=E4=B9=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增append接口；对上传key去掉转义；
---
 v1/ucloud/http.php  |  8 +++++++-
 v1/ucloud/proxy.php | 33 +++++++++++++++++++++++++++++++++
 v1/ucloud/utils.php |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/v1/ucloud/http.php b/v1/ucloud/http.php
index d653f87..0247e65 100644
--- a/v1/ucloud/http.php
+++ b/v1/ucloud/http.php
@@ -125,11 +125,17 @@ function UCloud_Client_Do($req)
         CURLOPT_HEADER => true,
         CURLOPT_NOBODY => false,
         CURLOPT_CUSTOMREQUEST  => $req->METHOD,
-        CURLOPT_URL => $url['host'] . "/" . rawurlencode($url['path']) . "?" . $req->EncodedQuery(),
+        //CURLOPT_URL => $url['host'] . "/" . rawurlencode($url['path']) . "?" . $req->EncodedQuery(),
         CURLOPT_TIMEOUT => $req->Timeout,
         CURLOPT_CONNECTTIMEOUT => $req->Timeout
     );
 
+    if($req->EncodedQuery() !== ""){
+        $options[CURLOPT_URL] = $url['host'] . "/" . $url['path'] . "?" . $req->EncodedQuery();
+    }else{
+        $options[CURLOPT_URL] = $url['host'] . "/" . $url['path'];
+    }
+
     $httpHeader = $req->Header;
     if (!empty($httpHeader))
     {
diff --git a/v1/ucloud/proxy.php b/v1/ucloud/proxy.php
index 273db3f..db71e8b 100644
--- a/v1/ucloud/proxy.php
+++ b/v1/ucloud/proxy.php
@@ -272,6 +272,39 @@ function UCloud_Delete($bucket, $key)
     return UCloud_Client_Call($client, $req);
 }
 
+//------------------------------追加上传------------------------------
+function UCloud_AppendFile($bucket, $key, $file, $position)
+{
+    $action_type = ActionType::APPENDFILE;
+    $err = CheckConfig(ActionType::APPENDFILE);
+    if ($err != null) {
+        return array(null, $err);
+    }
+
+    $f = @fopen($file, "r");
+    if (!$f) return array(null, new UCloud_Error(-1, -1, "open $file error"));
+
+    global $UCLOUD_PROXY_SUFFIX;
+    $host = $bucket . $UCLOUD_PROXY_SUFFIX;
+    $key = $key . "?append&position=" . $position;
+    $path = $key;
+    $content  = @fread($f, filesize($file));
+    list($mimetype, $err) = GetFileMimeType($file);
+    if ($err) {
+        fclose($f);
+        return array("", $err);
+    }
+    $req = new HTTP_Request('PUT', array('host'=>$host, 'path'=>$path), $content, $bucket, $key, $action_type);
+    $req->Header['Expect'] = '';
+    $req->Header['Content-Type'] = $mimetype;
+
+    $client = new UCloud_AuthHttpClient(null, $mimetype);
+    list($data, $err) = UCloud_Client_Call($client, $req);
+    fclose($f);
+    return array($data, $err);
+}
+
+
 //------------------------------生成公有文件Url------------------------------
 // @results: $url
 function UCloud_MakePublicUrl($bucket, $key)
diff --git a/v1/ucloud/utils.php b/v1/ucloud/utils.php
index 4636f87..05002e1 100644
--- a/v1/ucloud/utils.php
+++ b/v1/ucloud/utils.php
@@ -16,6 +16,7 @@ abstract class ActionType
     const DELETE    = 6;
     const UPLOADHIT = 7;
     const GETFILE   = 8;
+    const APPENDFILE = 9;
 }
 
 class UCloud_Error