[publish] ServiceAdaptor

02.Gateway/ServiceAdaptor.NetCore.Gateway/ServiceAdaptor.NetCore.Gateway.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>1.1.405</Version>
+    <Version>1.1.416</Version>
     <Description>https://github.com/serset/ServiceAdaptor.NetCore/tree/1.1/release</Description>
   </PropertyGroup>
 
@@ -19,8 +19,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
    
-    <PackageReference Include="Sers.Core" Version="2.1.1.497" />
-    <PackageReference Include="Vit.WebHost" Version="2.1.1.497" />
+    <PackageReference Include="Sers.Core" Version="2.1.1.499" />
+    <PackageReference Include="Vit.WebHost" Version="2.1.1.499" />
     <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore\ServiceAdaptor.NetCore.csproj" />
     <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.MinHttp\ServiceAdaptor.NetCore.MinHttp.csproj" />  
     <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Consul\ServiceAdaptor.NetCore.Consul.csproj" />

11.ServiceProvider/ServiceProvider/ServiceProvider.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
  
     <!-- Sers -->
-    <PackageReference Include="Sers.Core" Version="2.1.1.497" />
+    <PackageReference Include="Sers.Core" Version="2.1.1.499" />
   </ItemGroup>
 
   <ItemGroup>

12.ServiceConsumer/ServiceConsumer/ServiceConsumer.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" /> 
     <!-- Sers -->
-    <PackageReference Include="Sers.Core" Version="2.1.1.497" />
+    <PackageReference Include="Sers.Core" Version="2.1.1.499" />
   </ItemGroup>
 
   <ItemGroup>

Library/ServiceAdaptor.NetCore.Be.Eureka/ServiceAdaptor.NetCore.Be.Eureka.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>1.1.405</Version>
+    <Version>1.1.416</Version>
     <Description>https://github.com/serset/ServiceAdaptor.NetCore/tree/1.1/release</Description>
   </PropertyGroup>
 
@@ -17,7 +17,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Vit.WebHost" Version="2.1.1.497" />    
+    <PackageReference Include="Vit.WebHost" Version="2.1.1.499" />    
     <PackageReference Include="Blueearth" Version="4.0.29" />
  
     

Library/ServiceAdaptor.NetCore.Consul/ServiceAdaptor.NetCore.Consul.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.1.405</Version>
+    <Version>1.1.416</Version>
     <Description>https://github.com/serset/ServiceAdaptor.NetCore/tree/1.1/release</Description>
   </PropertyGroup>
 
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Consul" Version="0.7.2.6" /> 
-    <PackageReference Include="Vit.WebHost" Version="2.1.1.497" />
+    <PackageReference Include="Vit.WebHost" Version="2.1.1.499" />
   </ItemGroup>
 
 

Library/ServiceAdaptor.NetCore.MinHttp/ServiceAdaptor.NetCore.MinHttp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.1.405</Version>
+    <Version>1.1.416</Version>
     <Description>https://github.com/serset/ServiceAdaptor.NetCore/tree/1.1/release</Description>
   </PropertyGroup>
 

Library/ServiceAdaptor.NetCore.Sers/ServiceAdaptor.NetCore.Sers.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.1.405</Version>
+    <Version>1.1.416</Version>
     <Description>https://github.com/serset/ServiceAdaptor.NetCore/tree/1.1/release</Description>
   </PropertyGroup>
 
@@ -16,7 +16,7 @@
 
   <ItemGroup>  
     <!-- Sers --> 
-    <PackageReference Include="Sers.Serslot" Version="2.1.1.497" />
+    <PackageReference Include="Sers.Serslot" Version="2.1.1.499" />
   </ItemGroup>
   
   

Library/ServiceAdaptor.NetCore/ServiceAdaptor.NetCore.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.1.405</Version>
+    <Version>1.1.416</Version>
     <Description>https://github.com/serset/ServiceAdaptor.NetCore/tree/1.1/release</Description>
   </PropertyGroup>
 
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
     
     <!-- Sers -->
-    <PackageReference Include="Vit.Core" Version="2.1.1.497" /> 
+    <PackageReference Include="Vit.Core" Version="2.1.1.499" /> 
   </ItemGroup> 
 
  

Publish/01.ServiceCenter/Sers/ServiceCenter/App.ServiceCenter.deps.json

