فهرست منبع

适配vue-next-admin前端框架

zuohuaijun 3 سال پیش
والد
کامیت
6944ffc75f
31فایلهای تغییر یافته به همراه1362 افزوده شده و 283 حذف شده
  1. 1 1
      Admin.NET/Admin.NET.Application/AppConfig.json
  2. 1 1
      Admin.NET/Admin.NET.Application/Entity/Student.cs
  3. 1 1
      Admin.NET/Admin.NET.Application/Entity/Test.cs
  4. 54 99
      Admin.NET/Admin.NET.Core/Admin.NET.Core.xml
  5. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs
  6. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysConfig.cs
  7. 2 2
      Admin.NET/Admin.NET.Core/Entity/SysDictData.cs
  8. 2 2
      Admin.NET/Admin.NET.Core/Entity/SysDictType.cs
  9. 39 21
      Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
  10. 2 2
      Admin.NET/Admin.NET.Core/Entity/SysNotice.cs
  11. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysOnlineUser.cs
  12. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysOrg.cs
  13. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysPos.cs
  14. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysRole.cs
  15. 2 2
      Admin.NET/Admin.NET.Core/Entity/SysTenant.cs
  16. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysUser.cs
  17. 1 1
      Admin.NET/Admin.NET.Core/Entity/WeChatUser.cs
  18. 133 0
      Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData - vben.cs
  19. 46 47
      Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs
  20. 3 0
      Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
  21. 5 70
      Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuInput.cs
  22. 116 0
      Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput - vben.cs
  23. 32 19
      Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs
  24. 3 3
      Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs
  25. 1 1
      vue-next-admin/src/stores/themeConfig.ts
  26. 1 1
      vue-next-admin/src/theme/app.scss
  27. 1 1
      vue-next-admin/src/theme/element.scss
  28. 3 2
      vue-next-admin/src/utils/axios-utils.ts
  29. 302 0
      vue-next-admin/src/views/dashboard/analysis/index.vue
  30. 302 0
      vue-next-admin/src/views/dashboard/workbench/index.vue
  31. 302 0
      vue-next-admin/src/views/system/tenant/index.vue

+ 1 - 1
Admin.NET/Admin.NET.Application/AppConfig.json

@@ -8,7 +8,7 @@
                 "ConfigId": "Dilon",
                 "DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access
                 "ConnectionString": "DataSource=./Admin.NET.db",
-                "EnableInitDb": false, // 启用库表初始化
+                "EnableInitDb": true, // 启用库表初始化
                 "EnableDiffLog": false // 启用库表差异日志
             },
             // 其他业务库

+ 1 - 1
Admin.NET/Admin.NET.Application/Entity/Student.cs

@@ -14,7 +14,7 @@ public class Student : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "姓名", Length = 32)]
     [Required, MaxLength(32)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 年龄

+ 1 - 1
Admin.NET/Admin.NET.Application/Entity/Test.cs

@@ -14,7 +14,7 @@ public class Test : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "姓名", Length = 32)]
     [Required, MaxLength(32)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 年龄

+ 54 - 99
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -890,19 +890,14 @@
             组件路径
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysMenu.Permission">
-            <summary>
-            权限标识
-            </summary>
-        </member>
         <member name="P:Admin.NET.Core.SysMenu.Redirect">
             <summary>
             重定向
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysMenu.FrameSrc">
+        <member name="P:Admin.NET.Core.SysMenu.Permission">
             <summary>
-            内嵌地址
+            权限标识
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysMenu.Title">
@@ -915,19 +910,29 @@
             图标
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysMenu.HideMenu">
+        <member name="P:Admin.NET.Core.SysMenu.IsIframe">
+            <summary>
+            是否内嵌
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.SysMenu.OutLink">
             <summary>
-            隐藏菜单
+            外链链接
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysMenu.IgnoreKeepAlive">
+        <member name="P:Admin.NET.Core.SysMenu.IsHide">
             <summary>
-            忽略缓存
+            是否隐藏
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysMenu.CurrentActiveMenu">
+        <member name="P:Admin.NET.Core.SysMenu.IsKeepAlive">
             <summary>
-            当前激活的菜单-用于配置详情页时左侧激活的菜单路径
+            是否缓存
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.SysMenu.IsAffix">
+            <summary>
+            是否固定
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysMenu.OrderNo">
@@ -935,6 +940,16 @@
             排序
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.SysMenu.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.SysMenu.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.SysMenu.Children">
             <summary>
             菜单子项
@@ -5255,79 +5270,9 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Pid">
-            <summary>
-            父Id
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Type">
-            <summary>
-            菜单类型(1目录 2菜单 3按钮)
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Path">
-            <summary>
-            路由地址
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Component">
-            <summary>
-            组件路径
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Permission">
-            <summary>
-            权限标识
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Redirect">
-            <summary>
-            跳转地址
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.FrameSrc">
-            <summary>
-            内嵌地址
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Title">
-            <summary>
-            标题
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.Icon">
-            <summary>
-            图标
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.OrderNo">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.HideMenu">
-            <summary>
-            是否显示
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.IgnoreKeepAlive">
-            <summary>
-            是否忽略KeepAlive缓存
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.MenuInput.CurrentActiveMenu">
-            <summary>
-            当前激活的菜单-用于配置详情页时左侧激活的菜单路径
-            </summary>
-        </member>
         <member name="P:Admin.NET.Core.Service.AddMenuInput.Title">
             <summary>
-            标题
+            名称
             </summary>
         </member>
         <member name="T:Admin.NET.Core.Service.MenuOutput">
@@ -5375,11 +5320,6 @@
             重定向
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.MenuOutput.Disabled">
-            <summary>
-            是否可用
-            </summary>
-        </member>
         <member name="P:Admin.NET.Core.Service.MenuOutput.Meta">
             <summary>
             菜单Meta
@@ -5405,29 +5345,44 @@
             图标
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.FrameSrc">
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.IsIframe">
             <summary>
-            内嵌地址
+            是否内嵌
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.OrderNo">
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.IsLink">
             <summary>
-            排序
+            外链链接
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.HideMenu">
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.IsHide">
             <summary>
-            是否显示
+            是否隐藏
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.IgnoreKeepAlive">
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.IsKeepAlive">
             <summary>
-            是否忽略KeepAlive缓存
+            是否缓存
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.CurrentActiveMenu">
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.IsAffix">
             <summary>
-            当前激活的菜单-用于配置详情页时左侧激活的菜单路径
+            是否固定
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.OrderNo">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.Service.SysMenuMeta.Remark">
+            <summary>
+            备注
             </summary>
         </member>
         <member name="T:Admin.NET.Core.Service.SysMenuMapper">

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs

@@ -17,7 +17,7 @@ public class SysCodeGenConfig : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "字段名称", Length = 128)]
     [Required, MaxLength(128)]
-    public string ColumnName { get; set; }
+    public virtual string ColumnName { get; set; }
 
     /// <summary>
     /// 字段描述

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysConfig.cs

