lith 4 年之前
父節點
當前提交
016617a0c5
共有 38 個文件被更改,包括 148 次插入132 次删除
  1. 3 3
      dotnet/Doc/PublishFile/Sers单体压测/ServiceCenter/appsettings.json
  2. 3 3
      dotnet/Gateway/App.Gateway/appsettings.json
  3. 13 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Properties/PublishProfiles/FolderProfile.pubxml
  4. 52 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj
  5. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/Fast/Bytes_RpcContextData.cs
  6. 24 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/Fast/ERpcPropertyName.cs
  7. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/Fast/MemoryStream_RpcContextData.cs
  8. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/MessagePack_RpcContextData.cs
  9. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/StringBuilder_RpcContextData.cs
  10. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_ActionBlock.cs
  11. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_BufferBlock.cs
  12. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_Disruptor.cs
  13. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_WorkerPool.cs
  14. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_WorkerPoolCache.cs
  15. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_WorkerPoolCascade.cs
  16. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/Demo/ApiModel_User.cs
  17. 5 7
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsEqualAttribute.cs
  18. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsMaxValueAttribute.cs
  19. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsMinValueAttribute.cs
  20. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsSizeAttribute.cs
  21. 2 2
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Extensions/byte/ReadOnlySpanByteExtensions.cs
  22. 2 2
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Extensions/byte/SpanByteExtensions.cs
  23. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Module/Serialization/Serialization_MessagePack.Newtonsoft.cs
  24. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Module/Serialization/Serialization_MessagePack.Newtonsoft_Object.cs
  25. 0 0
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Module/Serialization/Serialization_MessagePack.cs
  26. 4 4
      dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/RpcContextData.cs
  27. 0 21
      dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj
  28. 13 13
      dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/ConsumerFactory.cs
  29. 1 0
      dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Util.Consumer.Test/Sers.Core.Util.Consumer.Test.csproj
  30. 1 2
      dotnet/Library/Vit/Vit.Core/Test/Vit.Core.Module.Serialization.Qps/Vit.Core.Module.Serialization.Qps.csproj
  31. 0 13
      dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Serialization.cs
  32. 0 40
      dotnet/Library/Vit/Vit.Core/Vit.Core/Util/Threading/ThreadCache.cs
  33. 2 10
      dotnet/Library/Vit/Vit.Core/Vit.Core/Vit.Core.csproj
  34. 11 0
      dotnet/Sers.sln
  35. 3 3
      dotnet/ServiceCenter/App.Gover.Gateway/appsettings.json
  36. 3 3
      dotnet/ServiceCenter/App.ServiceCenter/appsettings.json
  37. 3 3
      dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/appsettings.json
  38. 3 3
      dotnet/ServiceStation/Demo/Serslot/Did.Serslot.Demo/appsettings.json

+ 3 - 3
dotnet/Doc/PublishFile/Sers单体压测/ServiceCenter/appsettings.json

@@ -44,8 +44,8 @@
 
 
     // RpcData序列化模式。可不指定。默认为Text。
-    // 可为 Newtonsoft、Text、MessagePack、BytePointor。
-    // 效率依次递增。MessagePack 和 BytePointor 序列化为二进制数据而不是json字符串。
+    // 可为 Newtonsoft、Text、BytePointor。
+    // 效率依次递增。BytePointor 序列化为二进制数据而不是json字符串。
     "RpcDataSerializeMode": "BytePointor",
 
 
@@ -301,7 +301,7 @@
       "PrintToConsole": true
     },
 
-    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) 、ActionBlock、BufferBlock  */
+    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) */
     "ConsumerMode": "ConsumerCache_BlockingCollection",
 
 

+ 3 - 3
dotnet/Gateway/App.Gateway/appsettings.json

@@ -32,8 +32,8 @@
 
 
     // RpcData序列化模式。可不指定。默认为Text。
-    // 可为 Newtonsoft、Text、MessagePack、BytePointor。
-    // 效率依次递增。MessagePack 和 BytePointor 序列化为二进制数据而不是json字符串。
+    // 可为 Newtonsoft、Text、BytePointor。
+    // 效率依次递增。BytePointor 序列化为二进制数据而不是json字符串。
     "RpcDataSerializeMode": "Text",
 
 
