release

ldqk · Aug 31, 2023 · 7c90531 · 7c90531
1 parent f59dec8
commit 7c90531
Show file tree

Hide file tree

Showing 10 changed files with 333 additions and 254 deletions.
diff --git a/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj b/Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj
@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6;net7</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.6.6.2</Version>
+        <Version>2.6.6.3</Version>
         <Authors>懒得勤快</Authors>
         <Description>新手友好的C#万能工具库，码数吐司库，Masuit.Tools基础公共库(适用于.NET4.6.1/.NET Standard2.0及以上项目)，包含一些常用的操作类，大都是静态类，加密解密，反射操作，Excel简单导出，权重随机筛选算法，分布式短id，表达式树，linq扩展，文件压缩，多线程下载和FTP客户端，硬件信息，字符串扩展方法，日期时间扩展操作，中国农历，大文件拷贝，图像裁剪，验证码，断点续传，集合扩展等常用封装。
             官网教程：https://tools.masuit.org

diff --git a/Masuit.Tools.Abstractions/Systems/SnowFlake.cs b/Masuit.Tools.Abstractions/Systems/SnowFlake.cs
@@ -6,146 +6,151 @@
 
 namespace Masuit.Tools.Systems
 {
-    /// <summary>
-    /// 动态生产有规律的分布式ID
-    /// </summary>
-    public class SnowFlake
-    {
-        #region 私有字段
-
-        private static long _machineId; //机器码
-        private static long _sequence; //计数从零开始
-        private static long _lastTimestamp = -1L; //最后时间戳
-
-        private const long Twepoch = 687888001020L; //唯一时间随机量
-
-        private const int MachineBits = 10; //机器码字节数
-
-        private const int SequenceBits = 12; //计数器字节数，12个字节用来保存计数码
-        private const int MachineLeft = SequenceBits; //机器码数据左移位数，就是后面计数器占用的位数
-        private const long TimestampLeft = MachineBits + SequenceBits; //时间戳左移动位数就是机器码+计数器总字节数+数据字节数
-        private const long SequenceMask = -1L ^ -1L << SequenceBits; //一毫秒内可以产生计数，如果达到该值则等到下一毫秒在进行生成
-
-        private static readonly object SyncRoot = new object(); //加锁对象
-        private static NumberFormater _numberFormater = new NumberFormater(36);
-        private static SnowFlake _snowFlake;
-
-        #endregion 私有字段
-
-        /// <summary>
-        /// 获取一个新的id
-        /// </summary>
-        public static string NewId => GetInstance().GetUniqueId();
-
-        /// <summary>
-        /// 创建一个实例
-        /// </summary>
-        /// <returns></returns>
-        public static SnowFlake GetInstance()
-        {
-            return _snowFlake ??= new SnowFlake();
-        }
-
-        /// <summary>
-        /// 默认构造函数
-        /// </summary>
-        public SnowFlake()
-        {
-            var bytes = NetworkInterface.GetAllNetworkInterfaces().FirstOrDefault().GetPhysicalAddress().GetAddressBytes();
-            Snowflakes(bytes[4] << 4 | bytes[5]);
-        }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="machineId">机器码</param>
-        public SnowFlake(long machineId)
-        {
-            Snowflakes(machineId);
-        }
-
-        private void Snowflakes(long machineId)
-        {
-            if (machineId >= 0)
-            {
-                if (machineId > 1024)
-                {
-                    throw new Exception("机器码ID非法");
-                }
-
-                _machineId = machineId;
-            }
-        }
-
-        /// <summary>
-        /// 设置数制格式化器
-        /// </summary>
-        /// <param name="nf"></param>
-        public static void SetNumberFormater(NumberFormater nf)
-        {
-            _numberFormater = nf;
-        }
-
-        /// <summary>
-        /// 获取长整形的ID
-        /// </summary>
-        /// <returns></returns>
-        public long GetLongId()
-        {
-            lock (SyncRoot)
-            {
-                var timestamp = DateTime.UtcNow.GetTotalMilliseconds();
-                if (_lastTimestamp == timestamp)
-                {
-                    //同一毫秒中生成ID
-                    _sequence = (_sequence + 1) & SequenceMask; //用&运算计算该毫秒内产生的计数是否已经到达上限
-                    if (_sequence == 0)
-                    {
-                        //一毫秒内产生的ID计数已达上限，等待下一毫秒
-                        timestamp = DateTime.UtcNow.GetTotalMilliseconds();
-                    }
-                }
-                else
-                {
-                    //不同毫秒生成ID
-                    _sequence = 0L;
-                }
-
-                _lastTimestamp = timestamp; //把当前时间戳保存为最后生成ID的时间戳
-                long id = ((timestamp - Twepoch) << (int)TimestampLeft) | (_machineId << MachineLeft) | _sequence;
-                return id;
-            }
-        }
-
-        /// <summary>
-        /// 获取一个字符串表示形式的id
-        /// </summary>
-        /// <returns></returns>
-        public string GetUniqueId()
-        {
-            return _numberFormater.ToString(GetLongId());
-        }
-
-        /// <summary>
-        /// 获取一个字符串表示形式的id
-        /// </summary>
-        /// <param name="maxLength">最大长度，至少6位</param>
-        /// <returns></returns>
-        public string GetUniqueShortId(int maxLength = 8)
-        {
-            if (maxLength < 6)
-            {
-                throw new ArgumentException("最大长度至少需要6位");
-            }
-
-            string id = GetUniqueId();
-            int index = id.Length - maxLength;
-            if (index < 0)
-            {
-                index = 0;
-            }
-
-            return id.Substring(index);
-        }
-    }
+	/// <summary>
+	/// 动态生产有规律的分布式ID
+	/// </summary>
+	public class SnowFlake
+	{
+		#region 私有字段
+
+		private static long _machineId; //机器码
+		private static long _sequence; //计数从零开始
+		private static long _lastTimestamp = -1L; //最后时间戳
+
+		private const long Twepoch = 687888001020L; //唯一时间随机量
+
+		private const int MachineBits = 10; //机器码字节数
+
+		private const int SequenceBits = 12; //计数器字节数，12个字节用来保存计数码
+		private const int MachineLeft = SequenceBits; //机器码数据左移位数，就是后面计数器占用的位数
+		private const long TimestampLeft = MachineBits + SequenceBits; //时间戳左移动位数就是机器码+计数器总字节数+数据字节数
+		private const long SequenceMask = -1L ^ -1L << SequenceBits; //一毫秒内可以产生计数，如果达到该值则等到下一毫秒在进行生成
+
+		private static readonly object SyncRoot = new object(); //加锁对象
+		private static NumberFormater _numberFormater = new NumberFormater(36);
+		private static SnowFlake _snowFlake;
+
+		#endregion 私有字段
+
+		/// <summary>
+		/// 获取一个新的id
+		/// </summary>
+		public static string NewId => GetInstance().GetUniqueId();
+
+		/// <summary>
+		/// 获取一个新的id
+		/// </summary>
+		public static long LongId => GetInstance().GetLongId();
+
+		/// <summary>
+		/// 创建一个实例
+		/// </summary>
+		/// <returns></returns>
+		public static SnowFlake GetInstance()
+		{
+			return _snowFlake ??= new SnowFlake();
+		}
+
+		/// <summary>
+		/// 默认构造函数
+		/// </summary>
+		public SnowFlake()
+		{
+			var bytes = NetworkInterface.GetAllNetworkInterfaces().FirstOrDefault().GetPhysicalAddress().GetAddressBytes();
+			Snowflakes(bytes[4] << 4 | bytes[5]);
+		}
+
+		/// <summary>
+		/// 构造函数
+		/// </summary>
+		/// <param name="machineId">机器码</param>
+		public SnowFlake(long machineId)
+		{
+			Snowflakes(machineId);
+		}
+
+		private void Snowflakes(long machineId)
+		{
+			if (machineId >= 0)
+			{
+				if (machineId > 1024)
+				{
+					throw new Exception("机器码ID非法");
+				}
+
+				_machineId = machineId;
+			}
+		}
+
+		/// <summary>
+		/// 设置数制格式化器
+		/// </summary>
+		/// <param name="nf"></param>
+		public static void SetNumberFormater(NumberFormater nf)
+		{
+			_numberFormater = nf;
+		}
+
+		/// <summary>
+		/// 获取长整形的ID
+		/// </summary>
+		/// <returns></returns>
+		public long GetLongId()
+		{
+			lock (SyncRoot)
+			{
+				var timestamp = DateTime.UtcNow.GetTotalMilliseconds();
+				if (_lastTimestamp == timestamp)
+				{
+					//同一毫秒中生成ID
+					_sequence = (_sequence + 1) & SequenceMask; //用&运算计算该毫秒内产生的计数是否已经到达上限
+					if (_sequence == 0)
+					{
+						//一毫秒内产生的ID计数已达上限，等待下一毫秒
+						timestamp = DateTime.UtcNow.GetTotalMilliseconds();
+					}
+				}
+				else
+				{
+					//不同毫秒生成ID
+					_sequence = 0L;
+				}
+
+				_lastTimestamp = timestamp; //把当前时间戳保存为最后生成ID的时间戳
+				long id = ((timestamp - Twepoch) << (int)TimestampLeft) | (_machineId << MachineLeft) | _sequence;
+				return id;
+			}
+		}
+
+		/// <summary>
+		/// 获取一个字符串表示形式的id
+		/// </summary>
+		/// <returns></returns>
+		public string GetUniqueId()
+		{
+			return _numberFormater.ToString(GetLongId());
+		}
+
+		/// <summary>
+		/// 获取一个字符串表示形式的id
+		/// </summary>
+		/// <param name="maxLength">最大长度，至少6位</param>
+		/// <returns></returns>
+		public string GetUniqueShortId(int maxLength = 8)
+		{
+			if (maxLength < 6)
+			{
+				throw new ArgumentException("最大长度至少需要6位");
+			}
+
+			string id = GetUniqueId();
+			int index = id.Length - maxLength;
+			if (index < 0)
+			{
+				index = 0;
+			}
+
+			return id.Substring(index);
+		}
+	}
 }