优化初始化数据

src/hosts/ZhonTai.Host/InitData/Admin/ad_permission.json

@@ -289,6 +289,28 @@
                 "sort": 0,
                 "description": "",
                 "childs": []
+              },
+              {
+                "id": 340890474405957,
+                "parentId": 161227168653381,
+                "label": "添加员工",
+                "code": "api:admin:role:add-role-user",
+                "type": 3,
+                "enabled": true,
+                "sort": 0,
+                "description": "",
+                "childs": []
+              },
+              {
+                "id": 340890633515077,
+                "parentId": 161227168653381,
+                "label": "移除员工",
+                "code": "api:admin:role:remove-role-user",
+                "type": 3,
+                "enabled": true,
+                "sort": 0,
+                "description": "",
+                "childs": []
               }
             ]
           },

src/hosts/ZhonTai.Host/InitData/Admin/ad_permission_api.json

@@ -45,15 +45,25 @@
     "apiId": 161227168190533
   },
   {
-    "id": 171036422099014,
+    "id": 340873399033925,
     "permissionId": 161227168645190,
     "apiId": 161227168190534
   },
   {
-    "id": 171036465147973,
+    "id": 340873399050309,
+    "permissionId": 161227168645190,
+    "apiId": 271618651926607
+  },
+  {
+    "id": 340873433083973,
     "permissionId": 161227168649285,
     "apiId": 161227168190535
   },
+  {
+    "id": 340873433083974,
+    "permissionId": 161227168649285,
+    "apiId": 336555241427019
+  },
   {
     "id": 340637112541253,
     "permissionId": 161227168653382,
@@ -80,15 +90,25 @@
     "apiId": 161227168178245
   },
   {
-    "id": 171039620800582,
+    "id": 340807468544069,
     "permissionId": 161227168661573,
     "apiId": 161227168178246
   },
   {
-    "id": 171039661600837,
+    "id": 340807468556357,
+    "permissionId": 161227168661573,
+    "apiId": 271618651926604
+  },
+  {
+    "id": 340807522390085,
     "permissionId": 161227168665669,
     "apiId": 161227168182341
   },
+  {
+    "id": 340807522390086,
+    "permissionId": 161227168665669,
+    "apiId": 336555241422921
+  },
   {
     "id": 171039848452166,
     "permissionId": 161227168669766,
@@ -553,5 +573,15 @@
     "id": 340645681578055,
     "permissionId": 340645133123653,
     "apiId": 161227168165957
+  },
+  {
+    "id": 340890474479685,
+    "permissionId": 340890474405957,
+    "apiId": 336555241422919
+  },
+  {
+    "id": 340890633531462,
+    "permissionId": 340890633515077,
+    "apiId": 336555241422920
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_role_permission.json

@@ -1,27 +1 @@
-[
-  {
-    "id": 340632656904261,
-    "roleId": 162605510979653,
-    "permissionId": 161227168464965
-  },
-  {
-    "id": 340632656904262,
-    "roleId": 162605510979653,
-    "permissionId": 161227168624709
-  },
-  {
-    "id": 340632656904263,
-    "roleId": 162605510979653,
-    "permissionId": 161227168628805
-  },
-  {
-    "id": 340632656904264,
-    "roleId": 162605510979653,
-    "permissionId": 161227168628806
-  },
-  {
-    "id": 340632656904265,
-    "roleId": 162605510979653,
-    "permissionId": 161227168632901
-  }
-]
+[]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user_org.json

@@ -1,6 +1,6 @@
 [
   {
-    "id": 340641196884037,
+    "id": 340793613013061,
     "userId": 161223411986501,
     "orgId": 189097691009093
   }

src/hosts/ZhonTai.Host/InitData/Admin/ad_user_role.json

@@ -1,6 +1,6 @@
 [
   {
-    "id": 340641196703813,
+    "id": 340793613008965,
     "userId": 161223411986501,
     "roleId": 161223412080709
   }

src/hosts/ZhonTai.Host/Program.cs

@@ -12,6 +12,8 @@ new HostApp(new HostAppOptions
 	//配置后置服务
 	ConfigurePostServices = context =>
 	{
+		//context.Services.AddTiDb(context);
+
 		//添加任务调度
 		context.Services.AddTaskScheduler(options =>
 		{

src/platform/ZhonTai.Admin/Core/Db/DBServiceCollectionExtensions.cs

@@ -11,6 +11,8 @@ using ZhonTai.Admin.Core.Auth;
 using ZhonTai.Admin.Core.Startup;
 using ZhonTai.Admin.Core.Consts;
 using System.Linq;
+using System.Collections.Concurrent;
+using System.Reflection;
 
 namespace ZhonTai.Admin.Core.Db;
 
@@ -209,4 +211,19 @@ public static class DBServiceCollectionExtensions
             }
         }
     }
+
+    /// <summary>
+    /// 添加TiDb数据库
+    /// </summary>
+    /// <param name="_"></param>
+    /// <param name="context"></param>
+    /// <param name="version">版本</param>
+    public static void AddTiDb(this IServiceCollection _, HostAppContext context, string version = "8.0")
+    {
+        var dbConfig = ConfigHelper.Get<DbConfig>("dbconfig", context.Environment.EnvironmentName);
+        var _dicMySqlVersion = typeof(FreeSqlGlobalExtensions).GetField("_dicMySqlVersion", BindingFlags.NonPublic | BindingFlags.Static);
+        var dicMySqlVersion = new ConcurrentDictionary<string, string>();
+        dicMySqlVersion[dbConfig.ConnectionString] = version;
+        _dicMySqlVersion.SetValue(new ConcurrentDictionary<string, string>(), dicMySqlVersion);
+    }
 }

src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs

@@ -139,8 +139,7 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
         }
        
         var permissionRepository = db.GetRepositoryBase<PermissionEntity>();
-        var menuSelect = permissionRepository.Select
-            .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type));
+        var menuSelect = permissionRepository.Select;
 
         var dotSelect = permissionRepository.Select.Where(a => a.Type == PermissionType.Dot);
 
@@ -181,6 +180,7 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
         }
 
         var menuList = await menuSelect
+            .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type))
             .OrderBy(a => new { a.ParentId, a.Sort })
             .ToListAsync(a => new AuthUserMenuDto { ViewPath = a.View.Path });
 

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -822,6 +822,14 @@
             <param name="hostAppOptions"></param>
             <returns></returns>
         </member>
+        <member name="M:ZhonTai.Admin.Core.Db.DBServiceCollectionExtensions.AddTiDb(Microsoft.Extensions.DependencyInjection.IServiceCollection,ZhonTai.Admin.Core.Startup.HostAppContext,System.String)">
+            <summary>
+            添加TiDb数据库
+            </summary>
+            <param name="_"></param>
+            <param name="context"></param>
+            <param name="version">版本</param>
+        </member>
         <member name="M:ZhonTai.Admin.Core.Db.FreeSqlCloudExtesions.CreateFreeSql(ZhonTai.Admin.Core.Auth.IUser,ZhonTai.Admin.Core.Configs.AppConfig,ZhonTai.Admin.Core.Configs.DbConfig,ZhonTai.Admin.Core.Dto.CreateFreeSqlTenantDto)">
             <summary>
             创建FreeSql实例