1.添加Apollo

Sln.Wcs/Controllers/WcsController.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 
 namespace Sln.Wcs.Controllers
 {
@@ -11,6 +12,27 @@ namespace Sln.Wcs.Controllers
     [Route("api/[controller]")]
     public class WcsController : ControllerBase
     {
+        private readonly IConfiguration _configuration;
+        public WcsController(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
 
+        [HttpGet]
+        public string GetName()
+        {
+            //var a = _configuration.GetSection("Name");
+            var a = _configuration.GetValue<string>("Name");
+            Console.WriteLine(a + "\n");
+            return a;
+            //return JsonConvert.SerializeObject(a);
+        }
+        [HttpGet]
+        public string GetID()
+        {
+            var a = _configuration.GetValue<string>("ID");
+            Console.WriteLine(a + "\n");
+            return a;
+        }
     }
 }

Sln.Wcs/Program.cs

@@ -5,6 +5,12 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using Sln.Wcs.Serilog;
+using Microsoft.Extensions.Configuration;
+using Com.Ctrip.Framework.Apollo;
+using Microsoft.OpenApi;
+using Swashbuckle.AspNetCore.Swagger;
+using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Hosting.Server;
 namespace Sln.Wcs
 {
     public class Program
@@ -18,8 +24,8 @@ namespace Sln.Wcs
                 Console.ForegroundColor = ConsoleColor.Yellow;
                 Console.WriteLine("Test!");
                 var host = CreateHostBuilder(args).Build();
-                var hostTask = host.RunAsync();
 
+                var hostTask = host.RunAsync();
                 //serilogHelper = host.Services.GetRequiredService<SerilogHelper>();
                 while (true)
                 {
@@ -37,7 +43,14 @@ namespace Sln.Wcs
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
+            Host.CreateDefaultBuilder(args).ConfigureAppConfiguration((context, config) =>
+            {
+                var builtConfig = config.Build();
+
+                config.AddApollo(builtConfig.GetSection("Apollo"))
+                      .AddNamespace("application")
+                      .AddDefault();
+            })
 
                 .UseSerilog((context, config) =>
                 {
@@ -45,11 +58,39 @@ namespace Sln.Wcs
                 .UseServiceProviderFactory(new AutofacServiceProviderFactory())
                 .ConfigureServices((hostContext, services) =>
                 {
+                    services.AddEndpointsApiExplorer();
+                    services.AddSwaggerGen(c =>
+                    {
+                        c.SwaggerDoc("v1", new OpenApiInfo  
+                        {
+                            Title = "My API",
+                            Version = "v1",
+                            Description = "API 文档"
+                        });
+                    });
                     //services.AddHostedService<ReadBusiness>();
                 })
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    //webBuilder.UseStartup<Startup>();
+                    webBuilder.Configure(app =>
+                    {
+                        // 配置中间件管道
+                        var env = app.ApplicationServices.GetRequiredService<IWebHostEnvironment>();
+
+                        if (env.IsDevelopment())
+                        {
+                            app.UseSwagger();
+                            app.UseSwaggerUI(c=> { c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"); });
+                        }
+
+                        // 其他中间件配置
+                        app.UseRouting();
+                        app.UseEndpoints(endpoints =>
+                        {
+                            endpoints.MapControllers();
+                        });
+                    });
+                    webBuilder.UseStartup<Sln.Wcs.Startup>();
                 });
     }
 }

Sln.Wcs/Properties/launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Sln.Wcs": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:55532;http://localhost:55533"
+    }
+  }
+}

Sln.Wcs/Sln.Wcs.csproj

@@ -7,12 +7,28 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Remove="appsettings.json" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Content Include="appsettings.json">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+		<PackageReference Include="Com.Ctrip.Framework.Apollo" Version="2.11.0" />
+		<PackageReference Include="Com.Ctrip.Framework.Apollo.Configuration" Version="2.11.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.3.9" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
+		<PackageReference Include="Microsoft.OpenApi" Version="3.4.0" />
 		<PackageReference Include="Serilog" Version="4.3.1" />
 		<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.5" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.5" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.5" />
 	</ItemGroup>
 
 	<ItemGroup>

Sln.Wcs/Startup.cs

@@ -11,7 +11,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Sln.Wcs.Serilog;
 using Sln.Wcs.Common;
 using Sln.Wcs.Config;
-using Sln.Wcs.Redis;
 using Sln.Wcs.Setup;
 
 namespace Sln.Wcs
@@ -48,7 +47,7 @@ namespace Sln.Wcs
             // 注册 SerilogHelper 服务
             services.AddSingleton<SerilogHelper>();
 
-            services.AddSingleton<RedisHandler>();
+            //services.AddSingleton<RedisHandler>();
 
             //注册AppConfig
             services.AddSingleton<AppConfig>(provider =>
@@ -58,12 +57,18 @@ namespace Sln.Wcs
             });
 
             //注册ORM
-            services.AddSqlSugarSetup();
+            //services.AddSqlSugarSetup();
 
             //注册PLC工厂
-            services.AddPlcFactorySetup();
+            //services.AddPlcFactorySetup();
 
-            services.AddRfidFactorySetup();
+            //services.AddRfidFactorySetup();
+        }
+
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            //启用Serilog中间件
+            app.UseSerilogExtensions();
         }
     }
 }

Sln.Wcs/appsettings.json

@@ -14,7 +14,7 @@
                 "configId": "wcs",
                 "dbType": 0,
                 // "connStr": "Data Source=127.0.0.1;Port=3306;Initial Catalog=jhrl_wcs;uid=root;pwd=root;Charset=utf8mb4;SslMode=none;Connect Timeout=100"
-            "connStr": "Data Source=192.168.228.241;Port=3306;Initial Catalog=jhrl_wcs;uid=root;pwd=root;Charset=utf8mb4;SslMode=none;Connect Timeout=100",
+                "connStr": "Data Source=192.168.228.241;Port=3306;Initial Catalog=jhrl_wcs;uid=root;pwd=root;Charset=utf8mb4;SslMode=none;Connect Timeout=100"
                 //"connStr": "Data Source=119.45.202.115;Port=3306;Initial Catalog=jhrl_wcs;uid=root;pwd=haiwei@123;Charset=utf8mb4;SslMode=none;Connect Timeout=100"
             }
             //{
@@ -59,5 +59,12 @@
             }
         ],
         "redisConfig": "175.27.215.92:6379,password=redis@2023"
+    },
+
+    "Apollo": {
+        "AppId": "ApolloTest",
+        "Env": "DEV",
+        "MetaServer": "http://119.45.202.115:4320",
+        "ConfigServer": [ "http://119.45.202.115:4320" ]
     }
 }