lith 3 лет назад
Родитель
Сommit
b715d56ef5
30 измененных файлов с 99 добавлено и 56 удалено
  1. 2 2
      Publish/ReleaseFile/docker-image/docker导入导出镜像.txt
  2. 1 1
      Publish/ReleaseFile/docker-image/制作镜像Sers.txt
  3. 1 1
      dotnet/Gateway/App.Gateway/App.Gateway.csproj
  4. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/Sers.CL.Ipc.NamedPipe-额外命名管道/Sers.CL.Ipc.NamedPipe.csproj
  5. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj
  6. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj
  7. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj
  8. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj
  9. 1 1
      dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj
  10. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj
  11. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj
  12. 1 1
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj
  13. 1 1
      dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj
  14. 1 1
      dotnet/Library/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj
  15. 1 1
      dotnet/Library/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj
  16. 1 1
      dotnet/Library/Sers/Sers.Serslot/Sers.Serslot/Sers.Serslot.csproj
  17. 1 1
      dotnet/Library/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj
  18. 11 0
      dotnet/Sers.sln
  19. 1 1
      dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj
  20. 18 18
      dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx.csproj
  21. 9 9
      dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/packages.config
  22. 1 1
      dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj
  23. 32 1
      dotnet/ServiceCenter/App.ServiceCenter/appsettings.json
  24. 1 1
      dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/Sers.Gover.Apm.Zipkin.csproj
  25. 3 2
      dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/appsettings.json
  26. 1 1
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj
  27. 1 1
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj
  28. 1 1
      dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj
  29. 1 1
      dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.HelloWorld/Did.SersLoader.HelloWorld.csproj
  30. 1 1
      dotnet/ServiceStation/Demo/StressTest/App.Robot.Station/App.Robot.Station.csproj

+ 2 - 2
Publish/ReleaseFile/docker-image/docker导入导出镜像.txt

@@ -1,5 +1,5 @@
-#导出镜像
-tag=2.1.7
+#导出镜像
+tag=2.1.8-temp
 
 docker save -o /root/image/dotnet.2.1.tar serset/dotnet:2.1
 docker save -o /root/image/sers-cgateway-1.2.0.tar serset/sers-cgateway:1.2.0

+ 1 - 1
Publish/ReleaseFile/docker-image/制作镜像Sers.txt

@@ -37,7 +37,7 @@ cd /root/image
 
 
 #构建镜像并推送到 Docker Hub 
-export tag=2.1.7
+export tag=2.1.8-temp
 
 cd sers
 docker buildx build . -t serset/sers:${tag} -t serset/sers --platform=linux/amd64,linux/arm64,linux/arm/v7 --push

+ 1 - 1
dotnet/Gateway/App.Gateway/App.Gateway.csproj

@@ -7,7 +7,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/Sers.CL.Ipc.NamedPipe-额外命名管道/Sers.CL.Ipc.NamedPipe.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.7</Version>
+    <Version>2.1.8-temp</Version>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>
 

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.7</Version>
+    <Version>2.1.8-temp</Version>
   </PropertyGroup>
   
   <PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Serslot/Sers.Serslot/Sers.Serslot.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 11 - 0
dotnet/Sers.sln