@@ -11,7 +11,7 @@ public class SysConfig : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "名称", Length = 64)]
     [Required, MaxLength(64)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 编码

+ 2 - 2
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs

@@ -24,14 +24,14 @@ public class SysDictData : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "值", Length = 128)]
     [Required, MaxLength(128)]
-    public string Value { get; set; }
+    public virtual string Value { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
     [SugarColumn(ColumnDescription = "编码", Length = 64)]
     [Required, MaxLength(64)]
-    public string Code { get; set; }
+    public virtual string Code { get; set; }
 
     /// <summary>
     /// 排序

+ 2 - 2
Admin.NET/Admin.NET.Core/Entity/SysDictType.cs

@@ -11,14 +11,14 @@ public class SysDictType : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "名称", Length = 64)]
     [Required, MaxLength(64)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
     [SugarColumn(ColumnDescription = "编码", Length = 64)]
     [Required, MaxLength(64)]
-    public string Code { get; set; }
+    public virtual string Code { get; set; }
 
     /// <summary>
     /// 排序

+ 39 - 21
Admin.NET/Admin.NET.Core/Entity/SysMenu.cs

@@ -39,13 +39,6 @@ public class SysMenu : EntityBase
     [MaxLength(128)]
     public string Component { get; set; }
 
-    /// <summary>
-    /// 权限标识
-    /// </summary>
-    [SugarColumn(ColumnDescription = "权限标识", Length = 128)]
-    [MaxLength(128)]
-    public string Permission { get; set; }
-
     /// <summary>
     /// 重定向
     /// </summary>
@@ -54,18 +47,18 @@ public class SysMenu : EntityBase
     public string Redirect { get; set; }
 
     /// <summary>
-    /// 内嵌地址
+    /// 权限标识
     /// </summary>
-    [SugarColumn(ColumnDescription = "内嵌地址", Length = 128)]
+    [SugarColumn(ColumnDescription = "权限标识", Length = 128)]
     [MaxLength(128)]
-    public string FrameSrc { get; set; }
+    public string Permission { get; set; }
 
     /// <summary>
     /// 标题
     /// </summary>
     [SugarColumn(ColumnDescription = "标题", Length = 64)]
     [Required, MaxLength(64)]
-    public string Title { get; set; }
+    public virtual string Title { get; set; }
 
     /// <summary>
     /// 图标
@@ -75,23 +68,35 @@ public class SysMenu : EntityBase
     public string Icon { get; set; }
 
     /// <summary>
-    /// 隐藏菜单
+    /// 是否内嵌
     /// </summary>
-    [SugarColumn(ColumnDescription = "隐藏菜单")]
-    public bool HideMenu { get; set; } = false;
+    [SugarColumn(ColumnDescription = "是否内嵌")]
+    public bool IsIframe { get; set; }
 
     /// <summary>
-    /// 忽略缓存
+    /// 外链链接
     /// </summary>
-    [SugarColumn(ColumnDescription = "忽略缓存")]
-    public bool IgnoreKeepAlive { get; set; } = false;
+    [SugarColumn(ColumnDescription = "外链链接", Length = 256)]
+    [MaxLength(256)]
+    public string OutLink { get; set; }
 
     /// <summary>
-    /// 当前激活的菜单-用于配置详情页时左侧激活的菜单路径
+    /// 是否隐藏
     /// </summary>
-    [SugarColumn(ColumnDescription = "当前激活菜单", Length = 128)]
-    [MaxLength(128)]
-    public string CurrentActiveMenu { get; set; }
+    [SugarColumn(ColumnDescription = "是否隐藏")]
+    public bool IsHide { get; set; }
+
+    /// <summary>
+    /// 是否缓存
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否缓存")]
+    public bool IsKeepAlive { get; set; } = true;
+
+    /// <summary>
+    /// 是否固定
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否固定")]
+    public bool IsAffix { get; set; }
 
     /// <summary>
     /// 排序
@@ -99,6 +104,19 @@ public class SysMenu : EntityBase
     [SugarColumn(ColumnDescription = "排序")]
     public int OrderNo { get; set; }
 
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态")]
+    public StatusEnum Status { get; set; } = StatusEnum.Enable;
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", Length = 256)]
+    [MaxLength(256)]
+    public string Remark { get; set; }
+
     /// <summary>
     /// 菜单子项
     /// </summary>

+ 2 - 2
Admin.NET/Admin.NET.Core/Entity/SysNotice.cs

@@ -11,14 +11,14 @@ public class SysNotice : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "标题", Length = 32)]
     [Required, MaxLength(32)]
-    public string Title { get; set; }
+    public virtual string Title { get; set; }
 
     /// <summary>
     /// 内容
     /// </summary>
     [SugarColumn(ColumnDescription = "内容", ColumnDataType = "longtext,text,clob")]
     [Required]
-    public string Content { get; set; }
+    public virtual string Content { get; set; }
 
     /// <summary>
     /// 类型(字典 1通知 2公告)

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysOnlineUser.cs

@@ -23,7 +23,7 @@ public class SysOnlineUser : EntityBaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "账号", Length = 32)]
     [Required, MaxLength(32)]
-    public string Account { get; set; }
+    public virtual string Account { get; set; }
 
     /// <summary>
     /// 姓名

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysOrg.cs

@@ -17,7 +17,7 @@ public class SysOrg : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "名称", Length = 64)]
     [Required, MaxLength(64)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 编码

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysPos.cs

@@ -11,7 +11,7 @@ public class SysPos : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "名称", Length = 64)]
     [Required, MaxLength(64)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 编码

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysRole.cs

@@ -11,7 +11,7 @@ public class SysRole : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "名称", Length = 64)]
     [Required, MaxLength(64)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 编码

+ 2 - 2
Admin.NET/Admin.NET.Core/Entity/SysTenant.cs

@@ -11,14 +11,14 @@ public class SysTenant : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "公司名称", Length = 64)]
     [Required, MaxLength(64)]
-    public string Name { get; set; }
+    public virtual string Name { get; set; }
 
     /// <summary>
     /// 管理员名称
     /// </summary>
     [SugarColumn(ColumnDescription = "管理员名称", Length = 32)]
     [Required, MaxLength(32)]
-    public string AdminName { get; set; }
+    public virtual string AdminName { get; set; }
 
     /// <summary>
     /// 主机

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -20,7 +20,7 @@ public class SysUser : EntityTenant
     [Required, MaxLength(64)]
     [System.Text.Json.Serialization.JsonIgnore]
     [JsonIgnore]
-    public string Password { get; set; }
+    public virtual string Password { get; set; }
 
     /// <summary>
     /// 昵称

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/WeChatUser.cs

@@ -29,7 +29,7 @@ public class WeChatUser : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "OpenId", Length = 64)]
     [Required, MaxLength(64)]
-    public string OpenId { get; set; }
+    public virtual string OpenId { get; set; }
 
     /// <summary>
     /// 缓存key

+ 133 - 0
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData - vben.cs

