auto commit 1.3.15-preview

02.Gateway/ServiceAdaptor.NetCore.Gateway/GatewayHost.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Vit.Core.Module.Log;
+using Vit.Core.Util.ConfigurationManager;
 using Vit.Extensions;
 using Vit.WebHost;
 
@@ -14,9 +15,9 @@ namespace ServiceAdaptor.NetCore.Gateway
     public class GatewayHost
     {
 
-        static string prefixOfCopyIpToHeader = Vit.Core.Util.ConfigurationManager.ConfigurationManager.Instance.GetStringByPath("Gateway.prefixOfCopyIpToHeader");
+        static string prefixOfCopyIpToHeader = Appsettings.json.GetStringByPath("Gateway.prefixOfCopyIpToHeader");
 
-        static string ResponseDefaultContentType = (Vit.Core.Util.ConfigurationManager.ConfigurationManager.Instance.GetStringByPath("Gateway.ResponseDefaultContentType") ?? ("application/json; charset=" + Vit.Core.Module.Serialization.Serialization_Newtonsoft.Instance.charset));
+        static string ResponseDefaultContentType = (Appsettings.json.GetStringByPath("Gateway.ResponseDefaultContentType") ?? ("application/json; charset=" + Vit.Core.Module.Serialization.Serialization_Newtonsoft.Instance.charset));
         static async Task Bridge(HttpContext context)
         {
             try
@@ -120,7 +121,7 @@ namespace ServiceAdaptor.NetCore.Gateway
             try
             {
 
-                HostRunArg arg = Vit.Core.Util.ConfigurationManager.ConfigurationManager.Instance.GetByPath<HostRunArg>("Gateway");
+                HostRunArg arg = Appsettings.json.GetByPath<HostRunArg>("Gateway");
                 if (arg == null || arg.urls == null || arg.urls.Length == 0) return;
 
 
@@ -142,7 +143,7 @@ namespace ServiceAdaptor.NetCore.Gateway
                 arg.RunAsync = true;
 
 
-                #region (x.x.4)启动           
+                #region (x.x.4)启动
                 Logger.Info("[WebHost]listening", arg.urls);
 
                 if (arg.staticFiles?.rootPath != null)

02.Gateway/ServiceAdaptor.NetCore.Gateway/Program.cs

@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+
+using Vit.Core.Util.ConfigurationManager;
 using Vit.Extensions;
 
 namespace ServiceAdaptor.NetCore.Gateway
@@ -15,15 +12,15 @@ namespace ServiceAdaptor.NetCore.Gateway
     {
         public static void Main(string[] args)
         {
-            Task.Run(()=> { GatewayHost.StartWebHost();  });
+            Task.Run(() => { GatewayHost.StartWebHost(); });
 
             CreateWebHostBuilder(args).Build().Run();
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)               
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls(Vit.Core.Util.ConfigurationManager.ConfigurationManager.Instance.GetByPath<string[]>("server.urls"))
+                .UseUrls(Appsettings.json.GetByPath<string[]>("server.urls"))
                 .UseServiceAdaptor();
     }
 }

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

@@ -1,47 +1,47 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-	<PropertyGroup>
-		<publish>Gateway</publish>
-		<docker>adaptor-gateway</docker>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
-		<Version>1.3.14</Version>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>微服务适配器-网关</Description>
-		<PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.Gateway.xml</DocumentationFile>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Folder Include="wwwroot\" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.App" />
-		
-		<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" />
-		<ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Sers\ServiceAdaptor.NetCore.Sers.csproj" />
-		<!--<ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Be.Eureka\ServiceAdaptor.NetCore.Be.Eureka.csproj" />-->
-	</ItemGroup>
-
-
-
-	<ItemGroup>
-		<Content Update="contentTypeMap.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+    <PropertyGroup>
+        <publish>Gateway</publish>
+        <docker>adaptor-gateway</docker>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <Version>1.3.15-preview</Version>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <Authors>Lith</Authors>
+        <Description>ServiceAdaptor - Gateway</Description>
+        <PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.Gateway.xml</DocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Folder Include="wwwroot\" />
+    </ItemGroup>
+
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.App" />
+
+        <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" />
+        <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Sers\ServiceAdaptor.NetCore.Sers.csproj" />
+        <!--<ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Be.Eureka\ServiceAdaptor.NetCore.Be.Eureka.csproj" />-->
+    </ItemGroup>
+
+
+
+    <ItemGroup>
+        <Content Update="contentTypeMap.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
 
 </Project>
 

11.ServiceProvider/ServiceProvider/Controllers/ValuesController.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Mvc;
+
 using Vit.Core.Util.ComponentModel.Data;
-using Vit.Extensions;
+using Vit.Extensions.Object_Serialize_Extensions;
 
 namespace ServiceProvider.Controllers
 {

11.ServiceProvider/ServiceProvider/Program.cs

@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+
+using Vit.Core.Util.ConfigurationManager;
 using Vit.Extensions;
 
 namespace ServiceProvider
@@ -19,9 +14,9 @@ namespace ServiceProvider
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)               
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls(Vit.Core.Util.ConfigurationManager.ConfigurationManager.Instance.GetByPath<string[]>("server.urls"))
+                .UseUrls(Appsettings.json.GetByPath<string[]>("server.urls"))
                 .UseServiceAdaptor();
     }
 }

