Skip to content

Commit 339bd46

Browse files
authored
Merge pull request #94 from fengrui358/Branch_FixDeletedAfterDays
fix:PutPolicy中DeleteAfterDays属性没有Json序列化
2 parents d7f1791 + 1c286b0 commit 339bd46

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

Qiniu.Test/IO/IOClientTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public void PutPolicyTest(){
5353
policy.CallbackBodyType = "application/json";
5454
try {
5555
string result = policy.ToString();
56-
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}";
56+
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}";
5757
//Assert.IsTrue(result==expect,"PutPolicyTest Failure5");
58-
Assert.AreEqual(result, expect);
58+
Assert.AreEqual(expect, result);
5959
} catch (Exception ee){
6060
Assert.IsTrue (false, ee.Message.ToString());
6161
}

Qiniu/RS/PutPolicy.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,16 @@ public int CallbackFetchKey
245245
}
246246

247247

248-
/// <summary>
249-
/// 文件在多少天后被删除,七牛将文件上传时间与指定的deleteAfterDays天数相加,得到的时间入到后一天的午夜(CST,中国标准时间),从而得到文件删除开始时间。例如文件在2015年1月1日上午10:00 CST上传,指定deleteAfterDays为3天,那么会在2015年1月5日00:00 CST之后当天内删除文件
250-
/// </summary>
251-
public int DeleteAfterDays
252-
{
253-
get { return deleteAfterDays; }
254-
set { deleteAfterDays = value; }
255-
}
248+
/// <summary>
249+
/// 文件在多少天后被删除,七牛将文件上传时间与指定的deleteAfterDays天数相加,得到的时间入到后一天的午夜(CST,中国标准时间),从而得到文件删除开始时间。例如文件在2015年1月1日上午10:00 CST上传,指定deleteAfterDays为3天,那么会在2015年1月5日00:00 CST之后当天内删除文件
250+
/// </summary>
251+
[JsonProperty("deleteAfterDays")]
252+
public int DeleteAfterDays
253+
{
254+
get { return deleteAfterDays; }
255+
set { deleteAfterDays = value; }
256+
}
257+
256258
/// <summary>
257259
/// Initializes a new instance of the <see cref="Qiniu.RS.PutPolicy"/> class.
258260
/// </summary>

0 commit comments

Comments
 (0)