@@ -0,0 +1,133 @@
+//namespace Admin.NET.Core;
+
+///// <summary>
+///// 系统菜单表种子数据
+///// </summary>
+//public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
+//{
+//    /// <summary>
+//    /// 种子数据
+//    /// </summary>
+//    /// <returns></returns>
+//    public IEnumerable<SysMenu> HasData()
+//    {
+//        return new[]
+//        {
+//            new SysMenu{ Id=252885263003710, Pid=0, Title="数据面板", Path="/dashboard", Name="Dashboard", Component="LAYOUT", Redirect="/dashboard/analysis", Icon="ant-design:home-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=50 },
+//            new SysMenu{ Id=252885263003711, Pid=252885263003710, Title="分析页", Path="analysis", Name="Analysis", Component="/dashboard/analysis/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003712, Pid=252885263003710, Title="工作台", Path="workbench", Name="Workbench", Component="/dashboard/workbench/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+
+//            new SysMenu{ Id=252885263003720, Pid=0, Title="系统管理", Path="/sys", Name="sys", Component="LAYOUT", Redirect="", Icon="ant-design:setting-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003730, Pid=252885263003720, Title="账号管理", Path="user", Name="UserManagement", Component="/sys/admin/user/index", Icon="ant-design:user-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003731, Pid=252885263003730, Title="账号查询", Permission="sysUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003732, Pid=252885263003730, Title="账号编辑", Permission="sysUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003733, Pid=252885263003730, Title="账号增加", Permission="sysUser:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003734, Pid=252885263003730, Title="账号删除", Permission="sysUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003735, Pid=252885263003730, Title="授权角色", Permission="sysUser:grantRole", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003736, Pid=252885263003730, Title="授权数据", Permission="sysUser:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003737, Pid=252885263003730, Title="重置密码", Permission="sysUser:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003738, Pid=252885263003730, Title="设置状态", Permission="sysUser:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003740, Pid=252885263003720, Title="角色管理", Path="role", Name="RoleManagement", Component="/sys/admin/role/index", Icon="ant-design:bulb-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+//            new SysMenu{ Id=252885263003741, Pid=252885263003740, Title="角色查询", Permission="sysRole:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003742, Pid=252885263003740, Title="角色编辑", Permission="sysRole:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003743, Pid=252885263003740, Title="角色增加", Permission="sysRole:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003744, Pid=252885263003740, Title="角色删除", Permission="sysRole:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003745, Pid=252885263003740, Title="授权菜单", Permission="sysRole:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003746, Pid=252885263003740, Title="授权数据", Permission="sysRole:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003747, Pid=252885263003740, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003750, Pid=252885263003720, Title="菜单管理", Path="menu", Name="MenuManagement", Component="/sys/admin/menu/index", Icon="ant-design:menu-fold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
+//            new SysMenu{ Id=252885263003751, Pid=252885263003750, Title="菜单查询", Permission="sysMenu:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003752, Pid=252885263003750, Title="菜单编辑", Permission="sysMenu:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003753, Pid=252885263003750, Title="菜单增加", Permission="sysMenu:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003754, Pid=252885263003750, Title="菜单删除", Permission="sysMenu:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003760, Pid=252885263003720, Title="机构管理", Path="org", Name="OrgManagement", Component="/sys/admin/org/index", Icon="ant-design:gold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=103 },
+//            new SysMenu{ Id=252885263003761, Pid=252885263003760, Title="机构查询", Permission="sysOrg:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003762, Pid=252885263003760, Title="机构编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003763, Pid=252885263003760, Title="机构增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003764, Pid=252885263003760, Title="机构删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003770, Pid=252885263003720, Title="职位管理", Path="pos", Name="PosManagement", Component="/sys/admin/pos/index",Icon="ant-design:tool-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=104 },
+//            new SysMenu{ Id=252885263003771, Pid=252885263003770, Title="职位查询", Permission="sysPos:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003772, Pid=252885263003770, Title="职位编辑", Permission="sysPos:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003773, Pid=252885263003770, Title="职位增加", Permission="sysPos:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003774, Pid=252885263003770, Title="职位删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003775, Pid=252885263003720, Title="修改密码", Path="password", Name="PasswordManagement", Component="/sys/admin/password/index",Icon="ant-design:eye-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=105 },
+
+//            new SysMenu{ Id=252885263003780, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="LAYOUT", Redirect="", Icon="ant-design:ant-design-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=200 },
+//            new SysMenu{ Id=252885263003790, Pid=252885263003780, Title="租户管理", Path="tenant", Name="TenantManagement", Component="/sys/admin/tenant/index", Icon="ant-design:cluster-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003791, Pid=252885263003790, Title="租户查询", Permission="sysTenant:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003792, Pid=252885263003790, Title="租户编辑", Permission="sysTenant:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003793, Pid=252885263003790, Title="租户增加", Permission="sysTenant:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003794, Pid=252885263003790, Title="租户删除", Permission="sysTenant:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003795, Pid=252885263003790, Title="授权菜单", Permission="sysTenant:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003796, Pid=252885263003790, Title="重置密码", Permission="sysTenant:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003800, Pid=252885263003780, Title="系统配置", Path="config", Name="ConfigManagement", Component="/sys/admin/config/index", Icon="ant-design:deployment-unit-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+//            new SysMenu{ Id=252885263003801, Pid=252885263003800, Title="配置查询", Permission="sysConfig:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003802, Pid=252885263003800, Title="配置编辑", Permission="sysConfig:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003803, Pid=252885263003800, Title="配置增加", Permission="sysConfig:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003804, Pid=252885263003800, Title="配置删除", Permission="sysConfig:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003810, Pid=252885263003780, Title="字典管理", Path="dict", Name="DictManagement", Component="/sys/admin/dict/index", Icon="ant-design:book-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
+//            new SysMenu{ Id=252885263003811, Pid=252885263003810, Title="字典查询", Permission="sysDict:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003812, Pid=252885263003810, Title="字典编辑", Permission="sysDict:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003813, Pid=252885263003810, Title="字典增加", Permission="sysDict:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003814, Pid=252885263003810, Title="字典删除", Permission="sysDict:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003820, Pid=252885263003780, Title="短信管理", Path="sms", Name="SmsManagement", Component="/sys/admin/sms/index", Icon="ant-design:mail-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=103 },
+
+//            new SysMenu{ Id=252885263003830, Pid=252885263003780, Title="任务调度", Path="timer", Name="TimerManagement", Component="/sys/admin/timer/index", Icon="ant-design:clock-circle-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=104 },
+//            new SysMenu{ Id=252885263003831, Pid=252885263003830, Title="任务查询", Permission="sysTimer:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003832, Pid=252885263003830, Title="任务编辑", Permission="sysTimer:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003833, Pid=252885263003830, Title="任务增加", Permission="sysTimer:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003834, Pid=252885263003830, Title="任务删除", Permission="sysTimer:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003835, Pid=252885263003830, Title="设置状态", Permission="sysTimer:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003840, Pid=252885263003780, Title="代码生成", Path="code", Name="CodeManagement", Component="/sys/admin/code/index", Icon="ant-design:bug-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=105 },
+
+//            new SysMenu{ Id=252885263003850, Pid=252885263003780, Title="数据库管理", Path="database", Name="DBManagement", Component="/sys/admin/database/index",Icon="ant-design:database-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=106 },
+
+//            new SysMenu{ Id=252885263003860, Pid=252885263003780, Title="在线用户", Path="online", Name="OnlineManagement", Component="/sys/admin/online/index", Icon="ant-design:user-switch-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=107 },
+//            new SysMenu{ Id=252885263003861, Pid=252885263003860, Title="用户查询", Permission="online:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003862, Pid=252885263003860, Title="用户删除", Permission="online:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003863, Pid=252885263003860, Title="强制下线", Permission="online:ForceExistUser", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003870, Pid=252885263003780, Title="系统监控", Path="server", Name="ServerManagement", Component="/sys/admin/server/index", Icon="ant-design:alert-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=108 },
+
+//            new SysMenu{ Id=252885263003880, Pid=252885263003780, Title="缓存管理", Path="cache", Name="CacheManagement", Component="/sys/admin/cache/index", Icon="ant-design:thunderbolt-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=109 },
+//            new SysMenu{ Id=252885263003881, Pid=252885263003880, Title="缓存查询", Permission="cache:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003882, Pid=252885263003880, Title="缓存删除", Permission="cache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003890, Pid=252885263003780, Title="数据资源", Path="dataResource", Name="DataResourceManagement", Component="/sys/admin/dataResource/index", Icon="ant-design:funnel-plot-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=110 },
+//            new SysMenu{ Id=252885263003891, Pid=252885263003890, Title="资源查询", Permission="sysDataResource:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003892, Pid=252885263003890, Title="资源编辑", Permission="sysDataResource:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003893, Pid=252885263003890, Title="资源增加", Permission="sysDataResource:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003894, Pid=252885263003890, Title="资源删除", Permission="sysDataResource:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003900, Pid=0, Title="日志管理", Path="/log", Name="log", Component="LAYOUT", Redirect="", Icon="ant-design:carry-out-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=300 },
+//            new SysMenu{ Id=252885263003910, Pid=252885263003900, Title="访问日志", Path="vislog", Name="VislogManagement", Component="/sys/admin/log/vislog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003911, Pid=252885263003910, Title="日志查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003912, Pid=252885263003910, Title="日志清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003920, Pid=252885263003900, Title="操作日志", Path="oplog", Name="OplogManagement", Component="/sys/admin/log/oplog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+//            new SysMenu{ Id=252885263003921, Pid=252885263003920, Title="日志查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003922, Pid=252885263003920, Title="日志清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003930, Pid=252885263003900, Title="异常日志", Path="exlog", Name="ExlogManagement", Component="/sys/admin/log/exlog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
+//            new SysMenu{ Id=252885263003931, Pid=252885263003930, Title="日志查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003932, Pid=252885263003930, Title="日志清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003935, Pid=252885263003900, Title="差异日志", Path="difflog", Name="DifflogManagement", Component="/sys/admin/log/difflog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003936, Pid=252885263003935, Title="日志查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003937, Pid=252885263003935, Title="日志清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003940, Pid=0, Title="文件管理", Path="/file", Name="file", Component="LAYOUT", Redirect="", Icon="ant-design:file-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=400 },
+//            new SysMenu{ Id=252885263003950, Pid=252885263003940, Title="文件管理", Path="file", Name="FileManagement", Component="/sys/admin/file/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003951, Pid=252885263003950, Title="文件查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003952, Pid=252885263003950, Title="文件上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003953, Pid=252885263003950, Title="文件下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003954, Pid=252885263003950, Title="文件删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+//            new SysMenu{ Id=252885263003960, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="LAYOUT", Redirect="", Icon="ant-design:read-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=500 },
+//            new SysMenu{ Id=252885263003961, Pid=252885263003960, Title="接口文档", Path="api", Name="Api", OutLink="https://localhost:44326/api/", Component="IFrame", Icon="ant-design:api-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003962, Pid=252885263003960, Title="Furion文档", Path="https://dotnetchina.gitee.io/furion/", Name="Furion", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//            new SysMenu{ Id=252885263003963, Pid=252885263003960, Title="Vben文档", Path="https://vvbin.cn/doc-next/", Name="Vben", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+//        };
+//    }
+//}

