ITME

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}"));
 
 
                 }

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)
                         {

Proxy/SiteSetupActivity.cs

@@ -299,7 +299,7 @@ namespace UMC.ITME.Activities
             if (config.ContainsKey("Menu"))
             {
                 var lis = new List<Menu>();
-                var meus = JSON.Deserialize(config["Open"]);
+                var meus = JSON.Deserialize(config["Menu"]);
                 var tid = Utility.TimeSpan();
                 if (meus is IDictionary)
                 {

Proxy/SiteUMCActivity.cs

@@ -127,7 +127,7 @@ namespace UMC.ITME.Activities
 
                     var webItem = new WebMeta();
                     webItem.Put("time", time);
-                    webItem.Put("appId", time);
+                    webItem.Put("appId", site.Root);
                     ns.Add("appId", site.Root);
                     ns.Add("time", time.ToString());
 

README.md

@@ -6,7 +6,7 @@
 <a href="https://gitee.com/apiumc/ITME/LICENSE"><img src="https://img.shields.io/badge/license-Apache--2.0-green"></a>
 <a href="https://gitee.com/apiumc/ITME/stargazers"><img src="https://img.shields.io/badge/version-v1.0.0-blue"></a>
 
-ITME全称为IT管理引擎，英文名IT Management Engine，
+ITME全称为IT管理引擎，英文名IT Management Engine;
 
 它在面向应用管理时，等于 `Nginx` + [网关登录](https://www.apiumc.com/itme/auth/about) + [图片切割](https://www.apiumc.com/itme/image/cast)  + [内网穿透](https://www.apiumc.com/itme/vpn/about) 等等； 
 

Resources/desktop.page.html

@@ -48,6 +48,7 @@
                 UMC(document.body).on('UI.Key.Url', function (e, v) {
                     location.href = v;
                 })
+                //Prompt
                 $.UI.On('UI.Push', function (e, xhr) {
 
                     var last = app.children('div.ui').cls('ui', 0);
@@ -70,7 +71,12 @@
                         value: v
                     }), "*");
 
-
+                }).On('Prompt', function (e, t) {
+                    window.top.postMessage(JSON.stringify({
+                            type: 'msg',
+                            value: t.Text
+                        }), "*");
+                    
                 });
 
 

UMC.ITME.csproj

@@ -43,13 +43,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="2.88.7" />
-    <PackageReference Include="UMC" Version="1.0.40" />
-    <PackageReference Include="UMC.Data" Version="1.0.48" />
+    <!-- <PackageReference Include="UMC" Version="1.0.40" />
+    <PackageReference Include="UMC.Data" Version="1.0.48" /> -->
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
     <PackageReference Include="SshNet.Security.Cryptography" Version="1.3.0" />
   </ItemGroup>
-  <!-- <ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\UMC\Net\UMC\UMC.csproj" />
     <ProjectReference Include="..\UMC.Data\UMC.Data.csproj" />
-  </ItemGroup> -->
+  </ItemGroup>
 </Project>