Merge branch 'master' of https://git.zhongjie51.com/zhongjie51/99ditui

src/hosts/ZhonTai.Host/Configs/appconfig.json

@@ -92,7 +92,7 @@
     "fonts": [ "Times New Roman", "Verdana", "Arial", "Gungsuh", "Impact" ]
   },
   //默认密码
-  "defaultPassword": "111111",
+  "defaultPassword": "123456",
   //动态api
   "dynamicApi": {
     //结果格式化
@@ -108,5 +108,7 @@
     "enable": true,
     //访问路径
     "path": "/admin/health"
-  }
+  },
+  //H5域名
+  "H5WebSite": "http://dev.gl.zjdg.cn/"
 }

src/platform/ZhonTai.Admin/Core/Configs/AppConfig.cs

@@ -104,6 +104,7 @@ public class AppConfig
     /// 健康检查配置
     /// </summary>
     public HealthChecksConfig HealthChecks { get; set; } = new HealthChecksConfig();
+    public string H5WebSite { get; set; }
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Services/Tenant/Dto/TenantListOutput.cs

@@ -75,4 +75,8 @@ public class TenantListOutput
     /// 创建时间
     /// </summary>
     public DateTime? CreatedTime { get; set; }
+    /// <summary>
+    /// H5域名
+    /// </summary>
+    public string H5WebSite { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs

@@ -109,7 +109,8 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
             RealName = a.User.Name,
             Phone = a.User.Mobile,
             Email = a.User.Email,
-            Pkgs = a.Pkgs,
+            Pkgs = a.Pkgs,   
+            H5WebSite=_appConfig.H5WebSite+a.Org.Code+"/"
         });
 
         var data = new PageOutput<TenantListOutput>()