Skip to content

fix：PutPolicy中DeleteAfterDays属性没有Json序列化 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 12, 2016
Merged

fix：PutPolicy中DeleteAfterDays属性没有Json序列化 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89920a4
fix：PutPolicy中DeleteAfterDays属性没有Json序列化
fengrui358 Aug 11, 2016
1c286b0
修复测试没有通过
fengrui358 Aug 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Qiniu.Test/IO/IOClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
18 changes: 10 additions & 8 deletions Qiniu/RS/PutPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,14 +245,16 @@ public int CallbackFetchKey
}


/// <summary>
/// 文件在多少天后被删除，七牛将文件上传时间与指定的deleteAfterDays天数相加，得到的时间入到后一天的午夜(CST,中国标准时间)，从而得到文件删除开始时间。例如文件在2015年1月1日上午10:00 CST上传，指定deleteAfterDays为3天，那么会在2015年1月5日00:00 CST之后当天内删除文件
/// </summary>
public int DeleteAfterDays
{
get { return deleteAfterDays; }
set { deleteAfterDays = value; }
}
/// <summary>
/// 文件在多少天后被删除，七牛将文件上传时间与指定的deleteAfterDays天数相加，得到的时间入到后一天的午夜(CST,中国标准时间)，从而得到文件删除开始时间。例如文件在2015年1月1日上午10:00 CST上传，指定deleteAfterDays为3天，那么会在2015年1月5日00:00 CST之后当天内删除文件
/// </summary>
[JsonProperty("deleteAfterDays")]
public int DeleteAfterDays
{
get { return deleteAfterDays; }
set { deleteAfterDays = value; }
}

/// <summary>
/// Initializes a new instance of the <see cref="Qiniu.RS.PutPolicy"/> class.
/// </summary>
Expand Down