@@ -6,15 +6,15 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v2.1": {
-      "App.ServiceCenter/2.1.1.482": {
+      "App.ServiceCenter/2.1.1.499": {
         "dependencies": {
-          "Sers.CL.ClrZmq.ThreadWait": "2.1.1.482",
-          "Sers.CL.Ipc.SharedMemory": "2.1.1.482",
-          "Sers.CL.WebSocket": "2.1.1.482",
-          "Sers.CL.Zmq.FullDuplex": "2.1.1.482",
-          "Sers.Gateway": "2.1.1.482",
-          "Sers.Gover": "2.1.1.482",
-          "Sers.Gover.Apm.Zipkin": "2.1.1.482"
+          "Sers.CL.ClrZmq.ThreadWait": "2.1.1.499",
+          "Sers.CL.Ipc.SharedMemory": "2.1.1.499",
+          "Sers.CL.WebSocket": "2.1.1.499",
+          "Sers.CL.Zmq.FullDuplex": "2.1.1.499",
+          "Sers.Gateway": "2.1.1.499",
+          "Sers.Gover": "2.1.1.499",
+          "Sers.Gover.Apm.Zipkin": "2.1.1.499"
         },
         "runtime": {
           "App.ServiceCenter.dll": {}
@@ -1543,131 +1543,131 @@
           }
         }
       },
