diff --git a/Txgy.RBS.Server.WebApi/Controllers/GlobalConfigController.cs b/Txgy.RBS.Server.WebApi/Controllers/GlobalConfigController.cs index f2998a2..6eb2bb8 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/GlobalConfigController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/GlobalConfigController.cs @@ -7,7 +7,7 @@ using Txgy.RBS.Services; namespace Txgy.RBS.Server.WebApi.Controllers { - [Route("api/[controller]/[action]")] + [Route("rbs/[controller]/[action]")] [ApiController] public class GlobalConfigController : ControllerBase { diff --git a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs index 3567b7e..672c891 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs @@ -14,7 +14,7 @@ using Txgy.RBS.Services; namespace Txgy.RBS.Server.WebApi.Controllers { - [Route("api/[controller]/[action]")] + [Route("rbs/[controller]/[action]")] [ApiController] public class ProjectInfoController : ControllerBase { diff --git a/Txgy.RBS.Server.WebApi/Controllers/ResultInfoController.cs b/Txgy.RBS.Server.WebApi/Controllers/ResultInfoController.cs index 0848081..e918a3f 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/ResultInfoController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/ResultInfoController.cs @@ -8,7 +8,7 @@ using Txgy.RBS.Services; namespace Txgy.RBS.Server.WebApi.Controllers { - [Route("api/[controller]/[action]")] + [Route("rbs/[controller]/[action]")] [ApiController] public class ResultInfoController : ControllerBase { diff --git a/Txgy.RBS.Server.WebApi/Controllers/StationsController.cs b/Txgy.RBS.Server.WebApi/Controllers/StationsController.cs index 7bc5904..9d0c182 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/StationsController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/StationsController.cs @@ -7,7 +7,7 @@ using Txgy.RBS.IServices; namespace Txgy.RBS.Server.WebApi.Controllers { - [Route("api/[controller]/[action]")] + [Route("rbs/[controller]/[action]")] [ApiController] public class StationsController : ControllerBase { diff --git a/Txgy.RBS.Server.WebApi/Controllers/TimeTabController.cs b/Txgy.RBS.Server.WebApi/Controllers/TimeTabController.cs index 32e83fe..d1263a1 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/TimeTabController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/TimeTabController.cs @@ -6,7 +6,7 @@ using Txgy.RBS.IServices; namespace Txgy.RBS.Server.WebApi.Controllers { - [Route("api/[controller]/[action]")] + [Route("rbs/[controller]/[action]")] [ApiController] public class TimeTabController : ControllerBase { diff --git a/Txgy.RBS.Server.WebApi/Program.cs b/Txgy.RBS.Server.WebApi/Program.cs index f34533d..9b81092 100644 --- a/Txgy.RBS.Server.WebApi/Program.cs +++ b/Txgy.RBS.Server.WebApi/Program.cs @@ -25,6 +25,7 @@ var app = builder.Build(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { + Console.WriteLine("app.Environment.IsDevelopment"); app.UseSwagger(); app.UseSwaggerUI(); } diff --git a/Txgy.RBS.Server.WebApi/Properties/launchSettings.json b/Txgy.RBS.Server.WebApi/Properties/launchSettings.json index bbf768e..349add6 100644 --- a/Txgy.RBS.Server.WebApi/Properties/launchSettings.json +++ b/Txgy.RBS.Server.WebApi/Properties/launchSettings.json @@ -6,7 +6,7 @@ "iisExpress": { "applicationUrl": "http://localhost:37391", "sslPort": 44354 - } + } }, "profiles": { "Txgy.RBS.Server.WebApi": { diff --git a/Txgy.RBS.Server.WebApi/appsettings.json b/Txgy.RBS.Server.WebApi/appsettings.json index 41f5c20..8100b23 100644 --- a/Txgy.RBS.Server.WebApi/appsettings.json +++ b/Txgy.RBS.Server.WebApi/appsettings.json @@ -56,5 +56,7 @@ "RecordeLog": true }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "Urls": "http://localhost:5094" + } diff --git a/Txgy.RBS.Server.WebApi/rbs_server_db.db b/Txgy.RBS.Server.WebApi/rbs_server_db.db index 8c8bf15..e69de29 100644 Binary files a/Txgy.RBS.Server.WebApi/rbs_server_db.db and b/Txgy.RBS.Server.WebApi/rbs_server_db.db differ diff --git a/program/recvmqtt/gw.recvmqtt.exe b/program/recvmqtt/gw.recvmqtt.exe index 12aec1e..3cd87c5 100644 Binary files a/program/recvmqtt/gw.recvmqtt.exe and b/program/recvmqtt/gw.recvmqtt.exe differ