Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/UpdateBaseUrlTab01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-03-05 17:28:53 +01:00
parent 805bb1782f 3d4998d783
commit 592ca82487
5 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/PrintMag.razor.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace MP_TAB3.Components
{
await FixQtyUdc();
var currUrl = NavMan.Uri;
string baseUrl = config.GetValue<string>("ServerConf:BaseUrl") ?? (config.GetValue<string>("OptConf:BaseUrl") ?? "");
string baseUrl = config.GetValue<string>("ServerConf:BaseUrlTab") ?? (config.GetValue<string>("OptConf:BaseUrlTab") ?? "");
string UrlTabJumpMag = SMServ.GetConf("UrlTabJumpMag");
if (string.IsNullOrEmpty(UrlTabJumpMag))
{
MP-TAB3/Program.cs
+1 -1
View File
@@ -49,7 +49,7 @@ builder.Services.AddHttpContextAccessor();
var app = builder.Build();
// aggiunt base URL x routing corretto
var pathBase= configuration.GetValue<string>("ServerConf:BaseUrl") ?? (configuration.GetValue<string>("OptConf:BaseUrl") ?? "");
var pathBase= configuration.GetValue<string>("ServerConf:BaseUrlTab") ?? (configuration.GetValue<string>("OptConf:BaseUrlTab") ?? "");
app.UsePathBase(pathBase);
// Configure the HTTP request pipeline.
MP-TAB3/appsettings.Production.json
+1 -1
View File
@@ -21,7 +21,7 @@
"ServerConf": {
"BaseAddr": "https://iis04.egalware.com/MP/TAB3/",
"BasePathDisegni": "C:\\Steamware\\disegni",
"BaseUrl": "/MP/TAB3",
"BaseUrlTab": "/MP/TAB3",
"ImgBasePath": "https://iis04.egalware.com/MP/images/macchine/small/"
},
"AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net"
MP-TAB3/appsettings.json
+1 -1
View File
@@ -22,7 +22,7 @@
"ServerConf": {
"BaseAddr": "https://localhost:7295/MP/TAB3/",
"BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni",
"BaseUrl": "/MP/TAB3",
"BaseUrlTab": "/MP/TAB3",
"ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/"
},
"AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net",
MP.Data/Services/TabDataFeeder.cs
-9
View File
@@ -18,15 +18,6 @@ namespace MP.Data.Services
dataPipe = new MessagePipe(redisConn, Constants.TAB_ACT_MSE_DATA_KEY, false);
blinkPipe = new MessagePipe(redisConn, Constants.TAB_ACT_BLINK_KEY, false);
//if (!string.IsNullOrEmpty(configuration.GetValue<string>("OptConf:msRefresh")))
//{
// fastRefreshMs = configuration.GetValue<int>("OptConf:msRefresh");
// if (fastRefreshMs <= 0)
// {
// fastRefreshMs = 1000;
// }
//}
// avvio timers...
startTimers();
}