@@ -168,7 +168,7 @@
       "PrintToConsole": true
     },
 
-    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) 、ActionBlock、BufferBlock  */
+    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) */
     "ConsumerMode": "BlockingCollection",
 
 

+ 13 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PublishDir>bin\nuget</PublishDir>
+  </PropertyGroup>
+</Project>

+ 52 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj

@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>2.1.1.499</Version>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <Authors>Lith</Authors>
+    <PackageProjectUrl>https://github.com/serset/Sers/tree/2.1.1/release</PackageProjectUrl>
+    <Description>Send email to serset@yeah.net if you have any questions.</Description>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Debug\netstandard2.0\Sers.Core.Temp.xml</DocumentationFile>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
+    <Compile Remove="Vit.Core\Extensions\byte\**" />
+    <EmbeddedResource Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
+    <EmbeddedResource Remove="Vit.Core\Extensions\byte\**" />
+    <None Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
+    <None Remove="Vit.Core\Extensions\byte\**" />
+  </ItemGroup>
+
+ 
+ 
+  <ItemGroup>
+    <PackageReference Include="MessagePack" Version="2.2.85" />
+    <PackageReference Include="Disruptor" Version="3.6.2" /> 
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
+  </ItemGroup>
+
+ 
+ 
+  <ItemGroup>
+    <ProjectReference Include="..\Sers.Core\Sers.Core.csproj" />
+  </ItemGroup>
+
+ 
+ 
+  <ItemGroup>
+    <Folder Include="Vit.Core\Extensions\" />
+  </ItemGroup>
+
+ 
+ 
+ 
+
+</Project>

+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/Serialization/Fast/Bytes_RpcContextData.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/Fast/Bytes_RpcContextData.cs


+ 24 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/Fast/ERpcPropertyName.cs

@@ -0,0 +1,24 @@
+
+
+namespace Sers.Core.Module.Rpc.Serialization.Fast
+{
+
+    enum ERpcPropertyName : byte
+    {
+        route = 10,
+
+        caller_rid = 20,
+        caller_callStack =21,
+        caller_source=22,
+
+        http_url = 30,
+        http_method = 31,
+        http_statusCode = 32,
+        http_protocol = 33,
+        http_headers = 34,
+
+
+        error = 40,
+        user = 50,
+    }
+}

+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/Serialization/Fast/MemoryStream_RpcContextData.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/Fast/MemoryStream_RpcContextData.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/Serialization/MessagePack_RpcContextData.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/MessagePack_RpcContextData.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/Serialization/StringBuilder_RpcContextData.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Module/Rpc/Serialization/StringBuilder_RpcContextData.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/Consumer_ActionBlock.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_ActionBlock.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/Consumer_BufferBlock.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_BufferBlock.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/Consumer_Disruptor.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_Disruptor.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/Consumer_WorkerPool.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_WorkerPool.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/Consumer_WorkerPoolCache.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_WorkerPoolCache.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/Consumer_WorkerPoolCascade.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core/Util/Consumer/Consumer_WorkerPoolCascade.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/SersLoader/ApiDesc/Attribute/Valid/delete/Demo/ApiModel_User.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/Demo/ApiModel_User.cs


