代码调整优化

Sky Chen · Sky Chen · commit d236d31ef307 · 2021-01-11T12:19:16.000+08:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/samples/基础设施服务解决方案/Id发号/GS.Infrastructure.Id/Startup.cs b/samples/基础设施服务解决方案/Id发号/GS.Infrastructure.Id/Startup.cs
@@ -8,6 +8,7 @@
 using Sikiro.Infrastructure.Id.Models;
 using Sikiro.MicroService.Extension;
 using Sikiro.MicroService.Extension.Attributes;
+using Sikiro.MicroService.Extension.Consul;
 using Sikiro.MicroService.Extension.SkyApm;
 
 namespace Sikiro.Infrastructure.Id
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Controllers/TestController.cs b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Controllers/TestController.cs
@@ -0,0 +1,45 @@
+﻿using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+using Sikiro.Tookits.Extension;
+
+namespace Sikiro.Infrastructure.Msg.Controllers
+{
+    [Route("[controller]/[action]")]
+    [ApiController]
+    public class TestController : Controller
+    {
+        [HttpGet]
+        public string Index()
+        {
+            var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces();
+
+            string localIp = NetworkInterface.GetAllNetworkInterfaces()
+                .Select(p => p.GetIPProperties())
+                .SelectMany(p => p.UnicastAddresses)
+                .FirstOrDefault(p => p.Address.AddressFamily == AddressFamily.InterNetwork && !IPAddress.IsLoopback(p.Address))?.Address.ToString();
+
+            var result = new List<string>();
+
+            var b = NetworkInterface.GetAllNetworkInterfaces()
+                .Select(p => p.GetIPProperties())
+                .SelectMany(p => p.UnicastAddresses)
+                .Where(p => p.Address.AddressFamily == AddressFamily.InterNetwork && !IPAddress.IsLoopback(p.Address))
+                .Select(a =>
+                {
+                    return new
+                    {
+                        Address = a.Address.ToStr()
+                    };
+                }).ToList();
+
+
+            return b.ToJson() + "------" + localIp;
+        }
+    }
+}
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Dockerfile b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Dockerfile
@@ -0,0 +1,13 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
+WORKDIR /app
+EXPOSE 80
+
+FROM base AS final
+WORKDIR /app
+COPY ./ /app
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ENTRYPOINT ["dotnet", "GS.Infrastructure.Msg.dll"]
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Properties/PublishProfiles/FolderProfile.pubxml b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,16 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Sikiro.Infrastructure.Msg.csproj b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Sikiro.Infrastructure.Msg.csproj
@@ -60,6 +60,13 @@
   </ItemGroup>
 
 
+  <ItemGroup>
+    <None Update="Dockerfile">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JSONSchema="" /></VisualStudio></ProjectExtensions>
 
 </Project>
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Startup.cs b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/Startup.cs
@@ -6,6 +6,7 @@
 using Sikiro.Infrastructure.Msg.Service;
 using Sikiro.MicroService.Extension;
 using Sikiro.MicroService.Extension.Attributes;
+using Sikiro.MicroService.Extension.Consul;
 using Sikiro.MicroService.Extension.SkyApm;
 using Sikiro.Nosql.Mongo;
 using Sikiro.Nosql.Redis;
@@ -30,18 +31,12 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddHealthChecks();
 
-            services.AddSingleton(new RedisRepository(Configuration["redisUrl"]));
-
             services.AddSingleton(Configuration);
 
-            services.AddSingleton(new SmsService(Configuration["Sms:key"], Configuration["Sms:secret"], Configuration["Sms:sign"], Configuration["Sms:code"], Configuration["Sms:foreignsign"], Configuration["Sms:foreigncode"]));
-
             services.AddHttpContextAccessor();
 
             services.UseSkyApm();
 
