fix params order

fallingrust · May 26, 2024 · 3292320 · 3292320
1 parent 524490c
commit 3292320
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 24 deletions.
diff --git a/AliyunSDK.DNS/AliyunDNS.cs b/AliyunSDK.DNS/AliyunDNS.cs
@@ -225,7 +225,7 @@ public static void Configure(Option option)
             return JsonSerializer.Deserialize<Response>(content);
         }
 #endif
-        private static string BuildQueryString(SortedDictionary<string, string> paramDic)
+        private static string BuildQueryString(Dictionary<string, string> paramDic)
         {
             var sb = new StringBuilder();
             foreach (var kv in paramDic)

diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/AddDomainRecordQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/AddDomainRecordQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -22,14 +23,14 @@ public AddDomainRecordQuery(string domainName, string rr, string type, string va
         public string RR { get; set; }
         public string Type { get; set; }
         public string Value { get; set; }
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("DomainName", DomainName);
             dic.Add("RR", RR);
             dic.Add("Type", Type);
             dic.Add("Value", Value);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/DeleteDomainRecordQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/DeleteDomainRecordQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -16,11 +17,11 @@ public DeleteDomainRecordQuery(string recordId, string accessKeyId, string actio
         }
         public string RecordId { get; set; }
 
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("RecordId", RecordId);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/DeleteSubDomainRecordsQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/DeleteSubDomainRecordsQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -19,13 +20,13 @@ public DeleteSubDomainRecordsQuery(string domainName, string rr, string type, st
         public string DomainName { get; set; }
         public string RR { get; set; }
         public string Type { get; set; }
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("DomainName", DomainName);
             dic.Add("RR", RR);
             dic.Add("Type", Type);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/DescribeDomainRecordInfoQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/DescribeDomainRecordInfoQuery.cs
@@ -1,6 +1,7 @@
 using AliyunSDK.DNS.Beans.Base;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -17,11 +18,11 @@ public DescribeDomainRecordInfoQuery(string recordId, string accessKeyId, string
         }
 
         public string RecordId { get; set; }
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("RecordId", RecordId);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/DescribeDomainRecordsQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/DescribeDomainRecordsQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -14,13 +15,13 @@ public DescribeDomainRecordsQuery(string domainName, string accessKeyId, string
         public long PageNumber { get; set; } = 1;
 
         public long PageSize { get; set; } = 100;
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("DomainName", DomainName);
             dic.Add("PageNumber", PageNumber.ToString());
             dic.Add("PageSize", PageSize.ToString());
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/DescribeSubDomainRecordsQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/DescribeSubDomainRecordsQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -14,13 +15,13 @@ public DescribeSubDomainRecordsQuery(string subDomain, string accessKeyId, strin
         public long PageNumber { get; set; } = 1;
 
         public long PageSize { get; set; } = 100;
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("SubDomain", SubDomain);
             dic.Add("PageNumber", PageNumber.ToString());
             dic.Add("PageSize", PageSize.ToString());
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/GetTxtRecordForVerifyQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/GetTxtRecordForVerifyQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -19,12 +20,12 @@ public GetTxtRecordForVerifyQuery(string domainName,string type,string accessKey
         public string DomainName { get; set; }
 
         public string Type { get; set; }
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("DomainName", DomainName);
             dic.Add("Type", Type);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/SetDomainRecordStatusQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/SetDomainRecordStatusQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -18,12 +19,12 @@ public SetDomainRecordStatusQuery(string recordd,string status, string accessKey
         public string RecordId { get; set; }
         public string Status { get; set; }
 
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("RecordId", RecordId);
             dic.Add("Status", Status);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/UpdateDomainRecordQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/UpdateDomainRecordQuery.cs
@@ -1,5 +1,7 @@
 using AliyunSDK.DNS.Beans.Base;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -18,14 +20,22 @@ public UpdateDomainRecordQuery(string recordId, string rr, string type, string v
         public string Type { get; set; } = "";
         public string Value { get; set; } = "";
 
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("RecordId", RecordId);
             dic.Add("RR", RR);
             dic.Add("Type", Type);
             dic.Add("Value", Value);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
+        }
+    }
+
+    public class OrdinalComparer : IComparer<string>
+    {
+        public int Compare(string? x, string? y)
+        {
+            return string.CompareOrdinal(x, y);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Aliyun/Query/UpdateDomainRecordRemarkQuery.cs b/AliyunSDK.DNS/Beans/Aliyun/Query/UpdateDomainRecordRemarkQuery.cs
@@ -1,5 +1,6 @@
 using AliyunSDK.DNS.Beans.Base;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AliyunSDK.DNS.Beans.Aliyun.Query
 {
@@ -17,12 +18,12 @@ public UpdateDomainRecordRemarkQuery(string recordId, string remark, string acce
         }
         public string RecordId { get; set; }
         public string Remark { get; set; }
-        public override SortedDictionary<string, string> GetQuery()
+        public override Dictionary<string, string> GetQuery()
         {
             var dic = GetParamsDictionary();
             dic.Add("RecordId", RecordId);
             dic.Add("Remark", Remark);
-            return dic;
+            return dic.OrderBy(p => p.Key, new OrdinalComparer()).ToDictionary(x => x.Key, y => y.Value);
         }
     }
 }
diff --git a/AliyunSDK.DNS/Beans/Base/AliyunQueryBase.cs b/AliyunSDK.DNS/Beans/Base/AliyunQueryBase.cs
@@ -19,11 +19,11 @@ public AliyunQueryBase(string accessKeyId, string action)
         public string SignatureMethod { get; set; } = "HMAC-SHA1";
         public string SignatureVersion { get; set; } = "1.0";
 
-        public abstract SortedDictionary<string, string> GetQuery();
+        public abstract Dictionary<string, string> GetQuery();
 
-        protected SortedDictionary<string,string> GetParamsDictionary()
+        protected Dictionary<string,string> GetParamsDictionary()
         {
-            return new SortedDictionary<string, string>()
+            return new Dictionary<string, string>()
             {
                 { "Action", Action },
                 { "Version", Version },