Strona główna Odkrywaj Pomoc
Zaloguj się
serset
/
Sers
2
1
Forkuj 0
Pliki Problemy Oczekujące zmiany 0 Wiki
Przeglądaj źródła

lith 3 lat temu
rodzic
15c57f9365
commit
99b42092b0
26 zmienionych plików z 40 dodań i 40 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 1 1
      dotnet/Gateway/App.Gateway/App.Gateway.csproj
  2. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/Sers.CL.Ipc.NamedPipe-额外命名管道/Sers.CL.Ipc.NamedPipe.csproj
  3. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj
  4. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj
  5. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj
  6. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj
  7. 1 1
      dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj
  8. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj
  9. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj
  10. 1 1
      dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj
  11. 5 7
      dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/Event/LocalApiEventMng.cs
  12. 4 2
      dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/LocalApiService/LocalApiService.cs
  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. 1 1
      dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj
  19. 8 8
      dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/packages.config
  20. 1 1
      dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj
  21. 1 1
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ApiTrace.Collector.Zipkin/Sers.ApiTrace.Collector.Zipkin.csproj
  22. 1 1
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj
  23. 1 1
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj
  24. 1 1
      dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj
  25. 1 1
      dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.HelloWorld/Did.SersLoader.HelloWorld.csproj
  26. 1 1
      dotnet/ServiceStation/Demo/StressTest/App.Robot.Station/App.Robot.Station.csproj

+ 1 - 1
dotnet/Gateway/App.Gateway/App.Gateway.csproj
Wyświetl plik 

@@ -8,7 +8,7 @@
 
 	<PropertyGroup>

 		<OutputType>Exe</OutputType>

 		<TargetFramework>netcoreapp2.1</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</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
Wyświetl plik 

@@ -2,7 +2,7 @@
 
 

   <PropertyGroup>

     <TargetFramework>netstandard2.0</TargetFramework>

-    <Version>2.1.17</Version>

+    <Version>2.1.18-preview</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
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj
Wyświetl plik 

@@ -2,7 +2,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj
Wyświetl plik 

@@ -3,7 +3,7 @@
 
 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj
Wyświetl plik 

@@ -2,7 +2,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj
Wyświetl plik 

@@ -2,7 +2,7 @@
 
 

   <PropertyGroup>

     <TargetFramework>netstandard2.0</TargetFramework>

-    <Version>2.1.17</Version>

+    <Version>2.1.18-preview</Version>

   </PropertyGroup>

   

   <PropertyGroup>

+ 5 - 7
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/Event/LocalApiEventMng.cs
Wyświetl plik 

@@ -10,7 +10,6 @@ using System.Linq;
 
 using System.Runtime.CompilerServices;

 

 using Vit.Core.Module.Log;

