Merge pull request #132 from dotnetcore/revert-131-fixs-rename-comparer

when generate the md5 hashcode use the StringComparer.Ordinal to order the string items.
dotnetcore · May 28, 2023 · 2666bc8 · 2666bc8
2 parents 12f17c5 + bba889b
commit 2666bc8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/AgileConfig.Server.Service/ConfigService.cs b/AgileConfig.Server.Service/ConfigService.cs
@@ -299,8 +299,8 @@ public async Task<string> AppPublishedConfigsMd5(string appId, string env)
                                  && c.Env == env
             ).ToListAsync();
 
-            var keyStr = string.Join('&', configs.Select(c => GenerateKey(c)).ToArray().OrderBy(k => k));
-            var valStr = string.Join('&', configs.Select(c => c.Value).ToArray().OrderBy(v => v));
+            var keyStr = string.Join('&', configs.Select(c => GenerateKey(c)).ToArray().OrderBy(k => k, StringComparer.Ordinal));
+            var valStr = string.Join('&', configs.Select(c => c.Value).ToArray().OrderBy(v => v, StringComparer.Ordinal));
             var txt = $"{keyStr}&{valStr}";
 
             return Encrypt.Md5(txt);
@@ -428,8 +428,8 @@ public async Task<string> AppPublishedConfigsMd5WithInheritanced(string appId, s
         {
             var configs = await GetPublishedConfigsByAppIdWithInheritanced(appId, env);
 
-            var keyStr = string.Join('&', configs.Select(c => GenerateKey(c)).ToArray().OrderBy(k => k, StringComparer.InvariantCultureIgnoreCase));
-            var valStr = string.Join('&', configs.Select(c => c.Value).ToArray().OrderBy(v => v, StringComparer.InvariantCultureIgnoreCase));
+            var keyStr = string.Join('&', configs.Select(c => GenerateKey(c)).ToArray().OrderBy(k => k, StringComparer.Ordinal));
+            var valStr = string.Join('&', configs.Select(c => c.Value).ToArray().OrderBy(v => v, StringComparer.Ordinal));
             var txt = $"{keyStr}&{valStr}";
 
             return Encrypt.Md5(txt);
@@ -931,8 +931,6 @@ private async Task<bool> SaveFromDictAsync(IDictionary<string, string> dict, str
                 }
             }
 
-
-
             if (addConfigs.Any())
             {
                 await dbcontext.Configs.AddRangeAsync(addConfigs);

diff --git a/AgileConfig.Server.Service/ServiceInfoService.cs b/AgileConfig.Server.Service/ServiceInfoService.cs
@@ -94,15 +94,15 @@ public async Task<string> ServicesMD5()
         private string GenerateMD5(List<ServiceInfo> services)
         {
             var sb = new StringBuilder();
-            foreach (var serviceInfo in services.OrderBy(x => x.ServiceId))
+            foreach (var serviceInfo in services.OrderBy(x => x.ServiceId, StringComparer.Ordinal))
             {
                 var metaDataStr = "";
                 if (!string.IsNullOrEmpty(serviceInfo.MetaData))
                 {
                     var metaData = JsonConvert.DeserializeObject<List<string>>(serviceInfo.MetaData);
                     if (metaData != null)
                     {
-                        metaDataStr = string.Join(",", metaData.OrderBy(x => x));
+                        metaDataStr = string.Join(",", metaData.OrderBy(x => x, StringComparer.Ordinal));
                     }
                 }