Browse Source

1. 调整65进制以上的字符关系
2. 调整雪花id

懒得勤快 2 years ago
parent
commit
f59dec83c3

+ 1 - 1
Masuit.Tools.Abstractions/Strings/NumberFormater.cs

@@ -131,7 +131,7 @@ namespace Masuit.Tools.Strings
             {
                 <= 2 => "01",
                 > 2 and < 65 => "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+/".Substring(0, @base),
-                >= 65 and <= 95 => "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._!@$#%*+?&()/\\,-:;<=>?[]^`{|}~'\"".Substring(0, @base),
+                >= 65 and <= 95 => "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._-!~'*()@$#%+?&/\\,:;<=>?[]^`{|}\"".Substring(0, @base),
                 _ => throw new ArgumentException("默认进制最大支持91进制")
             };
 

+ 4 - 1
Masuit.Tools.Abstractions/Systems/SnowFlake.cs

@@ -1,6 +1,8 @@
 using Masuit.Tools.DateTimeExt;
 using Masuit.Tools.Strings;
 using System;
+using System.Linq;
+using System.Net.NetworkInformation;
 
 namespace Masuit.Tools.Systems
 {
@@ -49,7 +51,8 @@ namespace Masuit.Tools.Systems
         /// </summary>
         public SnowFlake()
         {
-            Snowflakes(0);
+            var bytes = NetworkInterface.GetAllNetworkInterfaces().FirstOrDefault().GetPhysicalAddress().GetAddressBytes();
+            Snowflakes(bytes[4] << 4 | bytes[5]);
         }
 
         /// <summary>