11.ServiceProvider/ServiceProvider/ServiceProvider.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
+    <ItemGroup>
+        <Folder Include="wwwroot\" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <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" />
+        <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Sers\ServiceAdaptor.NetCore.Sers.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
 
-  <ItemGroup>
-    <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" />
-    <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Sers\ServiceAdaptor.NetCore.Sers.csproj" />
-  </ItemGroup>
-  
-  
 </Project>

12.ServiceConsumer/ServiceConsumer/Program.cs

@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+
+using Vit.Core.Util.ConfigurationManager;
 using Vit.Extensions;
 
 namespace ServiceConsumer
@@ -21,7 +16,7 @@ namespace ServiceConsumer
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls(Vit.Core.Util.ConfigurationManager.ConfigurationManager.Instance.GetByPath<string[]>("server.urls"))
+                .UseUrls(Appsettings.json.GetByPath<string[]>("server.urls"))
                 .UseServiceAdaptor()
             ;
     }

12.ServiceConsumer/ServiceConsumer/ServiceConsumer.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
+    <ItemGroup>
+        <Folder Include="wwwroot\" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />  
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <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" />
-    <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Sers\ServiceAdaptor.NetCore.Sers.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <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" />
+        <ProjectReference Include="..\..\Library\ServiceAdaptor.NetCore.Sers\ServiceAdaptor.NetCore.Sers.csproj" />
+    </ItemGroup>
 
 
 </Project>

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

@@ -1,34 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<pack>nuget</pack>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>1.3.14</Version>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>微服务适配器</Description>
-		<PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.Consul.xml</DocumentationFile>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Consul" Version="0.7.2.6" />
-		<PackageReference Include="Vit.WebHost" Version="2.1.16" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<ProjectReference Include="..\ServiceAdaptor.NetCore.MinHttp\ServiceAdaptor.NetCore.MinHttp.csproj" />
-		<ProjectReference Include="..\ServiceAdaptor.NetCore\ServiceAdaptor.NetCore.csproj" />
-	</ItemGroup>
+    <PropertyGroup>
+        <pack>nuget</pack>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Version>1.3.15-preview</Version>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <Authors>Lith</Authors>
+        <Description>ServiceAdaptor</Description>
+        <PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.Consul.xml</DocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Consul" Version="0.7.2.6" />
+        <PackageReference Include="Vit.WebHost" Version="2.1.19" />
+    </ItemGroup>
+
+
+    <ItemGroup>
+        <ProjectReference Include="..\ServiceAdaptor.NetCore.MinHttp\ServiceAdaptor.NetCore.MinHttp.csproj" />
+        <ProjectReference Include="..\ServiceAdaptor.NetCore\ServiceAdaptor.NetCore.csproj" />
+    </ItemGroup>
 
 
 </Project>

Library/ServiceAdaptor.NetCore.Consul/ServiceAdaptor.cs

@@ -1,14 +1,20 @@
 using Consul;
+
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+
 using Newtonsoft.Json.Linq;
+
 using ServiceAdaptor.NetCore.Client;
+
 using System;
 using System.Threading.Tasks;
+
 using Vit.Core.Module.Log;
 using Vit.Extensions;
