Skip to content

Commit 9bdb6ad

Browse files
author
lith
committed
auto commit 1.3.14
1 parent 28a1725 commit 9bdb6ad

38 files changed

Lines changed: 347 additions & 127 deletions

‎.github/workflows/action-main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
run: |
3333
set -e
3434
echo start build
35+
export APPNAME="ServiceAdaptor"
3536
export DOCKER_USERNAME="${{ secrets.DOCKER_USERNAME }}"
3637
export DOCKER_PASSWORD="${{ secrets.DOCKER_PASSWORD }}"
3738
export NUGET_SERVER="${{ secrets.NUGET_SERVER }}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ public static void StartWebHost()
143143

144144

145145
#region (x.x.4)启动
146-
Logger.Info("[WebHost]will listening on: " + string.Join(",", arg.urls));
146+
Logger.Info("[WebHost]listening", arg.urls);
147147

148148
if (arg.staticFiles?.rootPath != null)
149-
Logger.Info("[WebHost]wwwroot : " + arg.staticFiles?.rootPath);
149+
Logger.Info("[WebHost]wwwroot path", arg.staticFiles?.rootPath);
150150

151151
Vit.WebHost.Host.Run(arg);
152152
#endregion

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.1</TargetFramework>
10-
<Version>1.3.13</Version>
9+
<TargetFramework>net5.0</TargetFramework>
10+
<Version>1.3.14</Version>
1111
</PropertyGroup>
1212

1313
<PropertyGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<TargetFramework>netstandard2.0</TargetFramework>
9-
<Version>1.3.13</Version>
9+
<Version>1.3.14</Version>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
@@ -21,7 +21,7 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Consul" Version="0.7.2.6" />
24-
<PackageReference Include="Vit.WebHost" Version="2.1.14" />
24+
<PackageReference Include="Vit.WebHost" Version="2.1.16" />
2525
</ItemGroup>
2626

2727

‎Library/ServiceAdaptor.NetCore.Consul/ServiceAdaptor.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ public IWebHostBuilder InitWebHostBuilder(IWebHostBuilder builder, JObject confi
7474

7575
}).ConfigureApp(app =>
7676
{
77-
Logger.Info("[ServiceAdaptor.NetCore.Consul]注册... ");
78-
79-
Logger.Info("[ServiceAdaptor.NetCore.Consul]配置：" + consulConfig.Serialize());
77+
Logger.Info("[ServiceAdaptor.NetCore.Consul]注册... ", consulConfig);
8078

8179
#region Configure
8280

@@ -109,7 +107,7 @@ public IWebHostBuilder InitWebHostBuilder(IWebHostBuilder builder, JObject confi
109107

110108
if ((result?.StatusCode) != System.Net.HttpStatusCode.OK)
111109
{
112-
Logger.Info("[ServiceAdaptor.NetCore.Consul]注册失败!");
110+
Logger.Error("[ServiceAdaptor.NetCore.Consul]注册失败!");
113111
Task.Run(() =>
114112
{
115113
appLife.StopApplication();
@@ -121,7 +119,7 @@ public IWebHostBuilder InitWebHostBuilder(IWebHostBuilder builder, JObject confi
121119
{
122120
Logger.Error(ex);
123121

124-
Logger.Info("[ServiceAdaptor.NetCore.Consul]注册失败!");
122+
Logger.Error("[ServiceAdaptor.NetCore.Consul]注册失败!");
125123
Task.Run(() =>
126124
{
127125
appLife.StopApplication();
@@ -155,7 +153,7 @@ public IWebHostBuilder InitWebHostBuilder(IWebHostBuilder builder, JObject confi
155153

156154
#endregion
157155

158-
Logger.Info("[ServiceAdaptor.NetCore.Consul]注册成功!");
156+
Logger.Error("[ServiceAdaptor.NetCore.Consul]注册成功!");
159157

160158
});
161159

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<TargetFramework>netstandard2.0</TargetFramework>
9-
<Version>1.3.13</Version>
9+
<Version>1.3.14</Version>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>

‎Library/ServiceAdaptor.NetCore.MinHttp/ServiceAdaptor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public IWebHostBuilder InitWebHostBuilder(IWebHostBuilder builder, JObject confi
3333

3434
#endregion
3535

36-
Logger.Info("[ServiceAdaptor.NetCore.MinHttp]配置：" + new { gatewayAddress }.Serialize());
36+
Logger.Info("[ServiceAdaptor.NetCore.MinHttp]配置", new { gatewayAddress });
3737

3838

3939
return builder;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<TargetFramework>netstandard2.0</TargetFramework>
9-
<Version>1.3.13</Version>
9+
<Version>1.3.14</Version>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
@@ -21,7 +21,7 @@
2121

2222
<ItemGroup>
2323
<!-- Sers -->
24-
<PackageReference Include="Sers.Serslot" Version="2.1.16" />
24+
<PackageReference Include="Sers.Serslot" Version="2.1.18" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎Library/ServiceAdaptor.NetCore/Extensions/IWebHostBuilderExtensions_UseServiceAdaptor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static IWebHostBuilder UseServiceAdaptor(this IWebHostBuilder hostBuilder
3030

3131

3232
//(x.2) init
33-
Logger.Info("[ServiceAdaptor.NetCore]启用微服务适配器："+ msAdaptor.GetType().FullName);
33+
Logger.Info("[ServiceAdaptor.NetCore]启用微服务适配器", msAdaptor.GetType().FullName);
3434
var builder = msAdaptor.InitWebHostBuilder(hostBuilder, msConfig, out var apiClient);
3535
ApiClient.Instance = apiClient;
3636

‎Library/ServiceAdaptor.NetCore/ServiceAdaptor.NetCore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<TargetFramework>netstandard2.0</TargetFramework>
9-
<Version>1.3.13</Version>
9+
<Version>1.3.14</Version>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
@@ -23,7 +23,7 @@
2323
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.0" />
2424

2525
<!-- Sers -->
26-
<PackageReference Include="Vit.Core" Version="2.1.14" />
26+
<PackageReference Include="Vit.Core" Version="2.1.16" />
2727
</ItemGroup>
2828

2929

0 commit comments

Comments
 (0)