+ 5 - 7
dotnet/Library/Sers/Sers.Core/Sers.Core/SersLoader/ApiDesc/Attribute/Valid/delete/SsEqualAttribute.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsEqualAttribute.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Sers.Core.Extensions;
-using Sers.Core.Module.SsApiDiscovery.ApiDesc.Attribute.Valid;
-using Sers.Core.Module.SsApiDiscovery.SersValid;
-using Sers.Core.Util.SsError;
+using Sers.Core.Module.Valid.Sers1;
+
+using Vit.Core.Util.ComponentModel.SsError;
+using Vit.Extensions;
 
 namespace Sers.Core.Module.ApiDesc.Attribute
 {

+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/SersLoader/ApiDesc/Attribute/Valid/delete/SsMaxValueAttribute.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsMaxValueAttribute.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/SersLoader/ApiDesc/Attribute/Valid/delete/SsMinValueAttribute.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsMinValueAttribute.cs


+ 0 - 0
dotnet/Library/Sers/Sers.Core/Sers.Core/SersLoader/ApiDesc/Attribute/Valid/delete/SsSizeAttribute.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/SersLoader/ApiDesc/Attribute/Valid/delete/SsSizeAttribute.cs


+ 2 - 2
dotnet/Library/Vit/Vit.Core/Vit.Core/Extensions/byte/ReadOnlySpanByteExtensions.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Extensions/byte/ReadOnlySpanByteExtensions.cs

@@ -10,13 +10,13 @@ namespace Vit.Extensions
   
         public static string ReadOnlySpanByteToString(this ReadOnlySpan<byte> data)
         {             
-            return Serialization.Instance.encoding.GetString(data); 
+            return Serialization_Newtonsoft.Instance.encoding.GetString(data); 
         }
 
 
         public static ReadOnlySpan<byte> StringToReadOnlySpanByte(this string data)
         {
-            return Serialization.Instance.encoding.GetBytes(data);
+            return Serialization_Newtonsoft.Instance.encoding.GetBytes(data);
         }
         #endregion
 

+ 2 - 2
dotnet/Library/Vit/Vit.Core/Vit.Core/Extensions/byte/SpanByteExtensions.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Extensions/byte/SpanByteExtensions.cs

@@ -10,13 +10,13 @@ namespace Vit.Extensions
  
         public static string SpanByteToString(this Span<byte> data)
         {             
-            return Serialization.Instance.encoding.GetString(data); 
+            return Serialization_Newtonsoft.Instance.encoding.GetString(data); 
         }
 
 
         public static Span<byte> StringToSpanByte(this string data)
         {
-            return Serialization.Instance.encoding.GetBytes(data);
+            return Serialization_Newtonsoft.Instance.encoding.GetBytes(data);
         }
         #endregion
 

+ 0 - 0
dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Serialization_MessagePack.Newtonsoft.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Module/Serialization/Serialization_MessagePack.Newtonsoft.cs


+ 0 - 0
dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Serialization_MessagePack.Newtonsoft_Object.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Module/Serialization/Serialization_MessagePack.Newtonsoft_Object.cs


+ 0 - 0
dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Serialization_MessagePack.cs → dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Vit.Core/Module/Serialization/Serialization_MessagePack.cs


+ 4 - 4
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Rpc/RpcContextData.cs

@@ -9,7 +9,7 @@ using Vit.Core.Util.ConfigurationManager;
 namespace Sers.Core.Module.Rpc
 {
 
-    [MessagePack.MessagePackFormatter(typeof(Sers.Core.Module.Rpc.Serialization.MessagePack_RpcContextData))]
+    //[MessagePack.MessagePackFormatter(typeof(Sers.Core.Module.Rpc.Serialization.MessagePack_RpcContextData))]
     public class RpcContextData
     {
 
@@ -19,8 +19,8 @@ namespace Sers.Core.Module.Rpc
         static RpcContextData()
         {
             // RpcData序列化模式。可不指定。默认为Text。
-            // 可为 Newtonsoft、Text、MessagePack、BytePointor。
-            // 效率依次递增。MessagePack 和 BytePointor 序列化为二进制数据而不是json字符串。
+            // 可为 Newtonsoft、Text、BytePointor。
+            // 效率依次递增。BytePointor 序列化为二进制数据而不是json字符串。
             string rpcDataSerializeMode = ConfigurationManager.Instance.GetByPath<string>("Sers.RpcDataSerializeMode");
  
             switch (rpcDataSerializeMode) 
@@ -28,7 +28,7 @@ namespace Sers.Core.Module.Rpc
                 case "Newtonsoft": Serialization = Newtonsoft_RpcContextData.Instance; break;
                 case "Text": Serialization = Text_RpcContextData.Instance; break;
                 //case "StringBuilder": Serialization = StringBuilder_RpcContextData.Instance; break;
-                case "MessagePack": Serialization = MessagePack_RpcContextData.Instance; break;
+                //case "MessagePack": Serialization = MessagePack_RpcContextData.Instance; break;
                 case "BytePointor": Serialization = BytePointor_RpcContextData.Instance; break;           
                           
                 default: Serialization = Text_RpcContextData.Instance; break;

+ 0 - 21
dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -19,28 +19,7 @@
 
 
   <ItemGroup>
-    <Compile Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
-    <Compile Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
-    <EmbeddedResource Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
-    <EmbeddedResource Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
-    <None Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
-    <None Remove="SersLoader\ApiDesc\Attribute\Valid\delete\**" />
-  </ItemGroup>
-
-
-  <ItemGroup>
-    <Compile Remove="Module\Rpc\Serialization\StringBuilder_RpcContextData.cs" />
-    <Compile Remove="Util\Consumer\Consumer_Disruptor.cs" />
-    <Compile Remove="Util\Consumer\Consumer_WorkerPool.cs" />
-    <Compile Remove="Util\Consumer\Consumer_WorkerPoolCache.cs" />
-    <Compile Remove="Util\Consumer\Consumer_WorkerPoolCascade.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--<PackageReference Include="Disruptor" Version="3.6.2" />-->
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
   </ItemGroup>  
  
   

+ 13 - 13
dotnet/Library/Sers/Sers.Core/Sers.Core/Util/Consumer/ConsumerFactory.cs

@@ -6,7 +6,7 @@ namespace Sers.Core.Util.Consumer
     {
 
         /// <summary>
-        /// 队列模式。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) 、ActionBlock、BufferBlock 
+        /// 队列模式。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能)
         /// </summary>
         public static string ConsumerMode = ConfigurationManager.Instance.GetByPath<string>("Vit.ConsumerMode");
 
@@ -17,12 +17,12 @@ namespace Sers.Core.Util.Consumer
             IConsumer<T> consumer;
             switch (ConsumerMode)
             {
-                case "ActionBlock":
-                    consumer = new Consumer_ActionBlock<T>();  // 16 16 700万     24 24 900-1000万
-                    break;
-                case "BufferBlock":
-                    consumer = new Consumer_BufferBlock<T>();   //2 36 800-1000万
-                    break;
+                //case "ActionBlock":
+                //    consumer = new Consumer_ActionBlock<T>();  // 16 16 700万     24 24 900-1000万
+                //    break;
+                //case "BufferBlock":
+                //    consumer = new Consumer_BufferBlock<T>();   //2 36 800-1000万
+                //    break;
                 case "BlockingCollection":
                     consumer = new Consumer_BlockingCollection<T>();  //16 16 440万          2  2  800万
                     break;
@@ -35,12 +35,12 @@ namespace Sers.Core.Util.Consumer
                 //    consumer = new Consumer_WorkerPool<T>(); //16 16 800-900万
                 //    break;
 
-                case "ConsumerCache_ActionBlock":
-                    consumer = new ConsumerCache<T, Consumer_ActionBlock<T>>(); // 16 16  4000-4200万
-                    break;
-                case "ConsumerCache_BufferBlock":
-                    consumer = new ConsumerCache<T, Consumer_BufferBlock<T>>(); // 16 16  1500-1600万
-                    break;
+                //case "ConsumerCache_ActionBlock":
+                //    consumer = new ConsumerCache<T, Consumer_ActionBlock<T>>(); // 16 16  4000-4200万
+                //    break;
+                //case "ConsumerCache_BufferBlock":
+                //    consumer = new ConsumerCache<T, Consumer_BufferBlock<T>>(); // 16 16  1500-1600万
+                //    break;
                 case "ConsumerCache_BlockingCollection":
                     consumer = new ConsumerCache<T, Consumer_BlockingCollection<T>>(); //16 16 4200-4500万
                     break;

+ 1 - 0
dotnet/Library/Sers/Sers.Core/Test/Sers.Core.Util.Consumer.Test/Sers.Core.Util.Consumer.Test.csproj

@@ -23,6 +23,7 @@
  
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Sers.Core.Temp\Sers.Core.Temp.csproj" />
     <ProjectReference Include="..\..\Sers.Core\Sers.Core.csproj" />
   </ItemGroup>
  

+ 1 - 2
dotnet/Library/Vit/Vit.Core/Test/Vit.Core.Module.Serialization.Qps/Vit.Core.Module.Serialization.Qps.csproj

@@ -6,8 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Sers\Sers.Core\Sers.Core\Sers.Core.csproj" />
-    <ProjectReference Include="..\..\Vit.Core\Vit.Core.csproj" />
+    <ProjectReference Include="..\..\..\..\Sers\Sers.Core\Sers.Core.Temp\Sers.Core.Temp.csproj" />
   </ItemGroup>
  
 

+ 0 - 13
dotnet/Library/Vit/Vit.Core/Vit.Core/Module/Serialization/Serialization.cs

@@ -8,18 +8,5 @@ namespace Vit.Core.Module.Serialization
 
         public static ISerialization Instance { get; set; } = Serialization_Newtonsoft.Instance;
 
-        //public static readonly Serialization_Newtonsoft Newtonsoft = Serialization_Newtonsoft.Instance;
-        //public static readonly Serialization_Text Text = Serialization_Text.Instance;
-        //public static readonly Serialization_MessagePack MessagePack = Serialization_MessagePack.Instance;
-
-
-
-
-
-
-
-
-
-
     }
 }

+ 0 - 40
dotnet/Library/Vit/Vit.Core/Vit.Core/Util/Threading/ThreadCache.cs

@@ -1,40 +0,0 @@
-#region << 版本注释 - v1 >>
-/*
- * ========================================================================
- * 版本:v1
- * 时间:2021-03-19
- * 作者:Lith
- * 邮箱:serset@yeah.net
- * 
- * ========================================================================
-*/
-#endregion
-
-
-
-
-namespace Vit.Core.Util.Threading
-{
-    /// <summary>
-    /// 切换线程时不传递数据     
-    /// </summary>
-    public class ThreadCache<T>
-    {
-
-        readonly System.Threading.ThreadLocal<T> _AsyncLocal = new System.Threading.ThreadLocal<T>();
-
-       
-        public T Value
-        {
-            get
-            {              
-                return _AsyncLocal.Value;
-            }
-            set
-            {               
-                _AsyncLocal.Value = value;
-            }
-        }
-    }
-   
-}

+ 2 - 10
dotnet/Library/Vit/Vit.Core/Vit.Core/Vit.Core.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Lith</Authors>
     <PackageProjectUrl>https://github.com/serset/Sers/tree/2.1.1/release</PackageProjectUrl>
-    <Description>.net core common tool. log to txt,serialize(Newtonsoft.Json/System.Text.Json/MessagePack),ConfigurationManager,DynamicMethodExecutor,Guid,Reflection,Shell etc.</Description>
+    <Description>.net core common tool. log to txt,serialize(Newtonsoft.Json/System.Text.Json),ConfigurationManager,DynamicMethodExecutor,Guid,Reflection,Shell etc.</Description>
     <PackageReleaseNotes>Send email to serset@yeah.net if you have any questions.</PackageReleaseNotes>
   </PropertyGroup>
 
@@ -17,17 +17,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>bin\Debug\netstandard2.0\Vit.Core.xml</DocumentationFile>
   </PropertyGroup>
-
  
 
-  <ItemGroup>
-    <Compile Remove="Extensions\byte\ReadOnlySpanByteExtensions.cs" />
-    <Compile Remove="Extensions\byte\SpanByteExtensions.cs" />
-    <Compile Remove="Util\Threading\ThreadCache.cs" /> 
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MessagePack" Version="2.2.85" />
+  <ItemGroup>    
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Buffers" Version="4.5.1" /> 
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" /> 

+ 11 - 0
dotnet/Sers.sln

@@ -173,6 +173,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Core.Module.LocalApi.Q
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Core.Module.Serialization.Qps", "Library\Vit\Vit.Core\Test\Vit.Core.Module.Serialization.Qps\Vit.Core.Module.Serialization.Qps.csproj", "{8D55E47B-102B-4905-BA35-40CDD2430B54}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Core.Temp", "Library\Sers\Sers.Core\Sers.Core.Temp\Sers.Core.Temp.csproj", "{F0FB825C-DB85-4268-8396-51CEF5AEAB50}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -565,6 +567,14 @@ Global
 		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Release|x86.ActiveCfg = Release|Any CPU
 		{8D55E47B-102B-4905-BA35-40CDD2430B54}.Release|x86.Build.0 = Release|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Debug|x86.Build.0 = Debug|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -651,6 +661,7 @@ Global
 		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB} = {0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}
 		{A2E07766-8290-446D-AD4E-D8277687D4C0} = {37633A5F-54B5-4179-8BCD-B7B422B4857C}
 		{8D55E47B-102B-4905-BA35-40CDD2430B54} = {B0C8734C-7CAC-4EA4-BF49-4ECE4876BB5D}
+		{F0FB825C-DB85-4268-8396-51CEF5AEAB50} = {C3954FC1-88A0-4915-AF47-E0B75AAAA63A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}

+ 3 - 3
dotnet/ServiceCenter/App.Gover.Gateway/appsettings.json

@@ -32,8 +32,8 @@
 
 
     // RpcData序列化模式。可不指定。默认为Text。
-    // 可为 Newtonsoft、Text、MessagePack、BytePointor。
-    // 效率依次递增。MessagePack 和 BytePointor 序列化为二进制数据而不是json字符串。
+    // 可为 Newtonsoft、Text、BytePointor。
+    // 效率依次递增。BytePointor 序列化为二进制数据而不是json字符串。
     "RpcDataSerializeMode": "Text",
 
 
@@ -168,7 +168,7 @@
       "PrintToConsole": true
     },
 
-    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) 、ActionBlock、BufferBlock  */
+    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) */
     "ConsumerMode": "BlockingCollection",
 
 

