diff --git a/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj b/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj
index 06f637e6..fcb104a4 100644
--- a/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj
+++ b/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj
@@ -9,6 +9,7 @@
+
diff --git a/CoreCms.Net.Utility/Helper/CommonHelper.cs b/CoreCms.Net.Utility/Helper/CommonHelper.cs
index 2bcd5535..84f1260d 100644
--- a/CoreCms.Net.Utility/Helper/CommonHelper.cs
+++ b/CoreCms.Net.Utility/Helper/CommonHelper.cs
@@ -11,6 +11,7 @@ using System.Text;
using System.Text.RegularExpressions;
using CoreCms.Net.Configuration;
using CoreCms.Net.Model.ViewModels.Basics;
+using Yitter.IdGenerator;
namespace CoreCms.Net.Utility.Helper
{
@@ -238,31 +239,31 @@ namespace CoreCms.Net.Utility.Helper
switch (type)
{
case (int)GlobalEnumVars.SerialNumberType.订单编号: //订单编号
- str = type + Msectime() + rand.Next(0, 9);
+ str = type + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.支付单编号: //支付单编号
- str = type + Msectime() + rand.Next(0, 9);
+ str = type + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.商品编号: //商品编号
- str = 'G' + Msectime() + rand.Next(0, 5);
+ str = 'G' + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.货品编号: //货品编号
- str = 'P' + Msectime() + rand.Next(0, 5);
+ str = 'P' + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.售后单编号: //售后单编号
- str = type + Msectime() + rand.Next(0, 9);
+ str = type + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.退款单编号: //退款单编号
- str = type + Msectime() + rand.Next(0, 9);
+ str = type + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.退货单编号: //退货单编号
- str = type + Msectime() + rand.Next(0, 9);
+ str = type + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.发货单编号: //发货单编号
- str = type + Msectime() + rand.Next(0, 9);
+ str = type + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.服务订单编号: //服务订单编号
- str = type + Msectime() + rand.Next(0, 9);
+ str = type + YitIdHelper.NextId().ToString();
break;
case (int)GlobalEnumVars.SerialNumberType.提货单号: //提货单号
//str = 'T' + type + msectime() + rand.Next(0, 5);
@@ -286,7 +287,7 @@ namespace CoreCms.Net.Utility.Helper
}
break;
default:
- str = 'T' + Msectime() + rand.Next(0, 9);
+ str = 'T' + YitIdHelper.NextId().ToString();
break;
}
return str;
diff --git a/CoreCms.Net.Web.Admin/Startup.cs b/CoreCms.Net.Web.Admin/Startup.cs
index eb82a85b..530b744d 100644
--- a/CoreCms.Net.Web.Admin/Startup.cs
+++ b/CoreCms.Net.Web.Admin/Startup.cs
@@ -140,14 +140,18 @@ namespace CoreCms.Net.Web.Admin
p.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
});
-
-
// ѩƯ㷨
// IdGeneratorOptions ڹ캯 WorkerId
var options = new IdGeneratorOptions(1);
+ // WorkerIdBitLength Ĭֵ6ֵ֧ WorkerId ֵΪ2^6-1 WorkerId 64ø WorkerIdBitLength
+ // options.WorkerIdBitLength = 10;
+ // ...... òο IdGeneratorOptions 壬һ˵ֻҪ WorkerIdBitLength WorkerId ֵ
+
// IJöЧ
YitIdHelper.SetIdGenerator(options);
+ // ʼԺκҪIDĵط·
+ //var newId = YitIdHelper.NextId();
}
diff --git a/CoreCms.Net.Web.WebApi/Startup.cs b/CoreCms.Net.Web.WebApi/Startup.cs
index 07e3dba5..cbe870e6 100644
--- a/CoreCms.Net.Web.WebApi/Startup.cs
+++ b/CoreCms.Net.Web.WebApi/Startup.cs
@@ -34,6 +34,7 @@ using CoreCms.Net.WeChat.Service.Mediator;
using Essensoft.Paylink.Alipay;
using Essensoft.Paylink.WeChatPay;
using MediatR;
+using Yitter.IdGenerator;
namespace CoreCms.Net.Web.WebApi
{
@@ -152,7 +153,18 @@ namespace CoreCms.Net.Web.WebApi
p.SerializerSettings.DateFormatString = "yyyy/MM/dd HH:mm:ss";
});
+ // ѩƯ㷨
+ // IdGeneratorOptions ڹ캯 WorkerId
+ var options = new IdGeneratorOptions(1);
+ // WorkerIdBitLength Ĭֵ6ֵ֧ WorkerId ֵΪ2^6-1 WorkerId 64ø WorkerIdBitLength
+ // options.WorkerIdBitLength = 10;
+ // ...... òο IdGeneratorOptions 壬һ˵ֻҪ WorkerIdBitLength WorkerId ֵ
+ // IJöЧ
+ YitIdHelper.SetIdGenerator(options);
+
+ // ʼԺκҪIDĵط·
+ //var newId = YitIdHelper.NextId();
}