From b665ec57170c6dc475320e6887fd212bcae6fc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sun, 25 Sep 2022 18:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=A7=8D=E5=AD=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AccountController.cs | 6 + .../Controllers/TestController.cs | 2 + .../yi-sqlsugar-dev.db | Bin 163840 -> 172032 bytes .../Yi.Framework.Model/MenuEntity.cs | 3 +- .../Yi.Framework.Model/SeedData/DeptSeed.cs | 130 ++++++++ .../SeedData/DictionaryInfoSeed.cs | 284 ++++++++++++++++++ .../Yi.Framework.Model/SeedData/MenuSeed.cs | 117 +++++++- .../Yi.Framework.Model/SeedData/PostSeed.cs | 58 ++++ .../SeedData/SeedFactory.cs | 14 + .../Yi.Framework.Service/UserService.cs | 6 +- .../DbExtend/DbSeedExtend.cs | 17 ++ 11 files changed, 633 insertions(+), 4 deletions(-) create mode 100644 Yi.Framework.Net6/Yi.Framework.Model/SeedData/DeptSeed.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionaryInfoSeed.cs create mode 100644 Yi.Framework.Net6/Yi.Framework.Model/SeedData/PostSeed.cs diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs index b434aa41..1aec3327 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs @@ -116,6 +116,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers //通过鉴权jwt获取到用户的id var userId = HttpContext.GetUserIdInfo(); var data = await _iUserService.GetUserAllInfo(userId); + //系统用户数据被重置，老前端访问重新授权 + if (data is null) + { + return Result.UnAuthorize(); + } + data.Menus.Clear(); return Result.Success().SetData(data); } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs index 55be5dd9..c2f7fdf3 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs @@ -219,6 +219,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers await rep.ChangeRepository>().DeleteAsync(u => true); await rep.ChangeRepository>().DeleteAsync(u => true); await rep.ChangeRepository>().DeleteAsync(u => true); + await rep.ChangeRepository>().DeleteAsync(u => true); + await rep.ChangeRepository>().DeleteAsync(u => true); })); } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 614c01a771ddec69e36df9d0dcc659a398394a9d..467083e356373ddeced5f2c59590137155f12a2d 100644 GIT binary patch literal 172032 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 Vo@=`Q>x^#=ZgBq0-LCuC{{t=d2iO1r diff --git a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs index dfca072a..446470f0 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs @@ -48,8 +48,6 @@ namespace Yi.Framework.Model.Models r.Component = m.Component; r.AlwaysShow = false; } - - r.Meta = new Meta { Title = m.MenuName, @@ -59,6 +57,7 @@ namespace Yi.Framework.Model.Models if ((bool)m.IsLink) { r.Meta.link = m.Router; + r.AlwaysShow = false; } routers.Add(r); diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DeptSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DeptSeed.cs new file mode 100644 index 00000000..559735d3 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DeptSeed.cs @@ -0,0 +1,130 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Common.Enum; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Model.SeedData +{ + public class DeptSeed : AbstractSeed + { + public override List GetSeed() + { + + DeptEntity chengziDept = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "橙子科技", + DeptCode="Yi", + OrderNum =100, + IsDeleted = false, + ParentId=0, + Leader="橙子", + Remark="如名所指" + }; + Entitys.Add(chengziDept); + + + DeptEntity shenzhenDept = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "深圳总公司", + OrderNum = 100, + IsDeleted = false, + ParentId=chengziDept.Id + }; + Entitys.Add(shenzhenDept); + + + DeptEntity jiangxiDept = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "江西总公司", + OrderNum = 100, + IsDeleted = false, + ParentId = chengziDept.Id + }; + Entitys.Add(jiangxiDept); + + + + DeptEntity szDept1 = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "研发部门", + OrderNum = 100, + IsDeleted = false, + ParentId = shenzhenDept.Id + }; + Entitys.Add(szDept1); + + DeptEntity szDept2 = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "市场部门", + OrderNum = 100, + IsDeleted = false, + ParentId = shenzhenDept.Id + }; + Entitys.Add(szDept2); + + DeptEntity szDept3 = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "测试部门", + OrderNum = 100, + IsDeleted = false, + ParentId = shenzhenDept.Id + }; + Entitys.Add(szDept3); + + DeptEntity szDept4 = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "财务部门", + OrderNum = 100, + IsDeleted = false, + ParentId = shenzhenDept.Id + }; + Entitys.Add(szDept4); + + DeptEntity szDept5 = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "运维部门", + OrderNum = 100, + IsDeleted = false, + ParentId = shenzhenDept.Id + }; + Entitys.Add(szDept5); + + + DeptEntity jxDept1 = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "市场部门", + OrderNum = 100, + IsDeleted = false, + ParentId = jiangxiDept.Id + }; + Entitys.Add(jxDept1); + + + DeptEntity jxDept2 = new DeptEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DeptName = "财务部门", + OrderNum = 100, + IsDeleted = false, + ParentId = jiangxiDept.Id + }; + Entitys.Add(jxDept2); + + + return Entitys; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionaryInfoSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionaryInfoSeed.cs new file mode 100644 index 00000000..41beab8b --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionaryInfoSeed.cs @@ -0,0 +1,284 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Model.SeedData +{ + public class DictionaryInfoSeed : AbstractSeed + { + public override List GetSeed() + { + DictionaryInfoEntity dictInfo1 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "男", + DictValue= "0", + DictType = "sys_user_sex", + OrderNum = 100, + Remark = "性别男", + IsDeleted = false, + }; + Entitys.Add(dictInfo1); + + DictionaryInfoEntity dictInfo2 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "女", + DictValue = "1", + DictType = "sys_user_sex", + OrderNum = 99, + Remark = "性别女", + IsDeleted = false, + }; + Entitys.Add(dictInfo2); + + DictionaryInfoEntity dictInfo3 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "未知", + DictValue = "2", + DictType = "sys_user_sex", + OrderNum = 98, + Remark = "性别未知", + IsDeleted = false, + }; + Entitys.Add(dictInfo3); + + + + DictionaryInfoEntity dictInfo4 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "显示", + DictValue = "0", + DictType = "sys_show_hide", + OrderNum = 100, + Remark = "显示菜单", + IsDeleted = false, + }; + Entitys.Add(dictInfo4); + + DictionaryInfoEntity dictInfo5 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "隐藏", + DictValue = "1", + DictType = "sys_show_hide", + OrderNum = 99, + Remark = "隐藏菜单", + IsDeleted = false, + }; + Entitys.Add(dictInfo5); + + + + DictionaryInfoEntity dictInfo6= new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "正常", + DictValue = "false", + DictType = "sys_normal_disable", + OrderNum = 100, + Remark = "正常状态", + IsDeleted = false, + }; + Entitys.Add(dictInfo6); + DictionaryInfoEntity dictInfo7 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "停用", + DictValue = "true", + DictType = "sys_normal_disable", + OrderNum = 99, + Remark = "停用状态", + IsDeleted = false, + ListClass= "danger" + }; + Entitys.Add(dictInfo7); + + + + DictionaryInfoEntity dictInfo8 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "正常", + DictValue = "0", + DictType = "sys_job_status", + OrderNum = 100, + Remark = "正常状态", + IsDeleted = false, + }; + Entitys.Add(dictInfo8); + DictionaryInfoEntity dictInfo9 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "暂停", + DictValue = "1", + DictType = "sys_job_status", + OrderNum = 99, + Remark = "停用状态", + IsDeleted = false, + ListClass = "danger" + }; + Entitys.Add(dictInfo9); + + + + + DictionaryInfoEntity dictInfo10 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "默认", + DictValue = "DEFAULT", + DictType = "sys_job_group", + OrderNum = 100, + Remark = "默认分组", + IsDeleted = false, + }; + Entitys.Add(dictInfo10); + DictionaryInfoEntity dictInfo11 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "系统", + DictValue = "SYSTEM", + DictType = "sys_job_group", + OrderNum = 99, + Remark = "系统分组", + IsDeleted = false, + }; + Entitys.Add(dictInfo11); + + + + DictionaryInfoEntity dictInfo12 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "是", + DictValue = "Y", + DictType = "sys_yes_no", + OrderNum = 100, + Remark = "系统默认是", + IsDeleted = false, + }; + Entitys.Add(dictInfo12); + DictionaryInfoEntity dictInfo13 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "否", + DictValue = "N", + DictType = "sys_yes_no", + OrderNum = 99, + Remark = "系统默认否", + IsDeleted = false, + ListClass = "danger" + }; + Entitys.Add(dictInfo13); + + + + DictionaryInfoEntity dictInfo14 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "通知", + DictValue = "1", + DictType = "sys_notice_type", + OrderNum = 100, + Remark = "通知", + IsDeleted = false, + }; + Entitys.Add(dictInfo14); + DictionaryInfoEntity dictInfo15 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "公告", + DictValue = "2", + DictType = "sys_notice_type", + OrderNum = 99, + Remark = "公告", + IsDeleted = false, + }; + Entitys.Add(dictInfo15); + + DictionaryInfoEntity dictInfo16 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "正常", + DictValue = "0", + DictType = "sys_notice_status", + OrderNum = 100, + Remark = "正常状态", + IsDeleted = false, + }; + Entitys.Add(dictInfo16); + DictionaryInfoEntity dictInfo17 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "关闭", + DictValue = "1", + DictType = "sys_notice_status", + OrderNum = 99, + Remark = "关闭状态", + IsDeleted = false, + ListClass = "danger" + }; + Entitys.Add(dictInfo17); + + DictionaryInfoEntity dictInfo18 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "正常", + DictValue = "0", + DictType = "sys_oper_type", + OrderNum = 100, + Remark = "正常状态", + IsDeleted = false, + }; + Entitys.Add(dictInfo18); + DictionaryInfoEntity dictInfo19 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "关闭", + DictValue = "1", + DictType = "sys_oper_type", + OrderNum = 99, + Remark = "关闭状态", + IsDeleted = false, + ListClass = "danger" + }; + Entitys.Add(dictInfo19); + + + + + DictionaryInfoEntity dictInfo20 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "成功", + DictValue = "0", + DictType = "sys_common_status", + OrderNum = 100, + Remark = "正常状态", + IsDeleted = false, + }; + Entitys.Add(dictInfo20); + DictionaryInfoEntity dictInfo21 = new DictionaryInfoEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + DictLabel = "失败", + DictValue = "1", + DictType = "sys_common_status", + OrderNum = 99, + Remark = "失败状态", + IsDeleted = false, + ListClass = "danger" + }; + Entitys.Add(dictInfo21); + + return Entitys; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs index aa87ea54..de7b0767 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs @@ -18,7 +18,6 @@ namespace Yi.Framework.Model.SeedData { Id = SnowFlakeSingle.Instance.NextId(), MenuName = "系统管理", - //PermissionCode = "*:*:*", MenuType = MenuTypeEnum.Catalogue.GetHashCode(), Router = "/system", IsShow = true, @@ -30,6 +29,55 @@ namespace Yi.Framework.Model.SeedData }; Entitys.Add(system); + //系统监控 + MenuEntity monitoring = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "系统监控", + MenuType = MenuTypeEnum.Catalogue.GetHashCode(), + Router = "/monitor", + IsShow = true, + IsLink = false, + MenuIcon = "monitor", + OrderNum = 99, + ParentId = 0, + IsDeleted = false + }; + Entitys.Add(monitoring); + + //系统工具 + MenuEntity tool = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "系统工具", + MenuType = MenuTypeEnum.Catalogue.GetHashCode(), + Router = "/tool", + IsShow = true, + IsLink = false, + MenuIcon = "tool", + OrderNum = 98, + ParentId = 0, + IsDeleted = false + }; + Entitys.Add(tool); + + //Yi框架 + MenuEntity guide = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "Yi框架", + MenuType = MenuTypeEnum.Catalogue.GetHashCode(), + Router = "https://gitee.com/ccnetcore/yi", + IsShow = true, + IsLink = true, + MenuIcon = "guide", + OrderNum = 90, + ParentId = 0, + IsDeleted = false, + }; + Entitys.Add(guide); + + //用户管理 MenuEntity user = new MenuEntity() { @@ -437,6 +485,73 @@ namespace Yi.Framework.Model.SeedData Entitys.Add(dictRemove); + //参数设置 + MenuEntity config = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "参数设置", + PermissionCode = "system:config:list", + MenuType = MenuTypeEnum.Menu.GetHashCode(), + Router = "config", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "system/config/index", + MenuIcon = "edit", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + Entitys.Add(config); + + MenuEntity configQuery = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "参数查询", + PermissionCode = "system:config:query", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + Entitys.Add(configQuery); + + MenuEntity configAdd = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "参数新增", + PermissionCode = "system:config:add", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + Entitys.Add(configAdd); + + MenuEntity configEdit = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "参数修改", + PermissionCode = "system:config:edit", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + Entitys.Add(configEdit); + + MenuEntity configRemove = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "参数删除", + PermissionCode = "system:config:remove", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = config.Id, + IsDeleted = false + }; + Entitys.Add(configRemove); + return Entitys; } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/PostSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/PostSeed.cs new file mode 100644 index 00000000..b13ffc5c --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/PostSeed.cs @@ -0,0 +1,58 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Common.Enum; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Model.SeedData +{ + public class PostSeed : AbstractSeed + { + public override List GetSeed() + { + PostEntity Post1 = new PostEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + PostName = "董事长", + PostCode = "ceo", + OrderNum =100, + IsDeleted = false + }; + Entitys.Add(Post1); + + PostEntity Post2 = new PostEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + PostName = "项目经理", + PostCode = "se", + OrderNum = 100, + IsDeleted = false + }; + Entitys.Add(Post2); + + PostEntity Post3 = new PostEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + PostName = "人力资源", + PostCode = "hr", + OrderNum = 100, + IsDeleted = false + }; + Entitys.Add(Post3); + + PostEntity Post4 = new PostEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + PostName = "普通员工", + PostCode = "user", + OrderNum = 100, + IsDeleted = false + }; + Entitys.Add(Post4); + return Entitys; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs index ee32cc57..d6cedacf 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs @@ -26,6 +26,20 @@ namespace Yi.Framework.Model.SeedData { return new DictionarySeed().GetSeed(); } + public static List GetPostSeed() + { + return new PostSeed().GetSeed(); + } + + public static List GetDictionaryInfoSeed() + { + return new DictionaryInfoSeed().GetSeed(); + } + + public static List GetDeptSeed() + { + return new DeptSeed().GetSeed(); + } public static List GetUserRoleSeed(List users, List roles) { List userRoleEntities = new(); diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs index 3c5eb373..2ae0bd44 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs @@ -154,6 +154,10 @@ namespace Yi.Framework.Service //得到用户 var user = await _repository._DbQueryable.Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).InSingleAsync(userId); + if (user is null) + { + return null; + } user.Password = null; user.Salt = null; //得到角色集合 @@ -293,6 +297,6 @@ namespace Yi.Framework.Service userDto.User.DeptId = null; return await _repository.UpdateIgnoreNullAsync(userDto.User); } - + } } diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs index 8e1b11fe..65462da3 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs @@ -24,6 +24,9 @@ namespace Yi.Framework.WebCore.DbExtend var roles = SeedFactory.GetRoleSeed(); var menus = SeedFactory.GetMenuSeed(); var dicts= SeedFactory.GetDictionarySeed(); + var posts = SeedFactory.GetPostSeed(); + var dictinfos= SeedFactory.GetDictionaryInfoSeed(); + var depts = SeedFactory.GetDeptSeed(); if (!_Db.Queryable().Any()) { _Db.Insertable(users).ExecuteCommand(); @@ -43,6 +46,20 @@ namespace Yi.Framework.WebCore.DbExtend { _Db.Insertable(dicts).ExecuteCommand(); } + if (!_Db.Queryable().Any()) + { + _Db.Insertable(posts).ExecuteCommand(); + } + if (!_Db.Queryable().Any()) + { + _Db.Insertable(dictinfos).ExecuteCommand(); + } + + + if (!_Db.Queryable().Any()) + { + _Db.Insertable(depts).ExecuteCommand(); + } if (!_Db.Queryable().Any()) {