wenjy
/
Sln.Wcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.添加Apollo

Browse Source
zhangxy 2 months ago
parent 8c2ffd2a61
commit e0f80172a4
6 changed files with 173 additions and 70 deletions
Show Stats Download Patch File Download Diff File

22
Sln.Wcs/Controllers/WcsController.cs
Unescape Escape View File

@ -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;
}
}
}

49
Sln.Wcs/Program.cs
Unescape Escape View File

@ -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.AddHostedService<ReadBusiness>();
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>();
});
}
}

12
Sln.Wcs/Properties/launchSettings.json
Unescape Escape View File

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

16
Sln.Wcs/Sln.Wcs.csproj
Unescape Escape View File

@ -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>

15
Sln.Wcs/Startup.cs
Unescape Escape View File

@ -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();
}
}
}

125
Sln.Wcs/appsettings.json
Unescape Escape View File

@ -1,63 +1,70 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*",
"AppConfig": {
"logPath": "E:\\桌面\\SlnMesnac\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows",
"SqlConfig": [
{
"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=119.45.202.115;Port=3306;Initial Catalog=jhrl_wcs;uid=root;pwd=haiwei@123;Charset=utf8mb4;SslMode=none;Connect Timeout=100"
}
//{
// "configId": "mcs",
// "dbType": 3,
// "connStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma"
//}
],
"PlcConfig": [
{
"configId": 1,
"plcType": "SiemensPlc",
//"plcIp": "192.168.0.7",
"plcIp": "172.16.160.61",
//"plcIp": "127.0.0.1",
"plcPort": 102,
//"plcPort": 20108,
// 3#车间上料点plc
"plcKey": "workShop3Plc",
"isFlage": true
},
{
"configId": 2,
"plcType": "SiemensPlc",
//"plcIp": "192.168.0.7",
//"plcPort": 20108,
"plcIp": "172.16.160.60",
"plcPort": 102,
// 2#计量室相关点位
"plcKey": "workShop2Plc",
"isFlage": true
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*",
"AppConfig": {
"logPath": "E:\\桌面\\SlnMesnac\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows",
"SqlConfig": [
{
"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=119.45.202.115;Port=3306;Initial Catalog=jhrl_wcs;uid=root;pwd=haiwei@123;Charset=utf8mb4;SslMode=none;Connect Timeout=100"
}
//{
// "configId": "mcs",
// "dbType": 3,
// "connStr": "Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma"
//}
],
"PlcConfig": [
{
"configId": 1,
"plcType": "SiemensPlc",
//"plcIp": "192.168.0.7",
"plcIp": "172.16.160.61",
//"plcIp": "127.0.0.1",
"plcPort": 102,
//"plcPort": 20108,
// 3#车间上料点plc
"plcKey": "workShop3Plc",
"isFlage": true
},
{
"configId": 2,
"plcType": "SiemensPlc",
//"plcIp": "192.168.0.7",
//"plcPort": 20108,
"plcIp": "172.16.160.60",
"plcPort": 102,
// 2#计量室相关点位
"plcKey": "workShop2Plc",
"isFlage": true
}
],
"RfidConfig": [
{
"configId": 1,
"equipIp": "192.168.0.7",
"equipPort": 20108,
"equipKey": "1",
"isFlage": false
}
],
"redisConfig": "175.27.215.92:6379,password=redis@2023"
}
],
"RfidConfig": [
{
"configId": 1,
"equipIp": "192.168.0.7",
"equipPort": 20108,
"equipKey": "1",
"isFlage": false
}
],
"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" ]
}
}
Write Preview
Loading…
Cancel
Save