🦄 refactor: 调整雪花生成器时间戳

Author: DwGoing

.gitignore

@@ -6,6 +6,7 @@
 # Custom files
 .DS_Store
 Config.json
+build/
 
 # User-specific files
 *.rsuser

example/CoreExample/Program.cs

@@ -7,6 +7,7 @@
 using Autofac.Extras.DynamicProxy;
 using NLog;
 using DwFramework.Core;
+using DwFramework.Core.Generator;
 using DwFramework.Core.AOP;
 
 namespace CoreExample
@@ -21,29 +22,38 @@ class A
 
         static async Task Main(string[] args)
         {
-            var host = new ServiceHost();
-            host.AddJsonConfiguration("Config.json", reloadOnChange: true);
-            host.ConfigureLogging(builder => builder.UserNLog());
-            host.ConfigureContainer(builder =>
+            var s = DateTime.Parse("2020.01.01");
+            var g = new SnowflakeGenerator(0, s);
+            while (true)
             {
-                builder.Register(c => new LoggerInterceptor(invocation => (
-                    $"{invocation.TargetType.Name}InvokeLog",
-                    LogLevel.Debug,
-                    "\n========================================\n"
-                    + $"Method:\t{invocation.Method}\n"
-                    + $"Args:\t{string.Join('|', invocation.Arguments)}\n"
-                    + $"Return:\t{invocation.ReturnValue}\n"
-                    + "========================================"
-                )));
-                builder.RegisterType<A>().As<I>().EnableInterfaceInterceptors();
-                builder.RegisterType<B>().As<I>().EnableInterfaceInterceptors();
-            });
-            host.OnHostStarted += provider =>
-            {
-                ServiceHost.ParseConfiguration<string>("ConnectionString");
-                foreach (var item in provider.GetServices<I>()) item.Do(5, 6);
-            };
-            await host.RunAsync();
+                var i = g.GenerateId();
+                var x = SnowflakeGenerator.DecodeId(i, s);
+                Console.WriteLine(i);
+            }
+
+            // var host = new ServiceHost();
+            // host.AddJsonConfiguration("Config.json", reloadOnChange: true);
+            // host.ConfigureLogging(builder => builder.UserNLog());
+            // host.ConfigureContainer(builder =>
+            // {
+            //     builder.Register(c => new LoggerInterceptor(invocation => (
+            //         $"{invocation.TargetType.Name}InvokeLog",
+            //         LogLevel.Debug,
+            //         "\n========================================\n"
+            //         + $"Method:\t{invocation.Method}\n"
+            //         + $"Args:\t{string.Join('|', invocation.Arguments)}\n"
+            //         + $"Return:\t{invocation.ReturnValue}\n"
+            //         + "========================================"
+            //     )));
+            //     builder.RegisterType<A>().As<I>().EnableInterfaceInterceptors();
+            //     builder.RegisterType<B>().As<I>().EnableInterfaceInterceptors();
+            // });
+            // host.OnHostStarted += provider =>
+            // {
+            //     ServiceHost.ParseConfiguration<string>("ConnectionString");
+            //     foreach (var item in provider.GetServices<I>()) item.Do(5, 6);
+            // };
+            // await host.RunAsync();
         }
     }
 

build/build_nuget_macos.sh scripts/build_nuget_macos.shbuild/build_nuget_macos.sh renamed to scripts/build_nuget_macos.sh

@@ -11,9 +11,9 @@ public static class DateTimeExtension
         /// <param name="endTime"></param>
         /// <param name="isMilliseconds"></param>
         /// <returns></returns>
-        public static long GetTimeDiff(this DateTime startTime, DateTime? endTime = null, bool isMilliseconds = false)
+        public static long GetTimeDiff(this DateTime startTime, DateTime endTime, bool isMilliseconds = false)
         {
-            var diffTime = (endTime ?? DateTime.Now).ToUniversalTime() - startTime.ToUniversalTime();
+            var diffTime = endTime - startTime;
             if (isMilliseconds) return (long)diffTime.TotalMilliseconds;
             else return (long)diffTime.TotalSeconds;
         }

build/build_nuget_windows.ps1 scripts/build_nuget_windows.ps1build/build_nuget_windows.ps1 renamed to scripts/build_nuget_windows.ps1

@@ -8,14 +8,14 @@ namespace DwFramework.Core.Generator
     /// </summary>
     public sealed class SnowflakeGenerator
     {
-        public sealed class SnowflakeIdInfo
+        public record SnowflakeIdInfo
         {
-            public long ID { get; }
-            public DateTime StartTime { get; }
-            public long Timestamp { get; }
+            public long ID { get; init; }
+            public DateTime StartTime { get; init; }
+            public long Timestamp { get; init; }
             public DateTime Time => DateTime.UnixEpoch.AddSeconds(Timestamp);
-            public long WorkId { get; }
-            public long Sequence { get; }
+            public long WorkId { get; init; }
+            public long Sequence { get; init; }
 
             /// <summary>
             /// 构造函数
@@ -71,7 +71,7 @@ public long GenerateId()
             {
                 _currentSequence++;
                 if (_currentSequence > MaxSequence) Thread.Sleep(1);
-                var timestamp = StartTime.GetTimeDiff(DateTime.Now);
+                var timestamp = StartTime.GetTimeDiff(DateTime.UtcNow);
                 if (timestamp > MaxTimestamp) throw new Exception("时间戳容量不足,请调整StartTime");
                 if (timestamp < _currentTimestamp) throw new Exception("时间获取异常,请检查服务器时间");
                 else if (timestamp > _currentTimestamp)