Merge pull request #35 from icattlecoder/hotfix/unixtime

longshanksmo · longshanksmo · commit eaf487c29f6c · 2013-10-23T02:49:43.000-07:00
fix universalTime
diff --git a/Qiniu/RS/PutPolicy.cs b/Qiniu/RS/PutPolicy.cs
@@ -96,10 +96,8 @@ public UInt64 Expires {
 		public PutPolicy (string scope, UInt32 expires=3600)
 		{
 			Scope = scope;
-			DateTime begin = new DateTime (1970, 1, 1);
-			DateTime now = DateTime.Now;
-			TimeSpan interval = new TimeSpan (now.Ticks - begin.Ticks);
-			Expires = (UInt32)interval.TotalSeconds + expires;
+			UInt32 deadline = (UInt32)((DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000 + expires);
+			Expires = deadline;
 		}
 
 		/// <summary>
diff --git a/Qiniu/RS/RSClient.cs b/Qiniu/RS/RSClient.cs
@@ -38,7 +38,7 @@ public enum FileHandle
 	/// </summary>
 	public class RSClient :QiniuAuthClient
 	{
-		private static string[] OPS = new string[] { "stat", "move", "copy", "delet" };
+		private static string[] OPS = new string[] { "stat", "move", "copy", "delete" };
 
 		public RSClient (Mac mac=null)
             : base(mac)

Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,8 @@ public UInt64 Expires {`
`96`	`96`	`public PutPolicy (string scope, UInt32 expires=3600)`
`97`	`97`	`{`
`98`	`98`	`Scope = scope;`
`99`		`- DateTime begin = new DateTime (1970, 1, 1);`
`100`		`- DateTime now = DateTime.Now;`
`101`		`- TimeSpan interval = new TimeSpan (now.Ticks - begin.Ticks);`
`102`		`- Expires = (UInt32)interval.TotalSeconds + expires;`
	`99`	`+ UInt32 deadline = (UInt32)((DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000 + expires);`
	`100`	`+ Expires = deadline;`
`103`	`101`	`}`
`104`	`102`
`105`	`103`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public enum FileHandle`
`38`	`38`	`/// </summary>`
`39`	`39`	`public class RSClient :QiniuAuthClient`
`40`	`40`	`{`
`41`		`- private static string[] OPS = new string[] { "stat", "move", "copy", "delet" };`
	`41`	`+ private static string[] OPS = new string[] { "stat", "move", "copy", "delete" };`
`42`	`42`
`43`	`43`	`public RSClient (Mac mac=null)`
`44`	`44`	`: base(mac)`