+ 3 - 3
dotnet/ServiceCenter/App.ServiceCenter/appsettings.json

@@ -165,8 +165,8 @@
     },
 
     // RpcData序列化模式。可不指定。默认为Text。
-    // 可为 Newtonsoft、Text、MessagePack、BytePointor。
-    // 效率依次递增。MessagePack 和 BytePointor 序列化为二进制数据而不是json字符串。
+    // 可为 Newtonsoft、Text、BytePointor。
+    // 效率依次递增。BytePointor 序列化为二进制数据而不是json字符串。
     "RpcDataSerializeMode": "Text",
 
 
@@ -522,7 +522,7 @@
       "PrintToConsole": true
     },
 
-    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) 、ActionBlock、BufferBlock  */
+    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) */
     "ConsumerMode": "BlockingCollection",
 
     /* 序列化配置,可不指定 */

+ 3 - 3
dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/appsettings.json

@@ -153,8 +153,8 @@
 
 
     // RpcData序列化模式。可不指定。默认为Text。
-    // 可为 Newtonsoft、Text、MessagePack、BytePointor。
-    // 效率依次递增。MessagePack 和 BytePointor 序列化为二进制数据而不是json字符串。
+    // 可为 Newtonsoft、Text、BytePointor。
+    // 效率依次递增。BytePointor 序列化为二进制数据而不是json字符串。
     "RpcDataSerializeMode": "Text",
 
 
@@ -343,7 +343,7 @@
       "PrintToConsole": true
     },
 
-    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) 、ActionBlock、BufferBlock  */
+    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) */
     "ConsumerMode": "BlockingCollection",
 
 

+ 3 - 3
dotnet/ServiceStation/Demo/Serslot/Did.Serslot.Demo/appsettings.json

@@ -40,8 +40,8 @@
 
 
     // RpcData序列化模式。可不指定。默认为Text。
-    // 可为 Newtonsoft、Text、MessagePack、BytePointor。
-    // 效率依次递增。MessagePack 和 BytePointor 序列化为二进制数据而不是json字符串。
+    // 可为 Newtonsoft、Text、BytePointor。
+    // 效率依次递增。BytePointor 序列化为二进制数据而不是json字符串。
     "RpcDataSerializeMode": "Text",
 
 
@@ -202,7 +202,7 @@
       "PrintToConsole": true
     },
 
-    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) 、ActionBlock、BufferBlock  */
+    /* 队列模式,可不指定。可为 BlockingCollection(默认)、 ConsumerCache_BlockingCollection(高性能) */
     "ConsumerMode": "BlockingCollection",