From 89920a48cbc0b73d3171bba236c82f717b3c5276 Mon Sep 17 00:00:00 2001 From: "free@action" Date: Thu, 11 Aug 2016 11:40:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9APutPolicy=E4=B8=ADDeleteAfterDa?= =?UTF-8?q?ys=E5=B1=9E=E6=80=A7=E6=B2=A1=E6=9C=89Json=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Qiniu/RS/PutPolicy.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Qiniu/RS/PutPolicy.cs b/Qiniu/RS/PutPolicy.cs index ea3526ac..9d482334 100644 --- a/Qiniu/RS/PutPolicy.cs +++ b/Qiniu/RS/PutPolicy.cs @@ -245,14 +245,16 @@ public int CallbackFetchKey } - /// - /// 文件在多少天后被删除，七牛将文件上传时间与指定的deleteAfterDays天数相加，得到的时间入到后一天的午夜(CST,中国标准时间)，从而得到文件删除开始时间。例如文件在2015年1月1日上午10:00 CST上传，指定deleteAfterDays为3天，那么会在2015年1月5日00:00 CST之后当天内删除文件 - /// - public int DeleteAfterDays - { - get { return deleteAfterDays; } - set { deleteAfterDays = value; } - } + /// + /// 文件在多少天后被删除，七牛将文件上传时间与指定的deleteAfterDays天数相加，得到的时间入到后一天的午夜(CST,中国标准时间)，从而得到文件删除开始时间。例如文件在2015年1月1日上午10:00 CST上传，指定deleteAfterDays为3天，那么会在2015年1月5日00:00 CST之后当天内删除文件 + /// + [JsonProperty("deleteAfterDays")] + public int DeleteAfterDays + { + get { return deleteAfterDays; } + set { deleteAfterDays = value; } + } + /// /// Initializes a new instance of the class. /// From 1c286b0334097db2dfb8aafa06c5722f2baa9818 Mon Sep 17 00:00:00 2001 From: "free@action" Date: Thu, 11 Aug 2016 11:48:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Qiniu.Test/IO/IOClientTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Qiniu.Test/IO/IOClientTest.cs b/Qiniu.Test/IO/IOClientTest.cs index 1961bbc7..5ff10f14 100644 --- a/Qiniu.Test/IO/IOClientTest.cs +++ b/Qiniu.Test/IO/IOClientTest.cs @@ -53,9 +53,9 @@ public void PutPolicyTest(){ policy.CallbackBodyType = "application/json"; try { string result = policy.ToString(); - string expect = "{\"scope\":\"bucket\",\"callBackUrl\":\"www.qiniu.com\",\"callBackBody\":\"uid=123\",\"deadline\":0,\"insertOnly\":1,\"detectMime\":1,\"fsizeLimit\":4096,\"fsizeMin\":0,\"persistentNotifyUrl\":\"www.yourdomain.com/persistentNotifyUrl\",\"persistentOps\":\"avthumb/m3u8/preset/video_16x9_440k\",\"callbackHost\":\"180.97.211.38\",\"callbackBodyType\":\"application/json\",\"callbackFetchKey\":0}"; + string expect = "{\"scope\":\"bucket\",\"callBackUrl\":\"www.qiniu.com\",\"callBackBody\":\"uid=123\",\"deadline\":0,\"insertOnly\":1,\"detectMime\":1,\"fsizeLimit\":4096,\"fsizeMin\":0,\"persistentNotifyUrl\":\"www.yourdomain.com/persistentNotifyUrl\",\"persistentOps\":\"avthumb/m3u8/preset/video_16x9_440k\",\"callbackHost\":\"180.97.211.38\",\"callbackBodyType\":\"application/json\",\"callbackFetchKey\":0,\"deleteAfterDays\":0}"; //Assert.IsTrue(result==expect,"PutPolicyTest Failure5"); - Assert.AreEqual(result, expect); + Assert.AreEqual(expect, result); } catch (Exception ee){ Assert.IsTrue (false, ee.Message.ToString()); }