-using Vit.Core.Util.ConfigurationManager;

 

 namespace Sers.Core.Module.Api.LocalApi.Event

 {

@@ -20,27 +19,26 @@ namespace Sers.Core.Module.Api.LocalApi.Event
 
     public class LocalApiEventMng

     {

 

-        [MethodImpl(MethodImplOptions.AggressiveInlining)]

-        public LocalApiEventMng()

+        public void Init(JToken config)

         {

+            if (config == null) return;

+

             #region (x.1)构建 Api Event OnCreateScope

             {

-                var apiScopeEvents = Sers.Core.Module.Api.ApiEvent.EventBuilder.LoadEvent_OnCreateScope(ConfigurationManager.Instance.GetByPath<JArray>("Sers.LocalApiService.OnCreateScope"));

-

+                var apiScopeEvents = Sers.Core.Module.Api.ApiEvent.EventBuilder.LoadEvent_OnCreateScope(config["OnCreateScope"] as JArray);

                 AddEvent_ApiScope(apiScopeEvents.ToArray());

             }

             #endregion

 

             #region (x.2)构建 Api Event BeforeCallApi

             {

-                var beforeCallApi = Sers.Core.Module.Api.ApiEvent.EventBuilder.LoadEvent_BeforeCallApi(ConfigurationManager.Instance.GetByPath<JArray>("Sers.LocalApiService.BeforeCallApi"));

+                var beforeCallApi = Sers.Core.Module.Api.ApiEvent.EventBuilder.LoadEvent_BeforeCallApi(config["BeforeCallApi"] as JArray);

                 if (beforeCallApi != null) BeforeCallApi += beforeCallApi;

             }

             #endregion

         }

 

 

-

         #region OnCreateScope

         internal List<IApiScopeEvent> apiScopeEventList = null;

+ 4 - 2
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/LocalApiService/LocalApiService.cs
Wyświetl plik 

@@ -36,10 +36,12 @@ namespace Sers.Core.Module.Api.LocalApi
 
 

         public void Init()

         {

-            localApiEventMng = new LocalApiEventMng();

+            var localApiServiceConfig = ConfigurationManager.Instance.GetByPath<JToken>("Sers.LocalApiService");

+            if (localApiServiceConfig != null)

+                localApiEventMng.Init(localApiServiceConfig);

         }

 

-        LocalApiEventMng localApiEventMng;

+        public readonly LocalApiEventMng localApiEventMng = new LocalApiEventMng();

 

         /// <summary>

         /// 映射  route -> LocalApiNode

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.Serslot/Sers.Serslot/Sers.Serslot.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

     <TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/Library/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj
Wyświetl plik 

@@ -8,7 +8,7 @@
 
 	<PropertyGroup>

 		<OutputType>Exe</OutputType>

 		<TargetFramework>netcoreapp2.1</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>

 	</PropertyGroup>

+ 8 - 8
dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/packages.config
Wyświetl plik 

@@ -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.17" targetFramework="net461" />

-  <package id="Sers.CL.Socket.Iocp" version="2.1.17" targetFramework="net461" />

-  <package id="Sers.CL.Socket.ThreadWait" version="2.1.17" targetFramework="net461" />

-  <package id="Sers.CL.WebSocket" version="2.1.17" targetFramework="net461" />

-  <package id="Sers.Core" version="2.1.17" targetFramework="net461" />

-  <package id="Sers.Gover" version="2.1.17" targetFramework="net461" />

-  <package id="Sers.Hardware" version="2.1.17" targetFramework="net461" />

-  <package id="Sers.ServiceCenter" version="2.1.17" targetFramework="net461" />

+  <package id="Sers.CL.Ipc.NamedPipe" version="2.1.18-preview" targetFramework="net461" />

+  <package id="Sers.CL.Socket.Iocp" version="2.1.18-preview" targetFramework="net461" />

+  <package id="Sers.CL.Socket.ThreadWait" version="2.1.18-preview" targetFramework="net461" />

+  <package id="Sers.CL.WebSocket" version="2.1.18-preview" targetFramework="net461" />

+  <package id="Sers.Core" version="2.1.18-preview" targetFramework="net461" />

+  <package id="Sers.Gover" version="2.1.18-preview" targetFramework="net461" />

+  <package id="Sers.Hardware" version="2.1.18-preview" targetFramework="net461" />

+  <package id="Sers.ServiceCenter" version="2.1.18-preview" targetFramework="net461" />

   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />

   <package id="Vit.Core" version="2.1.14" targetFramework="net461" />

 </packages>

+ 1 - 1
dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj
Wyświetl plik 

@@ -8,7 +8,7 @@
 
 	<PropertyGroup>

 		<OutputType>Exe</OutputType>

 		<TargetFramework>netcoreapp2.1</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>

 	</PropertyGroup>

+ 1 - 1
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ApiTrace.Collector.Zipkin/Sers.ApiTrace.Collector.Zipkin.csproj
Wyświetl plik 

@@ -2,7 +2,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 

 	<PropertyGroup>

 		<TargetFramework>netstandard2.0</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 	</PropertyGroup>

 

 	<PropertyGroup>

+ 1 - 1
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj
Wyświetl plik 

@@ -6,7 +6,7 @@
 
 
 	<PropertyGroup>
 
 		<TargetFramework>netstandard2.0</TargetFramework>
 
-		<Version>2.1.17</Version>
 
+		<Version>2.1.18-preview</Version>
 
 	</PropertyGroup>
 
 
 	<PropertyGroup>

+ 1 - 1
dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj
Wyświetl plik 

@@ -8,7 +8,7 @@
 
   <PropertyGroup>

     <OutputType>Exe</OutputType>

     <TargetFramework>netcoreapp2.1</TargetFramework>

-    <Version>2.1.17</Version>

+    <Version>2.1.18-preview</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
Wyświetl plik 

@@ -3,7 +3,7 @@
 
 	<PropertyGroup>

 		<OutputType>Exe</OutputType>

 		<TargetFramework>netcoreapp2.1</TargetFramework>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 		<Description>https://github.com/serset/Sers</Description>

 	</PropertyGroup>

+ 1 - 1
dotnet/ServiceStation/Demo/StressTest/App.Robot.Station/App.Robot.Station.csproj
Wyświetl plik 

@@ -9,7 +9,7 @@
 
 		<OutputType>Exe</OutputType>

 		<TargetFramework>netcoreapp2.1</TargetFramework>

 		<RunPostBuildEvent>Always</RunPostBuildEvent>

-		<Version>2.1.17</Version>

+		<Version>2.1.18-preview</Version>

 		<Description>https://github.com/serset/Sers</Description>

 	</PropertyGroup>