+ 46 - 47
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -13,12 +13,12 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
     {
         return new[]
         {
-            new SysMenu{ Id=252885263003710, Pid=0, Title="数据面板", Path="/dashboard", Name="Dashboard", Component="LAYOUT", Redirect="/dashboard/analysis", Icon="ant-design:home-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=50 },
-            new SysMenu{ Id=252885263003711, Pid=252885263003710, Title="分析页", Path="analysis", Name="Analysis", Component="/dashboard/analysis/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003712, Pid=252885263003710, Title="工作台", Path="workbench", Name="Workbench", Component="/dashboard/workbench/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+            new SysMenu{ Id=252885263003710, Pid=0, Title="数据面板", Path="/dashboard", Name="dashboard", Component="Layout", Redirect="/home", Icon="ele-HomeFilled", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=10 },
+            new SysMenu{ Id=252885263003711, Pid=252885263003710, Title="工作台", Path="/home", Name="home", Component="/home/index", IsAffix=true, Icon="ele-DataAnalysis", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            //new SysMenu{ Id=252885263003712, Pid=252885263003710, Title="分析页", Path="/dashboard/analysis", Name="analysis", Component="/dashboard/analysis/index", Icon="ele-DataLine", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
 
-            new SysMenu{ Id=252885263003720, Pid=0, Title="系统管理", Path="/sys", Name="sys", Component="LAYOUT", Redirect="", Icon="ant-design:setting-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003730, Pid=252885263003720, Title="账号管理", Path="user", Name="UserManagement", Component="/sys/admin/user/index", Icon="ant-design:user-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003720, Pid=0, Title="系统管理", Path="/system", Name="system", Component="Layout", Redirect="/system/user", Icon="ele-Setting", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003730, Pid=252885263003720, Title="账号管理", Path="/system/user", Name="user", Component="/system/user/index", Icon="ele-User", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003731, Pid=252885263003730, Title="账号查询", Permission="sysUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003732, Pid=252885263003730, Title="账号编辑", Permission="sysUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003733, Pid=252885263003730, Title="账号增加", Permission="sysUser:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
@@ -27,7 +27,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=252885263003736, Pid=252885263003730, Title="授权数据", Permission="sysUser:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003737, Pid=252885263003730, Title="重置密码", Permission="sysUser:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003738, Pid=252885263003730, Title="设置状态", Permission="sysUser:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003740, Pid=252885263003720, Title="角色管理", Path="role", Name="RoleManagement", Component="/sys/admin/role/index", Icon="ant-design:bulb-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+            new SysMenu{ Id=252885263003740, Pid=252885263003720, Title="角色管理", Path="/system/role", Name="role", Component="/system/role/index", Icon="ele-UserFilled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
             new SysMenu{ Id=252885263003741, Pid=252885263003740, Title="角色查询", Permission="sysRole:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003742, Pid=252885263003740, Title="角色编辑", Permission="sysRole:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003743, Pid=252885263003740, Title="角色增加", Permission="sysRole:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
@@ -35,25 +35,25 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=252885263003745, Pid=252885263003740, Title="授权菜单", Permission="sysRole:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003746, Pid=252885263003740, Title="授权数据", Permission="sysRole:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003747, Pid=252885263003740, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003750, Pid=252885263003720, Title="菜单管理", Path="menu", Name="MenuManagement", Component="/sys/admin/menu/index", Icon="ant-design:menu-fold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
+            new SysMenu{ Id=252885263003750, Pid=252885263003720, Title="菜单管理", Path="/system/menu", Name="menu", Component="/system/menu/index", Icon="ele-Menu", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
             new SysMenu{ Id=252885263003751, Pid=252885263003750, Title="菜单查询", Permission="sysMenu:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003752, Pid=252885263003750, Title="菜单编辑", Permission="sysMenu:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003753, Pid=252885263003750, Title="菜单增加", Permission="sysMenu:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003754, Pid=252885263003750, Title="菜单删除", Permission="sysMenu:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003760, Pid=252885263003720, Title="机构管理", Path="org", Name="OrgManagement", Component="/sys/admin/org/index", Icon="ant-design:gold-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=103 },
+            new SysMenu{ Id=252885263003760, Pid=252885263003720, Title="机构管理", Path="/system/org", Name="org", Component="/system/org/index", Icon="ele-OfficeBuilding", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=103 },
             new SysMenu{ Id=252885263003761, Pid=252885263003760, Title="机构查询", Permission="sysOrg:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003762, Pid=252885263003760, Title="机构编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003763, Pid=252885263003760, Title="机构增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003764, Pid=252885263003760, Title="机构删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003770, Pid=252885263003720, Title="职位管理", Path="pos", Name="PosManagement", Component="/sys/admin/pos/index",Icon="ant-design:tool-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=104 },
+            new SysMenu{ Id=252885263003770, Pid=252885263003720, Title="职位管理", Path="/system/pos", Name="pos", Component="/system/pos/index",Icon="ele-Mug", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=104 },
             new SysMenu{ Id=252885263003771, Pid=252885263003770, Title="职位查询", Permission="sysPos:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003772, Pid=252885263003770, Title="职位编辑", Permission="sysPos:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003773, Pid=252885263003770, Title="职位增加", Permission="sysPos:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003774, Pid=252885263003770, Title="职位删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003775, Pid=252885263003720, Title="修改密码", Path="password", Name="PasswordManagement", Component="/sys/admin/password/index",Icon="ant-design:eye-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=105 },
+            new SysMenu{ Id=252885263003775, Pid=252885263003720, Title="修改密码", Path="/system/password", Name="password", Component="/system/password/index",Icon="ele-Hide", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=105 },
 
-            new SysMenu{ Id=252885263003780, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="LAYOUT", Redirect="", Icon="ant-design:ant-design-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=200 },
-            new SysMenu{ Id=252885263003790, Pid=252885263003780, Title="租户管理", Path="tenant", Name="TenantManagement", Component="/sys/admin/tenant/index", Icon="ant-design:cluster-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003780, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="Layout", Redirect="/system/config", Icon="ele-Menu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=200 },
+            new SysMenu{ Id=252885263003790, Pid=252885263003780, Title="租户管理", Path="/system/tenant", Name="tenant", Component="/system/tenant/index", Icon="ele-School", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003791, Pid=252885263003790, Title="租户查询", Permission="sysTenant:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003792, Pid=252885263003790, Title="租户编辑", Permission="sysTenant:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003793, Pid=252885263003790, Title="租户增加", Permission="sysTenant:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
@@ -61,73 +61,72 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=252885263003795, Pid=252885263003790, Title="授权菜单", Permission="sysTenant:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003796, Pid=252885263003790, Title="重置密码", Permission="sysTenant:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=252885263003800, Pid=252885263003780, Title="系统配置", Path="config", Name="ConfigManagement", Component="/sys/admin/config/index", Icon="ant-design:deployment-unit-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+            new SysMenu{ Id=252885263003800, Pid=252885263003780, Title="系统配置", Path="/system/config", Name="config", Component="/system/config/index", Icon="ele-DocumentCopy", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
             new SysMenu{ Id=252885263003801, Pid=252885263003800, Title="配置查询", Permission="sysConfig:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003802, Pid=252885263003800, Title="配置编辑", Permission="sysConfig:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003803, Pid=252885263003800, Title="配置增加", Permission="sysConfig:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003804, Pid=252885263003800, Title="配置删除", Permission="sysConfig:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=252885263003810, Pid=252885263003780, Title="字典管理", Path="dict", Name="DictManagement", Component="/sys/admin/dict/index", Icon="ant-design:book-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
+            new SysMenu{ Id=252885263003810, Pid=252885263003780, Title="字典管理", Path="/system/dict", Name="dict", Component="/system/dict/index", Icon="ele-Collection", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
             new SysMenu{ Id=252885263003811, Pid=252885263003810, Title="字典查询", Permission="sysDict:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003812, Pid=252885263003810, Title="字典编辑", Permission="sysDict:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003813, Pid=252885263003810, Title="字典增加", Permission="sysDict:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003814, Pid=252885263003810, Title="字典删除", Permission="sysDict:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=252885263003820, Pid=252885263003780, Title="短信管理", Path="sms", Name="SmsManagement", Component="/sys/admin/sms/index", Icon="ant-design:mail-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=103 },
+            new SysMenu{ Id=252885263003820, Pid=252885263003780, Title="短信管理", Path="/system/sms", Name="sms", Component="/system/sms/index", Icon="ele-Message", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=103 },
 
-            new SysMenu{ Id=252885263003830, Pid=252885263003780, Title="任务调度", Path="timer", Name="TimerManagement", Component="/sys/admin/timer/index", Icon="ant-design:clock-circle-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=104 },
+            new SysMenu{ Id=252885263003830, Pid=252885263003780, Title="任务调度", Path="/system/timer", Name="timer", Component="/system/timer/index", Icon="ele-AlarmClock", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=104 },
             new SysMenu{ Id=252885263003831, Pid=252885263003830, Title="任务查询", Permission="sysTimer:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003832, Pid=252885263003830, Title="任务编辑", Permission="sysTimer:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003833, Pid=252885263003830, Title="任务增加", Permission="sysTimer:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003834, Pid=252885263003830, Title="任务删除", Permission="sysTimer:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003835, Pid=252885263003830, Title="设置状态", Permission="sysTimer:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=252885263003840, Pid=252885263003780, Title="代码生成", Path="code", Name="CodeManagement", Component="/sys/admin/code/index", Icon="ant-design:bug-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=105 },
+            new SysMenu{ Id=252885263003840, Pid=252885263003780, Title="代码生成", Path="/system/code", Name="code", Component="/system/code/index", Icon="ele-Crop", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=105 },
 
-            new SysMenu{ Id=252885263003850, Pid=252885263003780, Title="数据库管理", Path="database", Name="DBManagement", Component="/sys/admin/database/index",Icon="ant-design:database-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=106 },
+            new SysMenu{ Id=252885263003850, Pid=252885263003780, Title="库表管理", Path="/system/database", Name="database", Component="/system/database/index",Icon="ele-Coin", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=106 },
 
-            new SysMenu{ Id=252885263003860, Pid=252885263003780, Title="在线用户", Path="online", Name="OnlineManagement", Component="/sys/admin/online/index", Icon="ant-design:user-switch-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=107 },
+            new SysMenu{ Id=252885263003860, Pid=252885263003780, Title="在线用户", Path="/system/online", Name="online", Component="/system/online/index", Icon="ele-Sunny", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=107 },
             new SysMenu{ Id=252885263003861, Pid=252885263003860, Title="用户查询", Permission="online:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003862, Pid=252885263003860, Title="用户删除", Permission="online:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003863, Pid=252885263003860, Title="强制下线", Permission="online:ForceExistUser", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=252885263003870, Pid=252885263003780, Title="系统监控", Path="server", Name="ServerManagement", Component="/sys/admin/server/index", Icon="ant-design:alert-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=108 },
+            new SysMenu{ Id=252885263003870, Pid=252885263003780, Title="系统监控", Path="/system/server", Name="server", Component="/system/server/index", Icon="ele-Monitor", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=108 },
 
-            new SysMenu{ Id=252885263003880, Pid=252885263003780, Title="缓存管理", Path="cache", Name="CacheManagement", Component="/sys/admin/cache/index", Icon="ant-design:thunderbolt-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=109 },
+            new SysMenu{ Id=252885263003880, Pid=252885263003780, Title="缓存管理", Path="/system/cache", Name="cache", Component="/system/cache/index", Icon="ele-Loading", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=109 },
             new SysMenu{ Id=252885263003881, Pid=252885263003880, Title="缓存查询", Permission="cache:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003882, Pid=252885263003880, Title="缓存删除", Permission="cache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=252885263003890, Pid=252885263003780, Title="数据资源", Path="dataResource", Name="DataResourceManagement", Component="/sys/admin/dataResource/index", Icon="ant-design:funnel-plot-filled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=110 },
+            new SysMenu{ Id=252885263003890, Pid=252885263003780, Title="数据资源", Path="/system/dataResource", Name="dataResource", Component="/system/dataResource/index", Icon="ele-TakeawayBox", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=110 },
             new SysMenu{ Id=252885263003891, Pid=252885263003890, Title="资源查询", Permission="sysDataResource:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003892, Pid=252885263003890, Title="资源编辑", Permission="sysDataResource:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003893, Pid=252885263003890, Title="资源增加", Permission="sysDataResource:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263003894, Pid=252885263003890, Title="资源删除", Permission="sysDataResource:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-05-30 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=252885263003900, Pid=0, Title="日志管理", Path="/log", Name="log", Component="LAYOUT", Redirect="", Icon="ant-design:carry-out-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=300 },
-            new SysMenu{ Id=252885263003910, Pid=252885263003900, Title="访问日志", Path="vislog", Name="VislogManagement", Component="/sys/admin/log/vislog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003911, Pid=252885263003910, Title="日志查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003912, Pid=252885263003910, Title="日志清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003920, Pid=252885263003900, Title="操作日志", Path="oplog", Name="OplogManagement", Component="/sys/admin/log/oplog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
-            new SysMenu{ Id=252885263003921, Pid=252885263003920, Title="日志查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003922, Pid=252885263003920, Title="日志清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003930, Pid=252885263003900, Title="异常日志", Path="exlog", Name="ExlogManagement", Component="/sys/admin/log/exlog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
-            new SysMenu{ Id=252885263003931, Pid=252885263003930, Title="日志查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003932, Pid=252885263003930, Title="日志清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003935, Pid=252885263003900, Title="差异日志", Path="difflog", Name="DifflogManagement", Component="/sys/admin/log/difflog/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003936, Pid=252885263003935, Title="日志查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003937, Pid=252885263003935, Title="日志清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263003940, Pid=0, Title="文件管理", Path="/file", Name="file", Component="LAYOUT", Redirect="", Icon="ant-design:file-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=400 },
-            new SysMenu{ Id=252885263003950, Pid=252885263003940, Title="文件管理", Path="file", Name="FileManagement", Component="/sys/admin/file/index", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003951, Pid=252885263003950, Title="文件查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003952, Pid=252885263003950, Title="文件上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003953, Pid=252885263003950, Title="文件下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003954, Pid=252885263003950, Title="文件删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263003960, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="LAYOUT", Redirect="", Icon="ant-design:read-outlined", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=500 },
-            new SysMenu{ Id=252885263003961, Pid=252885263003960, Title="接口文档", Path="api", Name="Api", FrameSrc="https://localhost:44326/api/", Component="IFrame", Icon="ant-design:api-outlined", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003962, Pid=252885263003960, Title="Furion文档", Path="https://dotnetchina.gitee.io/furion/", Name="Furion", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263003963, Pid=252885263003960, Title="Vben文档", Path="https://vvbin.cn/doc-next/", Name="Vben", Component="IFrame", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003900, Pid=252885263003780, Title="文件管理", Path="/system/file", Name="file", Component="/system/file/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=111 },
+            new SysMenu{ Id=252885263003901, Pid=252885263003900, Title="文件查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003902, Pid=252885263003900, Title="文件上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003903, Pid=252885263003900, Title="文件下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263003904, Pid=252885263003900, Title="文件删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263004000, Pid=0, Title="日志管理", Path="/log", Name="log", Component="Layout", Redirect="/system/vislog", Icon="ele-DocumentCopy", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=200 },
+            new SysMenu{ Id=252885263004010, Pid=252885263004000, Title="访问日志", Path="/system/vislog", Name="vislog", Component="/system/log/vislog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004011, Pid=252885263004010, Title="日志查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004012, Pid=252885263004010, Title="日志清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004020, Pid=252885263004000, Title="操作日志", Path="/system/oplog", Name="oplog", Component="/system/log/oplog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+            new SysMenu{ Id=252885263004021, Pid=252885263004020, Title="日志查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004022, Pid=252885263004020, Title="日志清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004030, Pid=252885263004000, Title="异常日志", Path="/system/exlog", Name="exlog", Component="/system/log/exlog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
+            new SysMenu{ Id=252885263004031, Pid=252885263004030, Title="日志查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004032, Pid=252885263004030, Title="日志清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004035, Pid=252885263004000, Title="差异日志", Path="/system/difflog", Name="difflog", Component="/system/log/difflog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004036, Pid=252885263004035, Title="日志查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004037, Pid=252885263004035, Title="日志清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263004100, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="Layout", Redirect="/api", Icon="ele-Notebook", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=300 },
+            new SysMenu{ Id=252885263004101, Pid=252885263004100, Title="接口文档", Path="/api", Name="api", Component="layout/routerView/iframe", IsIframe=true, OutLink="https://localhost:44326/api/", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004102, Pid=252885263004100, Title="后台文档", Path="/furion", Name="furion", Component="IFrame", IsIframe=false, IsKeepAlive=false, OutLink="https://furion.baiqian.ltd/", Icon="ele-Promotion", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263004103, Pid=252885263004100, Title="前端文档", Path="/element", Name="element", Component="IFrame", IsIframe=false, IsKeepAlive=false, OutLink="https://element-plus.gitee.io/zh-CN/", Icon="ele-Position", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
         };
     }
 }

+ 3 - 0
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -1,4 +1,5 @@
 using Furion.SpecificationDocument;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Memory;
 
 namespace Admin.NET.Core.Service;
@@ -85,6 +86,7 @@ public class SysAuthService : IDynamicApiController, ITransient
         var refreshToken = JWTEncryption.GenerateRefreshToken(accessToken, _refreshTokenOptions.ExpiredTime);
 
         // 设置响应报文头
+        // _httpContextAccessor.HttpContext.SetTokensOfResponseHeaders(accessToken, refreshToken);
         _httpContextAccessor.HttpContext.Response.Headers["access-token"] = accessToken;
         _httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = refreshToken;
 
@@ -174,6 +176,7 @@ public class SysAuthService : IDynamicApiController, ITransient
             throw Oops.Oh(ErrorCodeEnum.D1011);
 
         // 设置响应报文头
+        // _httpContextAccessor.HttpContext.SetTokensOfResponseHeaders("invalid_token", "invalid_token");
         _httpContextAccessor.HttpContext.Response.Headers["access-token"] = "invalid_token";
         _httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = "invalid_token";
 

+ 5 - 70
Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuInput.cs

@@ -1,87 +1,22 @@
 namespace Admin.NET.Core.Service;
 
-public class MenuInput : BaseIdInput
+[NotTable]
+public class MenuInput : SysMenu
 {
-    /// <summary>
-    /// 父Id
-    /// </summary>
-    public virtual long Pid { get; set; }
-
-    /// <summary>
-    /// 菜单类型(1目录 2菜单 3按钮)
-    /// </summary>
-    public virtual int Type { get; set; }
-
-    /// <summary>
-    /// 名称
-    /// </summary>
-    public virtual string Name { get; set; }
-
-    /// <summary>
-    /// 路由地址
-    /// </summary>
-    public virtual string Path { get; set; }
-
-    /// <summary>
-    /// 组件路径
-    /// </summary>
-    public virtual string Component { get; set; }
-
-    /// <summary>
-    /// 权限标识
-    /// </summary>
-    public virtual string Permission { get; set; }
-
-    /// <summary>
-    /// 跳转地址
-    /// </summary>
-    public virtual string Redirect { get; set; }
 
-    /// <summary>
-    /// 内嵌地址
-    /// </summary>
-    public string FrameSrc { get; set; }
-
-    /// <summary>
-    /// 标题
-    /// </summary>
-    public virtual string Title { get; set; }
-
-    /// <summary>
-    /// 图标
-    /// </summary>
-    public virtual string Icon { get; set; }
-
-    /// <summary>
-    /// 排序
-    /// </summary>
-    public virtual int OrderNo { get; set; }
-
-    /// <summary>
-    /// 是否显示
-    /// </summary>
-    public virtual bool HideMenu { get; set; } = false;
-
-    /// <summary>
-    /// 是否忽略KeepAlive缓存
-    /// </summary>
-    public virtual bool IgnoreKeepAlive { get; set; } = true;
-
-    /// <summary>
-    /// 当前激活的菜单-用于配置详情页时左侧激活的菜单路径
-    /// </summary>
-    public virtual string CurrentActiveMenu { get; set; }
 }
 
+[NotTable]
 public class AddMenuInput : MenuInput
 {
     /// <summary>
-    /// 标题
+    /// 名称
     /// </summary>
     [Required(ErrorMessage = "菜单名称不能为空")]
     public override string Title { get; set; }
 }
 
+[NotTable]
 public class UpdateMenuInput : AddMenuInput
 {
 }

+ 116 - 0
Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput - vben.cs

@@ -0,0 +1,116 @@
+//namespace Admin.NET.Core.Service;
+
+///// <summary>
+///// 系统菜单返回结果
+///// </summary>
+//public class MenuOutput
+//{
+//    /// <summary>
+//    /// Id
+//    /// </summary>
+//    public long Id { get; set; }
+
+//    /// <summary>
+//    /// 父Id
+//    /// </summary>
+//    public long Pid { get; set; }
+
+//    /// <summary>
+//    /// 菜单类型(0目录 1菜单 2按钮)
+//    /// </summary>
+//    public MenuTypeEnum Type { get; set; }
+
+//    /// <summary>
+//    /// 名称
+//    /// </summary>
+//    public string Name { get; set; }
+
+//    /// <summary>
+//    /// 路由地址
+//    /// </summary>
+//    public string Path { get; set; }
+
+//    /// <summary>
+//    /// 组件路径
+//    /// </summary>
+//    public string Component { get; set; }
+
+//    /// <summary>
+//    /// 权限标识
+//    /// </summary>
+//    public string Permission { get; set; }
+
+//    /// <summary>
+//    /// 重定向
+//    /// </summary>
+//    public string Redirect { get; set; }
+
+//    /// <summary>
+//    /// 菜单Meta
+//    /// </summary>
+//    public SysMenuMeta Meta { get; set; }
+
+//    /// <summary>
+//    /// 菜单子项
+//    /// </summary>
+//    public List<MenuOutput> Children { get; set; }
+//}
+
+///// <summary>
+///// 菜单Meta配置
+///// </summary>
+//public class SysMenuMeta
+//{
+//    /// <summary>
+//    /// 标题
+//    /// </summary>
+//    public string Title { get; set; }
+
+//    /// <summary>
+//    /// 图标
+//    /// </summary>
+//    public string Icon { get; set; }
+
+//    /// <summary>
+//    /// 内嵌地址
+//    /// </summary>
+//    public string FrameSrc { get; set; }
+
+//    /// <summary>
+//    /// 排序
+//    /// </summary>
+//    public int OrderNo { get; set; }
+
+//    /// <summary>
+//    /// 是否显示
+//    /// </summary>
+//    public bool HideMenu { get; set; }
+
+//    /// <summary>
+//    /// 是否忽略KeepAlive缓存
+//    /// </summary>
+//    public bool IgnoreKeepAlive { get; set; }
+
+//    /// <summary>
+//    /// 当前激活的菜单-用于配置详情页时左侧激活的菜单路径
+//    /// </summary>
+//    public string CurrentActiveMenu { get; set; }
+//}
+
+///// <summary>
+///// 配置菜单对象映射
+///// </summary>
+//public class SysMenuMapper : IRegister
+//{
+//    public void Register(TypeAdapterConfig config)
+//    {
+//        config.ForType<SysMenu, MenuOutput>()
+//            .Map(t => t.Meta.Title, o => o.Title)
+//            .Map(t => t.Meta.Icon, o => o.Icon)
+//            .Map(t => t.Meta.FrameSrc, o => o.OutLink)
+//            .Map(t => t.Meta.OrderNo, o => o.OrderNo)
+//            .Map(t => t.Meta.HideMenu, o => o.IsHide)
+//            .Map(t => t.Meta.IgnoreKeepAlive, o => o.IsKeepAlive);
+//        //.Map(t => t.Meta.CurrentActiveMenu, o => o.CurrentActiveMenu);
+//    }
+//}

+ 32 - 19
Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs

@@ -45,11 +45,6 @@ public class MenuOutput
     /// </summary>
     public string Redirect { get; set; }
 
-    /// <summary>
-    /// 是否可用
-    /// </summary>
-    public bool Disabled { get; set; }
-
     /// <summary>
     /// 菜单Meta
     /// </summary>
@@ -77,29 +72,44 @@ public class SysMenuMeta
     public string Icon { get; set; }
 
     /// <summary>
-    /// 内嵌地址
+    /// 是否内嵌
     /// </summary>
-    public string FrameSrc { get; set; }
+    public bool IsIframe { get; set; }
 
     /// <summary>
-    /// 排序
+    /// 外链链接
     /// </summary>
-    public int OrderNo { get; set; }
+    public string IsLink { get; set; }
+
+    /// <summary>
+    /// 是否隐藏
+    /// </summary>
+    public bool IsHide { get; set; }
 
     /// <summary>
-    /// 是否显示
+    /// 是否缓存
     /// </summary>
-    public bool HideMenu { get; set; }
+    public bool IsKeepAlive { get; set; }
+
+    /// <summary>
+    /// 是否固定
+    /// </summary>
+    public bool IsAffix { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int OrderNo { get; set; }
 
     /// <summary>
-    /// 是否忽略KeepAlive缓存
+    /// 状态
     /// </summary>
-    public bool IgnoreKeepAlive { get; set; }
+    public StatusEnum Status { get; set; }
 
     /// <summary>
-    /// 当前激活的菜单-用于配置详情页时左侧激活的菜单路径
+    /// 备注
     /// </summary>
-    public string CurrentActiveMenu { get; set; }
+    public string Remark { get; set; }
 }
 
 /// <summary>
@@ -112,10 +122,13 @@ public class SysMenuMapper : IRegister
         config.ForType<SysMenu, MenuOutput>()
             .Map(t => t.Meta.Title, o => o.Title)
             .Map(t => t.Meta.Icon, o => o.Icon)
-            .Map(t => t.Meta.FrameSrc, o => o.FrameSrc)
+            .Map(t => t.Meta.IsIframe, o => o.IsIframe)
+            .Map(t => t.Meta.IsLink, o => o.OutLink)
+            .Map(t => t.Meta.IsHide, o => o.IsHide)
+            .Map(t => t.Meta.IsKeepAlive, o => o.IsKeepAlive)
+            .Map(t => t.Meta.IsAffix, o => o.IsAffix)
             .Map(t => t.Meta.OrderNo, o => o.OrderNo)
-            .Map(t => t.Meta.HideMenu, o => o.HideMenu)
-            .Map(t => t.Meta.IgnoreKeepAlive, o => o.IgnoreKeepAlive)
-            .Map(t => t.Meta.CurrentActiveMenu, o => o.CurrentActiveMenu);
+            .Map(t => t.Meta.Status, o => o.Status)
+            .Map(t => t.Meta.Remark, o => o.Remark);
     }
 }

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -84,7 +84,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     [HttpPost("/sysMenu/add")]
     public async Task AddMenu(AddMenuInput input)
     {
-        var isExist = input.Type != (int)MenuTypeEnum.Btn
+        var isExist = input.Type != MenuTypeEnum.Btn
             ? await _sysMenuRep.IsAnyAsync(u => u.Name == input.Name)
             : await _sysMenuRep.IsAnyAsync(u => u.Permission == input.Permission);
 
@@ -108,7 +108,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     [HttpPost("/sysMenu/update"),]
     public async Task UpdateMenu(UpdateMenuInput input)
     {
-        var isExist = input.Type != (int)MenuTypeEnum.Btn
+        var isExist = input.Type != MenuTypeEnum.Btn
             ? await _sysMenuRep.IsAnyAsync(u => u.Name == input.Name && u.Id != input.Id)
             : await _sysMenuRep.IsAnyAsync(u => u.Permission == input.Permission && u.Id != input.Id);
         if (isExist)
@@ -159,7 +159,7 @@ public class SysMenuService : IDynamicApiController, ITransient
         //        throw Oops.Oh(ErrorCodeEnum.D4001);
         //}
         //else
-        if (type == (int)MenuTypeEnum.Btn)
+        if (type == MenuTypeEnum.Btn)
         {
             if (string.IsNullOrEmpty(permission))
                 throw Oops.Oh(ErrorCodeEnum.D4003);

+ 1 - 1
vue-next-admin/src/stores/themeConfig.ts

@@ -42,7 +42,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 是否开启菜单背景颜色渐变
 			isMenuBarColorGradual: false,
 			// 默认分栏菜单背景颜色
-			columnsMenuBar: '#001529',
+			columnsMenuBar: '#2C3A49',
 			// 默认分栏菜单字体颜色
 			columnsMenuBarColor: '#F0F0F0',
 			// 是否开启分栏菜单背景颜色渐变

+ 1 - 1
vue-next-admin/src/theme/app.scss

@@ -124,7 +124,7 @@ body,
 	}
 	.layout-scrollbar {
 		@extend .el-scrollbar;
-		padding: 10px; // 四周间隙
+		padding: 5px; // 四周间隙
 	}
 	.layout-mian-height-50 {
 		height: calc(100vh - 50px);

+ 1 - 1
vue-next-admin/src/theme/element.scss

@@ -68,7 +68,7 @@
 // 鼠标 hover 时颜色
 .el-menu-hover-bg-color {
 	background-color: var(--el-color-primary-light-8) !important;
-	border-right: solid 3px var(--el-color-primary);
+	// border-bottom: solid 1px var(--el-color-primary);
 	// margin: 0 2px 0 2px;
 	// border-radius: 10px;
 }

+ 3 - 2
vue-next-admin/src/utils/axios-utils.ts

@@ -9,7 +9,7 @@ import globalAxios, { AxiosInstance } from 'axios';
 import { Configuration } from '/@/api-services';
 import { BaseAPI, BASE_PATH } from '/@/api-services/base';
 import { ElMessage } from 'element-plus';
-import { Local } from '/@/utils/storage';
+import { Local, Session } from '/@/utils/storage';
 
 // 如果是 Angular 项目,则取消下面注释即可
 // import { environment } from './environments/environment';
@@ -38,7 +38,8 @@ const clearAccessTokens = () => {
 	// 刷新浏览器
 	window.location.reload();
 
-	// 这里可以添加清除更多 Key =========================================
+	// 清除其他
+	Session.clear();
 };
 
 /**

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 302 - 0
vue-next-admin/src/views/dashboard/analysis/index.vue


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 302 - 0
vue-next-admin/src/views/dashboard/workbench/index.vue


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 302 - 0
vue-next-admin/src/views/system/tenant/index.vue


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است