diff --git a/Proxy/SiteActivity.cs b/Proxy/SiteActivity.cs index 2b7e5d3..f9d8e73 100644 --- a/Proxy/SiteActivity.cs +++ b/Proxy/SiteActivity.cs @@ -1181,13 +1181,14 @@ namespace UMC.ITME.Activities var home = UMC.Data.WebResource.Instance().WebDomain(); if (home == "localhost") { - var v = UICell.UI('\uf015', $"{site.Root}.[主域名]", "主域名未配置", new UIClick(request.Model, "Server")); + + var v = UICell.UI('\uf015', $"{site.Root}{WebServlet.DomainUnion}[主域名]", "主域名未配置", new UIClick(request.Model, "Server")); v.Style.Name("value").Color(0xc00); ui2.Add(v); } else { - ui2.AddCell('\uf015', $"[{site.Root}.{home}]", "", new UIClick(request.Model, "Server", "Model", "CSR", "Domain", $"{site.Root}.{home}")); + ui2.AddCell('\uf015', $"[{site.Root}{WebServlet.DomainUnion}{home}]", "", new UIClick(request.Model, "Server", "Model", "CSR", "Domain", $"{site.Root}.{home}")); } diff --git a/Proxy/SiteAppActivity.cs b/Proxy/SiteAppActivity.cs index 96000f9..3b86b01 100644 --- a/Proxy/SiteAppActivity.cs +++ b/Proxy/SiteAppActivity.cs @@ -128,10 +128,26 @@ namespace UMC.ITME.Activities { strUrl = new Uri(new Uri(SiteConfig.Config(d.Domain)[0]), d.Home ?? "/").AbsoluteUri; } - else if (SiteConfig.Config(d.AuthConf).Contains("*") || d.AuthType == WebAuthType.All) + else { - strUrl = $"{request.Url.Scheme}://{d.Root}{union}{home}{d.Home}"; - } + var authCnf = SiteConfig.Config(d.AuthConf); + if (authCnf.Contains("#") && String.IsNullOrEmpty(d.Home) == false) + { + if (d.Home.StartsWith("/Desktop/")) + { + strUrl = d.Home; + } + else + { + + strUrl = $"{request.Url.Scheme}://{d.Root}{union}{home}{d.Home}"; + } + } + else if (authCnf.Contains("*") || d.AuthType == WebAuthType.All) + { + strUrl = $"{request.Url.Scheme}://{d.Root}{union}{home}{d.Home}"; + } + } var isDesktop = desktop.ContainsKey(d.Root); if (d.IsDesktop == true) { diff --git a/Proxy/SiteSetupActivity.cs b/Proxy/SiteSetupActivity.cs index 8f7ae9a..e3524e7 100644 --- a/Proxy/SiteSetupActivity.cs +++ b/Proxy/SiteSetupActivity.cs @@ -299,7 +299,7 @@ namespace UMC.ITME.Activities if (config.ContainsKey("Menu")) { var lis = new List