perf: Guid

HMBSbige · Apr 11, 2022 · 1b8ff95 · 1b8ff95
1 parent ba8fd1d
commit 1b8ff95
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/shadowsocks-csharp/Model/Configuration.cs b/shadowsocks-csharp/Model/Configuration.cs
@@ -1,5 +1,4 @@
 using Shadowsocks.Enums;
-using Shadowsocks.Util;
 using Shadowsocks.ViewModel;
 using System;
 using System.Collections.Generic;
@@ -553,7 +552,7 @@ public void FixConfiguration()
             {
                 while (id.Contains(server.Id))
                 {
-                    server.Id = Rng.RandId();
+                    server.Id = Guid.NewGuid().ToString(@"N");
                 }
                 id.Add(server.Id);
             }

diff --git a/shadowsocks-csharp/Model/Server.cs b/shadowsocks-csharp/Model/Server.cs
@@ -382,7 +382,7 @@ public Server()
             SubTag = @"";
             UdpOverTcp = false;
             Enable = true;
-            Id = Rng.RandId();
+            Id = Guid.NewGuid().ToString(@"N");
             SpeedLog = new ServerSpeedLog();
             Index = 0;
             IsSelected = false;

diff --git a/shadowsocks-csharp/Util/RNG.cs b/shadowsocks-csharp/Util/RNG.cs
@@ -1,18 +1,12 @@
 using System;
 using System.Security.Cryptography;
 
-namespace Shadowsocks.Util
+namespace Shadowsocks.Util;
+
+public static class Rng
 {
-    public static class Rng
+    public static void RandBytes(byte[] buf, int length = -1)
     {
-        public static void RandBytes(byte[] buf, int length = -1)
-        {
-            RandomNumberGenerator.Fill(length < 0 ? buf : buf.AsSpan(0, length));
-        }
-
-        public static string RandId()
-        {
-            return Guid.NewGuid().ToString().Replace(@"-", string.Empty);
-        }
+        RandomNumberGenerator.Fill(length < 0 ? buf : buf.AsSpan(0, length));
     }
 }