lith 4 жил өмнө
parent
commit
84eca7e265

+ 0 - 2
dotnet/Library/Sers/Sers.Core/Sers.Core/CL/MessageOrganize/DefaultOrganize/RequestAdaptor.cs

@@ -182,8 +182,6 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
         #region (x.x.4)构造函数       
         #region (x.x.4)构造函数       
         public RequestAdaptor(JObject config)
         public RequestAdaptor(JObject config)
         {
         {
-            requestTimeoutMs = config["requestTimeoutMs"]?.Deserialize<int?>() ?? requestTimeoutMs;
-
             workThreadCount = config["workThreadCount"]?.Deserialize<int?>() ?? workThreadCount;
             workThreadCount = config["workThreadCount"]?.Deserialize<int?>() ?? workThreadCount;
             heartBeatTimeoutMs = config["heartBeatTimeoutMs"]?.Deserialize<int?>() ?? heartBeatTimeoutMs;
             heartBeatTimeoutMs = config["heartBeatTimeoutMs"]?.Deserialize<int?>() ?? heartBeatTimeoutMs;
             heartBeatRetryCount = config["heartBeatRetryCount"]?.Deserialize<int?>() ?? heartBeatRetryCount;
             heartBeatRetryCount = config["heartBeatRetryCount"]?.Deserialize<int?>() ?? heartBeatRetryCount;

+ 4 - 4
dotnet/Library/Vit/Vit.Core/Vit.Core/Util/Guid/FastGuid.cs

@@ -14,8 +14,8 @@ namespace Vit.Core.Util.Guid
         //  1 byte        1 byte           4 byte                2 byte             
         //  1 byte        1 byte           4 byte                2 byte             
         //  机器ID        数据ID            时间                  自增             
         //  机器ID        数据ID            时间                  自增             
         // machineId    dataCenterId       seconds                curId
         // machineId    dataCenterId       seconds                curId
-        private static int machineId= CommonHelp.Random(0, 127);//机器ID
-        private static int dataCenterId = CommonHelp.Random(0, 255);//数据ID
+        private static long machineId = CommonHelp.Random(0, 127);//机器ID
+        private static long dataCenterId = CommonHelp.Random(0, 255);//数据ID
         //private static int seconds;
         //private static int seconds;
         private static int curId=0;
         private static int curId=0;
 
 
@@ -43,8 +43,8 @@ namespace Vit.Core.Util.Guid
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static long GetGuid()
         public static long GetGuid()
         {
         {
-            int seconds = (int)(long)GetTimestamp();
-            int id= Interlocked.Increment(ref curId);
+            long seconds = (long)GetTimestamp();
+            long id = Interlocked.Increment(ref curId);
             return (((((machineId << 8) | dataCenterId) << 32) | seconds) << 8) | id;
             return (((((machineId << 8) | dataCenterId) << 32) | seconds) << 8) | id;
         }
         }