Boonlive_RD_Web/Web_BLVLOG_Server_Mvc_Prod
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加动态配置各项参数

Browse Source
This commit is contained in:
TianMaiCheng
2026-01-20 10:19:48 +08:00
parent 37896ea102
commit b393425166
4 changed files with 90 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BLW_Log/Controllers/ValuesController.cs
View File

@@ -10,6 +10,18 @@ namespace BLW_Log.Controllers
[ApiController]
public class ValuesController : ControllerBase
{
public readonly IConfiguration configuration;
public ValuesController(IConfiguration _configuration)
{
configuration = _configuration;
}
public string Get()
{
var timer_es = configuration["ShengJi:JianGe"];
var RoomTypeID_FirstVersion = configuration["ShengJi:RoomTypeID_FirstVersion"];
return timer_es;
}
public string get_json(string data)
{
return data;

14
BLW_Log/Program.cs
View File

@@ -176,13 +176,13 @@ namespace BLW_Log
//<2F><>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD>
var jobKey5 = new JobKey("BuTingShengJi");
q.AddJob<ShengJiCaoZuoA>(opts => opts.WithIdentity(jobKey5));
q.AddTrigger(opts => opts
.ForJob(jobKey5)
.WithIdentity("BuTingShengJi-trigger")
.StartAt(DateTimeOffset.Now.AddMinutes(1))
);
//var jobKey5 = new JobKey("BuTingShengJi");
//q.AddJob<ShengJiCaoZuoA>(opts => opts.WithIdentity(jobKey5));
//q.AddTrigger(opts => opts
// .ForJob(jobKey5)
// .WithIdentity("BuTingShengJi-trigger")
// .StartAt(DateTimeOffset.Now.AddMinutes(1))
//);
});
builder.Services.AddQuartzHostedService(q => q.WaitForJobsToComplete = true);

38
BLW_Log/appsettings.json
View File

@@ -1,18 +1,26 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=10.8.8.208;Database=postgres;user id=postgres;password=123456;port=16035;"
},
"ExcelGenerater": "15,45,0",
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"JwT": {
"SecretKey": "393bJJaBS%siAQ7U=dxk3&lb$0p3])r96=FU9-B.yp'8%'a.1wF64rkCv3$&2?^T3Vs]6z4u8j]*4NRTd418x8b6m4T04=hyn4>l0i-MB8Sy%h745GKN0~p3fMIaJav)",
"Issuer": "宝来威供应商系统",
"Audience": "W*u93xxp*08DnW@%6}5Tjh6bE?;hW"
"ConnectionStrings": {
"DefaultConnection": "Server=10.8.8.208;Database=postgres;user id=postgres;password=123456;port=16035;"
},
"ExcelGenerater": "15,45,0",
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"JwT": {
"SecretKey": "393bJJaBS%siAQ7U=dxk3&lb$0p3])r96=FU9-B.yp'8%'a.1wF64rkCv3$&2?^T3Vs]6z4u8j]*4NRTd418x8b6m4T04=hyn4>l0i-MB8Sy%h745GKN0~p3fMIaJav)",
"Issuer": "宝来威供应商系统",
"Audience": "W*u93xxp*08DnW@%6}5Tjh6bE?;hW"
},
"ShengJi": {
"JianGe": "10",
"RoomTypeID_FirstVersion": "1412",
"First_GuJian_Name": "C1F_A_L4_31_240723_NM.bin",
"RoomTypeID_SecondVerrsion": "2438",
"Second_GuJian_Name": "C1F_A_L4_41_250605_NM.bin",
"HostIdList": "[24540]"
}
}

70
BLW_Log/services/ShengJiCaoZuo.cs
View File