-      "Sers.CL.ClrZmq.ThreadWait/2.1.1.482": {
+      "Sers.CL.ClrZmq.ThreadWait/2.1.1.499": {
         "dependencies": {
-          "Sers.Core": "2.1.1.482",
+          "Sers.Core": "2.1.1.499",
           "ZeroMQ": "0.0.0.0"
         },
         "runtime": {
           "Sers.CL.ClrZmq.ThreadWait.dll": {}
         }
       },
-      "Sers.CL.Ipc.NamedPipe/2.1.1.482": {
+      "Sers.CL.Ipc.NamedPipe/2.1.1.499": {
         "dependencies": {
-          "Sers.Core": "2.1.1.482"
+          "Sers.Core": "2.1.1.499"
         },
         "runtime": {
           "Sers.CL.Ipc.NamedPipe.dll": {}
         }
       },
-      "Sers.CL.Ipc.SharedMemory/2.1.1.482": {
+      "Sers.CL.Ipc.SharedMemory/2.1.1.499": {
         "dependencies": {
-          "Sers.Core": "2.1.1.482",
+          "Sers.Core": "2.1.1.499",
           "SharedMemory": "2.2.3"
         },
         "runtime": {
           "Sers.CL.Ipc.SharedMemory.dll": {}
         }
       },
-      "Sers.CL.Socket.Iocp/2.1.1.482": {
+      "Sers.CL.Socket.Iocp/2.1.1.499": {
         "dependencies": {
-          "Sers.Core": "2.1.1.482"
+          "Sers.Core": "2.1.1.499"
         },
         "runtime": {
           "Sers.CL.Socket.Iocp.dll": {}
         }
       },
-      "Sers.CL.Socket.ThreadWait/2.1.1.482": {
+      "Sers.CL.Socket.ThreadWait/2.1.1.499": {
         "dependencies": {
-          "Sers.Core": "2.1.1.482"
+          "Sers.Core": "2.1.1.499"
         },
         "runtime": {
           "Sers.CL.Socket.ThreadWait.dll": {}
         }
       },
-      "Sers.CL.WebSocket/2.1.1.482": {
+      "Sers.CL.WebSocket/2.1.1.499": {
         "dependencies": {
           "Fleck": "1.1.0",
-          "Sers.Core": "2.1.1.482"
+          "Sers.Core": "2.1.1.499"
         },
         "runtime": {
           "Sers.CL.WebSocket.dll": {}
         }
       },
-      "Sers.CL.Zmq.FullDuplex/2.1.1.482": {
+      "Sers.CL.Zmq.FullDuplex/2.1.1.499": {
         "dependencies": {
-          "Sers.Core": "2.1.1.482"
+          "Sers.Core": "2.1.1.499"
         },
         "runtime": {
           "Sers.CL.Zmq.FullDuplex.dll": {}
         }
       },
-      "Sers.Core/2.1.1.482": {
+      "Sers.Core/2.1.1.499": {
         "dependencies": {
           "Microsoft.Extensions.DependencyModel": "2.0.0",
-          "Sers.Hardware": "2.1.1.482",
-          "Vit.Core": "2.1.1.482"
+          "Sers.Hardware": "2.1.1.499",
+          "Vit.Core": "2.1.1.499"
         },
         "runtime": {
           "Sers.Core.dll": {}
         }
       },
-      "Sers.Gateway/2.1.1.482": {
+      "Sers.Gateway/2.1.1.499": {
         "dependencies": {
           "Microsoft.AspNetCore": "2.1.1",
-          "Sers.ServiceStation": "2.1.1.482",
-          "Vit.WebHost": "2.1.1.482"
+          "Sers.ServiceStation": "2.1.1.499",
+          "Vit.WebHost": "2.1.1.499"
         },
         "runtime": {
           "Sers.Gateway.dll": {}
         }
       },
-      "Sers.Gover/2.1.1.482": {
+      "Sers.Gover/2.1.1.499": {
         "dependencies": {
-          "Sers.ServiceCenter": "2.1.1.482"
+          "Sers.ServiceCenter": "2.1.1.499"
         },
         "runtime": {
           "Sers.Gover.dll": {}
         }
       },
-      "Sers.Gover.Apm.Zipkin/2.1.1.482": {
+      "Sers.Gover.Apm.Zipkin/2.1.1.499": {
         "dependencies": {
-          "Sers.Gover": "2.1.1.482",
+          "Sers.Gover": "2.1.1.499",
           "zipkin4net": "1.5.0"
         },
         "runtime": {
           "Sers.Gover.Apm.Zipkin.dll": {}
         }
       },
-      "Sers.Hardware/2.1.1.482": {
+      "Sers.Hardware/2.1.1.499": {
         "dependencies": {
-          "Vit.Core": "2.1.1.482"
+          "Vit.Core": "2.1.1.499"
         },
         "runtime": {
           "Sers.Hardware.dll": {}
         }
       },
-      "Sers.ServiceCenter/2.1.1.482": {
+      "Sers.ServiceCenter/2.1.1.499": {
         "dependencies": {
-          "Sers.CL.Ipc.NamedPipe": "2.1.1.482",
-          "Sers.CL.Socket.Iocp": "2.1.1.482",
-          "Sers.CL.Socket.ThreadWait": "2.1.1.482"
+          "Sers.CL.Ipc.NamedPipe": "2.1.1.499",
+          "Sers.CL.Socket.Iocp": "2.1.1.499",
+          "Sers.CL.Socket.ThreadWait": "2.1.1.499"
         },
         "runtime": {
           "Sers.ServiceCenter.dll": {}
         }
       },
-      "Sers.ServiceStation/2.1.1.482": {
+      "Sers.ServiceStation/2.1.1.499": {
         "dependencies": {
-          "Sers.CL.Ipc.NamedPipe": "2.1.1.482",
-          "Sers.CL.Socket.Iocp": "2.1.1.482",
-          "Sers.CL.Socket.ThreadWait": "2.1.1.482"
+          "Sers.CL.Ipc.NamedPipe": "2.1.1.499",
+          "Sers.CL.Socket.Iocp": "2.1.1.499",
+          "Sers.CL.Socket.ThreadWait": "2.1.1.499"
         },
         "runtime": {
           "Sers.ServiceStation.dll": {}
         }
       },
-      "Vit.Core/2.1.1.482": {
+      "Vit.Core/2.1.1.499": {
         "dependencies": {
           "Microsoft.Extensions.DependencyModel": "2.0.0",
           "Newtonsoft.Json": "12.0.3",
@@ -1677,12 +1677,12 @@
           "Vit.Core.dll": {}
         }
       },
-      "Vit.WebHost/2.1.1.482": {
+      "Vit.WebHost/2.1.1.499": {
         "dependencies": {
           "Microsoft.AspNetCore.Cors": "2.0.0",
           "Microsoft.AspNetCore.Server.Kestrel": "2.1.1",
           "Microsoft.AspNetCore.StaticFiles": "2.0.0",
-          "Vit.Core": "2.1.1.482"
+          "Vit.Core": "2.1.1.499"
         },
         "runtime": {
           "Vit.WebHost.dll": {}
@@ -1699,7 +1699,7 @@
     }
   },
   "libraries": {
-    "App.ServiceCenter/2.1.1.482": {
+    "App.ServiceCenter/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
@@ -2656,82 +2656,82 @@
       "path": "zipkin4net/1.5.0",
       "hashPath": "zipkin4net.1.5.0.nupkg.sha512"
     },
-    "Sers.CL.ClrZmq.ThreadWait/2.1.1.482": {
+    "Sers.CL.ClrZmq.ThreadWait/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.CL.Ipc.NamedPipe/2.1.1.482": {
+    "Sers.CL.Ipc.NamedPipe/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.CL.Ipc.SharedMemory/2.1.1.482": {
+    "Sers.CL.Ipc.SharedMemory/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.CL.Socket.Iocp/2.1.1.482": {
+    "Sers.CL.Socket.Iocp/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.CL.Socket.ThreadWait/2.1.1.482": {
+    "Sers.CL.Socket.ThreadWait/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.CL.WebSocket/2.1.1.482": {
+    "Sers.CL.WebSocket/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.CL.Zmq.FullDuplex/2.1.1.482": {
+    "Sers.CL.Zmq.FullDuplex/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.Core/2.1.1.482": {
+    "Sers.Core/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.Gateway/2.1.1.482": {
+    "Sers.Gateway/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.Gover/2.1.1.482": {
+    "Sers.Gover/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.Gover.Apm.Zipkin/2.1.1.482": {
+    "Sers.Gover.Apm.Zipkin/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.Hardware/2.1.1.482": {
+    "Sers.Hardware/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.ServiceCenter/2.1.1.482": {
+    "Sers.ServiceCenter/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Sers.ServiceStation/2.1.1.482": {
+    "Sers.ServiceStation/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Vit.Core/2.1.1.482": {
+    "Vit.Core/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Vit.WebHost/2.1.1.482": {
+    "Vit.WebHost/2.1.1.499": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

Publish/01.ServiceCenter/Sers/ServiceCenter/Vit.Core.xml

@@ -387,6 +387,13 @@
             <param name="type"></param>
             <returns></returns>
         </member>
+        <member name="M:Vit.Extensions.TypeExtensions.IfNullable(System.Type)">
+            <summary>
+            是否为Nullable类型（例如 long?）
+            </summary>
+            <param name="type"></param>
+            <returns></returns>
+        </member>
         <member name="M:Vit.Extensions.TypeExtensions.GetUnderlyingTypeIfNullable(System.Type)">
             <summary>
             若为Nullable类型（例如 long?）则获取对应的值类型(例如long)，否则返回自身。

Publish/01.ServiceCenter/Sers/ServiceCenter/appsettings.json

@@ -54,7 +54,7 @@
           /* 在此Assembly中查找Builder */
           "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
           /* the class of Builder in assemblyFile  */
-          "className": "Sers.CL.Ipc.NamedPipe.OrganizeServerBuilder",
+          //"className": "Sers.CL.Ipc.NamedPipe.OrganizeServerBuilder",
 
 
           /* (x.2) config */
@@ -65,7 +65,7 @@
           // Socket.Iocp
           /* (x.1) type - Iocp */
           /* the class of Builder in assemblyFile  */
-          //"className": "Sers.CL.Socket.Iocp.OrganizeServerBuilder",
+          "className": "Sers.CL.Socket.Iocp.OrganizeServerBuilder",
 
 
           /* (x.2) config */

Publish/06.Docker/制作镜像/adaptor_gateway/Dockerfile

@@ -1,2 +1,4 @@
 FROM serset/dotnet:2.1
-COPY root /root
+COPY gateway /root/app/gateway
+WORKDIR /root/app/gateway
+CMD dotnet ServiceAdaptor.NetCore.Gateway.dll

Publish/06.Docker/制作镜像/adaptor_gateway/root/app/startup.sh

@@ -1,2 +0,0 @@
-cd /root/app/gateway
-dotnet ServiceAdaptor.NetCore.Gateway.dll

Publish/06.Docker/制作镜像/制作镜像.txt

@@ -38,7 +38,7 @@ cd /home/ec2-user/image
 
 #构建镜像并推送到 Docker Hub 
 cd adaptor_gateway
-docker buildx build . -t serset/adaptor_gateway:1.1.405 -t serset/adaptor_gateway --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
+docker buildx build . -t serset/adaptor_gateway:1.1.416 -t serset/adaptor_gateway --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
  
 
 

Publish/脚本/制作docker镜像/docker镜像-1.复制文件.bat

@@ -1,7 +1,7 @@
 echo '复制文件'
 
 ::制作镜像
-xcopy  "..\..\02.Gateway\Gateway"   "..\..\06.Docker\制作镜像\adaptor_gateway\root\app\gateway" /e /i /r /y
+xcopy  "..\..\02.Gateway\Gateway"   "..\..\06.Docker\制作镜像\adaptor_gateway\gateway" /e /i /r /y
 
 
 

Publish/脚本/制作docker镜像/docker镜像-2.删除文件.bat

@@ -1,7 +1,7 @@
 echo '删除文件'
  
 ::制作镜像
-rd /s/q "..\..\06.Docker\制作镜像\adaptor_gateway\root\app\gateway" 
+rd /s/q "..\..\06.Docker\制作镜像\adaptor_gateway\gateway"