-            services.AddSingleton(new MongoRepository(Configuration["MongoDbUrl"]));
-
             services.AddSwaggerDocument(config =>
             {
                 config.PostProcess = document =>
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/appsettings.Development.json b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/appsettings.Development.json
@@ -10,7 +10,7 @@
   "MongoDbUrl": "",
   "Consul": {
     "ServiceName": "Msg",
-    "ConsulHost": "http://47.106.228.67:5037",
+    "ConsulHost": "http://10.0.2.101:8500",
     "SelfPort": 80
   },
   "Sms": {
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/appsettings.Testing.json b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/appsettings.Testing.json
@@ -10,7 +10,7 @@
   "MongoDbUrl": "",
   "Consul": {
     "ServiceName": "Msg",
-    "ConsulHost": "http://47.106.228.67:5037",
+    "ConsulHost": "http://10.0.2.101:8500",
     "SelfPort": 80
   },
   "Sms": {
diff --git a/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/appsettings.json b/samples/基础设施服务解决方案/消息推送/GS.Infrastructure.Msg/appsettings.json
@@ -10,7 +10,7 @@
   "MongoDbUrl": "",
   "Consul": {
     "ServiceName": "Msg",
-    "ConsulHost": "http://47.106.228.67:5037",
+    "ConsulHost": "http://10.0.2.101:8500",
     "SelfPort": 80
   },
   "Sms": {
diff --git a/samples/客户系统解决方案-新分层/Sikiro.InnerApi.Customer/Startup.cs b/samples/客户系统解决方案-新分层/Sikiro.InnerApi.Customer/Startup.cs
@@ -14,6 +14,7 @@
 using Sikiro.InnerApi.Customer.Extention;
 using Sikiro.MicroService.Extension;
 using Sikiro.MicroService.Extension.Attributes;
+using Sikiro.MicroService.Extension.Consul;
 using Sikiro.MicroService.Extension.SkyApm;
 
 namespace Sikiro.InnerApi.Customer
diff --git a/samples/客户系统解决方案/业务API服务/GS.InnerApi.Customer/Startup.cs b/samples/客户系统解决方案/业务API服务/GS.InnerApi.Customer/Startup.cs
@@ -14,6 +14,7 @@
 using Sikiro.InnerApi.Customer.Extention;
 using Sikiro.MicroService.Extension;
 using Sikiro.MicroService.Extension.Attributes;
+using Sikiro.MicroService.Extension.Consul;
 using Sikiro.MicroService.Extension.SkyApm;
 
 namespace Sikiro.InnerApi.Customer
diff --git a/src/Sikiro.MicroService.Extension/Consul/ConsulExtensions.cs b/src/Sikiro.MicroService.Extension/Consul/ConsulExtensions.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
@@ -8,7 +9,7 @@
 using Microsoft.Extensions.Hosting;
 using Sikiro.Tookits.Extension;
 
-namespace Sikiro.MicroService.Extension
+namespace Sikiro.MicroService.Extension.Consul
 {
     /// <summary>
     /// Consul扩展类
@@ -29,29 +30,35 @@ public static IApplicationBuilder UseConsul(this IApplicationBuilder app, IHostA
 
             //创建Consul客户端
             var consulClient = new ConsulClient(x => x.Address = new Uri(option.ConsulHost));//请求注册的 Consul 地址
-            var selfHost = new Uri("http://" + LocalIpAddress + ":" + option.SelfPort);
+
+            AgentServiceRegistration registration = null;
 
             //注册服务
-            var registration = new AgentServiceRegistration
+            lifetime.ApplicationStarted.Register(() =>
             {
-                Checks = new[] { new AgentServiceCheck
+                var selfHost = new Uri("http://" + LocalIpAddress + ":" + option.SelfPort);
+                registration = new AgentServiceRegistration
                 {
-                    Interval = TimeSpan.FromSeconds(option.HealthCheckInterval),
-                    HTTP = $"{selfHost.OriginalString}/health",//健康检查地址
-                    Timeout = TimeSpan.FromSeconds(3)
-                } },
-                ID = selfHost.OriginalString.EncodeMd5String(),
-                Name = option.ServiceName,
-                Address = selfHost.Host,
-                Port = selfHost.Port,
-                Tags = new[] { $"urlprefix-/{option.ServiceName} strip=/{option.ServiceName}" }//添加 urlprefix-/servicename 格式的 tag 标签，以便 Fabio 识别  
-            };
-            consulClient.Agent.ServiceRegister(registration).Wait();
+                    Checks = new[] { new AgentServiceCheck
+                    {
+                        Interval = TimeSpan.FromSeconds(option.HealthCheckInterval),
+                        HTTP = $"{selfHost.OriginalString}/health",//健康检查地址
+                        Timeout = TimeSpan.FromSeconds(3)
+                    } },
+                    ID = selfHost.OriginalString.EncodeMd5String(),
+                    Name = option.ServiceName,
+                    Address = selfHost.Host,
+                    Port = selfHost.Port,
+                    Tags = new[] { $"urlprefix-/{option.ServiceName} strip=/{option.ServiceName}" }//添加 urlprefix-/servicename 格式的 tag 标签，以便 Fabio 识别  
+                };
+                consulClient.Agent.ServiceRegister(registration).Wait();
+            });
 
             //反注册服务
             lifetime.ApplicationStopping.Register(() =>
             {
-                consulClient.Agent.ServiceDeregister(registration.ID).Wait();
+                if (registration != null)
+                    consulClient.Agent.ServiceDeregister(registration.ID).Wait();
             });
             return app;
         }
@@ -60,26 +67,11 @@ private static string LocalIpAddress
         {
             get
             {
-                var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces();
+                return NetworkInterface.GetAllNetworkInterfaces()
+                    .Select(p => p.GetIPProperties())
+                    .SelectMany(p => p.UnicastAddresses)
+                    .FirstOrDefault(p => p.Address.AddressFamily == AddressFamily.InterNetwork && !IPAddress.IsLoopback(p.Address))?.Address.ToString();
 
-                foreach (var network in networkInterfaces)
-                {
-                    if (network.OperationalStatus != OperationalStatus.Up)
-                        continue;
-                    var properties = network.GetIPProperties();
-                    if (properties.GatewayAddresses.Count == 0)
-                        continue;
-
-                    foreach (var address in properties.UnicastAddresses)
-                    {
-                        if (address.Address.AddressFamily != AddressFamily.InterNetwork)
-                            continue;
-                        if (IPAddress.IsLoopback(address.Address))
-                            continue;
-                        return address.Address.ToString();
-                    }
-                }
-                return "";
             }
         }
     }