+using Vit.Extensions.Json_Extensions;
 
 namespace ServiceAdaptor.NetCore.Consul
 {

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

@@ -1,26 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<pack>nuget</pack>
-	</PropertyGroup>
+    <PropertyGroup>
+        <pack>nuget</pack>
+    </PropertyGroup>
 
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>1.3.14</Version>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Version>1.3.15-preview</Version>
+    </PropertyGroup>
 
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>微服务适配器</Description>
-		<PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
-	</PropertyGroup>
+    <PropertyGroup>
+        <Authors>Lith</Authors>
+        <Description>ServiceAdaptor</Description>
+        <PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
+    </PropertyGroup>
 
-	<PropertyGroup>
-		<DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.MinHttp.xml</DocumentationFile>
-	</PropertyGroup>
+    <PropertyGroup>
+        <DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.MinHttp.xml</DocumentationFile>
+    </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\ServiceAdaptor.NetCore\ServiceAdaptor.NetCore.csproj" />
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\ServiceAdaptor.NetCore\ServiceAdaptor.NetCore.csproj" />
+    </ItemGroup>
 
 </Project>

Library/ServiceAdaptor.NetCore.MinHttp/ServiceAdaptor.cs

@@ -1,15 +1,19 @@
 using Microsoft.AspNetCore.Hosting;
+
 using Newtonsoft.Json.Linq;
+
 using ServiceAdaptor.NetCore.Client;
+
 using Vit.Core.Module.Log;
-using Vit.Extensions;
+using Vit.Extensions.Json_Extensions;
+using Vit.Extensions.Newtonsoft_Extensions;
 
 namespace ServiceAdaptor.NetCore.MinHttp
 {
     public class ServiceAdaptor : IServiceAdaptor
     {
         public IWebHostBuilder InitWebHostBuilder(IWebHostBuilder builder, JObject config, out IApiClient apiClient)
-        {       
+        {
 
             #region (x.)构建ApiClient     
 
@@ -24,7 +28,7 @@ namespace ServiceAdaptor.NetCore.MinHttp
 
 
             #region (x.x.2)超时时间
-            var timeoutSeconds = config["timeoutSeconds"].ConvertBySerialize<int?>(); 
+            var timeoutSeconds = config["timeoutSeconds"].ConvertBySerialize<int?>();
             if (timeoutSeconds.HasValue)
             {
                 httpApi.vitHttpClient.TimeoutSeconds = timeoutSeconds.Value;

Library/ServiceAdaptor.NetCore.Sers/ApiClient.cs

@@ -17,6 +17,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Vit.Core.Util.Net;
 using Vit.Extensions;
+using Vit.Extensions.Object_Serialize_Extensions;
 
 namespace ServiceAdaptor.NetCore.Sers
 {

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

@@ -1,32 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<pack>nuget</pack>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>1.3.14</Version>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>微服务适配器</Description>
-		<PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.Sers.xml</DocumentationFile>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<!-- Sers -->
-		<PackageReference Include="Sers.Serslot" Version="2.1.18" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\ServiceAdaptor.NetCore\ServiceAdaptor.NetCore.csproj" />
-	</ItemGroup>
+    <PropertyGroup>
+        <pack>nuget</pack>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Version>1.3.15-preview</Version>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <Authors>Lith</Authors>
+        <Description>ServiceAdaptor</Description>
+        <PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.Sers.xml</DocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <!-- Sers -->
+        <PackageReference Include="Sers.Serslot" Version="2.1.22" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\ServiceAdaptor.NetCore\ServiceAdaptor.NetCore.csproj" />
+    </ItemGroup>
 
 
 </Project>

Library/ServiceAdaptor.NetCore/Extensions/IWebHostBuilderExtensions_UseServiceAdaptor.cs

@@ -6,16 +6,17 @@ using Vit.Core.Module.Log;
 using ServiceAdaptor.NetCore.Client;
 using ServiceAdaptor.NetCore;
 using Vit.Core.Util.Reflection;
+using Vit.Extensions.Newtonsoft_Extensions;
 
 namespace Vit.Extensions
 {
     public static class IWebHostBuilderExtensions_UseServiceAdaptor
     {
-        
+
         public static IWebHostBuilder UseServiceAdaptor(this IWebHostBuilder hostBuilder)
         {
-            var configs = ConfigurationManager.Instance.GetByPath<JArray>("ServiceAdaptor");
-            if (configs  == null|| configs.Count==0)
+            var configs = Appsettings.json.GetByPath<JArray>("ServiceAdaptor");
+            if (configs == null || configs.Count == 0)
             {
                 return hostBuilder;
             }
@@ -38,7 +39,7 @@ namespace Vit.Extensions
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error(ex);                  
+                    Logger.Error(ex);
                 }
             }
 
@@ -54,10 +55,10 @@ namespace Vit.Extensions
 
                 var assemblyFile = config["assemblyFile"].ConvertToString();
                 if (string.IsNullOrEmpty(assemblyFile)) return null;
- 
+
 
                 //(x.2)get assembly 
-                var assembly = ObjectLoader.LoadAssemblyFromFile(assemblyFile);              
+                var assembly = ObjectLoader.LoadAssemblyFromFile(assemblyFile);
 
                 //(x.3) create class
                 return assembly?.CreateInstance(className) as IServiceAdaptor;
@@ -69,6 +70,6 @@ namespace Vit.Extensions
 
 
 
-    
+
     }
 }

Library/ServiceAdaptor.NetCore/ServiceAdaptor.NetCore.csproj

@@ -1,30 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<pack>nuget</pack>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>1.3.14</Version>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>微服务适配器</Description>
-		<PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.xml</DocumentationFile>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.0" />
-
-		<!-- Sers -->
-		<PackageReference Include="Vit.Core" Version="2.1.16" />
-	</ItemGroup>
+    <PropertyGroup>
+        <pack>nuget</pack>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Version>1.3.15-preview</Version>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <Authors>Lith</Authors>
+        <Description>ServiceAdaptor</Description>
+        <PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.NetCore.xml</DocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.0" />
+
+        <!-- Sers -->
+        <PackageReference Include="Vit.Core" Version="2.1.19" />
+    </ItemGroup>
 
 
 

Library/ServiceAdaptor/ServiceAdaptor.csproj

@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.0.0-preview</Version>
-    <Description>https://github.com/serset/ServiceAdaptor/tree/1.0/release</Description>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Version>1.0.0.0-preview</Version>
+        <Description>https://github.com/serset/ServiceAdaptor/tree/1.0/release</Description>
+    </PropertyGroup>
 
-	<PropertyGroup>
-		<Authors>Lith</Authors>
-		<Description>微服务适配器</Description>
-		<PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
-	</PropertyGroup>
+    <PropertyGroup>
+        <Authors>Lith</Authors>
+        <Description>ServiceAdaptor</Description>
+        <PackageProjectUrl>https://github.com/serset/ServiceAdaptor.NetCore</PackageProjectUrl>
+    </PropertyGroup>
 
-  <PropertyGroup>
-    <DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.xml</DocumentationFile>
-  </PropertyGroup>
+    <PropertyGroup>
+        <DocumentationFile>bin\Debug\netstandard2.0\ServiceAdaptor.xml</DocumentationFile>
+    </PropertyGroup>
 
 </Project>

Publish/DevOps/build-bash/40.Station-publish(net6.0).sh

@@ -1,38 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-#(x.1)参数
-args_="
-
-export basePath=/root/temp/svn
-
-# "
-
-curPath=$PWD
-
-
-#----------------------------------------------
-echo "(x.2)netVersion"
-netVersion=net6.0
-
-
-
-#---------------------------------------------- 
-echo "(x.3)publish $netVersion"
-
-#修改csproj文件中的版本号
-cd $basePath
-sed -i 's/net5.0/'"$netVersion"'/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-cd $curPath
-bash 40.Station-publish.sh;
-
-
-#还原csproj文件中的版本号为net5.0
-cd $basePath
-sed -i 's/'"$netVersion"'/net5.0/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-
-cd $curPath
-

Publish/DevOps/build-bash/40.Station-publish(netcoreapp2.1).sh

@@ -1,38 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-#(x.1)参数
-args_="
-
-export basePath=/root/temp/svn
-
-# "
-
-curPath=$PWD
-
-
-#----------------------------------------------
-echo "(x.2)netVersion"
-netVersion=netcoreapp2.1
-
-
-
-#---------------------------------------------- 
-echo "(x.3)publish $netVersion"
-
-#修改csproj文件中的版本号
-cd $basePath
-sed -i 's/net5.0/'"$netVersion"'/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-cd $curPath
-bash 40.Station-publish.sh;
-
-
-#还原csproj文件中的版本号为net5.0
-cd $basePath
-sed -i 's/'"$netVersion"'/net5.0/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-
-cd $curPath
-

Publish/DevOps/build-bash/40.Station-publish(netcoreapp2.2).sh

@@ -1,38 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-#(x.1)参数
-args_="
-
-export basePath=/root/temp/svn
-
-# "
-
-curPath=$PWD
-
-
-#----------------------------------------------
-echo "(x.2)netVersion"
-netVersion=netcoreapp2.2
-
-
-
-#---------------------------------------------- 
-echo "(x.3)publish $netVersion"
-
-#修改csproj文件中的版本号
-cd $basePath
-sed -i 's/net5.0/'"$netVersion"'/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-cd $curPath
-bash 40.Station-publish.sh;
-
-
-#还原csproj文件中的版本号为net5.0
-cd $basePath
-sed -i 's/'"$netVersion"'/net5.0/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-
-cd $curPath
-

Publish/DevOps/build-bash/40.Station-publish(netcoreapp3.0).sh

@@ -1,38 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-#(x.1)参数
-args_="
-
-export basePath=/root/temp/svn
-
-# "
-
-curPath=$PWD
-
-
-#----------------------------------------------
-echo "(x.2)netVersion"
-netVersion=netcoreapp3.0
-
-
-
-#---------------------------------------------- 
-echo "(x.3)publish $netVersion"
-
-#修改csproj文件中的版本号
-cd $basePath
-sed -i 's/net5.0/'"$netVersion"'/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-cd $curPath
-bash 40.Station-publish.sh;
-
-
-#还原csproj文件中的版本号为net5.0
-cd $basePath
-sed -i 's/'"$netVersion"'/net5.0/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-
-cd $curPath
-

Publish/DevOps/build-bash/40.Station-publish(netcoreapp3.1).sh

@@ -1,38 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-#(x.1)参数
-args_="
-
-export basePath=/root/temp/svn
-
-# "
-
-curPath=$PWD
-
-
-#----------------------------------------------
-echo "(x.2)netVersion"
-netVersion=netcoreapp3.1
-
-
-
-#---------------------------------------------- 
-echo "(x.3)publish $netVersion"
-
-#修改csproj文件中的版本号
-cd $basePath
-sed -i 's/net5.0/'"$netVersion"'/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-cd $curPath
-bash 40.Station-publish.sh;
-
-
-#还原csproj文件中的版本号为net5.0
-cd $basePath
-sed -i 's/'"$netVersion"'/net5.0/g'  `grep -a '<publish>' . -rl --include *.csproj`
-
-
-cd $curPath
-

Publish/DevOps/build-bash/40.Station-publish-multiple.bash

@@ -0,0 +1,46 @@
+set -e
+
+
+#---------------------------------------------------------------------
+# args
+args_="
+
+export basePath=/root/temp/svn
+export NUGET_PATH=$basePath/Publish/release/.nuget
+
+# "
+
+
+curPath=$PWD
+
+cd $curPath/../../..
+export basePath=$PWD
+cd $curPath
+
+#----------------------------------------------
+echo "40.Station-publish-multiple.bash"
+
+for netVersion in net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
+do
+	echo "#2.1 publish netVersion: $netVersion"
+
+	echo "#2.2 change netVersion to $netVersion in csproj"
+	sed -i 's/net6.0/'"$netVersion"'/g' `find ${basePath} -name *.csproj -exec grep '<publish>' -l {} \;`
+
+
+	echo "#2.3 sh 40.Station-publish.sh"
+	cd $curPath
+	sh 40.Station-publish.sh
+
+
+	echo "#2.4 change back netVersion to net6.0 in csproj"
+	sed -i 's/'"$netVersion"'/net6.0/g' `find ${basePath} -name *.csproj -exec grep '<publish>' -l {} \;`
+
+done
+
+
+
+cd $curPath
+
+
+

Publish/DevOps/build-bash/40.Station-publish.sh

@@ -1,76 +1,74 @@
-set -e
-
-
-#---------------------------------------------------------------------
-#(x.1)参数
-args_="
-
-export basePath=/root/temp/svn
-export NUGET_PATH=$basePath/Publish/release/.nuget
-
-# "
-
-if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
-
-
-#----------------------------------------------
-echo "(x.2)获取netVersion" 
-netVersion=`grep '<TargetFramework>' $(grep '<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
-
-
-publishPath=$basePath/Publish/release/release/Station\($netVersion\)
-echo publish Station
-echo dotnet version: $netVersion
-
-
-#----------------------------------------------
-echo "(x.3)查找所有需要发布的项目并发布"
-
-
-mkdir -p $publishPath
-
-docker run -i --rm \
---env LANG=C.UTF-8 \
--v $NUGET_PATH:/root/.nuget \
--v $basePath:/root/code \
-serset/dotnet:sdk-6.0 \
-bash -c "
-set -e
-
-basePath=/root/code
-publishPath=\$basePath/Publish/release/release/Station\($netVersion\)
-
-#(x.3)查找所有需要发布的项目并发布
-cd \$basePath
-for file in \$(grep -a '<publish>' . -rl --include *.csproj)
-do
-	cd \$basePath
-	
-	#get publishName
-	publishName=\`grep '<publish>' \$file -r | grep -oP '>(.*)<' | tr -d '<>'\`
-
-	echo publish \$publishName
-
-	#publish
-	cd \$(dirname \"\$file\")
-	dotnet build --configuration Release
-	dotnet publish --configuration Release --output \"\$publishPath/\$publishName\"
-
-	#copy xml
-	for filePath in bin/Release/$netVersion/*.xml ; do \\cp -rf \$filePath \"\$publishPath/\$publishName\";done
-done
-
-
-#(x.4)copy dir
-\cp -rf \$basePath/Publish/ReleaseFile/Station/. \"\$publishPath\"
-
-"
-
-
-
-echo 'publish succeed！'
-
-
-
-
-
+set -e
+
+
+#---------------------------------------------------------------------
+# args
+args_="
+
+export basePath=/root/temp/svn
+export NUGET_PATH=$basePath/Publish/release/.nuget
+
+# "
+
+if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
+
+
+#----------------------------------------------
+echo "40.Station-publish.sh find projects and build"
+
+
+
+
+docker run -i --rm \
+--env LANG=C.UTF-8 \
+-v $NUGET_PATH:/root/.nuget \
+-v $basePath:/root/code \
+serset/dotnet:sdk-6.0 \
+bash -c "
+set -e
+
+echo '#1 get netVersion'
+netVersion=\$(grep '<TargetFramework>' \$(grep '<publish>' -rl --include *.csproj /root/code | head -n 1) | grep -oP '>(.*)<' | tr -d '<>')
+echo netVersion: \$netVersion
+
+
+basePath=/root/code
+publishPath=\$basePath/Publish/release/release/Station\(\$netVersion\)
+mkdir -p \$publishPath
+
+echo '#2 publish Station'
+cd \$basePath
+for file in \$(grep -a '<publish>' . -rl --include *.csproj)
+do
+	cd \$basePath
+	
+	#get publishName
+	publishName=\`grep '<publish>' \$file -r | grep -oP '>(.*)<' | tr -d '<>'\`
+
+	echo publish \$publishName
+
+	#publish
+	cd \$(dirname \"\$file\")
+	dotnet build --configuration Release
+	dotnet publish --configuration Release --output \"\$publishPath/\$publishName\"
+
+	#copy xml
+	for filePath in bin/Release/\$netVersion/*.xml ; do \\cp -rf \$filePath \"\$publishPath/\$publishName\";done
+done
+
+
+echo '#3 copy ReleaseFile'
+\cp -rf \$basePath/Publish/ReleaseFile/Station/. \"\$publishPath\"
+
+
+
+"
+
+
+
+echo 'publish succeed!'
+
+
+
+
+

Publish/DevOps/build-bash/51.docker-deploy-copy.sh

@@ -12,7 +12,7 @@ export basePath=/root/temp/svn
  
 #---------------------------------------------------------------------
 #(x.2)
-publishPath="$basePath/Publish/release/release/Station(net5.0)"
+publishPath="$basePath/Publish/release/release/Station(net6.0)"
 deployPath=$basePath/Publish/release/release/docker-deploy
 
 

Publish/ReleaseFile/docker-image/adaptor-gateway/Dockerfile

@@ -1,4 +1,4 @@
-FROM serset/dotnet:aspnet-5.0
+FROM serset/dotnet:aspnet-6.0
 COPY app /root/app
 WORKDIR /root/app
 CMD dotnet ServiceAdaptor.NetCore.Gateway.dll