@@ -9,29 +9,43 @@ namespace BLW_Log.services
{
public class ShengJiCaoZuoB : IJob
{
public static int ShengJiCaoZuoBCount = 0;
private readonly Logger _logger = LogManager.GetCurrentClassLogger();
//public static string BaseUrl = "https://www.boonlive-rcu.com/";
private readonly Dictionary<string, IRestClient> _clients;
public ShengJiCaoZuoB(Dictionary<string, IRestClient> clients)
private readonly IConfiguration configuration;
public ShengJiCaoZuoB(Dictionary<string, IRestClient> clients, IConfiguration configuration)
{
_clients = clients;
this.configuration = configuration;
}
async public Task Execute(IJobExecutionContext context)
{
try
{
var timer_es = configuration["ShengJi:JianGe"];
var RoomTypeID_FirstVersion = configuration["ShengJi:RoomTypeID_FirstVersion"];
var First_GuJian_Name = configuration["ShengJi:First_GuJian_Name"];
var RoomTypeID_SecondVerrsion = configuration["ShengJi:RoomTypeID_SecondVerrsion"];
var Second_GuJian_Name = configuration["ShengJi:Second_GuJian_Name"];
var HostIdList = configuration["ShengJi:HostIdList"];
int jiange = int.Parse(timer_es);
//var options = new RestClientOptions(BaseUrl);
var client = _clients["NoStopShengJi"];
string Url = "api/WebChatUpgrade";
var request = new RestRequest(Url);
//2438
//研发测试房型_1
//固件:BLV-C5 || Launcher_C1F_V04 || C1F_A_L4_41_250605_NM.bin
request.AddParameter("roomTypeID", "2438");
request.AddParameter("hostid_lists", "[24540]");
request.AddParameter("upgradefileName", "C1F_A_L4_41_250605_NM.bin");
//request.AddParameter("roomTypeID", "2438");
//request.AddParameter("hostid_lists", "[24540]");
//request.AddParameter("upgradefileName", "C1F_A_L4_41_250605_NM.bin");
request.AddParameter("roomTypeID", RoomTypeID_SecondVerrsion);
request.AddParameter("hostid_lists", HostIdList);
request.AddParameter("upgradefileName", Second_GuJian_Name);
_logger.Error("ShengJiCaoZuo 研发测试房型_1 开始：");
var response = await client.ExecutePostAsync(request);
_logger.Error("ShengJiCaoZuo 研发测试房型_1 执行结果：" + response.Content);
@@ -43,7 +57,7 @@ namespace BLW_Log.services
// 直接启动JobA
var jobA = JobBuilder.Create<ShengJiCaoZuoA>().Build();
var triggerA = TriggerBuilder.Create()
.StartAt(DateTimeOffset.Now.AddMinutes(10))
.StartAt(DateTimeOffset.Now.AddMinutes(jiange))
.Build();
await context.Scheduler.ScheduleJob(jobA, triggerA);
@@ -51,12 +65,12 @@ namespace BLW_Log.services
else
{
// 直接启动JobB
var jobA = JobBuilder.Create<ShengJiCaoZuoB>().Build();
var triggerA = TriggerBuilder.Create()
.StartAt(DateTimeOffset.Now.AddMinutes(10))
var jobB = JobBuilder.Create<ShengJiCaoZuoB>().Build();
var triggerB = TriggerBuilder.Create()
.StartAt(DateTimeOffset.Now.AddMinutes(jiange))
.Build();
await context.Scheduler.ScheduleJob(jobA, triggerA);
await context.Scheduler.ScheduleJob(jobB, triggerB);
}
}
catch (Exception ex)
@@ -64,25 +78,32 @@ namespace BLW_Log.services
_logger.Error("ShengJiCaoZuoB 执行失败：" + ex.Message);
}
}
public static int ShengJiCaoZuoBCount = 0;
}
public class ShengJiCaoZuoA : IJob
{
public static int ShengJiCaoZuoACount = 0;
private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public readonly IConfiguration configuration;
private readonly Dictionary<string, IRestClient> _clients;
public ShengJiCaoZuoA(Dictionary<string, IRestClient> clients)
public ShengJiCaoZuoA(Dictionary<string, IRestClient> clients, IConfiguration _configuration)
{
_clients = clients;
this.configuration = _configuration;
}
//public static string BaseUrl = "https://www.boonlive-rcu.com/";
public async Task Execute(IJobExecutionContext context)
{
try
{
//var options = new RestClientOptions(BaseUrl);
var timer_es = configuration["ShengJi:JianGe"];
var RoomTypeID_FirstVersion = configuration["ShengJi:RoomTypeID_FirstVersion"];
var First_GuJian_Name = configuration["ShengJi:First_GuJian_Name"];
var RoomTypeID_SecondVerrsion = configuration["ShengJi:RoomTypeID_SecondVerrsion"];
var Second_GuJian_Name = configuration["ShengJi:Second_GuJian_Name"];
var HostIdList = configuration["ShengJi:HostIdList"];
int jiange = int.Parse(timer_es);
var client = _clients["NoStopShengJi"];
string Url = "api/WebChatUpgrade";
var request = new RestRequest(Url);
@@ -96,20 +117,25 @@ namespace BLW_Log.services
//2438
//研发测试房型_1
//固件:BLV-C5 || Launcher_C1F_V04 || C1F_A_L4_41_250605_NM.bin
request.AddParameter("roomTypeID", "1412");
request.AddParameter("hostid_lists", "[24540]");
request.AddParameter("upgradefileName", "C1F_A_L4_31_240723_NM.bin");
_logger.Error("ShengJiCaoZuo YHF_T 开始:" );
//request.AddParameter("roomTypeID", "1412");
//request.AddParameter("hostid_lists", "[24540]");
//request.AddParameter("upgradefileName", "C1F_A_L4_31_240723_NM.bin");
request.AddParameter("roomTypeID", RoomTypeID_FirstVersion);
request.AddParameter("hostid_lists", HostIdList);
request.AddParameter("upgradefileName", First_GuJian_Name);
_logger.Error("ShengJiCaoZuo YHF_T 开始:");
var response = await client.ExecutePostAsync(request);
_logger.Error("ShengJiCaoZuo YHF_T 执行成功：" + response.Content);
ShengJiCaoZuoACount = ShengJiCaoZuoACount + 1;
if (ShengJiCaoZuoACount >= 2)
{
var jobB = JobBuilder.Create<ShengJiCaoZuoB>().Build();
var triggerB = TriggerBuilder.Create()
.StartAt(DateTimeOffset.Now.AddMinutes(10))
.StartAt(DateTimeOffset.Now.AddMinutes(jiange))
.Build();
await context.Scheduler.ScheduleJob(jobB, triggerB);
@@ -118,7 +144,7 @@ namespace BLW_Log.services
{
var jobA = JobBuilder.Create<ShengJiCaoZuoA>().Build();
var triggerA = TriggerBuilder.Create()
.StartAt(DateTimeOffset.Now.AddMinutes(10))
.StartAt(DateTimeOffset.Now.AddMinutes(jiange))
.Build();
await context.Scheduler.ScheduleJob(jobA, triggerA);
}