@@ -155,6 +155,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Gateway", "Library\Ser
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Core.Util.Shell.Demo", "Library\Vit\Vit.Core\Test\Vit.Core.Util.Shell.Demo\Vit.Core.Util.Shell.Demo.csproj", "{E230747C-FA8C-4BAB-801E-3AA7A07FD9D0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Gover.Apm.Txt", "ServiceCenter\Sers.ServiceCenter\Apm\Sers.Gover.Apm.Txt\Sers.Gover.Apm.Txt.csproj", "{168454FE-7C04-4CDA-8568-3578A14D0290}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -515,6 +517,14 @@ Global
 		{E230747C-FA8C-4BAB-801E-3AA7A07FD9D0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E230747C-FA8C-4BAB-801E-3AA7A07FD9D0}.Release|x86.ActiveCfg = Release|Any CPU
 		{E230747C-FA8C-4BAB-801E-3AA7A07FD9D0}.Release|x86.Build.0 = Release|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Debug|x86.Build.0 = Debug|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Release|Any CPU.Build.0 = Release|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Release|x86.ActiveCfg = Release|Any CPU
+		{168454FE-7C04-4CDA-8568-3578A14D0290}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -592,6 +602,7 @@ Global
 		{7C7DDF36-CB84-45A4-ABE3-BDBF1C239D68} = {015B5793-0478-4884-A58B-8889639FD65A}
 		{4EADA81F-6554-4A2E-A0F5-2B9459558347} = {E07D5AC5-2B0F-4916-9B10-5038C8C16B71}
 		{E230747C-FA8C-4BAB-801E-3AA7A07FD9D0} = {B0C8734C-7CAC-4EA4-BF49-4ECE4876BB5D}
+		{168454FE-7C04-4CDA-8568-3578A14D0290} = {AF17FAEF-DBCC-4E5C-954D-BD4F60A016C1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}

+ 1 - 1
dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj

@@ -7,7 +7,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

+ 18 - 18
dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx.csproj

@@ -45,29 +45,29 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Ipc.NamedPipe, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Ipc.NamedPipe.2.1.7\lib\netstandard2.0\Sers.CL.Ipc.NamedPipe.dll</HintPath>
+    <Reference Include="Sers.CL.Ipc.NamedPipe, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Ipc.NamedPipe.2.1.8-temp\lib\netstandard2.0\Sers.CL.Ipc.NamedPipe.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Socket.Iocp, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Socket.Iocp.2.1.7\lib\netstandard2.0\Sers.CL.Socket.Iocp.dll</HintPath>
+    <Reference Include="Sers.CL.Socket.Iocp, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Socket.Iocp.2.1.8-temp\lib\netstandard2.0\Sers.CL.Socket.Iocp.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Socket.ThreadWait, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Socket.ThreadWait.2.1.7\lib\netstandard2.0\Sers.CL.Socket.ThreadWait.dll</HintPath>
+    <Reference Include="Sers.CL.Socket.ThreadWait, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Socket.ThreadWait.2.1.8-temp\lib\netstandard2.0\Sers.CL.Socket.ThreadWait.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.WebSocket, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.WebSocket.2.1.7\lib\netstandard2.0\Sers.CL.WebSocket.dll</HintPath>
+    <Reference Include="Sers.CL.WebSocket, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.WebSocket.2.1.8-temp\lib\netstandard2.0\Sers.CL.WebSocket.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Core, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Core.2.1.7\lib\netstandard2.0\Sers.Core.dll</HintPath>
+    <Reference Include="Sers.Core, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Core.2.1.8-temp\lib\netstandard2.0\Sers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Gover, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Gover.2.1.7\lib\netstandard2.0\Sers.Gover.dll</HintPath>
+    <Reference Include="Sers.Gover, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Gover.2.1.8-temp\lib\netstandard2.0\Sers.Gover.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Hardware, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Hardware.2.1.7\lib\netstandard2.0\Sers.Hardware.dll</HintPath>
+    <Reference Include="Sers.Hardware, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Hardware.2.1.8-temp\lib\netstandard2.0\Sers.Hardware.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.ServiceCenter, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.ServiceCenter.2.1.7\lib\netstandard2.0\Sers.ServiceCenter.dll</HintPath>
+    <Reference Include="Sers.ServiceCenter, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.ServiceCenter.2.1.8-temp\lib\netstandard2.0\Sers.ServiceCenter.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -80,8 +80,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Vit.Core, Version=2.1.7, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Vit.Core.2.1.7\lib\netstandard2.0\Vit.Core.dll</HintPath>
+    <Reference Include="Vit.Core, Version=2.1.8-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Vit.Core.2.1.8-temp\lib\netstandard2.0\Vit.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

+ 9 - 9
dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/packages.config

@@ -4,14 +4,14 @@
   <package id="Microsoft.DotNet.PlatformAbstractions" version="2.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyModel" version="2.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="Sers.CL.Ipc.NamedPipe" version="2.1.7" targetFramework="net461" />
-  <package id="Sers.CL.Socket.Iocp" version="2.1.7" targetFramework="net461" />
-  <package id="Sers.CL.Socket.ThreadWait" version="2.1.7" targetFramework="net461" />
-  <package id="Sers.CL.WebSocket" version="2.1.7" targetFramework="net461" />
-  <package id="Sers.Core" version="2.1.7" targetFramework="net461" />
-  <package id="Sers.Gover" version="2.1.7" targetFramework="net461" />
-  <package id="Sers.Hardware" version="2.1.7" targetFramework="net461" />
-  <package id="Sers.ServiceCenter" version="2.1.7" targetFramework="net461" />
+  <package id="Sers.CL.Ipc.NamedPipe" version="2.1.8-temp" targetFramework="net461" />
+  <package id="Sers.CL.Socket.Iocp" version="2.1.8-temp" targetFramework="net461" />
+  <package id="Sers.CL.Socket.ThreadWait" version="2.1.8-temp" targetFramework="net461" />
+  <package id="Sers.CL.WebSocket" version="2.1.8-temp" targetFramework="net461" />
+  <package id="Sers.Core" version="2.1.8-temp" targetFramework="net461" />
+  <package id="Sers.Gover" version="2.1.8-temp" targetFramework="net461" />
+  <package id="Sers.Hardware" version="2.1.8-temp" targetFramework="net461" />
+  <package id="Sers.ServiceCenter" version="2.1.8-temp" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
-  <package id="Vit.Core" version="2.1.7" targetFramework="net461" />
+  <package id="Vit.Core" version="2.1.8-temp" targetFramework="net461" />
 </packages>

+ 1 - 1
dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

@@ -7,7 +7,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

+ 32 - 1
dotnet/ServiceCenter/App.ServiceCenter/appsettings.json

@@ -375,7 +375,8 @@
 
     /* 动态加载的App事件 */
     "AppEvent": [
-      {
+      { //记录请求Trace到Zipkin
+
         /* 在此Assembly中加载类 */
         "assemblyFile": "Sers.Gover.Apm.Zipkin.dll",
         /* 动态加载的类名,必须继承接口 Sers.Core.Module.App.AppEvent.IAppEvent */
@@ -408,6 +409,36 @@
           //"responseData": "{{responseData}}",
           //"responseData.error": "{{responseData.error}}"
 
+        }
+      },
+      { //记录请求Trace到 Log/{yyyy-MM}/[{yyyy-MM-dd}]ApiTrace.txt文件
+
+        /* 在此Assembly中加载类 */
+        "assemblyFile": "Sers.Gover.Apm.Txt.dll",
+        /* 动态加载的类名,必须继承接口 Sers.Core.Module.App.AppEvent.IAppEvent */
+        //"className": "Sers.Gover.Apm.Txt.AppEvent",
+
+
+        "tags": {
+          // 可为 requestRpc requestData responseRpc responseData
+          "From": "Sers.Gover.Apm.Txt",
+
+          "route": "{{requestRpc.route}}",
+          //"{{requestRpc.route}}": "route",
+
+          "url": "{{requestRpc.http.url}}",
+          "method": "{{requestRpc.http.method}}",
+          "requestRpc": "{{requestRpc}}",
+          //"requestData": "{{requestData}}",
+
+
+          "responseRpc": "{{responseRpc}}",
+          "responseState": "{{responseRpc.http.headers.responseState}}"
+          //"responseError_Base64": "{{responseRpc.http.headers.responseError_Base64}}"
+
+          //"responseData": "{{responseData}}",
+          //"responseData.error": "{{responseData.error}}"
+
         }
       }
     ],

+ 1 - 1
dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/Sers.Gover.Apm.Zipkin.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 3 - 2
dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/appsettings.json

@@ -1,9 +1,10 @@
 {
-  "Sers": {       
+  "Sers": {
 
     /* 动态加载的App事件 */
     "AppEvent": [
-      {
+      { //记录请求Trace到Zipkin
+
         /* 在此Assembly中加载类 */
         "assemblyFile": "Sers.Gover.Apm.Zipkin.dll",
         /* 动态加载的类名,必须继承接口 Sers.Core.Module.App.AppEvent.IAppEvent */

+ 1 - 1
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 1 - 1
dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj

@@ -7,7 +7,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.7</Version>
+    <Version>2.1.8-temp</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>

+ 1 - 1
dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.HelloWorld/Did.SersLoader.HelloWorld.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.7</Version>
+    <Version>2.1.8-temp</Version>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>
 

+ 1 - 1
dotnet/ServiceStation/Demo/StressTest/App.Robot.Station/App.Robot.Station.csproj

@@ -8,7 +8,7 @@
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>
-		<Version>2.1.7</Version>
+		<Version>2.1.8-temp</Version>
 		<Description>https://github.com/serset/Sers</Description>
 	</PropertyGroup>