diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index 614f74b5..d10b11a6 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -17,13 +17,13 @@ - + 列表查询 - + 条件分页查询 @@ -147,7 +147,7 @@ 文章控制器 - + 动态条件分页查询 @@ -155,7 +155,7 @@ - + 添加 @@ -175,24 +175,12 @@ - + 回复文章或回复评论 - - - 动态条件分页查询 - - - - - - 动态条件分页查询 - - - 账户管理 @@ -249,7 +237,7 @@ - + 动态条件分页查询 @@ -257,21 +245,21 @@ - + 动态条件查询 - + 添加 - + 更新 @@ -285,7 +273,7 @@ - + 动态条件分页查询 @@ -293,7 +281,7 @@ - + 动态条件分页查询 @@ -313,7 +301,7 @@ 文件 - + 文件上传下载 @@ -356,7 +344,7 @@ - + 动态条件分页查询 @@ -369,21 +357,21 @@ 菜单管理 - + 动态条件查询全部 - + 插入 - + 更新 @@ -423,7 +411,7 @@ - + 动态条件分页查询 @@ -431,7 +419,7 @@ - + 动态条件分页查询 @@ -444,7 +432,7 @@ 角色管理 - + 动态条件分页查询 @@ -496,7 +484,7 @@ 用户管理 - + 动态条件分页查询 @@ -548,19 +536,31 @@ - + 重置密码 + + + 动态条件分页查询 + + + + + + 动态条件分页查询 + + + 测试控制器 - + 依赖注入，优雅写法 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/AgreeController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/AgreeController.cs similarity index 93% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/AgreeController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/AgreeController.cs index ef52a5c0..0bfe0e0c 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/AgreeController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/AgreeController.cs @@ -9,12 +9,13 @@ using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel.Vo; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.BBS; +using Yi.Framework.Model.BBS.Entitys; using Yi.Framework.Repository; using Yi.Framework.Service; -using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; using Yi.Framework.WebCore.AuthorizationPolicy; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.ApiMicroservice.Controllers { diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/ArticleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/ArticleController.cs similarity index 95% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/ArticleController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/ArticleController.cs index 644e1e5c..6c9865d5 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/ArticleController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/ArticleController.cs @@ -9,11 +9,12 @@ using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel.Vo; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.BBS; +using Yi.Framework.Model.BBS.Entitys; using Yi.Framework.Repository; -using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; using Yi.Framework.WebCore.AuthorizationPolicy; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.ApiMicroservice.Controllers { diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/CommentController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/CommentController.cs similarity index 97% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/CommentController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/CommentController.cs index 5a4e76de..521b59e8 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Community/CommentController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BBS/CommentController.cs @@ -9,7 +9,8 @@ using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel.Vo; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.BBS; +using Yi.Framework.Model.BBS.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseCrudController.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseCrudController.cs index 524c0d4d..5d196a9d 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseCrudController.cs @@ -2,10 +2,9 @@ using Microsoft.Extensions.Localization; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; -using Yi.Framework.Interface; +using Yi.Framework.Interface.Base; using Yi.Framework.Language; -using Yi.Framework.Model.Models; -using Yi.Framework.Model.Query; +using Yi.Framework.Model.Base.Query; using Yi.Framework.Repository; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseExcelController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseExcelController.cs similarity index 97% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseExcelController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseExcelController.cs index 01f74731..1d246613 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseExcelController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseExcelController.cs @@ -7,8 +7,6 @@ using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Interface; using Yi.Framework.Language; -using Yi.Framework.Model.Models; -using Yi.Framework.Model.Query; using Yi.Framework.Repository; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseSimpleCrudController.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseSimpleCrudController.cs index b285609e..7cdb6814 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseSimpleCrudController.cs @@ -2,10 +2,8 @@ using Microsoft.Extensions.Localization; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; -using Yi.Framework.Interface; +using Yi.Framework.Interface.Base; using Yi.Framework.Language; -using Yi.Framework.Model.Models; -using Yi.Framework.Model.Query; using Yi.Framework.Repository; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleRdController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseSimpleRdController.cs similarity index 95% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleRdController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseSimpleRdController.cs index 1f5be22b..3f98aadf 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleRdController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Base/BaseSimpleRdController.cs @@ -2,10 +2,8 @@ using Microsoft.Extensions.Localization; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; -using Yi.Framework.Interface; +using Yi.Framework.Interface.Base; using Yi.Framework.Language; -using Yi.Framework.Model.Models; -using Yi.Framework.Model.Query; using Yi.Framework.Repository; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/AccountController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/AccountController.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/AccountController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/AccountController.cs index cb7199d8..ca30359f 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/AccountController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/AccountController.cs @@ -11,13 +11,15 @@ using Yi.Framework.Common.Enum; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Core; +using Yi.Framework.Core.Cache; using Yi.Framework.DTOModel; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; using Yi.Framework.WebCore.AuthorizationPolicy; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.ApiMicroservice.Controllers { diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/ConfigController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/ConfigController.cs similarity index 94% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/ConfigController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/ConfigController.cs index 9ef0398f..4242c75f 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/ConfigController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/ConfigController.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DeptController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DeptController.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DeptController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DeptController.cs index e6e74b00..99eebdfb 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DeptController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DeptController.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DictionaryController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DictionaryController.cs similarity index 95% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DictionaryController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DictionaryController.cs index cb77be55..4f915135 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DictionaryController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DictionaryController.cs @@ -8,7 +8,8 @@ using System.Threading.Tasks; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.Service; using Yi.Framework.WebCore; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DictionaryInfoController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DictionaryInfoController.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DictionaryInfoController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DictionaryInfoController.cs index ac8fcec2..34c429dc 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/DictionaryInfoController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/DictionaryInfoController.cs @@ -8,7 +8,8 @@ using System.Threading.Tasks; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.Service; using Yi.Framework.WebCore; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/FileController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/FileController.cs similarity index 99% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/FileController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/FileController.cs index 31b858b7..5da73d6a 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/FileController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/FileController.cs @@ -14,8 +14,8 @@ using Yi.Framework.Common.Enum; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Core; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.WebCore; namespace Yi.Framework.ApiMicroservice.Controllers diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/LogController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/LogController.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/LogController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/LogController.cs index ab1333dd..92aff1ef 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/LogController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/LogController.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/LoginLogController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/LoginLogController.cs similarity index 94% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/LoginLogController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/LoginLogController.cs index 38503f04..294559d4 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/LoginLogController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/LoginLogController.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/MenuController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/MenuController.cs similarity index 97% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/MenuController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/MenuController.cs index 619f35ee..148b24df 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/MenuController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/MenuController.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/OnlineController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OnlineController.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/OnlineController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OnlineController.cs index 654d5249..d2d4de64 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/OnlineController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OnlineController.cs @@ -14,7 +14,6 @@ using Yi.Framework.Common.Models; using Yi.Framework.Core; using Yi.Framework.DTOModel; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/OperationLogController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OperationLogController.cs similarity index 94% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/OperationLogController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OperationLogController.cs index 86663cba..47dd2ea4 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/OperationLogController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/OperationLogController.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/PostController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/PostController.cs similarity index 95% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/PostController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/PostController.cs index 81ae790c..be7d7232 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/PostController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/PostController.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/RoleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/RoleController.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/RoleController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/RoleController.cs index de2f92a8..519ee379 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/RoleController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/RoleController.cs @@ -8,7 +8,8 @@ using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.Service; using Yi.Framework.WebCore; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/UserController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/UserController.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/UserController.cs rename to Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/UserController.cs index a4753bf9..e28dc5a3 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/System/UserController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RABC/UserController.cs @@ -12,11 +12,12 @@ using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; using Yi.Framework.WebCore.AuthorizationPolicy; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.ApiMicroservice.Controllers { diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/CategoryController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/CategoryController.cs index cc47f38f..93a6f9bb 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/CategoryController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/CategoryController.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SkuController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SkuController.cs index 600874f6..bfa4284c 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SkuController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SkuController.cs @@ -8,7 +8,8 @@ using System.Threading.Tasks; using Yi.Framework.Common.Enum; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsController.cs index c31c4c91..3607e9ea 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsController.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsGroupController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsGroupController.cs index 8e65d62e..3a2a196b 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsGroupController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpecsGroupController.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpuController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpuController.cs index 48030c83..0bbcb69a 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpuController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/Shop/SpuController.cs @@ -8,7 +8,8 @@ using System.Threading.Tasks; using Yi.Framework.Common.Enum; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; using Yi.Framework.WebCore; using Yi.Framework.WebCore.AttributeExtend; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs index 3d3ad62e..bd5937d4 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs @@ -11,10 +11,13 @@ using Yi.Framework.Common.Attribute; using Yi.Framework.Common.Const; using Yi.Framework.Common.Models; using Yi.Framework.Core; +using Yi.Framework.Core.Cache; +using Yi.Framework.Core.Quartz; using Yi.Framework.Interface; +using Yi.Framework.Interface.RABC; using Yi.Framework.Job; using Yi.Framework.Language; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; using Yi.Framework.Uow.Interceptors; using Yi.Framework.WebCore; diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs index 6245fd97..c2919db0 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs @@ -10,7 +10,6 @@ using Microsoft.Extensions.Localization; using Yi.Framework.WebCore.AttributeExtend; using Yi.Framework.WebCore.SignalRHub; using Hei.Captcha; -using Yi.Framework.WebCore; using Microsoft.Extensions.DependencyInjection; using Yi.Framework.WebCore.DbExtend; using IPTools.Core; @@ -21,6 +20,8 @@ using Yi.Framework.WebCore.AutoFacExtend; using AspectCore.Extensions.DependencyInjection; using AspectCore.Extensions.Hosting; using Yi.Framework.Uow.Interceptors; +using Yi.Framework.WebCore.AspNetCoreExtensions; +using Yi.Framework.WebCore.CommonExtend; var builder = WebApplication.CreateBuilder(args); builder.Configuration.AddCommandLine(args); 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 20be0b0c..d44570fd 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Common/Base/NullValue.cs b/Yi.Framework.Net6/Yi.Framework.Common/Base/NullValue.cs index 9aa7ab9b..de62622e 100644 --- a/Yi.Framework.Net6/Yi.Framework.Common/Base/NullValue.cs +++ b/Yi.Framework.Net6/Yi.Framework.Common/Base/NullValue.cs @@ -1,4 +1,6 @@ -namespace System +using System; + +namespace Yi.Framework.Common.Base { #region 无值定义 @@ -71,12 +73,12 @@ /// /// 字串的默认无值 /// - public static readonly string String = String.Empty; + public static readonly string String = string.Empty; /// /// 一般对象的判断 /// - public const Object Object = null; + public const object Object = null; } #endregion @@ -150,7 +152,7 @@ /// /// 待判断对象 /// 是否为空(true--真,false--假) - public static bool IsNull(this String value) + public static bool IsNull(this string value) { if (string.IsNullOrEmpty(value) || string.IsNullOrWhiteSpace(value)) { @@ -165,7 +167,7 @@ /// /// 待判断对象 /// 是否不为空(true--真,false--假) - public static bool IsNotNull(this String value) + public static bool IsNotNull(this string value) { return !value.IsNull(); } diff --git a/Yi.Framework.Net6/Yi.Framework.Common/Yi.Framework.Common.csproj b/Yi.Framework.Net6/Yi.Framework.Common/Yi.Framework.Common.csproj index 6ea5c089..5b591087 100644 --- a/Yi.Framework.Net6/Yi.Framework.Common/Yi.Framework.Common.csproj +++ b/Yi.Framework.Net6/Yi.Framework.Common/Yi.Framework.Common.csproj @@ -5,6 +5,7 @@ + diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Cache/CacheInvoker.cs b/Yi.Framework.Net6/Yi.Framework.Core/Cache/CacheInvoker.cs index 303a6e3f..8eeac052 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/Cache/CacheInvoker.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/Cache/CacheInvoker.cs @@ -11,14 +11,14 @@ using Yi.Framework.Common.IOCOptions; using CSRedis; using static CSRedis.CSRedisClient; -namespace Yi.Framework.Core +namespace Yi.Framework.Core.Cache { public abstract class CacheInvoker { - public virtual bool Exits(string key) + public virtual bool Exits(string key) { - throw new NotImplementedException(); + throw new NotImplementedException(); } public virtual T Get(string key) { @@ -147,7 +147,7 @@ namespace Yi.Framework.Core public virtual string[] Keys(string pattern) { - throw new NotImplementedException(); + throw new NotImplementedException(); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Consul/AbstractConsulDispatcher.cs b/Yi.Framework.Net6/Yi.Framework.Core/Consul/AbstractConsulDispatcher.cs index b603875c..47c18d09 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/Consul/AbstractConsulDispatcher.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/Consul/AbstractConsulDispatcher.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.IOCOptions; -namespace Yi.Framework.Core.ConsulExtend +namespace Yi.Framework.Core.Consul { public abstract class AbstractConsulDispatcher { @@ -16,7 +16,7 @@ namespace Yi.Framework.Core.ConsulExtend public AbstractConsulDispatcher(IOptionsMonitor consulClientOption) { - this._ConsulClientOption = consulClientOption.CurrentValue; + _ConsulClientOption = consulClientOption.CurrentValue; } /// @@ -28,7 +28,7 @@ namespace Yi.Framework.Core.ConsulExtend { Uri uri = new Uri(mappingUrl); string serviceName = uri.Host; - string addressPort = this.ChooseAddress(serviceName); + string addressPort = ChooseAddress(serviceName); return $"{uri.Scheme}://{addressPort}{uri.PathAndQuery}"; } @@ -36,8 +36,8 @@ namespace Yi.Framework.Core.ConsulExtend { ConsulClient client = new ConsulClient(c => { - c.Address = new Uri($"http://{this._ConsulClientOption.IP}:{this._ConsulClientOption.Port}/"); - c.Datacenter = this._ConsulClientOption.Datacenter; + c.Address = new Uri($"http://{_ConsulClientOption.IP}:{_ConsulClientOption.Port}/"); + c.Datacenter = _ConsulClientOption.Datacenter; }); AgentService agentService = null; //var response = client.Agent.Services().Result.Response; @@ -59,10 +59,10 @@ namespace Yi.Framework.Core.ConsulExtend { serviceList.Add(new KeyValuePair(i.ToString(), entrys[i].Service)); } - this._CurrentAgentServiceDictionary = serviceList.ToArray(); + _CurrentAgentServiceDictionary = serviceList.ToArray(); - int index = this.GetIndex(); - agentService = this._CurrentAgentServiceDictionary[index].Value; + int index = GetIndex(); + agentService = _CurrentAgentServiceDictionary[index].Value; return $"{agentService.Address}:{agentService.Port}"; } diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Consul/AverageDispatcher.cs b/Yi.Framework.Net6/Yi.Framework.Core/Consul/AverageDispatcher.cs index 905a6ea7..f5c43fb6 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/Consul/AverageDispatcher.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/Consul/AverageDispatcher.cs @@ -6,7 +6,7 @@ using Consul; using Microsoft.Extensions.Options; using Yi.Framework.Common.IOCOptions; -namespace Yi.Framework.Core.ConsulExtend +namespace Yi.Framework.Core.Consul { /// /// 平均 @@ -23,7 +23,7 @@ namespace Yi.Framework.Core.ConsulExtend } set { - _iTotalCount = value >= Int32.MaxValue ? 0 : value; + _iTotalCount = value >= int.MaxValue ? 0 : value; } } @@ -39,7 +39,7 @@ namespace Yi.Framework.Core.ConsulExtend /// protected override int GetIndex() { - return new Random(iTotalCount++).Next(0, base._CurrentAgentServiceDictionary.Length); + return new Random(iTotalCount++).Next(0, _CurrentAgentServiceDictionary.Length); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Consul/PollingDispatcher.cs b/Yi.Framework.Net6/Yi.Framework.Core/Consul/PollingDispatcher.cs index 882d7fbc..02eb2d36 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/Consul/PollingDispatcher.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/Consul/PollingDispatcher.cs @@ -6,7 +6,7 @@ using Consul; using Microsoft.Extensions.Options; using Yi.Framework.Common.IOCOptions; -namespace Yi.Framework.Core.ConsulExtend +namespace Yi.Framework.Core.Consul { /// /// 轮询 @@ -23,7 +23,7 @@ namespace Yi.Framework.Core.ConsulExtend } set { - _iTotalCount = value >= Int32.MaxValue ? 0 : value; + _iTotalCount = value >= int.MaxValue ? 0 : value; } } @@ -39,7 +39,7 @@ namespace Yi.Framework.Core.ConsulExtend /// protected override int GetIndex() { - return iTotalCount++ % base._CurrentAgentServiceDictionary.Length; + return iTotalCount++ % _CurrentAgentServiceDictionary.Length; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Consul/WeightDispatcher.cs b/Yi.Framework.Net6/Yi.Framework.Core/Consul/WeightDispatcher.cs index 41a215f8..ab399446 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/Consul/WeightDispatcher.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/Consul/WeightDispatcher.cs @@ -6,7 +6,7 @@ using Consul; using Microsoft.Extensions.Options; using Yi.Framework.Common.IOCOptions; -namespace Yi.Framework.Core.ConsulExtend +namespace Yi.Framework.Core.Consul { /// /// 权重 @@ -23,7 +23,7 @@ namespace Yi.Framework.Core.ConsulExtend } set { - _iTotalCount = value >= Int32.MaxValue ? 0 : value; + _iTotalCount = value >= int.MaxValue ? 0 : value; } } public WeightDispatcher(IOptionsMonitor consulClientOption) : base(consulClientOption) @@ -36,17 +36,17 @@ namespace Yi.Framework.Core.ConsulExtend { ConsulClient client = new ConsulClient(c => { - c.Address = new Uri($"http://{base._ConsulClientOption.IP}:{base._ConsulClientOption.Port}/"); - c.Datacenter = base._ConsulClientOption.Datacenter; + c.Address = new Uri($"http://{_ConsulClientOption.IP}:{_ConsulClientOption.Port}/"); + c.Datacenter = _ConsulClientOption.Datacenter; }); AgentService agentService = null; var response = client.Agent.Services().Result.Response; - this._CurrentAgentServiceDictionary = response.Where(s => s.Value.Service.Equals(serviceName, StringComparison.OrdinalIgnoreCase)).ToArray(); + _CurrentAgentServiceDictionary = response.Where(s => s.Value.Service.Equals(serviceName, StringComparison.OrdinalIgnoreCase)).ToArray(); var serviceDictionaryNew = new List(); - foreach (var service in base._CurrentAgentServiceDictionary) + foreach (var service in _CurrentAgentServiceDictionary) { serviceDictionaryNew.AddRange(Enumerable.Repeat(service.Value, int.TryParse(service.Value.Tags?[0], out int iWeight) ? 1 : iWeight)); } diff --git a/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs b/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs index 6742f5ae..1f444409 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Const; using Yi.Framework.Common.IOCOptions; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; using JwtRegisteredClaimNames = Microsoft.IdentityModel.JsonWebTokens.JwtRegisteredClaimNames; namespace Yi.Framework.Core diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Quartz/QuartzInvoker.cs b/Yi.Framework.Net6/Yi.Framework.Core/Quartz/QuartzInvoker.cs index 7cbd6314..51cb882d 100644 --- a/Yi.Framework.Net6/Yi.Framework.Core/Quartz/QuartzInvoker.cs +++ b/Yi.Framework.Net6/Yi.Framework.Core/Quartz/QuartzInvoker.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Yi.Framework.Common.Helper; using Yi.Framework.Job; -namespace Yi.Framework.Core +namespace Yi.Framework.Core.Quartz { public class QuartzInvoker { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/RoleInfoDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/RoleInfoDto.cs index 7d972ee3..977c1218 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/RoleInfoDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/RoleInfoDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; namespace Yi.Framework.DTOModel { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/UserInfoDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/UserInfoDto.cs index 983e7135..87487498 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/UserInfoDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/UserInfoDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; namespace Yi.Framework.DTOModel { diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/UserRoleMenuDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/UserRoleMenuDto.cs index 490a6e70..51c7ebbe 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/UserRoleMenuDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/UserRoleMenuDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; namespace Yi.Framework.DTOModel { diff --git a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Program.cs b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Program.cs index b0e05774..58532533 100644 --- a/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Program.cs +++ b/Yi.Framework.Net6/Yi.Framework.ElasticSearchProcessor/Program.cs @@ -5,8 +5,8 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using System; using Yi.Framework.WebCore; +using Yi.Framework.WebCore.AspNetCoreExtensions; using Yi.Framework.WebCore.BuilderExtend; -using Yi.Framework.WebCore.MiddlewareExtend; namespace Yi.Framework.ElasticSearchProcessor { diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/BBS/IAgreeService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/BBS/IAgreeService.cs new file mode 100644 index 00000000..23f34823 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/BBS/IAgreeService.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Yi.Framework.Common.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.BBS.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.BBS +{ + public partial interface IAgreeService : IBaseService + { + Task OperateAsync(long articleOrCommentId, long userId); + + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IArticleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/BBS/IArticleService.cs similarity index 57% rename from Yi.Framework.Net6/Yi.Framework.Interface/IArticleService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/BBS/IArticleService.cs index e2eb4c5f..ade0e8f8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IArticleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/BBS/IArticleService.cs @@ -1,13 +1,15 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.BBS.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.BBS { - public partial interface IArticleService:IBaseService + public partial interface IArticleService:IBaseService { Task>> SelctPageList(ArticleEntity eneity, PageParModel page); } + } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/BBS/ICommentService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/BBS/ICommentService.cs new file mode 100644 index 00000000..e822ffff --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/BBS/ICommentService.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.BBS.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.BBS +{ + public partial interface ICommentService:IBaseService + { + Task AddAsync(CommentEntity comment); + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IApplicationService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IApplicationService.cs new file mode 100644 index 00000000..510ea025 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IApplicationService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Interface.Base.Crud +{ + public interface IApplicationService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICreateAppService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICreateAppService.cs new file mode 100644 index 00000000..26671aee --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICreateAppService.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Interface.Base.Crud +{ + public interface ICreateAppService + : ICreateAppService + { + + } + + + public interface ICreateAppService : IApplicationService + { + Task CreateAsync(TCreateInputDto dto); + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICreateUpdateAppService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICreateUpdateAppService.cs new file mode 100644 index 00000000..67e89268 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICreateUpdateAppService.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Interface.Base.Crud +{ + public interface ICreateUpdateAppService + : ICreateUpdateAppService + { + + } + + public interface ICreateUpdateAppService + : ICreateUpdateAppService + { + + } + + public interface ICreateUpdateAppService + : ICreateAppService, + IUpdateAppService + { + + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICrudAppService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICrudAppService.cs new file mode 100644 index 00000000..78634aca --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/ICrudAppService.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Interface.Base.Crud +{ + public interface ICrudAppService + : ICrudAppService + { + + } + + public interface ICrudAppService + : ICrudAppService + { + + } + + public interface ICrudAppService + : ICrudAppService + { + + } + + public interface ICrudAppService + : IReadOnlyAppService, + ICreateUpdateAppService, + IDeleteAppService + { + + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IDeleteAppService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IDeleteAppService.cs new file mode 100644 index 00000000..2db68eb6 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IDeleteAppService.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Interface.Base.Crud +{ + public interface IDeleteAppService : IApplicationService + { + Task DeleteAsync(IEnumerable ids); + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IReadOnlyAppService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IReadOnlyAppService.cs new file mode 100644 index 00000000..3efb6568 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IReadOnlyAppService.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Interface.Base.Crud +{ + + public interface IReadOnlyAppService : IReadOnlyAppService + { + } + + public interface IReadOnlyAppService : IApplicationService + { + /// + /// 根据Id获取数据 + /// + /// + /// + Task GetByIdAsync(TKey id); + + + /// + /// 根据url参数查询 + /// + /// + /// + //Task> GetByUrl(List input = null); + } + +} + diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IUpdateAppService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IUpdateAppService.cs new file mode 100644 index 00000000..f1c943e1 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/Crud/IUpdateAppService.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Interface.Base.Crud +{ + public interface IUpdateAppService + : IUpdateAppService + { + + } + public interface IUpdateAppService : IApplicationService + { + Task UpdateAsync(TKey id, TUpdateInputDto dto); + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/Base/IBaseService.cs similarity index 64% rename from Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/Base/IBaseService.cs index c0611af0..c7a5cab5 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IBaseService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/Base/IBaseService.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.Base { - public interface IBaseService where T: class,new() + public interface IBaseService where T : class, new() { public IRepository _repository { get; set; } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IAgreeService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IAgreeService.cs deleted file mode 100644 index 585a7d66..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IAgreeService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Threading.Tasks; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IAgreeService : IBaseService - { - Task OperateAsync(long articleOrCommentId, long userId); - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ICommentService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ICommentService.cs deleted file mode 100644 index a2743b97..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ICommentService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Threading.Tasks; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ICommentService - { - Task AddAsync(CommentEntity comment); - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IAgreeService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IAgreeService.cs deleted file mode 100644 index 80309158..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IAgreeService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IAgreeService : IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IArticleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IArticleService.cs deleted file mode 100644 index ea7137fb..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IArticleService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IArticleService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ICategoryService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ICategoryService.cs deleted file mode 100644 index 88833ca8..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ICategoryService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ICategoryService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ICommentService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ICommentService.cs deleted file mode 100644 index 5005fd1a..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ICommentService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ICommentService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IConfigService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IConfigService.cs deleted file mode 100644 index d1f8d435..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IConfigService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IConfigService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDeptService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDeptService.cs deleted file mode 100644 index cae8ca25..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDeptService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IDeptService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDictionaryInfoService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDictionaryInfoService.cs deleted file mode 100644 index 7bf4b670..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDictionaryInfoService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IDictionaryInfoService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDictionaryService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDictionaryService.cs deleted file mode 100644 index 6fbea5da..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IDictionaryService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IDictionaryService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IFileService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IFileService.cs deleted file mode 100644 index 044a213e..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IFileService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IFileService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs deleted file mode 100644 index dc8bf5c6..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILogService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ILogService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILoginLogService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILoginLogService.cs deleted file mode 100644 index 95f35cc8..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ILoginLogService.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ILoginLogService : IBaseService - { - - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IMenuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IMenuService.cs deleted file mode 100644 index 413a0ade..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IMenuService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IMenuService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IOperationLogService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IOperationLogService.cs deleted file mode 100644 index 54073186..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IOperationLogService.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IOperationLogService : IBaseService - { - - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IPostService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IPostService.cs deleted file mode 100644 index 7a512f14..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IPostService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IPostService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleDeptService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleDeptService.cs deleted file mode 100644 index 4ab659ea..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleDeptService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IRoleDeptService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleMenuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleMenuService.cs deleted file mode 100644 index a9a7479a..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleMenuService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IRoleMenuService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleService.cs deleted file mode 100644 index 10846b67..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IRoleService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IRoleService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISkuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISkuService.cs deleted file mode 100644 index 5adf4d8f..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISkuService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ISkuService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpecsGroupService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpecsGroupService.cs deleted file mode 100644 index f7bb04e6..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpecsGroupService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ISpecsGroupService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpecsService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpecsService.cs deleted file mode 100644 index 174689d2..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpecsService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ISpecsService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpuService.cs deleted file mode 100644 index 774a4cab..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ISpuService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ISpuService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ITenantService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ITenantService.cs deleted file mode 100644 index 31f8a4a9..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/ITenantService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface ITenantService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserPostService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserPostService.cs deleted file mode 100644 index 9caf7f6e..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserPostService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IUserPostService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserRoleService.cs deleted file mode 100644 index a299d0af..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserRoleService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IUserRoleService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserService.cs deleted file mode 100644 index 9d12e09a..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IUserService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Interface -{ - public partial interface IUserService:IBaseService - { - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IConfigService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IConfigService.cs similarity index 57% rename from Yi.Framework.Net6/Yi.Framework.Interface/IConfigService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IConfigService.cs index 3edb9a3c..d5ef2a2a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IConfigService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IConfigService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IConfigService:IBaseService + public partial interface IConfigService:IBaseService { Task>> SelctPageList(ConfigEntity config, PageParModel page); } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDeptService.cs similarity index 75% rename from Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDeptService.cs index bbb1a275..34bd8c84 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IDeptService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDeptService.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IDeptService:IBaseService + public partial interface IDeptService:IBaseService { /// /// 动态条件查询 diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IDictionaryInfoService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDictionaryInfoService.cs similarity index 57% rename from Yi.Framework.Net6/Yi.Framework.Interface/IDictionaryInfoService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDictionaryInfoService.cs index 1244d240..38acce88 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IDictionaryInfoService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDictionaryInfoService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IDictionaryInfoService:IBaseService + public partial interface IDictionaryInfoService:IBaseService { Task>> SelctPageList(DictionaryInfoEntity dicInfo, PageParModel page); } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IDictionaryService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDictionaryService.cs similarity index 70% rename from Yi.Framework.Net6/Yi.Framework.Interface/IDictionaryService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDictionaryService.cs index 368bd3e6..88808e4c 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IDictionaryService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IDictionaryService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IDictionaryService:IBaseService + public partial interface IDictionaryService:IBaseService { /// /// 动态条件分页查询 diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IFileService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IFileService.cs new file mode 100644 index 00000000..1a4f7389 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IFileService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.RABC +{ + public partial interface IFileService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ILogService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/ILogService.cs similarity index 56% rename from Yi.Framework.Net6/Yi.Framework.Interface/ILogService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/ILogService.cs index 911d4b4f..691da556 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ILogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/ILogService.cs @@ -1,11 +1,12 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface ILogService + public partial interface ILogService:IBaseService { Task> AddListTest(List logEntities); Task> GetListTest(); diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ILoginLogService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/ILoginLogService.cs similarity index 57% rename from Yi.Framework.Net6/Yi.Framework.Interface/ILoginLogService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/ILoginLogService.cs index b1f07f92..ea903b91 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ILoginLogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/ILoginLogService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface ILoginLogService:IBaseService + public partial interface ILoginLogService : IBaseService { Task>> SelctPageList(LoginLogEntity loginLog, PageParModel page); } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IMenuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IMenuService.cs similarity index 71% rename from Yi.Framework.Net6/Yi.Framework.Interface/IMenuService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IMenuService.cs index 19592ce7..ef35fc19 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IMenuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IMenuService.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IMenuService:IBaseService + public partial interface IMenuService:IBaseService { Task> GetMenuTreeAsync(); Task> SelctGetList(MenuEntity menu); diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IOperationLogService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IOperationLogService.cs similarity index 57% rename from Yi.Framework.Net6/Yi.Framework.Interface/IOperationLogService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IOperationLogService.cs index 8e7823c8..95c53a39 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IOperationLogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IOperationLogService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IOperationLogService:IBaseService + public partial interface IOperationLogService : IBaseService { Task>> SelctPageList(OperationLogEntity operationLog, PageParModel page); } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IPostService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IPostService.cs similarity index 70% rename from Yi.Framework.Net6/Yi.Framework.Interface/IPostService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IPostService.cs index 2402b5ff..cc8dbd79 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IPostService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IPostService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IPostService:IBaseService + public partial interface IPostService:IBaseService { /// /// 动态条件分页查询 diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleDeptService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleDeptService.cs new file mode 100644 index 00000000..9e3d8079 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleDeptService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.RABC +{ + public partial interface IRoleDeptService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleMenuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleMenuService.cs new file mode 100644 index 00000000..f6a896c4 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleMenuService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.RABC +{ + public partial interface IRoleMenuService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleService.cs similarity index 90% rename from Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleService.cs index 6db2848c..5ffc5b3b 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IRoleService.cs @@ -2,12 +2,13 @@ using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IRoleService + public partial interface IRoleService:IBaseService { /// /// DbTest @@ -49,7 +50,7 @@ namespace Yi.Framework.Interface /// /// /// - Task AddInfo(RoleInfoDto roleDto); + Task AddInfo(RoleInfoDto roleDto); /// diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/ITenantService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/ITenantService.cs new file mode 100644 index 00000000..1972e2f2 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/ITenantService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.RABC +{ + public partial interface ITenantService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserPostService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserPostService.cs new file mode 100644 index 00000000..8a31e780 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserPostService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.RABC +{ + public partial interface IUserPostService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserRoleService.cs new file mode 100644 index 00000000..ae464cd1 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserRoleService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.RABC +{ + public partial interface IUserRoleService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserService.cs similarity index 91% rename from Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserService.cs index 94bf093a..7fda956d 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IUserService.cs @@ -1,15 +1,17 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using System; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.RABC { - public partial interface IUserService + public partial interface IUserService:IBaseService { + /// /// 关联角色测试 /// @@ -74,7 +76,7 @@ namespace Yi.Framework.Interface /// /// /// - Task>> SelctPageList(UserEntity user, PageParModel page,long ? deptId); + Task>> SelctPageList(UserEntity user, PageParModel page, long? deptId); /// @@ -97,7 +99,7 @@ namespace Yi.Framework.Interface /// /// /// - Task RestPassword(long userId,string password ); + Task RestPassword(long userId, string password); /// diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ICategoryService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ICategoryService.cs new file mode 100644 index 00000000..0155f9ae --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ICategoryService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.SHOP.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.SHOP +{ + public partial interface ICategoryService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ISkuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISkuService.cs similarity index 71% rename from Yi.Framework.Net6/Yi.Framework.Interface/ISkuService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISkuService.cs index f1766465..9790870a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ISkuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISkuService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.SHOP { - public partial interface ISkuService:IBaseService + public partial interface ISkuService:IBaseService { /// /// 动态条件分页查询 diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpecsGroupService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpecsGroupService.cs new file mode 100644 index 00000000..526a8ef1 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpecsGroupService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.SHOP.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.SHOP +{ + public partial interface ISpecsGroupService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpecsService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpecsService.cs new file mode 100644 index 00000000..b61c723a --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpecsService.cs @@ -0,0 +1,10 @@ +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.SHOP.Entitys; +using Yi.Framework.Repository; + +namespace Yi.Framework.Interface.SHOP +{ + public partial interface ISpecsService : IBaseService + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ISpuService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpuService.cs similarity index 71% rename from Yi.Framework.Net6/Yi.Framework.Interface/ISpuService.cs rename to Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpuService.cs index 01532604..7dc30937 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ISpuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/SHOP/ISpuService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; -namespace Yi.Framework.Interface +namespace Yi.Framework.Interface.SHOP { - public partial interface ISpuService:IBaseService + public partial interface ISpuService:IBaseService { /// /// 动态条件分页查询 diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ArticleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ArticleEntity.cs deleted file mode 100644 index 0f9cb8ca..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ArticleEntity.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - public partial class ArticleEntity:IBaseModelEntity - { - [Navigate(NavigateType.OneToOne,nameof(UserId))] - public UserEntity? User { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/AgreeEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/AgreeEntity.cs similarity index 50% rename from Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/AgreeEntity.cs rename to Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/AgreeEntity.cs index 03654c49..ce03e86f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/AgreeEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/AgreeEntity.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json.Serialization; using SqlSugar; -namespace Yi.Framework.Model.Models + +namespace Yi.Framework.Model.BBS.Entitys { /// /// 点赞表 @@ -13,35 +14,35 @@ namespace Yi.Framework.Model.Models { public AgreeEntity() { - this.CreateTime = DateTime.Now; + CreateTime = DateTime.Now; } [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } /// /// 用户id /// - [SugarColumn(ColumnName="UserId" )] - public long? UserId { get; set; } + [SugarColumn(ColumnName = "UserId")] + public long? UserId { get; set; } /// /// 文章或评论id /// - [SugarColumn(ColumnName="ArticleOrCommentId" )] - public long? ArticleOrCommentId { get; set; } + [SugarColumn(ColumnName = "ArticleOrCommentId")] + public long? ArticleOrCommentId { get; set; } /// /// 创建者 /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } /// /// 创建时间 /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } /// /// 租户Id /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/ArticleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/ArticleEntity.cs new file mode 100644 index 00000000..40c87ee7 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/ArticleEntity.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; +using Yi.Framework.Model.RABC.Entitys; + +namespace Yi.Framework.Model.BBS.Entitys +{ + /// + /// 文章表 + /// + [SugarTable("Article")] + public partial class ArticleEntity : IBaseModelEntity + { + public ArticleEntity() + { + CreateTime = DateTime.Now; + AgreeNum = 0; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 文章标题 + /// + [SugarColumn(ColumnName = "Title")] + public string? Title { get; set; } + /// + /// 文章内容 + /// + [SugarColumn(ColumnName = "Content")] + public string? Content { get; set; } + /// + /// 用户id + /// + [SugarColumn(ColumnName = "UserId")] + public long? UserId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// 图片列表 + /// + [SugarColumn(ColumnName = "Images", IsJson = true)] + public List? Images { get; set; } + /// + /// 点赞数量 + /// + [SugarColumn(ColumnName = "AgreeNum")] + public int AgreeNum { get; set; } + + [Navigate(NavigateType.OneToOne, nameof(UserId))] + public UserEntity? User { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/CommentEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/CommentEntity.cs new file mode 100644 index 00000000..83e168da --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/BBS/Entitys/CommentEntity.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; +using Yi.Framework.Model.RABC.Entitys; + +namespace Yi.Framework.Model.BBS.Entitys +{ + /// + /// 评论表 + /// + [SugarTable("Comment")] + public partial class CommentEntity : IBaseModelEntity + { + public CommentEntity() + { + CreateTime = DateTime.Now; + AgreeNum = 0; + CommentNum = 0; + ParentId = 0; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 文章id + /// + [SugarColumn(ColumnName = "ArticleId")] + public long? ArticleId { get; set; } + /// + /// 被回复用户id + /// + [SugarColumn(ColumnName = "UserId")] + public long? UserId { get; set; } + /// + /// 评论内容 + /// + [SugarColumn(ColumnName = "Content")] + public string? Content { get; set; } + /// + /// 点赞数 + /// + [SugarColumn(ColumnName = "AgreeNum")] + public int? AgreeNum { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// 子评论数 + /// + [SugarColumn(ColumnName = "CommentNum")] + public int? CommentNum { get; set; } + /// + /// 父级评论id + /// + [SugarColumn(ColumnName = "ParentId")] + public long? ParentId { get; set; } + + /// + /// 被回复的用户信息 + /// + [Navigate(NavigateType.OneToOne, nameof(UserId), nameof(UserEntity.Id))] + public UserEntity? UserInfo { get; set; } + + /// + /// 创建评论的用户信息 + /// + [Navigate(NavigateType.OneToOne, nameof(CreateUser), nameof(UserEntity.Id))] + public UserEntity? CreateUserInfo { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs new file mode 100644 index 00000000..6d6fb88d --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Model.Base +{ + public class Entity : IEntity + { + public Key Id { get; set; } + + public object[] GetKeys() + { + throw new NotImplementedException(); + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs new file mode 100644 index 00000000..ad710e6a --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Model.Base +{ + [Serializable] + public abstract class EntityDto : EntityDto, IEntityDto, IEntityDto + { + // + // 摘要: + // Id of the entity. + public TKey Id { get; set; } + + public override string ToString() + { + return $"[DTO: {GetType().Name}] Id = {Id}"; + } + } + + [Serializable] + public abstract class EntityDto : IEntityDto + { + public override string ToString() + { + return "[DTO: " + GetType().Name + "]"; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/BaseModel/IBaseModelEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/IBaseModelEntity.cs similarity index 85% rename from Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/BaseModel/IBaseModelEntity.cs rename to Yi.Framework.Net6/Yi.Framework.Model/Base/IBaseModelEntity.cs index eaf25431..fe3d657c 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/BaseModel/IBaseModelEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/IBaseModelEntity.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Model.Models +namespace Yi.Framework.Model.Base { - public interface IBaseModelEntity + public interface IBaseModelEntity { public long Id { get; set; } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntity.cs new file mode 100644 index 00000000..25e3510d --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntity.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Model.Base +{ + /// + /// Defines an entity. It's primary key may not be "Id" or it may have a composite primary key. + /// Use where possible for better integration to repositories and other structures in the framework. + /// + public interface IEntity + { + /// + /// Returns an array of ordered keys for this entity. + /// + /// + object[] GetKeys(); + } + + /// + /// Defines an entity with a single primary key with "Id" property. + /// + /// Type of the primary key of the entity + public interface IEntity : IEntity + { + /// + /// Unique identifier for this entity. + /// + TKey Id { get; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs new file mode 100644 index 00000000..db4615d0 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Model.Base +{ + public interface IEntityDto + { + + } + + public interface IEntityDto : IEntityDto + { + TKey Id { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/IMultiTenant.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/IMultiTenant.cs new file mode 100644 index 00000000..022ad20e --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/IMultiTenant.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Model.Base +{ + public interface IMultiTenant + { + Guid? TenantId { get; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Query/QueryCondition.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryCondition.cs similarity index 94% rename from Yi.Framework.Net6/Yi.Framework.Model/Query/QueryCondition.cs rename to Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryCondition.cs index 6d316518..43efb4a8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Query/QueryCondition.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryCondition.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Model.Query +namespace Yi.Framework.Model.Base.Query { public class QueryPageCondition { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Query/QueryParameter.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs similarity index 91% rename from Yi.Framework.Net6/Yi.Framework.Model/Query/QueryParameter.cs rename to Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs index a27727c6..e2f45c0d 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Query/QueryParameter.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Model.Query +namespace Yi.Framework.Model.Base.Query { public class QueryParameter { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Query/QueryParametersExtensions.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParametersExtensions.cs similarity index 97% rename from Yi.Framework.Net6/Yi.Framework.Model/Query/QueryParametersExtensions.cs rename to Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParametersExtensions.cs index bac5176c..dfb1cfdb 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Query/QueryParametersExtensions.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParametersExtensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Model.Query +namespace Yi.Framework.Model.Base.Query { public static class QueryParametersExtensions { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/CategoryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/CategoryEntity.cs deleted file mode 100644 index 565f195e..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/CategoryEntity.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 商品分类表 - /// - public partial class CategoryEntity:IBaseModelEntity - { - [SugarColumn(IsIgnore = true)] - public List? Children { get; set; } - - - [Navigate(NavigateType.OneToMany,nameof(SpecsGroupEntity.CategoryId))] - public List? SpecsGroups { get; set; } - } -} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.Model/CommentEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/CommentEntity.cs deleted file mode 100644 index 5438c636..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/CommentEntity.cs +++ /dev/null @@ -1,24 +0,0 @@ -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Yi.Framework.Model.Models -{ - public partial class CommentEntity - { - /// - /// 被回复的用户信息 - /// - [Navigate(NavigateType.OneToOne,nameof(UserId),nameof(UserEntity.Id))] - public UserEntity? UserInfo { get; set; } - - /// - /// 创建评论的用户信息 - /// - [Navigate(NavigateType.OneToOne, nameof(CreateUser), nameof(UserEntity.Id))] - public UserEntity? CreateUserInfo { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs deleted file mode 100644 index a3951984..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/LogEntity.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 日志表 - /// - [SplitTable(SplitType.Year)] - [SugarTable("SplitLog_{year}{month}{day}")] - public partial class LogEntity - { - [SplitField] //分表字段 在插入的时候会根据这个字段插入哪个表，在更新删除的时候用这个字段找出相关表 - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "CreateTime")] - public DateTime? CreateTime { get; set; } - - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs deleted file mode 100644 index c867aa6f..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -using Yi.Framework.Common.Enum; -using Yi.Framework.Common.Models; - -namespace Yi.Framework.Model.Models -{ - /// - /// 菜单表 - /// - public partial class MenuEntity - { - [SqlSugar.SugarColumn(IsIgnore = true)] - public List? Children { get; set; } - - - public static List RouterBuild(List menus) - { - menus = menus.Where(m => m.MenuType != null && m.MenuType != MenuTypeEnum.Component.GetHashCode()).ToList(); - List routers = new(); - foreach (var m in menus) - { - - var r = new VueRouterModel(); - r.OrderNum = m.OrderNum ?? 0; - var routerName = m.Router?.Split("/").LastOrDefault(); - r.Id = m.Id; - r.ParentId = m.ParentId??-1; - - //开头大写 - r.Name = routerName?.First().ToString().ToUpper() + routerName?.Substring(1); - r.Path = m.Router; - r.Hidden =!m.IsShow??false; - - - if (m.MenuType == MenuTypeEnum.Catalogue.GetHashCode()) - { - r.Redirect = "noRedirect"; - r.AlwaysShow = true; - - //判断是否为最顶层的路由 - if (0 == m.ParentId) - { - r.Component = "Layout"; - } - else - { - r.Component = "ParentView"; - } - } - if (m.MenuType == MenuTypeEnum.Menu.GetHashCode()) - { - - r.Redirect = "noRedirect"; - r.AlwaysShow = true; - r.Component = m.Component; - r.AlwaysShow = false; - } - r.Meta = new Meta - { - Title = m.MenuName, - Icon = m.MenuIcon, - NoCache = !m.IsCache??true - }; - if (m.IsLink??false) - { - r.Meta.link = m.Router; - r.AlwaysShow = false; - } - - routers.Add(r); - } - return Common.Helper.TreeHelper.SetTree(routers); - } - - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs deleted file mode 100644 index 2fd22c2e..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 文章表 - /// - [SugarTable("Article")] - public partial class ArticleEntity:IBaseModelEntity - { - public ArticleEntity() - { - this.CreateTime = DateTime.Now; - this.AgreeNum = 0; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 文章标题 - /// - [SugarColumn(ColumnName="Title" )] - public string? Title { get; set; } - /// - /// 文章内容 - /// - [SugarColumn(ColumnName="Content" )] - public string? Content { get; set; } - /// - /// 用户id - /// - [SugarColumn(ColumnName="UserId" )] - public long? UserId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// 图片列表 - /// - [SugarColumn(ColumnName = "Images", IsJson = true)] - public List? Images { get; set; } - /// - /// 点赞数量 - /// - [SugarColumn(ColumnName="AgreeNum" )] - public int AgreeNum { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CategoryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CategoryEntity.cs deleted file mode 100644 index 16131d5e..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CategoryEntity.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 商品分类表 - /// - [SugarTable("Category")] - public partial class CategoryEntity:IBaseModelEntity - { - public CategoryEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 父级id - /// - [SugarColumn(ColumnName="ParentId" )] - public long? ParentId { get; set; } - /// - /// 分类名称 - /// - [SugarColumn(ColumnName="CategoryName" )] - public string CategoryName { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CommentEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CommentEntity.cs deleted file mode 100644 index 4b5c4a2b..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/CommentEntity.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 评论表 - /// - [SugarTable("Comment")] - public partial class CommentEntity:IBaseModelEntity - { - public CommentEntity() - { - this.CreateTime = DateTime.Now; - this.AgreeNum= 0; - this.CommentNum = 0; - this.ParentId= 0; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 文章id - /// - [SugarColumn(ColumnName="ArticleId" )] - public long? ArticleId { get; set; } - /// - /// 被回复用户id - /// - [SugarColumn(ColumnName="UserId" )] - public long? UserId { get; set; } - /// - /// 评论内容 - /// - [SugarColumn(ColumnName="Content" )] - public string? Content { get; set; } - /// - /// 点赞数 - /// - [SugarColumn(ColumnName="AgreeNum" )] - public int? AgreeNum { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// 子评论数 - /// - [SugarColumn(ColumnName="CommentNum" )] - public int? CommentNum { get; set; } - /// - /// 父级评论id - /// - [SugarColumn(ColumnName="ParentId" )] - public long? ParentId { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ConfigEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ConfigEntity.cs deleted file mode 100644 index 7fd11b35..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ConfigEntity.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 配置表 - /// - [SugarTable("Config")] - public partial class ConfigEntity:IBaseModelEntity - { - public ConfigEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 配置名称 - /// - [SugarColumn(ColumnName="ConfigName" )] - public string? ConfigName { get; set; } - /// - /// 配置键 - /// - [SugarColumn(ColumnName="ConfigKey" )] - public string? ConfigKey { get; set; } - /// - /// 配置值 - /// - [SugarColumn(ColumnName="ConfigValue" )] - public string? ConfigValue { get; set; } - /// - /// 配置类别 - /// - [SugarColumn(ColumnName="ConfigType" )] - public string? ConfigType { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DeptEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DeptEntity.cs deleted file mode 100644 index bfc66554..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DeptEntity.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 部门表 - /// - [SugarTable("Dept")] - public partial class DeptEntity:IBaseModelEntity - { - public DeptEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 部门名称 - /// - [SugarColumn(ColumnName="DeptName" )] - public string? DeptName { get; set; } - /// - /// 部门编码 - /// - [SugarColumn(ColumnName="DeptCode" )] - public string? DeptCode { get; set; } - /// - /// 负责人 - /// - [SugarColumn(ColumnName="Leader" )] - public string? Leader { get; set; } - /// - /// 父级id - /// - [SugarColumn(ColumnName="ParentId" )] - public long? ParentId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryEntity.cs deleted file mode 100644 index b14c1f02..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryEntity.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 字典表 - /// - [SugarTable("Dictionary")] - public partial class DictionaryEntity:IBaseModelEntity - { - public DictionaryEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 字典名称 - /// - [SugarColumn(ColumnName="DictName" )] - public string? DictName { get; set; } - /// - /// 字典类型 - /// - [SugarColumn(ColumnName="DictType" )] - public string? DictType { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryInfoEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryInfoEntity.cs deleted file mode 100644 index c1f7200e..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/DictionaryInfoEntity.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 字典信息表 - /// - [SugarTable("DictionaryInfo")] - public partial class DictionaryInfoEntity:IBaseModelEntity - { - public DictionaryInfoEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 字典类型 - /// - [SugarColumn(ColumnName="DictType" )] - public string? DictType { get; set; } - /// - /// 字典标签 - /// - [SugarColumn(ColumnName="DictLabel" )] - public string? DictLabel { get; set; } - /// - /// 字典值 - /// - [SugarColumn(ColumnName="DictValue" )] - public string? DictValue { get; set; } - /// - /// 是否为该类型的默认值 - /// - [SugarColumn(ColumnName="IsDefault" )] - public bool? IsDefault { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// tag类型 - /// - [SugarColumn(ColumnName="ListClass" )] - public string? ListClass { get; set; } - /// - /// tagClass - /// - [SugarColumn(ColumnName="CssClass" )] - public string? CssClass { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/FileEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/FileEntity.cs deleted file mode 100644 index 1336abe1..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/FileEntity.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 文件表 - /// - [SugarTable("File")] - public partial class FileEntity:IBaseModelEntity - { - public FileEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 文件类型 - /// - [SugarColumn(ColumnName="FileType" )] - public string? FileType { get; set; } - /// - /// 文件大小 - /// - [SugarColumn(ColumnName="FileSize" )] - public decimal? FileSize { get; set; } - /// - /// 文件名 - /// - [SugarColumn(ColumnName="FileName" )] - public string? FileName { get; set; } - /// - /// 文件路径 - /// - [SugarColumn(ColumnName="FilePath" )] - public string? FilePath { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs deleted file mode 100644 index e2db6dc9..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LogEntity.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - public partial class LogEntity:IBaseModelEntity - { - public LogEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 消息 - /// - [SugarColumn(ColumnName="Message" )] - public string? Message { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LoginLogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LoginLogEntity.cs deleted file mode 100644 index 9f0dc985..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/LoginLogEntity.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 登入日志 - /// - [SugarTable("LoginLog")] - public partial class LoginLogEntity:IBaseModelEntity - { - public LoginLogEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 登录用户 - /// - [SugarColumn(ColumnName="LoginUser" )] - public string? LoginUser { get; set; } - /// - /// 登录地点 - /// - [SugarColumn(ColumnName="LoginLocation" )] - public string? LoginLocation { get; set; } - /// - /// 登录Ip - /// - [SugarColumn(ColumnName="LoginIp" )] - public string? LoginIp { get; set; } - /// - /// 浏览器 - /// - [SugarColumn(ColumnName="Browser" )] - public string? Browser { get; set; } - /// - /// 操作系统 - /// - [SugarColumn(ColumnName="Os" )] - public string? Os { get; set; } - /// - /// 登录信息 - /// - [SugarColumn(ColumnName="LogMsg" )] - public string? LogMsg { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs deleted file mode 100644 index aeb3c471..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs +++ /dev/null @@ -1,118 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 菜单表 - /// - [SugarTable("Menu")] - public partial class MenuEntity:IBaseModelEntity - { - public MenuEntity() - { - this.IsCache = false; - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="MenuName" )] - public string? MenuName { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="MenuType" )] - public int? MenuType { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="PermissionCode" )] - public string? PermissionCode { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="ParentId" )] - public long? ParentId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 菜单图标 - /// - [SugarColumn(ColumnName="MenuIcon" )] - public string? MenuIcon { get; set; } - /// - /// 菜单组件路由 - /// - [SugarColumn(ColumnName="Router" )] - public string? Router { get; set; } - /// - /// 是否为外部链接 - /// - [SugarColumn(ColumnName="IsLink" )] - public bool? IsLink { get; set; } - /// - /// 是否缓存 - /// - [SugarColumn(ColumnName="IsCache" )] - public bool? IsCache { get; set; } - /// - /// 是否显示 - /// - [SugarColumn(ColumnName="IsShow" )] - public bool? IsShow { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// 组件路径 - /// - [SugarColumn(ColumnName="Component" )] - public string? Component { get; set; } - /// - /// 路由参数 - /// - [SugarColumn(ColumnName="Query" )] - public string? Query { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/OperationLogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/OperationLogEntity.cs deleted file mode 100644 index 8ebd2d91..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/OperationLogEntity.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 操作日志表 - /// - [SugarTable("OperationLog")] - public partial class OperationLogEntity:IBaseModelEntity - { - public OperationLogEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 操作模块 - /// - [SugarColumn(ColumnName="Title" )] - public string? Title { get; set; } - /// - /// 操作类型 - /// - [SugarColumn(ColumnName="OperType" )] - public int? OperType { get; set; } - /// - /// 请求方法 - /// - [SugarColumn(ColumnName="RequestMethod" )] - public string? RequestMethod { get; set; } - /// - /// 操作人员 - /// - [SugarColumn(ColumnName="OperUser" )] - public string? OperUser { get; set; } - /// - /// 操作Ip - /// - [SugarColumn(ColumnName="OperIp" )] - public string? OperIp { get; set; } - /// - /// 操作地点 - /// - [SugarColumn(ColumnName="OperLocation" )] - public string? OperLocation { get; set; } - /// - /// 操作方法 - /// - [SugarColumn(ColumnName="Method" )] - public string? Method { get; set; } - /// - /// 请求参数 - /// - [SugarColumn(ColumnName="RequestParam" )] - public string? RequestParam { get; set; } - /// - /// 请求结果 - /// - [SugarColumn(ColumnName="RequestResult" )] - public string? RequestResult { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/PostEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/PostEntity.cs deleted file mode 100644 index 02564b99..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/PostEntity.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 岗位表 - /// - [SugarTable("Post")] - public partial class PostEntity:IBaseModelEntity - { - public PostEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 岗位编码 - /// - [SugarColumn(ColumnName="PostCode" )] - public string? PostCode { get; set; } - /// - /// 岗位名称 - /// - [SugarColumn(ColumnName="PostName" )] - public string? PostName { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleDeptEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleDeptEntity.cs deleted file mode 100644 index 5a3689c0..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleDeptEntity.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 角色部门关系表 - /// - [SugarTable("RoleDept")] - public partial class RoleDeptEntity:IBaseModelEntity - { - public RoleDeptEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 角色id - /// - [SugarColumn(ColumnName="RoleId" )] - public long? RoleId { get; set; } - /// - /// 部门id - /// - [SugarColumn(ColumnName="DeptId" )] - public long? DeptId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs deleted file mode 100644 index e269079b..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 角色表 - /// - [SugarTable("Role")] - public partial class RoleEntity : IBaseModelEntity - { - public RoleEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] - public long Id { get; set; } - /// - /// - /// - [SugarColumn(ColumnName = "RoleName")] - public string? RoleName { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 角色编码 - /// - [SugarColumn(ColumnName="RoleCode" )] - public string? RoleCode { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// 角色数据范围 - /// - [SugarColumn(ColumnName="DataScope" )] - public int? DataScope { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleMenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleMenuEntity.cs deleted file mode 100644 index e5cd3f1b..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleMenuEntity.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 角色菜单关系表 - /// - [SugarTable("RoleMenu")] - public partial class RoleMenuEntity:IBaseModelEntity - { - public RoleMenuEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="RoleId" )] - public long? RoleId { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="MenuId" )] - public long? MenuId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SkuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SkuEntity.cs deleted file mode 100644 index 76e374eb..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SkuEntity.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// Sku表 - /// - [SugarTable("Sku")] - public partial class SkuEntity:IBaseModelEntity - { - public SkuEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// SpuId - /// - [SugarColumn(ColumnName="SpuId" )] - public long? SpuId { get; set; } - /// - /// 库存 - /// - [SugarColumn(ColumnName="Stock" )] - public int? Stock { get; set; } - /// - /// 价格 - /// - [SugarColumn(ColumnName="Price" )] - public int? Price { get; set; } - - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpecsEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpecsEntity.cs deleted file mode 100644 index a5b0c161..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpecsEntity.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 商品规格表 - /// - [SugarTable("Specs")] - public partial class SpecsEntity:IBaseModelEntity - { - public SpecsEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 商品规格组id - /// - [SugarColumn(ColumnName="SpecsGroupId" )] - public long? SpecsGroupId { get; set; } - /// - /// 商品规格名 - /// - [SugarColumn(ColumnName="SpecsName" )] - public string SpecsName { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpecsGroupEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpecsGroupEntity.cs deleted file mode 100644 index 8dd9c248..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpecsGroupEntity.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 商品规格组表 - /// - [SugarTable("SpecsGroup")] - public partial class SpecsGroupEntity:IBaseModelEntity - { - public SpecsGroupEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 分类id - /// - [SugarColumn(ColumnName="CategoryId" )] - public long? CategoryId { get; set; } - /// - /// 商品规格组名 - /// - [SugarColumn(ColumnName="SpecsGroupName" )] - public string SpecsGroupName { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpuEntity.cs deleted file mode 100644 index 51db453a..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/SpuEntity.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// Spu表 - /// - [SugarTable("Spu")] - public partial class SpuEntity:IBaseModelEntity - { - public SpuEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 商品分类Id - /// - [SugarColumn(ColumnName="CategoryId" )] - public long? CategoryId { get; set; } - /// - /// 商品名称 - /// - [SugarColumn(ColumnName="SpuName" )] - public string? SpuName { get; set; } - /// - /// 商品详情 - /// - [SugarColumn(ColumnName="Details" )] - public string? Details { get; set; } - /// - /// 商品价格 - /// - [SugarColumn(ColumnName="Price" )] - public string? Price { get; set; } - - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs deleted file mode 100644 index 6fe01429..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/TenantEntity.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 租户表 - /// - [SugarTable("Tenant")] - public partial class TenantEntity:IBaseModelEntity - { - public TenantEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="TenantName" )] - public string? TenantName { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs deleted file mode 100644 index 62203bb4..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserEntity.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 用户表 - /// - [SugarTable("User")] - public partial class UserEntity:IBaseModelEntity - { - public UserEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Name" )] - public string? Name { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Age" )] - public int? Age { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="UserName" )] - public string? UserName { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Password" )] - public string? Password { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Salt" )] - public string? Salt { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Icon" )] - public string? Icon { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Nick" )] - public string? Nick { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Email" )] - public string? Email { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Ip" )] - public string? Ip { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Address" )] - public string? Address { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Phone" )] - public string? Phone { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="Introduction" )] - public string? Introduction { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - /// - /// 部门id - /// - [SugarColumn(ColumnName="DeptId" )] - public long? DeptId { get; set; } - /// - /// 性别 - /// - [SugarColumn(ColumnName="Sex" )] - public int? Sex { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserPostEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserPostEntity.cs deleted file mode 100644 index bf737ff6..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserPostEntity.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 用户岗位表 - /// - [SugarTable("UserPost")] - public partial class UserPostEntity:IBaseModelEntity - { - public UserPostEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// 用户id s - /// - [SugarColumn(ColumnName="UserId" )] - public long? UserId { get; set; } - /// - /// 岗位id - /// - [SugarColumn(ColumnName= "PostId")] - public long? PostId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - /// - /// 排序字段 - /// - [SugarColumn(ColumnName="OrderNum" )] - public int? OrderNum { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnName="Remark" )] - public string? Remark { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserRoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserRoleEntity.cs deleted file mode 100644 index d1db9129..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/UserRoleEntity.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 用户角色关系表 - /// - [SugarTable("UserRole")] - public partial class UserRoleEntity:IBaseModelEntity - { - public UserRoleEntity() - { - this.CreateTime = DateTime.Now; - } - [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] - public long Id { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="RoleId" )] - public long? RoleId { get; set; } - /// - /// - /// - [SugarColumn(ColumnName="UserId" )] - public long? UserId { get; set; } - /// - /// 创建者 - /// - [SugarColumn(ColumnName="CreateUser" )] - public long? CreateUser { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CreateTime" )] - public DateTime? CreateTime { get; set; } - /// - /// 修改者 - /// - [SugarColumn(ColumnName="ModifyUser" )] - public long? ModifyUser { get; set; } - /// - /// 修改时间 - /// - [SugarColumn(ColumnName="ModifyTime" )] - public DateTime? ModifyTime { get; set; } - /// - /// 是否删除 - /// - [SugarColumn(ColumnName="IsDeleted" )] - public bool? IsDeleted { get; set; } - /// - /// 租户Id - /// - [SugarColumn(ColumnName="TenantId" )] - public long? TenantId { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/ConfigEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/ConfigEntity.cs new file mode 100644 index 00000000..cd5d8d4a --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/ConfigEntity.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 配置表 + /// + [SugarTable("Config")] + public partial class ConfigEntity : IBaseModelEntity + { + public ConfigEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 配置名称 + /// + [SugarColumn(ColumnName = "ConfigName")] + public string? ConfigName { get; set; } + /// + /// 配置键 + /// + [SugarColumn(ColumnName = "ConfigKey")] + public string? ConfigKey { get; set; } + /// + /// 配置值 + /// + [SugarColumn(ColumnName = "ConfigValue")] + public string? ConfigValue { get; set; } + /// + /// 配置类别 + /// + [SugarColumn(ColumnName = "ConfigType")] + public string? ConfigType { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DeptEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DeptEntity.cs new file mode 100644 index 00000000..e5d678a4 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DeptEntity.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 部门表 + /// + [SugarTable("Dept")] + public partial class DeptEntity : IBaseModelEntity + { + public DeptEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 部门名称 + /// + [SugarColumn(ColumnName = "DeptName")] + public string? DeptName { get; set; } + /// + /// 部门编码 + /// + [SugarColumn(ColumnName = "DeptCode")] + public string? DeptCode { get; set; } + /// + /// 负责人 + /// + [SugarColumn(ColumnName = "Leader")] + public string? Leader { get; set; } + /// + /// 父级id + /// + [SugarColumn(ColumnName = "ParentId")] + public long? ParentId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DictionaryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DictionaryEntity.cs new file mode 100644 index 00000000..f973ebe4 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DictionaryEntity.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 字典表 + /// + [SugarTable("Dictionary")] + public partial class DictionaryEntity : IBaseModelEntity + { + public DictionaryEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 字典名称 + /// + [SugarColumn(ColumnName = "DictName")] + public string? DictName { get; set; } + /// + /// 字典类型 + /// + [SugarColumn(ColumnName = "DictType")] + public string? DictType { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DictionaryInfoEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DictionaryInfoEntity.cs new file mode 100644 index 00000000..1776bf23 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/DictionaryInfoEntity.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 字典信息表 + /// + [SugarTable("DictionaryInfo")] + public partial class DictionaryInfoEntity : IBaseModelEntity + { + public DictionaryInfoEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 字典类型 + /// + [SugarColumn(ColumnName = "DictType")] + public string? DictType { get; set; } + /// + /// 字典标签 + /// + [SugarColumn(ColumnName = "DictLabel")] + public string? DictLabel { get; set; } + /// + /// 字典值 + /// + [SugarColumn(ColumnName = "DictValue")] + public string? DictValue { get; set; } + /// + /// 是否为该类型的默认值 + /// + [SugarColumn(ColumnName = "IsDefault")] + public bool? IsDefault { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// tag类型 + /// + [SugarColumn(ColumnName = "ListClass")] + public string? ListClass { get; set; } + /// + /// tagClass + /// + [SugarColumn(ColumnName = "CssClass")] + public string? CssClass { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/FileEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/FileEntity.cs new file mode 100644 index 00000000..b11c2be9 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/FileEntity.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 文件表 + /// + [SugarTable("File")] + public partial class FileEntity : IBaseModelEntity + { + public FileEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 文件类型 + /// + [SugarColumn(ColumnName = "FileType")] + public string? FileType { get; set; } + /// + /// 文件大小 + /// + [SugarColumn(ColumnName = "FileSize")] + public decimal? FileSize { get; set; } + /// + /// 文件名 + /// + [SugarColumn(ColumnName = "FileName")] + public string? FileName { get; set; } + /// + /// 文件路径 + /// + [SugarColumn(ColumnName = "FilePath")] + public string? FilePath { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/LogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/LogEntity.cs new file mode 100644 index 00000000..9b64f948 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/LogEntity.cs @@ -0,0 +1,69 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + [SplitTable(SplitType.Year)] + [SugarTable("SplitLog_{year}{month}{day}")] + public partial class LogEntity : IBaseModelEntity + { + public LogEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 消息 + /// + [SugarColumn(ColumnName = "Message")] + public string? Message { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + + [SplitField] //分表字段 在插入的时候会根据这个字段插入哪个表，在更新删除的时候用这个字段找出相关表 + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/LoginLogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/LoginLogEntity.cs new file mode 100644 index 00000000..69b59b76 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/LoginLogEntity.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 登入日志 + /// + [SugarTable("LoginLog")] + public partial class LoginLogEntity : IBaseModelEntity + { + public LoginLogEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 登录用户 + /// + [SugarColumn(ColumnName = "LoginUser")] + public string? LoginUser { get; set; } + /// + /// 登录地点 + /// + [SugarColumn(ColumnName = "LoginLocation")] + public string? LoginLocation { get; set; } + /// + /// 登录Ip + /// + [SugarColumn(ColumnName = "LoginIp")] + public string? LoginIp { get; set; } + /// + /// 浏览器 + /// + [SugarColumn(ColumnName = "Browser")] + public string? Browser { get; set; } + /// + /// 操作系统 + /// + [SugarColumn(ColumnName = "Os")] + public string? Os { get; set; } + /// + /// 登录信息 + /// + [SugarColumn(ColumnName = "LogMsg")] + public string? LogMsg { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/MenuEntity.cs new file mode 100644 index 00000000..f0ee48e7 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/MenuEntity.cs @@ -0,0 +1,185 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Common.Enum; +using Yi.Framework.Common.Models; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 菜单表 + /// + [SugarTable("Menu")] + public partial class MenuEntity : IBaseModelEntity + { + public MenuEntity() + { + IsCache = false; + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "MenuName")] + public string? MenuName { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "MenuType")] + public int? MenuType { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "PermissionCode")] + public string? PermissionCode { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "ParentId")] + public long? ParentId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 菜单图标 + /// + [SugarColumn(ColumnName = "MenuIcon")] + public string? MenuIcon { get; set; } + /// + /// 菜单组件路由 + /// + [SugarColumn(ColumnName = "Router")] + public string? Router { get; set; } + /// + /// 是否为外部链接 + /// + [SugarColumn(ColumnName = "IsLink")] + public bool? IsLink { get; set; } + /// + /// 是否缓存 + /// + [SugarColumn(ColumnName = "IsCache")] + public bool? IsCache { get; set; } + /// + /// 是否显示 + /// + [SugarColumn(ColumnName = "IsShow")] + public bool? IsShow { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// 组件路径 + /// + [SugarColumn(ColumnName = "Component")] + public string? Component { get; set; } + /// + /// 路由参数 + /// + [SugarColumn(ColumnName = "Query")] + public string? Query { get; set; } + + [SugarColumn(IsIgnore = true)] + public List? Children { get; set; } + + + public static List RouterBuild(List menus) + { + menus = menus.Where(m => m.MenuType != null && m.MenuType != MenuTypeEnum.Component.GetHashCode()).ToList(); + List routers = new(); + foreach (var m in menus) + { + + var r = new VueRouterModel(); + r.OrderNum = m.OrderNum ?? 0; + var routerName = m.Router?.Split("/").LastOrDefault(); + r.Id = m.Id; + r.ParentId = m.ParentId ?? -1; + + //开头大写 + r.Name = routerName?.First().ToString().ToUpper() + routerName?.Substring(1); + r.Path = m.Router; + r.Hidden = !m.IsShow ?? false; + + + if (m.MenuType == MenuTypeEnum.Catalogue.GetHashCode()) + { + r.Redirect = "noRedirect"; + r.AlwaysShow = true; + + //判断是否为最顶层的路由 + if (0 == m.ParentId) + { + r.Component = "Layout"; + } + else + { + r.Component = "ParentView"; + } + } + if (m.MenuType == MenuTypeEnum.Menu.GetHashCode()) + { + + r.Redirect = "noRedirect"; + r.AlwaysShow = true; + r.Component = m.Component; + r.AlwaysShow = false; + } + r.Meta = new Meta + { + Title = m.MenuName, + Icon = m.MenuIcon, + NoCache = !m.IsCache ?? true + }; + if (m.IsLink ?? false) + { + r.Meta.link = m.Router; + r.AlwaysShow = false; + } + + routers.Add(r); + } + return Common.Helper.TreeHelper.SetTree(routers); + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/OperationLogEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/OperationLogEntity.cs new file mode 100644 index 00000000..2ee7dee0 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/OperationLogEntity.cs @@ -0,0 +1,109 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 操作日志表 + /// + [SugarTable("OperationLog")] + public partial class OperationLogEntity : IBaseModelEntity + { + public OperationLogEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 操作模块 + /// + [SugarColumn(ColumnName = "Title")] + public string? Title { get; set; } + /// + /// 操作类型 + /// + [SugarColumn(ColumnName = "OperType")] + public int? OperType { get; set; } + /// + /// 请求方法 + /// + [SugarColumn(ColumnName = "RequestMethod")] + public string? RequestMethod { get; set; } + /// + /// 操作人员 + /// + [SugarColumn(ColumnName = "OperUser")] + public string? OperUser { get; set; } + /// + /// 操作Ip + /// + [SugarColumn(ColumnName = "OperIp")] + public string? OperIp { get; set; } + /// + /// 操作地点 + /// + [SugarColumn(ColumnName = "OperLocation")] + public string? OperLocation { get; set; } + /// + /// 操作方法 + /// + [SugarColumn(ColumnName = "Method")] + public string? Method { get; set; } + /// + /// 请求参数 + /// + [SugarColumn(ColumnName = "RequestParam")] + public string? RequestParam { get; set; } + /// + /// 请求结果 + /// + [SugarColumn(ColumnName = "RequestResult")] + public string? RequestResult { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/PostEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/PostEntity.cs new file mode 100644 index 00000000..c674cf53 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/PostEntity.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 岗位表 + /// + [SugarTable("Post")] + public partial class PostEntity : IBaseModelEntity + { + public PostEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 岗位编码 + /// + [SugarColumn(ColumnName = "PostCode")] + public string? PostCode { get; set; } + /// + /// 岗位名称 + /// + [SugarColumn(ColumnName = "PostName")] + public string? PostName { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleDeptEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleDeptEntity.cs new file mode 100644 index 00000000..78f7a18c --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleDeptEntity.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 角色部门关系表 + /// + [SugarTable("RoleDept")] + public partial class RoleDeptEntity : IBaseModelEntity + { + public RoleDeptEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 角色id + /// + [SugarColumn(ColumnName = "RoleId")] + public long? RoleId { get; set; } + /// + /// 部门id + /// + [SugarColumn(ColumnName = "DeptId")] + public long? DeptId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleEntity.cs new file mode 100644 index 00000000..46dcbc86 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleEntity.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 角色表 + /// + [SugarTable("Role")] + public partial class RoleEntity : IBaseModelEntity + { + public RoleEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "RoleName")] + public string? RoleName { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 角色编码 + /// + [SugarColumn(ColumnName = "RoleCode")] + public string? RoleCode { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// 角色数据范围 + /// + [SugarColumn(ColumnName = "DataScope")] + public int? DataScope { get; set; } + + + [Navigate(typeof(RoleMenuEntity), nameof(RoleMenuEntity.RoleId), nameof(RoleMenuEntity.MenuId))] + public List? Menus { get; set; } + + [Navigate(typeof(RoleDeptEntity), nameof(RoleDeptEntity.RoleId), nameof(RoleDeptEntity.DeptId))] + public List? Depts { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleMenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleMenuEntity.cs new file mode 100644 index 00000000..7e9a3cba --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/RoleMenuEntity.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 角色菜单关系表 + /// + [SugarTable("RoleMenu")] + public partial class RoleMenuEntity : IBaseModelEntity + { + public RoleMenuEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "RoleId")] + public long? RoleId { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "MenuId")] + public long? MenuId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/TenantEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/TenantEntity.cs new file mode 100644 index 00000000..cc8ebf22 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/TenantEntity.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 租户表 + /// + [SugarTable("Tenant")] + public partial class TenantEntity : IBaseModelEntity + { + public TenantEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "TenantName")] + public string? TenantName { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + + // //需要在用户表中关联好该租户信息，一个用户关联一个租户 + // //不同租户下，用户可以相同 + // //用户登录后，token中可包含租户id，同时缓存一份用户信息(包含租户信息) + // [Tenant("0")] + // //当然，像用户、角色、菜单、租户为共享库了 + // [SugarTable("Tenant")] + // public class TenantEntity + // { + // /// + // /// 主键唯一标识 + // /// + // [SugarColumn(IsPrimaryKey = true)] + // public long Id { get; set; } + + // /// + // /// 租户id + // /// + // public string? TenantId { get; set; } + + // /// + // /// 业务库连接字符串 + // /// + // public string? Connection { get; set; } + + // /// + // /// 业务库连接类型 + // /// + // public string? DbType { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs new file mode 100644 index 00000000..c68f06a2 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs @@ -0,0 +1,176 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Common.Helper; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 用户表 + /// + [SugarTable("User")] + public partial class UserEntity : IBaseModelEntity + { + public UserEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Name")] + public string? Name { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Age")] + public int? Age { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "UserName")] + public string? UserName { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Password")] + public string? Password { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Salt")] + public string? Salt { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Icon")] + public string? Icon { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Nick")] + public string? Nick { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Email")] + public string? Email { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Ip")] + public string? Ip { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Address")] + public string? Address { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Phone")] + public string? Phone { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "Introduction")] + public string? Introduction { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + /// + /// 部门id + /// + [SugarColumn(ColumnName = "DeptId")] + public long? DeptId { get; set; } + /// + /// 性别 + /// + [SugarColumn(ColumnName = "Sex")] + public int? Sex { get; set; } + /// + /// 看好啦！ORM精髓，导航属性 + /// + [Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))] + public List? Roles { get; set; } + + [Navigate(typeof(UserPostEntity), nameof(UserPostEntity.UserId), nameof(UserPostEntity.PostId))] + public List? Posts { get; set; } + + [Navigate(NavigateType.OneToOne, nameof(DeptId))] + public DeptEntity? Dept { get; set; } + + /// + /// 构建密码，MD5盐值加密 + /// + public UserEntity BuildPassword(string password = null) + { + //如果不传值，那就把自己的password当作传进来的password + if (password == null) + { + password = Password; + } + Salt = MD5Helper.GenerateSalt(); + Password = MD5Helper.SHA2Encode(password, Salt); + return this; + } + + /// + /// 判断密码和加密后的密码是否相同 + /// + /// + /// + public bool JudgePassword(string password) + { + var p = MD5Helper.SHA2Encode(password, Salt); + if (Password == MD5Helper.SHA2Encode(password, Salt)) + { + return true; + } + return false; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserPostEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserPostEntity.cs new file mode 100644 index 00000000..6831dd91 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserPostEntity.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 用户岗位表 + /// + [SugarTable("UserPost")] + public partial class UserPostEntity : IBaseModelEntity + { + public UserPostEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 用户id s + /// + [SugarColumn(ColumnName = "UserId")] + public long? UserId { get; set; } + /// + /// 岗位id + /// + [SugarColumn(ColumnName = "PostId")] + public long? PostId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserRoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserRoleEntity.cs new file mode 100644 index 00000000..71ffa3d9 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserRoleEntity.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.RABC.Entitys +{ + /// + /// 用户角色关系表 + /// + [SugarTable("UserRole")] + public partial class UserRoleEntity : IBaseModelEntity + { + public UserRoleEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "RoleId")] + public long? RoleId { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "UserId")] + public long? UserId { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/AbstractSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/AbstractSeed.cs similarity index 88% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/AbstractSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/AbstractSeed.cs index 5275191d..36c2d7c8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/AbstractSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/AbstractSeed.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { public abstract class AbstractSeed { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DeptSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DeptSeed.cs similarity index 90% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/DeptSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DeptSeed.cs index 559735d3..8dce7427 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DeptSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DeptSeed.cs @@ -5,25 +5,25 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Enum; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { - public class DeptSeed : AbstractSeed + public class DeptSeed : AbstractSeed { public override List GetSeed() { - + DeptEntity chengziDept = new DeptEntity() { Id = SnowFlakeSingle.Instance.NextId(), DeptName = "橙子科技", - DeptCode="Yi", - OrderNum =100, + DeptCode = "Yi", + OrderNum = 100, IsDeleted = false, - ParentId=0, - Leader="橙子", - Remark="如名所指" + ParentId = 0, + Leader = "橙子", + Remark = "如名所指" }; Entitys.Add(chengziDept); @@ -34,7 +34,7 @@ namespace Yi.Framework.Model.SeedData DeptName = "深圳总公司", OrderNum = 100, IsDeleted = false, - ParentId=chengziDept.Id + ParentId = chengziDept.Id }; Entitys.Add(shenzhenDept); diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionaryInfoSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DictionaryInfoSeed.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionaryInfoSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DictionaryInfoSeed.cs index 7b2f998e..330cd05b 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionaryInfoSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DictionaryInfoSeed.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { public class DictionaryInfoSeed : AbstractSeed { @@ -16,7 +16,7 @@ namespace Yi.Framework.Model.SeedData { Id = SnowFlakeSingle.Instance.NextId(), DictLabel = "男", - DictValue= "0", + DictValue = "0", DictType = "sys_user_sex", OrderNum = 100, Remark = "性别男", @@ -76,7 +76,7 @@ namespace Yi.Framework.Model.SeedData - DictionaryInfoEntity dictInfo6= new DictionaryInfoEntity() + DictionaryInfoEntity dictInfo6 = new DictionaryInfoEntity() { Id = SnowFlakeSingle.Instance.NextId(), DictLabel = "正常", @@ -96,7 +96,7 @@ namespace Yi.Framework.Model.SeedData OrderNum = 99, Remark = "停用状态", IsDeleted = false, - ListClass= "danger" + ListClass = "danger" }; Entitys.Add(dictInfo7); diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionarySeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DictionarySeed.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionarySeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DictionarySeed.cs index 89667d23..455fc8b4 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/DictionarySeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/DictionarySeed.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { public class DictionarySeed : AbstractSeed { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/FileSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/FileSeed.cs similarity index 87% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/FileSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/FileSeed.cs index 7b4d9814..fbf75344 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/FileSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/FileSeed.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { public class FileSeed : AbstractSeed { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/MenuSeed.cs similarity index 99% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/MenuSeed.cs index c0c53c5e..dbc3f6a7 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/MenuSeed.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Enum; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { public class MenuSeed : AbstractSeed { @@ -404,7 +404,7 @@ namespace Yi.Framework.Model.SeedData IsDeleted = false }; Entitys.Add(menuRemove); - + //部门管理 MenuEntity dept = new MenuEntity() { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/PostSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/PostSeed.cs similarity index 89% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/PostSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/PostSeed.cs index b13ffc5c..996a3d0a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/PostSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/PostSeed.cs @@ -5,11 +5,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Enum; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { - public class PostSeed : AbstractSeed + public class PostSeed : AbstractSeed { public override List GetSeed() { @@ -18,7 +18,7 @@ namespace Yi.Framework.Model.SeedData Id = SnowFlakeSingle.Instance.NextId(), PostName = "董事长", PostCode = "ceo", - OrderNum =100, + OrderNum = 100, IsDeleted = false }; Entitys.Add(Post1); diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/RoleSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/RoleSeed.cs similarity index 86% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/RoleSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/RoleSeed.cs index c1460b7a..b4c01fe1 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/RoleSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/RoleSeed.cs @@ -5,11 +5,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Enum; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { - public class RoleSeed : AbstractSeed + public class RoleSeed : AbstractSeed { public override List GetSeed() { @@ -20,7 +20,7 @@ namespace Yi.Framework.Model.SeedData RoleCode = "admin", DataScope = DataScopeEnum.ALL.GetHashCode(), OrderNum = 999, - Remark ="管理员", + Remark = "管理员", IsDeleted = false }; Entitys.Add(role1); diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/SeedFactory.cs similarity index 89% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/SeedFactory.cs index 27defca5..d883ad14 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/SeedFactory.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/SeedFactory.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { public class SeedFactory { @@ -52,7 +52,7 @@ namespace Yi.Framework.Model.SeedData { foreach (var r in roles) { - userRoleEntities.Add(new UserRoleEntity() {Id= SnowFlakeSingle.Instance.NextId(),UserId = u.Id, RoleId = r.Id, IsDeleted = false }); + userRoleEntities.Add(new UserRoleEntity() { Id = SnowFlakeSingle.Instance.NextId(), UserId = u.Id, RoleId = r.Id, IsDeleted = false }); } } return userRoleEntities; diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/UserSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/UserSeed.cs similarity index 70% rename from Yi.Framework.Net6/Yi.Framework.Model/SeedData/UserSeed.cs rename to Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/UserSeed.cs index 023f07f5..119814af 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/UserSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/UserSeed.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.Model.SeedData +namespace Yi.Framework.Model.RABC.SeedData { public class UserSeed : AbstractSeed { @@ -14,20 +14,20 @@ namespace Yi.Framework.Model.SeedData { UserEntity user1 = new UserEntity() { - Id =SnowFlakeSingle.Instance.NextId(), + Id = SnowFlakeSingle.Instance.NextId(), Name = "大橙子", UserName = "cc", Nick = "橙子", Password = "123456", - Email="454313500@qq.com", - Phone="13800000000", - Sex=0, - Address="深圳", - Age=20, - Introduction="还有谁？", - OrderNum=999, - Remark="描述是什么呢？", - IsDeleted=false + Email = "454313500@qq.com", + Phone = "13800000000", + Sex = 0, + Address = "深圳", + Age = 20, + Introduction = "还有谁？", + OrderNum = 999, + Remark = "描述是什么呢？", + IsDeleted = false }; user1.BuildPassword(); Entitys.Add(user1); @@ -39,7 +39,7 @@ namespace Yi.Framework.Model.SeedData UserName = "test", Nick = "测试", Password = "123456", - Email = "454313500@qq.com", + Email = "454313500@qq.com", Phone = "15900000000", Sex = 0, Address = "深圳", diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs deleted file mode 100644 index 6a99237e..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - - public partial class RoleEntity - { - - [Navigate(typeof(RoleMenuEntity),nameof(RoleMenuEntity.RoleId),nameof(RoleMenuEntity.MenuId))] - public List? Menus { get; set; } - - [Navigate(typeof(RoleDeptEntity), nameof(RoleDeptEntity.RoleId), nameof(RoleDeptEntity.DeptId))] - public List? Depts { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs new file mode 100644 index 00000000..50eb4512 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.SHOP.Entitys +{ + /// + /// 商品分类表 + /// + [SugarTable("Category")] + public partial class CategoryEntity : IBaseModelEntity + { + public CategoryEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 父级id + /// + [SugarColumn(ColumnName = "ParentId")] + public long? ParentId { get; set; } + /// + /// 分类名称 + /// + [SugarColumn(ColumnName = "CategoryName")] + public string CategoryName { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + + [SugarColumn(IsIgnore = true)] + public List? Children { get; set; } + + + [Navigate(NavigateType.OneToMany, nameof(SpecsGroupEntity.CategoryId))] + public List? SpecsGroups { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SkuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SkuEntity.cs new file mode 100644 index 00000000..1d7a5129 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SkuEntity.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.SHOP.Entitys +{ + /// + /// Sku表 + /// + [SugarTable("Sku")] + public partial class SkuEntity : IBaseModelEntity + { + public SkuEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// SpuId + /// + [SugarColumn(ColumnName = "SpuId")] + public long? SpuId { get; set; } + /// + /// 库存 + /// + [SugarColumn(ColumnName = "Stock")] + public int? Stock { get; set; } + /// + /// 价格 + /// + [SugarColumn(ColumnName = "Price")] + public int? Price { get; set; } + + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + + /// + /// 规格sku信息 + /// + [SugarColumn(ColumnName = "SpecsSkuInfo", IsJson = true)] + public List? SpecsSkuInfo { get; set; } + /// + /// 规格sku完整信息 + /// + [SugarColumn(ColumnName = "SpecsSkuAllInfo", IsJson = true)] + public List? SpecsSkuAllInfo { get; set; } + } + + public class SpecsSkuAllInfoModel + { + public string? SpecsGroupName { get; set; } + public string? SpecsName { get; set; } + } + public class SpecsSkuInfoModel + { + public long? SpecsGroupId { get; set; } + public long? SpecsId { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs new file mode 100644 index 00000000..ab855b32 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.SHOP.Entitys +{ + /// + /// 商品规格表 + /// + [SugarTable("Specs")] + public partial class SpecsEntity : IBaseModelEntity + { + public SpecsEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 商品规格组id + /// + [SugarColumn(ColumnName = "SpecsGroupId")] + public long? SpecsGroupId { get; set; } + /// + /// 商品规格名 + /// + [SugarColumn(ColumnName = "SpecsName")] + public string SpecsName { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs new file mode 100644 index 00000000..9ebc176e --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.SHOP.Entitys +{ + /// + /// 商品规格组表 + /// + [SugarTable("SpecsGroup")] + public partial class SpecsGroupEntity : IBaseModelEntity + { + public SpecsGroupEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 分类id + /// + [SugarColumn(ColumnName = "CategoryId")] + public long? CategoryId { get; set; } + /// + /// 商品规格组名 + /// + [SugarColumn(ColumnName = "SpecsGroupName")] + public string SpecsGroupName { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + + [Navigate(NavigateType.OneToMany, nameof(SpecsEntity.SpecsGroupId))] + public List? Specses { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpuEntity.cs new file mode 100644 index 00000000..90a5d6bf --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpuEntity.cs @@ -0,0 +1,108 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; +using SqlSugar; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.Model.SHOP.Entitys +{ + /// + /// Spu表 + /// + [SugarTable("Spu")] + public partial class SpuEntity : IBaseModelEntity + { + public SpuEntity() + { + CreateTime = DateTime.Now; + } + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 商品分类Id + /// + [SugarColumn(ColumnName = "CategoryId")] + public long? CategoryId { get; set; } + /// + /// 商品名称 + /// + [SugarColumn(ColumnName = "SpuName")] + public string? SpuName { get; set; } + /// + /// 商品详情 + /// + [SugarColumn(ColumnName = "Details")] + public string? Details { get; set; } + /// + /// 商品价格 + /// + [SugarColumn(ColumnName = "Price")] + public string? Price { get; set; } + + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "CreateUser")] + public long? CreateUser { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateTime")] + public DateTime? CreateTime { get; set; } + /// + /// 修改者 + /// + [SugarColumn(ColumnName = "ModifyUser")] + public long? ModifyUser { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyTime")] + public DateTime? ModifyTime { get; set; } + /// + /// 是否删除 + /// + [SugarColumn(ColumnName = "IsDeleted")] + public bool? IsDeleted { get; set; } + /// + /// 租户Id + /// + [SugarColumn(ColumnName = "TenantId")] + public long? TenantId { get; set; } + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int? OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } /// + /// 规格Spu完整信息 + /// + [SugarColumn(ColumnName = "SpecsAllInfo", IsJson = true)] + public List? SpecsSpuAllInfo { get; set; } + /// + /// 规格Spu信息 + /// + [SugarColumn(ColumnName = "SpecsInfo", IsJson = true)] + public List? SpecsSpuInfo { get; set; } + + [Navigate(NavigateType.OneToMany, nameof(SkuEntity.SpuId))] + public List? Skus { get; set; } + } + + public class SpecsSpuAllInfoModel + { + public string? SpecsGroupName { get; set; } + public List? SpecsNames { get; set; } + } + public class SpecsSpuInfoModel + { + public long? SpecsGroupId { get; set; } + public List? SpecsIds { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SkuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SkuEntity.cs deleted file mode 100644 index 582c3283..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/SkuEntity.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// Sku表 - /// - public partial class SkuEntity:IBaseModelEntity - { - /// - /// 规格sku信息 - /// - [SugarColumn(ColumnName = "SpecsSkuInfo", IsJson = true)] - public List? SpecsSkuInfo { get; set; } - /// - /// 规格sku完整信息 - /// - [SugarColumn(ColumnName = "SpecsSkuAllInfo", IsJson = true)] - public List? SpecsSkuAllInfo { get; set; } - } - - public class SpecsSkuAllInfoModel - { - public string? SpecsGroupName { get; set; } - public string? SpecsName { get; set; } - } - public class SpecsSkuInfoModel - { - public long? SpecsGroupId { get; set; } - public long? SpecsId { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SpecsGroupEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SpecsGroupEntity.cs deleted file mode 100644 index 3a4df243..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/SpecsGroupEntity.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - /// - /// 商品规格组表 - /// - public partial class SpecsGroupEntity:IBaseModelEntity - { - [Navigate(NavigateType.OneToMany, nameof(SpecsEntity.SpecsGroupId))] - public List? Specses { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SpuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SpuEntity.cs deleted file mode 100644 index 30ef1e5b..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/SpuEntity.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; -using SqlSugar; -namespace Yi.Framework.Model.Models -{ - - public partial class SpuEntity:IBaseModelEntity - { - /// - /// 规格Spu完整信息 - /// - [SugarColumn(ColumnName = "SpecsAllInfo", IsJson = true)] - public List? SpecsSpuAllInfo { get; set; } - /// - /// 规格Spu信息 - /// - [SugarColumn(ColumnName = "SpecsInfo", IsJson = true)] - public List? SpecsSpuInfo { get; set; } - - [Navigate(NavigateType.OneToMany, nameof(SkuEntity.SpuId))] - public List? Skus { get; set; } - } - - public class SpecsSpuAllInfoModel - { - public string? SpecsGroupName { get; set; } - public List? SpecsNames{ get;set;} - } - public class SpecsSpuInfoModel - { - public long? SpecsGroupId{ get; set; } - public List? SpecsIds { get; set; } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/TenantEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/TenantEntity.cs deleted file mode 100644 index 4c75aa7b..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/TenantEntity.cs +++ /dev/null @@ -1,41 +0,0 @@ -//using SqlSugar; -//using System; -//using System.Collections.Generic; -//using System.Linq; -//using System.Text; -//using System.Threading.Tasks; - -//namespace Yi.Framework.Model -//{ -// //需要在用户表中关联好该租户信息，一个用户关联一个租户 -// //不同租户下，用户可以相同 -// //用户登录后，token中可包含租户id，同时缓存一份用户信息(包含租户信息) -// [Tenant("0")] -// //当然，像用户、角色、菜单、租户为共享库了 -// [SugarTable("Tenant")] -// public class TenantEntity -// { -// /// -// /// 主键唯一标识 -// /// -// [SugarColumn(IsPrimaryKey = true)] -// public long Id { get; set; } - -// /// -// /// 租户id -// /// -// public string? TenantId { get; set; } - -// /// -// /// 业务库连接字符串 -// /// -// public string? Connection { get; set; } - -// /// -// /// 业务库连接类型 -// /// -// public string? DbType { get; set; } - - -// } -//} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs deleted file mode 100644 index c66544ee..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -using Yi.Framework.Common.Helper; - -namespace Yi.Framework.Model.Models -{ - public partial class UserEntity - { - /// - /// 看好啦！ORM精髓，导航属性 - /// - [Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))] - public List? Roles { get; set; } - - [Navigate(typeof(UserPostEntity), nameof(UserPostEntity.UserId), nameof(UserPostEntity.PostId))] - public List? Posts { get; set; } - - [Navigate( NavigateType.OneToOne,nameof(DeptId))] - public DeptEntity? Dept { get; set; } - - /// - /// 构建密码，MD5盐值加密 - /// - public UserEntity BuildPassword(string password = null) - { - //如果不传值，那就把自己的password当作传进来的password - if (password == null) - { - password = this.Password; - } - this.Salt = Common.Helper.MD5Helper.GenerateSalt(); - this.Password = Common.Helper.MD5Helper.SHA2Encode(password, this.Salt); - return this; - } - - /// - /// 判断密码和加密后的密码是否相同 - /// - /// - /// - public bool JudgePassword(string password) - { - var p = MD5Helper.SHA2Encode(password, this.Salt); - if (this.Password == MD5Helper.SHA2Encode(password, this.Salt)) - { - return true; - } - return false; - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Builder/DataContext.cs b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Builder/DataContext.cs index 4063842b..19d5f9ac 100644 --- a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Builder/DataContext.cs +++ b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Builder/DataContext.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using System.Collections.Generic; using Yi.Framework.Common.Models; -using Yi.Framework.Core; +using Yi.Framework.Core.Cache; namespace Yi.Framework.OcelotGateway.Builder { diff --git a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Startup.cs b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Startup.cs index 25a2f4b2..ba3dee1c 100644 --- a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Startup.cs +++ b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/Startup.cs @@ -16,8 +16,8 @@ using System.Linq; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Ocelot.Cache.CacheManager; -using Yi.Framework.WebCore.MiddlewareExtend; using Ocelot.Provider.Polly; +using Yi.Framework.WebCore.AspNetCoreExtensions; namespace Yi.Framework.OcelotGateway { diff --git a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/WebCore/OcelotExtension.cs b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/WebCore/OcelotExtension.cs index eedbb578..20c73cb8 100644 --- a/Yi.Framework.Net6/Yi.Framework.OcelotGateway/WebCore/OcelotExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.OcelotGateway/WebCore/OcelotExtension.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Http; using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.IOCOptions; -using Yi.Framework.Core; +using Yi.Framework.Core.Cache; using Yi.Framework.OcelotGateway.Builder; -using Yi.Framework.WebCore; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.OcelotGateway.WebCore { diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs index 61adc0d3..0e87a040 100644 --- a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs +++ b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs @@ -6,8 +6,7 @@ using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; -using Yi.Framework.Model.Query; +using Yi.Framework.Model.Base.Query; namespace Yi.Framework.Repository { diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs index 5f3a17a0..cf0eed27 100644 --- a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs +++ b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs @@ -3,8 +3,7 @@ using System.Data; using System.Linq.Expressions; using Yi.Framework.Common.Attribute; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; -using Yi.Framework.Model.Query; +using Yi.Framework.Model.Base.Query; /***这里面写的代码不会给覆盖,如果要重新生成请删除 Repository.cs ***/ namespace Yi.Framework.Repository diff --git a/Yi.Framework.Net6/Yi.Framework.SMSProcessor/Program.cs b/Yi.Framework.Net6/Yi.Framework.SMSProcessor/Program.cs index a0dfebec..a0b7dc77 100644 --- a/Yi.Framework.Net6/Yi.Framework.SMSProcessor/Program.cs +++ b/Yi.Framework.Net6/Yi.Framework.SMSProcessor/Program.cs @@ -11,7 +11,7 @@ using Yi.Framework.Common.IOCOptions; using Yi.Framework.Core; using Yi.Framework.Core.ConsulExtend; using Yi.Framework.WebCore; -using Yi.Framework.WebCore.MiddlewareExtend; +using Yi.Framework.WebCore.AspNetCoreExtensions; namespace Yi.Framework.SMSProcessor { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/AgreeService.cs b/Yi.Framework.Net6/Yi.Framework.Service/BBS/AgreeService.cs similarity index 87% rename from Yi.Framework.Net6/Yi.Framework.Service/AgreeService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/BBS/AgreeService.cs index 3a469afb..5e888a6f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/AgreeService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/BBS/AgreeService.cs @@ -1,13 +1,17 @@ using SqlSugar; using System.Threading.Tasks; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.BBS; +using Yi.Framework.Model.BBS.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.BBS { public partial class AgreeService : BaseService, IAgreeService { + public AgreeService(IRepository repository) : base(repository) + { + } /// /// 点赞操作 /// diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/BBS/ArticleService.cs similarity index 83% rename from Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/BBS/ArticleService.cs index 0b039004..40bd023f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/BBS/ArticleService.cs @@ -3,13 +3,18 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.BBS; +using Yi.Framework.Model.BBS.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.BBS { public partial class ArticleService : BaseService, IArticleService { + public ArticleService(IRepository repository) : base(repository) + { + } public async Task>> SelctPageList(ArticleEntity entity, PageParModel page) { RefAsync total = 0; @@ -24,6 +29,5 @@ namespace Yi.Framework.Service return new PageModel>(data, total); } - } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/BBS/CommentService.cs b/Yi.Framework.Net6/Yi.Framework.Service/BBS/CommentService.cs new file mode 100644 index 00000000..66065ee4 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/BBS/CommentService.cs @@ -0,0 +1,35 @@ +using SqlSugar; +using System.Threading.Tasks; +using Yi.Framework.Interface; +using Yi.Framework.Interface.BBS; +using Yi.Framework.Model.BBS.Entitys; +using Yi.Framework.Repository; +using Yi.Framework.Service.Base; + +namespace Yi.Framework.Service.BBS +{ + public partial class CommentService : BaseService, ICommentService + { + public CommentService(IRepository repository) : base(repository) + { + } + //添加一个评论 + public async Task AddAsync(CommentEntity comment) + { + //如果是一级评论：不用处理 + + //如果是二级评论：ParentId父节点评论数+1 + return await _repository.UseTranAsync(async () => + { + if (comment.ParentId != 0) + { + var parentData = await _repository.GetByIdAsync(comment.ParentId); + parentData.CommentNum += 1; + await _repository.AsUpdateable(parentData).UpdateColumns(u => new { u.CommentNum }).ExecuteCommandAsync(); + } + await _repository.InsertReturnSnowflakeIdAsync(comment); + }); + + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs b/Yi.Framework.Net6/Yi.Framework.Service/Base/BaseService.cs similarity index 70% rename from Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/Base/BaseService.cs index f46d6076..d0e61829 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/BaseService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/Base/BaseService.cs @@ -4,14 +4,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Attribute; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.Base; using Yi.Framework.Repository; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.Base { [AppService] - public class BaseService:IBaseService where T:class,new() + public class BaseService : IBaseService where T : class, new() { public IRepository _repository { get; set; } public BaseService(IRepository iRepository) diff --git a/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/AbstractKeyCrudAppService.cs b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/AbstractKeyCrudAppService.cs new file mode 100644 index 00000000..429e74b4 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/AbstractKeyCrudAppService.cs @@ -0,0 +1,215 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Interface.Base.Crud; +using Yi.Framework.Model.Base; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service.Base.Crud +{ + public abstract class AbstractKeyCrudAppService + : AbstractKeyCrudAppService + where TEntity : class, IEntity, new() + { + protected AbstractKeyCrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + } + + public abstract class AbstractKeyCrudAppService + : AbstractKeyCrudAppService + where TEntity : class, IEntity, new() + { + protected AbstractKeyCrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + } + + public abstract class AbstractKeyCrudAppService + : AbstractKeyCrudAppService + where TEntity : class, IEntity, new() + { + protected AbstractKeyCrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + + protected override Task MapToGetListOutputDtoAsync(TEntity entity) + { + return MapToGetOutputDtoAsync(entity); + } + + protected override TEntityDto MapToGetListOutputDto(TEntity entity) + { + return MapToGetOutputDto(entity); + } + } + + public abstract class AbstractKeyCrudAppService + : AbstractKeyReadOnlyAppService, + ICrudAppService + where TEntity : class, IEntity, new() + { + protected AbstractKeyCrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + + /// + /// 创建 + /// + /// + /// + public virtual async Task CreateAsync(TCreateInput input) + { + + var entity = await MapToEntityAsync(input); + + TryToSetTenantId(entity); + + await Repository.InsertAsync(entity); + + var entitydto = await MapToGetOutputDtoAsync(entity); + return entitydto; + } + + /// + /// 删除 + /// + /// + /// + /// + public virtual async Task DeleteAsync(IEnumerable ids) + { + throw new NotImplementedException(); + } + protected abstract Task DeleteByIdAsync(TKey id); + + /// + /// 更新 + /// + /// + /// + /// + public virtual async Task UpdateAsync(TKey id, TUpdateInput input) + { + var entity = await GetEntityByIdAsync(id); + + await UpdateValidAsync(entity, input); + //TODO: Check if input has id different than given id and normalize if it's default value, throw ex otherwise + await MapToEntityAsync(input, entity); + await Repository.UpdateAsync(entity); + + var entitydto = await MapToGetOutputDtoAsync(entity); + return entitydto; + } + /// + /// 效验更新 + /// + /// + /// + /// + protected virtual async Task UpdateValidAsync(TEntity idEntity, TUpdateInput dto) + { + return; + } + + /// + /// 将 更新输入dto转化为实体的异步 + /// + /// + /// + protected virtual Task MapToEntityAsync(TUpdateInput updateInput, TEntity entity) + { + MapToEntity(updateInput, entity); + return Task.CompletedTask; + } + /// + /// 将 更新输入dto转化为实体的同步方法 + /// + /// + /// + protected virtual void MapToEntity(TUpdateInput updateInput, TEntity entity) + { + ObjectMapper.Map(updateInput, entity); + } + + /// + /// 创建dto 给 实体的转换的异步方法 + /// + /// + /// + protected virtual Task MapToEntityAsync(TCreateInput createInput) + { + return Task.FromResult(MapToEntity(createInput)); + } + + /// + /// 创建dto 给 实体的转换 + /// + /// + /// + protected virtual TEntity MapToEntity(TCreateInput createInput) + { + var entity = ObjectMapper.Map(createInput); + SetIdForGuids(entity); + return entity; + } + + /// + /// 给主键id赋值上guid + /// + /// + protected virtual void SetIdForGuids(TEntity entity) + { + if (entity is IEntity entityWithGuidId && entityWithGuidId.Id == Guid.Empty) + { + //这里给主键赋值为guid,l临时写死属性名 + entity.GetType().GetProperty("Id").SetValue(entity, Guid.NewGuid()); + //EntityHelper.TrySetId( + // entityWithGuidId, + // () => GuidGenerator.Create(), + // true + //); + } + } + + /// + /// 给租户id赋值 + /// + /// + protected virtual void TryToSetTenantId(TEntity entity) + { + //实现多租户接口 + //if (entity is IMultiTenant) + //{ + // //给属性租户id赋值 + // if (ServiceLocator.GetTenantId(out var tid)) + // { + // var tenantId = tid; + + // var propertyInfo = entity.GetType().GetProperty(nameof(IMultiTenant.TenantId)); + + // if (propertyInfo == null || propertyInfo.GetSetMethod(true) == null) + // { + // return; + // } + + // propertyInfo.SetValue(entity, tenantId); + // } + + //} + } + + /// + /// 判断租户id的属性是否为空 + /// + /// + /// + protected virtual bool HasTenantIdProperty(TEntity entity) + { + return entity.GetType().GetProperty(nameof(IMultiTenant.TenantId)) != null; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/AbstractKeyReadOnlyAppService.cs b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/AbstractKeyReadOnlyAppService.cs new file mode 100644 index 00000000..c1a06c8d --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/AbstractKeyReadOnlyAppService.cs @@ -0,0 +1,107 @@ +using AutoMapper; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Security.Principal; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Interface.Base.Crud; +using Yi.Framework.Model.Base; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service.Base.Crud +{ + public abstract class AbstractKeyReadOnlyAppService + : AbstractKeyReadOnlyAppService + where TEntity : class, IEntity, new() + { + protected AbstractKeyReadOnlyAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + } + + + public abstract class AbstractKeyReadOnlyAppService : ApplicationService, + IReadOnlyAppService + where TEntity : class, IEntity, new() + { + + public AbstractKeyReadOnlyAppService(IRepository repository, IMapper mapper) : base(mapper) + { + Repository = repository; + + } + protected IRepository Repository { get; set; } + + + public async Task GetByIdAsync(TKey id) + { + var entity = await GetEntityByIdAsync(id); + var entityDto = await MapToGetOutputDtoAsync(entity); + + return entityDto; + } + + /// + /// 通过id获取实体 + /// + /// + /// + protected abstract Task GetEntityByIdAsync(TKey id); + /// + /// 实体向Get输出映射的异步方法 + /// + /// + /// + protected virtual Task MapToGetOutputDtoAsync(TEntity entity) + { + return Task.FromResult(MapToGetOutputDto(entity)); + } + + /// + /// 实体向Get输出Dto映射的同步方法 + /// + /// + /// + protected virtual TGetOutputDto MapToGetOutputDto(TEntity entity) + { + return ObjectMapper.Map(entity); + } + /// + /// 多个实体列表映射GetList输出dto列表的异步方法 + /// + /// + /// + protected virtual async Task> MapToGetListOutputDtosAsync(IEnumerable entities) + { + var dtos = new List(); + + foreach (var entity in entities) + { + dtos.Add(await MapToGetListOutputDtoAsync(entity)); + } + + return dtos; + } + /// + /// 实体列表映射GetList输出dto的异步方法 + /// + /// + /// + protected virtual Task MapToGetListOutputDtoAsync(TEntity entity) + { + return Task.FromResult(MapToGetListOutputDto(entity)); + } + /// + /// 实体列表映射GetList输出dto的同步方法 + /// + /// + /// + protected virtual TGetListOutputDto MapToGetListOutputDto(TEntity entity) + { + return ObjectMapper.Map(entity); + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/ApplicationService.cs b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/ApplicationService.cs new file mode 100644 index 00000000..1c5618e9 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/ApplicationService.cs @@ -0,0 +1,16 @@ +using AutoMapper; +using AutoMapper.Internal.Mappers; +using Microsoft.Extensions.DependencyInjection; +using Yi.Framework.Interface.Base.Crud; + +namespace Yi.Framework.Service.Base.Crud +{ + public class ApplicationService : IApplicationService + { + public ApplicationService(IMapper mapper) + { + ObjectMapper = mapper; + } + protected IMapper ObjectMapper { get; set; } + } +} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/CrudAppService.cs b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/CrudAppService.cs new file mode 100644 index 00000000..4ebc7c02 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/CrudAppService.cs @@ -0,0 +1,86 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Common.Models; +using Yi.Framework.Model.Base; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service.Base.Crud +{ + public abstract class CrudAppService + : CrudAppService + where TEntity : class, IEntity, new() + { + protected CrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + } + + public abstract class CrudAppService + : CrudAppService + where TEntity : class, IEntity, new() + { + protected CrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + } + + public abstract class CrudAppService + : CrudAppService + where TEntity : class, IEntity, new() + { + protected CrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + + protected override Task MapToGetListOutputDtoAsync(TEntity entity) + { + return MapToGetOutputDtoAsync(entity); + } + + protected override TEntityDto MapToGetListOutputDto(TEntity entity) + { + return MapToGetOutputDto(entity); + } + } + + public abstract class CrudAppService + : AbstractKeyCrudAppService + where TEntity : class, IEntity, new() + { + protected CrudAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + + protected override async Task DeleteByIdAsync(TKey id) + { + await DeleteAsync(new List { id }); + } + + protected override async Task GetEntityByIdAsync(TKey id) + { + return await Repository.GetByIdAsync(id); + } + + protected override void MapToEntity(TUpdateInput updateInput, TEntity entity) + { + if (updateInput is IEntityDto entityDto) + { + entityDto.Id = entity.Id; + } + + base.MapToEntity(updateInput, entity); + } + + + public override async Task> DeleteAsync(IEnumerable ids) + { + await Repository.DeleteAsync(e => ids.Contains(e.Id)); + return Result.Success(); + } + + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/ReadOnlyAppService.cs b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/ReadOnlyAppService.cs new file mode 100644 index 00000000..cf2c6782 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/Base/Crud/ReadOnlyAppService.cs @@ -0,0 +1,26 @@ +using AutoMapper; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; +using Yi.Framework.Repository; + +namespace Yi.Framework.Service.Base.Crud +{ + public abstract class ReadOnlyAppService + : AbstractKeyReadOnlyAppService + where TEntity : class, IEntity, new() + { + protected ReadOnlyAppService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + + protected override async Task GetEntityByIdAsync(TKey id) + { + return await Repository.GetByIdAsync(id); + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/CommentService.cs b/Yi.Framework.Net6/Yi.Framework.Service/CommentService.cs deleted file mode 100644 index 5df77ca3..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/CommentService.cs +++ /dev/null @@ -1,30 +0,0 @@ -using SqlSugar; -using System.Threading.Tasks; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class CommentService : BaseService, ICommentService - { - //添加一个评论 - public async Task AddAsync(CommentEntity comment) - { - //如果是一级评论：不用处理 - - //如果是二级评论：ParentId父节点评论数+1 - return await _repository.UseTranAsync(async () => - { - if (comment.ParentId != 0) - { - var parentData = await _repository.GetByIdAsync(comment.ParentId); - parentData.CommentNum += 1; - await _repository.AsUpdateable(parentData).UpdateColumns(u => new { u.CommentNum }).ExecuteCommandAsync(); - } - await _repository.InsertReturnSnowflakeIdAsync(comment); - }); - - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ConfigService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/ConfigService.cs similarity index 69% rename from Yi.Framework.Net6/Yi.Framework.Service/ConfigService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/ConfigService.cs index 47221328..8491dde3 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ConfigService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/ConfigService.cs @@ -1,29 +1,32 @@ using SqlSugar; -using System; using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class ConfigService : BaseService, IConfigService { + public ConfigService(IRepository repository) : base(repository) + { + } public async Task>> SelctPageList(ConfigEntity config, PageParModel page) { RefAsync total = 0; var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(config.ConfigName), u => u.ConfigName.Contains(config.ConfigName)) .WhereIF(!string.IsNullOrEmpty(config.ConfigKey), u => u.ConfigKey.Contains(config.ConfigKey)) - .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) - .WhereIF(config.IsDeleted.IsNotNull(), u => u.IsDeleted == config.IsDeleted) + .WhereIF(page.StartTime is not null && page.EndTime is not null, u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) + .WhereIF(config.IsDeleted is not null, u => u.IsDeleted == config.IsDeleted) .OrderBy(u => u.OrderNum, OrderByType.Desc) .ToPageListAsync(page.PageNum, page.PageSize, total); return new PageModel>(data, total); } - } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/DeptService.cs similarity index 67% rename from Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/DeptService.cs index fc04ad51..1b1863b0 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/DeptService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/DeptService.cs @@ -1,21 +1,24 @@ using SqlSugar; -using System; using System.Collections.Generic; using System.Threading.Tasks; -using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { - public partial class DeptService + public partial class DeptService : BaseService, IDeptService { + public DeptService(IRepository repository) : base(repository) + { + } public async Task> SelctGetList(DeptEntity dept) { var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(dept.DeptName), u => u.DeptName.Contains(dept.DeptName)) - .WhereIF(dept.IsDeleted.IsNotNull(), u => u.IsDeleted == dept.IsDeleted) + .WhereIF(dept.IsDeleted is not null, u => u.IsDeleted == dept.IsDeleted) .OrderBy(u => u.OrderNum, OrderByType.Desc) .ToListAsync(); diff --git a/Yi.Framework.Net6/Yi.Framework.Service/DictionaryInfoService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/DictionaryInfoService.cs similarity index 79% rename from Yi.Framework.Net6/Yi.Framework.Service/DictionaryInfoService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/DictionaryInfoService.cs index 391e7196..dc8dc685 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/DictionaryInfoService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/DictionaryInfoService.cs @@ -3,13 +3,18 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class DictionaryInfoService : BaseService, IDictionaryInfoService { + public DictionaryInfoService(IRepository repository) : base(repository) + { + } public async Task>> SelctPageList(DictionaryInfoEntity dicInfo, PageParModel page) { RefAsync total = 0; @@ -23,4 +28,4 @@ namespace Yi.Framework.Service return new PageModel>(data, total); } } -} +} \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.Service/DictionaryService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/DictionaryService.cs similarity index 72% rename from Yi.Framework.Net6/Yi.Framework.Service/DictionaryService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/DictionaryService.cs index b70d1e21..e3e68c58 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/DictionaryService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/DictionaryService.cs @@ -1,29 +1,32 @@ using SqlSugar; -using System; using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class DictionaryService : BaseService, IDictionaryService { + public DictionaryService(IRepository repository) : base(repository) + { + } public async Task>> SelctPageList(DictionaryEntity dic, PageParModel page) { RefAsync total = 0; var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(dic.DictName), u => u.DictName.Contains(dic.DictName)) .WhereIF(!string.IsNullOrEmpty(dic.DictType), u => u.DictType.Contains(dic.DictType)) - .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) + .WhereIF(page.StartTime is not null && page.EndTime is not null, u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) .Where(u => u.IsDeleted == false) .OrderBy(u => u.OrderNum, OrderByType.Desc) .ToPageListAsync(page.PageNum, page.PageSize, total); return new PageModel>(data, total); } - } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/FileService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/FileService.cs similarity index 63% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/FileService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/FileService.cs index 591508f2..a9a4d629 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/FileService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/FileService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class FileService : BaseService, IFileService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/LogService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/LogService.cs similarity index 55% rename from Yi.Framework.Net6/Yi.Framework.Service/LogService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/LogService.cs index 992e978d..da3d2ab3 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/LogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/LogService.cs @@ -3,13 +3,18 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { - public partial class LogService + public partial class LogService : BaseService, ILogService { + public LogService(IRepository repository) : base(repository) + { + } public async Task> AddListTest(List logEntities) { return await _repository._Db.Insertable(logEntities).SplitTable().ExecuteReturnSnowflakeIdListAsync(); @@ -17,7 +22,11 @@ namespace Yi.Framework.Service public async Task> GetListTest() { - return await _repository._DbQueryable.SplitTable(tas => tas.Where(u => u.TableName.Contains("2020") || u.TableName.Contains("2021"))).ToListAsync(); + return await _repository._DbQueryable.SplitTable(tas => + + tas.Where(u => u.TableName.Contains("2020") || u.TableName.Contains("2021")) + + ).ToListAsync(); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/LoginLogService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/LoginLogService.cs similarity index 69% rename from Yi.Framework.Net6/Yi.Framework.Service/LoginLogService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/LoginLogService.cs index ad11fc57..65e07ceb 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/LoginLogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/LoginLogService.cs @@ -1,24 +1,29 @@ using SqlSugar; -using System; using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class LoginLogService : BaseService, ILoginLogService { + public LoginLogService(IRepository repository) : base(repository) + { + } + public async Task>> SelctPageList(LoginLogEntity loginLog, PageParModel page) { RefAsync total = 0; var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(loginLog.LoginIp), u => u.LoginIp.Contains(loginLog.LoginIp)) .WhereIF(!string.IsNullOrEmpty(loginLog.LoginUser), u => u.LoginUser.Contains(loginLog.LoginUser)) - .WhereIF(loginLog.IsDeleted.IsNotNull(), u => u.IsDeleted == loginLog.IsDeleted) - .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) + .WhereIF(loginLog.IsDeleted is not null, u => u.IsDeleted == loginLog.IsDeleted) + .WhereIF(page.StartTime is not null && page.EndTime is not null, u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) .OrderBy(u => u.CreateTime, OrderByType.Desc) .ToPageListAsync(page.PageNum, page.PageSize, total); return new PageModel>(data, total); diff --git a/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/MenuService.cs similarity index 79% rename from Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/MenuService.cs index f76ecdaa..c8aed593 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/MenuService.cs @@ -1,15 +1,19 @@ using SqlSugar; using System.Collections.Generic; using System.Threading.Tasks; -using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class MenuService : BaseService, IMenuService { + public MenuService(IRepository repository) : base(repository) + { + } public async Task> SelctGetList(MenuEntity menu) { var data = await _repository._DbQueryable @@ -29,7 +33,7 @@ namespace Yi.Framework.Service public async Task> GetListByRoleId(long roleId) { - return (await _repository._Db.Queryable().Includes(r => r.Menus).SingleAsync(r=>r.Id==roleId)).Menus; + return (await _repository._Db.Queryable().Includes(r => r.Menus).SingleAsync(r => r.Id == roleId)).Menus; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/OperationLogService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/OperationLogService.cs similarity index 68% rename from Yi.Framework.Net6/Yi.Framework.Service/OperationLogService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/OperationLogService.cs index 0ae38734..9d9163fe 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/OperationLogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/OperationLogService.cs @@ -1,25 +1,29 @@ using SqlSugar; -using System; using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class OperationLogService : BaseService, IOperationLogService { + public OperationLogService(IRepository repository) : base(repository) + { + } public async Task>> SelctPageList(OperationLogEntity operationLog, PageParModel page) { RefAsync total = 0; var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(operationLog.Title), u => u.Title.Contains(operationLog.Title)) .WhereIF(!string.IsNullOrEmpty(operationLog.OperUser), u => u.OperUser.Contains(operationLog.OperUser)) - .WhereIF(operationLog.OperType is not null, u => u.OperType==operationLog.OperType.GetHashCode()) - .WhereIF(operationLog.IsDeleted.IsNotNull(), u => u.IsDeleted == operationLog.IsDeleted) - .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) + .WhereIF(operationLog.OperType is not null, u => u.OperType == operationLog.OperType.GetHashCode()) + .WhereIF(operationLog.IsDeleted is not null, u => u.IsDeleted == operationLog.IsDeleted) + .WhereIF(page.StartTime is not null && page.EndTime is not null, u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) .OrderBy(u => u.CreateTime, OrderByType.Desc) .ToPageListAsync(page.PageNum, page.PageSize, total); diff --git a/Yi.Framework.Net6/Yi.Framework.Service/PostService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/PostService.cs similarity index 75% rename from Yi.Framework.Net6/Yi.Framework.Service/PostService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/PostService.cs index 62d617e6..18a01e3a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/PostService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/PostService.cs @@ -1,23 +1,28 @@ using SqlSugar; -using System; using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class PostService : BaseService, IPostService { + public PostService(IRepository repository) : base(repository) + { + } + public async Task>> SelctPageList(PostEntity post, PageParModel page) { RefAsync total = 0; var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(post.PostName), u => u.PostName.Contains(post.PostName)) .WhereIF(!string.IsNullOrEmpty(post.PostCode), u => u.PostCode.Contains(post.PostCode)) - .WhereIF(post.IsDeleted.IsNotNull(), u => u.IsDeleted == post.IsDeleted) + .WhereIF(post.IsDeleted is not null, u => u.IsDeleted == post.IsDeleted) .OrderBy(u => u.OrderNum, OrderByType.Desc) .ToPageListAsync(page.PageNum, page.PageSize, total); diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleDeptService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleDeptService.cs similarity index 65% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleDeptService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleDeptService.cs index 08f62036..61414f27 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleDeptService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleDeptService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class RoleDeptService : BaseService, IRoleDeptService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleMenuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleMenuService.cs similarity index 65% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleMenuService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleMenuService.cs index db43413e..95b1257b 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleMenuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleMenuService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class RoleMenuService : BaseService, IRoleMenuService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleService.cs similarity index 93% rename from Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleService.cs index b35503f0..87526e73 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/RoleService.cs @@ -1,19 +1,24 @@ using SqlSugar; -using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; +using System; +using Yi.Framework.Common.Base; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; using Yi.Framework.Uow.Interceptors; +using Yi.Framework.Interface.RABC; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { - public partial class RoleService + public partial class RoleService : BaseService, IRoleService { + public RoleService(IRepository repository) : base(repository) + { + } public async Task> DbTest() { return await _repository._Db.Queryable().ToListAsync(); @@ -24,7 +29,7 @@ namespace Yi.Framework.Service { var res = await _repository.InsertReturnSnowflakeIdAsync(new RoleEntity { RoleName = "测试", RoleCode = "tt" }); throw new ApplicationException("测试uow"); - return res>0; + return res > 0; } public async Task GiveRoleSetMenu(List roleIds, List menuIds) diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/TenantService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/TenantService.cs similarity index 64% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/TenantService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/TenantService.cs index 6093f532..f1974541 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/TenantService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/TenantService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class TenantService : BaseService, ITenantService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserPostService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserPostService.cs similarity index 65% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserPostService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/UserPostService.cs index 124cfdab..0a9e0a94 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserPostService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserPostService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class UserPostService : BaseService, IUserPostService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserRoleService.cs similarity index 65% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserRoleService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/UserRoleService.cs index d48f838e..2530e0a8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserRoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserRoleService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { public partial class UserRoleService : BaseService, IUserRoleService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserService.cs similarity index 88% rename from Yi.Framework.Net6/Yi.Framework.Service/UserService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/RABC/UserService.cs index 1bebffc3..4b0418d8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/UserService.cs @@ -1,23 +1,26 @@ using SqlSugar; -using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Threading.Tasks; +using System; +using Yi.Framework.Common.Base; using Yi.Framework.Common.Const; -using Yi.Framework.Common.Enum; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.DTOModel; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.RABC.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; +using Yi.Framework.Interface.RABC; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.RABC { - - public partial class UserService + public partial class UserService : BaseService, IUserService { + public UserService(IRepository repository) : base(repository) + { + } public async Task> GetListInRole() { return await _repository._DbQueryable.Includes(u => u.Roles).ToListAsync(); @@ -55,7 +58,7 @@ namespace Yi.Framework.Service if (await Exist(userName, o => user = o)) { userAction.Invoke(user); - if (user.Password ==MD5Helper.SHA2Encode(password, user.Salt)) + if (user.Password == MD5Helper.SHA2Encode(password, user.Salt)) { return true; } @@ -82,30 +85,30 @@ namespace Yi.Framework.Service //多次操作，需要事务确保原子性 return await _repositoryUserRole.UseTranAsync(async () => - { - //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要） - await _repositoryUserRole.DeleteAsync(u => userIds.Contains((long)u.UserId)); + { + //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要） + await _repositoryUserRole.DeleteAsync(u => userIds.Contains((long)u.UserId)); - if (roleIds is not null) - { - //遍历用户 - foreach (var userId in userIds) - { - //添加新的关系 - List userRoleEntities = new(); + if (roleIds is not null) + { + //遍历用户 + foreach (var userId in userIds) + { + //添加新的关系 + List userRoleEntities = new(); - foreach (var roleId in roleIds) - { - userRoleEntities.Add(new UserRoleEntity() { UserId = userId, RoleId = roleId }); - } + foreach (var roleId in roleIds) + { + userRoleEntities.Add(new UserRoleEntity() { UserId = userId, RoleId = roleId }); + } - //一次性批量添加 - await _repositoryUserRole.InsertReturnSnowflakeIdAsync(userRoleEntities); - } - } + //一次性批量添加 + await _repositoryUserRole.InsertReturnSnowflakeIdAsync(userRoleEntities); + } + } - }); + }); } @@ -312,6 +315,5 @@ namespace Yi.Framework.Service userDto.User.DeptId = null; return await _repository.UpdateIgnoreNullAsync(userDto.User); } - } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/CategoryService.cs b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/CategoryService.cs similarity index 65% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/CategoryService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/SHOP/CategoryService.cs index ea55419a..bae9eef3 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/CategoryService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/CategoryService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.SHOP { public partial class CategoryService : BaseService, ICategoryService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/SkuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SkuService.cs similarity index 79% rename from Yi.Framework.Net6/Yi.Framework.Service/SkuService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/SHOP/SkuService.cs index 93bb7fe4..a479d899 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/SkuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SkuService.cs @@ -3,13 +3,18 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.SHOP { public partial class SkuService : BaseService, ISkuService { + public SkuService(IRepository repository) : base(repository) + { + } public async Task>> SelctPageList(SkuEntity enetity, PageParModel page) { RefAsync total = 0; diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpecsGroupService.cs b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpecsGroupService.cs similarity index 65% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpecsGroupService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpecsGroupService.cs index fc7edbe2..bcdf102c 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpecsGroupService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpecsGroupService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.SHOP { public partial class SpecsGroupService : BaseService, ISpecsGroupService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpecsService.cs b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpecsService.cs similarity index 63% rename from Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpecsService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpecsService.cs index 0374e217..d30dfcdb 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpecsService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpecsService.cs @@ -1,9 +1,10 @@ using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.SHOP { public partial class SpecsService : BaseService, ISpecsService { diff --git a/Yi.Framework.Net6/Yi.Framework.Service/SpuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpuService.cs similarity index 76% rename from Yi.Framework.Net6/Yi.Framework.Service/SpuService.cs rename to Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpuService.cs index c21b2c39..dfada59d 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/SpuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/SHOP/SpuService.cs @@ -3,18 +3,23 @@ using System.Collections.Generic; using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.SHOP; +using Yi.Framework.Model.SHOP.Entitys; using Yi.Framework.Repository; +using Yi.Framework.Service.Base; -namespace Yi.Framework.Service +namespace Yi.Framework.Service.SHOP { public partial class SpuService : BaseService, ISpuService { + public SpuService(IRepository repository) : base(repository) + { + } public async Task>> SelctPageList(SpuEntity enetity, PageParModel page) { RefAsync total = 0; var data = await _repository._DbQueryable - .Includes(spu=>spu.Skus) + .Includes(spu => spu.Skus) .WhereIF(page.StartTime is not null && page.EndTime is not null, u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) .WhereIF(enetity.IsDeleted is not null, u => u.IsDeleted == enetity.IsDeleted) .OrderBy(u => u.CreateTime, OrderByType.Desc) diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/AgreeService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/AgreeService.cs deleted file mode 100644 index 27d48eee..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/AgreeService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class AgreeService : BaseService, IAgreeService - { - public AgreeService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ArticleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ArticleService.cs deleted file mode 100644 index 2a230eea..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ArticleService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class ArticleService : BaseService, IArticleService - { - public ArticleService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/CommentService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/CommentService.cs deleted file mode 100644 index 1be5cbc9..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/CommentService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class CommentService : BaseService, ICommentService - { - public CommentService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ConfigService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ConfigService.cs deleted file mode 100644 index a9f404b4..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ConfigService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class ConfigService : BaseService, IConfigService - { - public ConfigService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DeptService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DeptService.cs deleted file mode 100644 index c799e682..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DeptService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class DeptService : BaseService, IDeptService - { - public DeptService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryInfoService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryInfoService.cs deleted file mode 100644 index 7764cd2a..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryInfoService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class DictionaryInfoService : BaseService, IDictionaryInfoService - { - public DictionaryInfoService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryService.cs deleted file mode 100644 index d2229e27..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/DictionaryService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class DictionaryService : BaseService, IDictionaryService - { - public DictionaryService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/LogService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/LogService.cs deleted file mode 100644 index d88d2d7d..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/LogService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class LogService : BaseService, ILogService - { - public LogService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/LoginLogService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/LoginLogService.cs deleted file mode 100644 index 1c0ed6c8..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/LoginLogService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class LoginLogService : BaseService, ILoginLogService - { - public LoginLogService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/MenuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/MenuService.cs deleted file mode 100644 index cee44d82..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/MenuService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class MenuService : BaseService, IMenuService - { - public MenuService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/OperationLogService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/OperationLogService.cs deleted file mode 100644 index 2acae0b0..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/OperationLogService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class OperationLogService : BaseService, IOperationLogService - { - public OperationLogService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/PostService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/PostService.cs deleted file mode 100644 index e534e610..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/PostService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class PostService : BaseService, IPostService - { - public PostService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleService.cs deleted file mode 100644 index 39adab0f..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/RoleService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class RoleService : BaseService, IRoleService - { - public RoleService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SkuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SkuService.cs deleted file mode 100644 index 6d86af4c..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SkuService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class SkuService : BaseService, ISkuService - { - public SkuService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpuService.cs deleted file mode 100644 index a91bc78d..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/SpuService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class SpuService : BaseService, ISpuService - { - public SpuService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserService.cs deleted file mode 100644 index 964a76dd..00000000 --- a/Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/UserService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SqlSugar; -using Yi.Framework.Interface; -using Yi.Framework.Model.Models; -using Yi.Framework.Repository; - -namespace Yi.Framework.Service -{ - public partial class UserService : BaseService, IUserService - { - public UserService(IRepository repository) : base(repository) - { - } - } -} diff --git a/Yi.Framework.Net6/Yi.Framework.Task/VisitJob.cs b/Yi.Framework.Net6/Yi.Framework.Task/VisitJob.cs index 2dec370c..9427a327 100644 --- a/Yi.Framework.Net6/Yi.Framework.Task/VisitJob.cs +++ b/Yi.Framework.Net6/Yi.Framework.Task/VisitJob.cs @@ -6,7 +6,6 @@ using System.IO; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Model.Models; namespace Yi.Framework.Job { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AuthorizationExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AuthorizationExtension.cs similarity index 94% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AuthorizationExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AuthorizationExtension.cs index 0fed6dd8..afcb5b46 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AuthorizationExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AuthorizationExtension.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.WebCore.AuthorizationPolicy; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { public static class AuthorizationExtension { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AutoIocExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoIocExtend.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AutoIocExtend.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoIocExtend.cs index aefe4f96..bf4a2565 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AutoIocExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoIocExtend.cs @@ -12,15 +12,15 @@ using System.Threading.Tasks; using Yi.Framework.Common.Attribute; using Yi.Framework.Uow.Interceptors; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { public static class AutoIocExtend { private static void RegIoc(ContainerBuilder build, Assembly assembly) { foreach (var type in assembly.GetTypes()) - { - + { + var serviceAttribute = type.GetCustomAttribute(); if (serviceAttribute is not null) { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AutoMapperExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs similarity index 90% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AutoMapperExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs index f8f34417..300e7db8 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/AutoMapperExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs @@ -4,7 +4,7 @@ using System; using System.IO; using Yi.Framework.WebCore.Mapper; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// 通用autoMapper扩展 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CAPExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CAPExtend.cs similarity index 90% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CAPExtend.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CAPExtend.cs index 80869150..32ce9f81 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CAPExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CAPExtend.cs @@ -7,8 +7,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { public static class CAPExtend { @@ -19,10 +20,11 @@ namespace Yi.Framework.WebCore.MiddlewareExtend services.AddCap(x => { x.UseMySql(Appsettings.app("DbConn", "WriteUrl")); - - x.UseRabbitMQ(optios => { + + x.UseRabbitMQ(optios => + { optios.HostName = Appsettings.app("RabbitConn", "HostName"); - optios.Port =Convert.ToInt32(Appsettings.app("RabbitConn", "Port")); + optios.Port = Convert.ToInt32(Appsettings.app("RabbitConn", "Port")); optios.UserName = Appsettings.app("RabbitConn", "UserName"); optios.Password = Appsettings.app("RabbitConn", "Password"); diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CacheExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CacheExtension.cs similarity index 73% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CacheExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CacheExtension.cs index e206a7e0..82f7ddf0 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CacheExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CacheExtension.cs @@ -4,10 +4,10 @@ using Microsoft.OpenApi.Models; using System; using System.IO; using Yi.Framework.Common.IOCOptions; -using Yi.Framework.Core; using Yi.Framework.Core.Cache; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// Redis扩展 @@ -16,9 +16,10 @@ namespace Yi.Framework.WebCore.MiddlewareExtend { public static IServiceCollection AddCacheService(this IServiceCollection services) { - var cacheSelect= Appsettings.app("CacheSelect"); + var cacheSelect = Appsettings.app("CacheSelect"); - switch (cacheSelect) { + switch (cacheSelect) + { case "Redis": services.Configure(Appsettings.appConfiguration("RedisConnOptions")); services.AddSingleton(); @@ -26,7 +27,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend case "MemoryCache": services.AddSingleton(); break; - default:throw new ArgumentException("CacheSelect配置填的是什么东西？俺不认得"); + default: throw new ArgumentException("CacheSelect配置填的是什么东西？俺不认得"); } return services; } diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CacheInitExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CacheInitExtend.cs similarity index 78% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CacheInitExtend.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CacheInitExtend.cs index 5db35b91..ee7e53b4 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CacheInitExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CacheInitExtend.cs @@ -8,14 +8,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Models; -using Yi.Framework.Core; +using Yi.Framework.Core.Cache; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { - public static class CacheInitExtend + public static class CacheInitExtend { private static readonly ILog log = LogManager.GetLogger(typeof(CacheInitExtend)); - public static void UseRedisSeedInitService(this IApplicationBuilder app ) + public static void UseRedisSeedInitService(this IApplicationBuilder app) { if (Appsettings.appBool("CacheSeed_Enabled")) diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ConsulRegisterHostExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ConsulRegisterHostExtend.cs similarity index 78% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ConsulRegisterHostExtend.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ConsulRegisterHostExtend.cs index 4061172f..2a9972c8 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ConsulRegisterHostExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ConsulRegisterHostExtend.cs @@ -5,8 +5,9 @@ using System; using System.Threading; using System.Threading.Tasks; using Yi.Framework.Common.IOCOptions; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// 注册ConsulRegisterService 这个servcie在app启动的时候会自动注册服务信息 @@ -23,16 +24,16 @@ namespace Yi.Framework.WebCore.MiddlewareExtend } public async Task StartAsync(CancellationToken cancellationToken) { - var httpPort = this._consulRegisterOptions.Port; + var httpPort = _consulRegisterOptions.Port; //var grpcPort = Convert.ToInt32(Appsettings.app("GrpcPort")); //------------------Http------------------ using (ConsulClient client = new ConsulClient(c => { - c.Address = new Uri($"http://{this._consulClientOptions.IP}:{this._consulClientOptions.Port}/"); - c.Datacenter = this._consulClientOptions.Datacenter; + c.Address = new Uri($"http://{_consulClientOptions.IP}:{_consulClientOptions.Port}/"); + c.Datacenter = _consulClientOptions.Datacenter; })) { - var serviceId = $"{this._consulRegisterOptions.IP}:{httpPort}-{this._consulRegisterOptions.GroupName}"; + var serviceId = $"{_consulRegisterOptions.IP}:{httpPort}-{_consulRegisterOptions.GroupName}"; await client.Agent.ServiceDeregister(serviceId, cancellationToken); @@ -41,18 +42,18 @@ namespace Yi.Framework.WebCore.MiddlewareExtend await client.Agent.ServiceRegister(new AgentServiceRegistration() { ID = serviceId,//唯一Id - Name = this._consulRegisterOptions.GroupName,//组名称-Group - Address = this._consulRegisterOptions.IP, + Name = _consulRegisterOptions.GroupName,//组名称-Group + Address = _consulRegisterOptions.IP, Port = httpPort, Tags = new string[] { "Http" }, Check = new AgentServiceCheck() { - Interval = TimeSpan.FromSeconds(this._consulRegisterOptions.Interval), + Interval = TimeSpan.FromSeconds(_consulRegisterOptions.Interval), HTTP = $"http://{_consulRegisterOptions.IP}:{httpPort}/Health", //GRPC = $"{this._consulRegisterOptions.IP}:{grpcPort}",//gRPC特有 GRPCUseTLS = false,//支持http - Timeout = TimeSpan.FromSeconds(this._consulRegisterOptions.Timeout), - DeregisterCriticalServiceAfter = TimeSpan.FromSeconds(this._consulRegisterOptions.DeregisterCriticalServiceAfter), + Timeout = TimeSpan.FromSeconds(_consulRegisterOptions.Timeout), + DeregisterCriticalServiceAfter = TimeSpan.FromSeconds(_consulRegisterOptions.DeregisterCriticalServiceAfter), } }); @@ -71,7 +72,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend // await client.Agent.ServiceDeregister(serviceId, cancellationToken); // Console.WriteLine($"开始向Consul注册Grpc[{serviceId}]服务 ..."); - + // await client.Agent.ServiceRegister(new AgentServiceRegistration() // { // ID = serviceId,//唯一Id @@ -100,18 +101,19 @@ namespace Yi.Framework.WebCore.MiddlewareExtend /// public async Task StopAsync(CancellationToken cancellationToken) { - var httpPort = this._consulRegisterOptions.Port; + var httpPort = _consulRegisterOptions.Port; //var grpcPort = Appsettings.app("GrpcPort"); using (ConsulClient client = new ConsulClient(c => { - c.Address = new Uri($"http://{this._consulClientOptions.IP}:{this._consulClientOptions.Port}/"); - c.Datacenter = this._consulClientOptions.Datacenter; - })) { + c.Address = new Uri($"http://{_consulClientOptions.IP}:{_consulClientOptions.Port}/"); + c.Datacenter = _consulClientOptions.Datacenter; + })) + { - var serviceId = $"{this._consulRegisterOptions.GroupName}:{this._consulRegisterOptions.IP}-{httpPort}"; + var serviceId = $"{_consulRegisterOptions.GroupName}:{_consulRegisterOptions.IP}-{httpPort}"; //var grpcServiceId = $"{this._consulRegisterOptions.GrpcGroupName}:{this._consulRegisterOptions.IP}-{grpcPort}"; @@ -120,7 +122,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend Console.WriteLine($"开始Consul注销[{serviceId}]服务 ..."); } - + } } } diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ConsulRegiterExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ConsulRegiterExtend.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ConsulRegiterExtend.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ConsulRegiterExtend.cs index 9eeca35e..91acd3dd 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ConsulRegiterExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ConsulRegiterExtend.cs @@ -9,8 +9,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.IOCOptions; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// HTTP模式 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CorsExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CorsExtension.cs similarity index 91% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CorsExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CorsExtension.cs index cdfd12fe..b6f5ed9f 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/CorsExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/CorsExtension.cs @@ -2,8 +2,9 @@ using Microsoft.Extensions.DependencyInjection; using System; using System.IO; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// 通用跨域扩展 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ElasticSeachExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ElasticSeachExtend.cs similarity index 88% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ElasticSeachExtend.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ElasticSeachExtend.cs index cfdaff61..cb9f8b1a 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ElasticSeachExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/ElasticSeachExtend.cs @@ -5,8 +5,9 @@ using System; using System.IO; using Yi.Framework.Common.IOCOptions; using Yi.Framework.Core; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// Redis扩展 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/HealthCheckExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/HealthCheckExtension.cs similarity index 92% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/HealthCheckExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/HealthCheckExtension.cs index a8658784..808528dc 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/HealthCheckExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/HealthCheckExtension.cs @@ -6,8 +6,9 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// 健康检测扩展 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/IocExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/IocExtension.cs similarity index 90% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/IocExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/IocExtension.cs index d7b5301f..8bb6f9f4 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/IocExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/IocExtension.cs @@ -6,8 +6,9 @@ using System; using System.IO; using Yi.Framework.Common.IOCOptions; using Yi.Framework.Model; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// 通用跨域扩展 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/JwtExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/JwtExtension.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/JwtExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/JwtExtension.cs index fc73ef92..cdf7b533 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/JwtExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/JwtExtension.cs @@ -11,8 +11,9 @@ using Yi.Framework.Common.Helper; using Yi.Framework.Common.IOCOptions; using Yi.Framework.Common.Models; using Yi.Framework.Core; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// 通用跨域扩展 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/LocalizerExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/LocalizerExtend.cs similarity index 94% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/LocalizerExtend.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/LocalizerExtend.cs index a4193392..6a4c94b5 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/LocalizerExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/LocalizerExtend.cs @@ -9,13 +9,13 @@ using System.Threading.Tasks; using Yi.Framework.Common.Models; using Yi.Framework.Language; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { public static class LocalizerExtend { public static IServiceCollection AddLocalizerService(this IServiceCollection services) { - + services.AddLocalization(); return services; } diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/QuartzExtensions.cs similarity index 90% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/QuartzExtensions.cs index 7e86dffb..39382c87 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/QuartzExtensions.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/QuartzExtensions.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Yi.Framework.Core; +using Yi.Framework.Core.Quartz; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// 启动定时器服务，后台服务 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/RabbitMQExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/RabbitMQExtension.cs similarity index 88% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/RabbitMQExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/RabbitMQExtension.cs index e98b49c8..d84d8dbd 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/RabbitMQExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/RabbitMQExtension.cs @@ -5,8 +5,9 @@ using System; using System.IO; using Yi.Framework.Common.IOCOptions; using Yi.Framework.Core; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// Redis扩展 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SMSExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SMSExtension.cs similarity index 88% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SMSExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SMSExtension.cs index 487f02d4..53fa566c 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SMSExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SMSExtension.cs @@ -6,8 +6,9 @@ using System.IO; using Yi.Framework.Common.IOCOptions; using Yi.Framework.Core; using Yi.Framework.Core.SMS; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// Redis扩展 @@ -18,7 +19,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend { if (Appsettings.appBool("SMS_Enabled")) { - + services.Configure(Appsettings.appConfiguration("SMS")); services.AddTransient(); } diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SqlsugarExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SqlsugarExtension.cs similarity index 98% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SqlsugarExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SqlsugarExtension.cs index 5603bc64..241b14db 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SqlsugarExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SqlsugarExtension.cs @@ -8,8 +8,9 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Models; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { public static class SqlsugarExtension { @@ -117,7 +118,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend } _logger?.LogInformation(sb.ToString()); } - + }; diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SwaggerExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SwaggerExtension.cs similarity index 96% rename from Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SwaggerExtension.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SwaggerExtension.cs index d49d925c..abbd0401 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/SwaggerExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/SwaggerExtension.cs @@ -1,5 +1,4 @@ -using IGeekFan.AspNetCore.Knife4jUI; -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; @@ -7,7 +6,7 @@ using System; using System.IO; using Yi.Framework.Common.Models; -namespace Yi.Framework.WebCore.MiddlewareExtend +namespace Yi.Framework.WebCore.AspNetCoreExtensions { /// /// Swagger扩展 @@ -20,7 +19,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend { Title = title, Version = "v1", - Contact = new OpenApiContact { Name = "橙子", Email = "454313500@qq.com", Url = new System.Uri("https://ccnetcore.com") } + Contact = new OpenApiContact { Name = "橙子", Email = "454313500@qq.com", Url = new Uri("https://ccnetcore.com") } }; #region 注册Swagger服务 services.AddSwaggerGen(c => diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/AttributeExtend/GlobalLogAttribute.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AttributeExtend/GlobalLogAttribute.cs index 20e5e3d1..da380881 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/AttributeExtend/GlobalLogAttribute.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AttributeExtend/GlobalLogAttribute.cs @@ -12,7 +12,9 @@ using Yi.Framework.Common.Attribute; using Yi.Framework.Common.Helper; using Yi.Framework.Common.Models; using Yi.Framework.Interface; -using Yi.Framework.Model.Models; +using Yi.Framework.Interface.RABC; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.WebCore.AttributeExtend { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/AuthorizationPolicy/CustomAuthorizationHandler.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AuthorizationPolicy/CustomAuthorizationHandler.cs index b3360551..ced39462 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/AuthorizationPolicy/CustomAuthorizationHandler.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AuthorizationPolicy/CustomAuthorizationHandler.cs @@ -9,7 +9,6 @@ using System.Security.Claims; using System.Threading.Tasks; using Yi.Framework.Common.Const; using Yi.Framework.Core; -using Yi.Framework.Model.Models; namespace Yi.Framework.WebCore.AuthorizationPolicy { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/AutoFacExtend/PropertiesAutowiredModule.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/AutoFacExtend/PropertiesAutowiredModule.cs index b143fc81..f976fa47 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/AutoFacExtend/PropertiesAutowiredModule.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/AutoFacExtend/PropertiesAutowiredModule.cs @@ -13,6 +13,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Yi.Framework.Common.Attribute; using Yi.Framework.Interface; using Yi.Framework.Job; using Yi.Framework.Repository; diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/ApolloExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/ApolloExtension.cs index 36c73af5..0f60ee07 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/ApolloExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/ApolloExtension.cs @@ -7,6 +7,7 @@ using Com.Ctrip.Framework.Apollo.Enums; using Com.Ctrip.Framework.Apollo.Logging; using Microsoft.Extensions.Primitives; using System.Reflection; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.WebCore.BuilderExtend { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/OptionsWritable/OptionsWritableConfigurationServiceCollectionExtensions.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/OptionsWritable/OptionsWritableConfigurationServiceCollectionExtensions.cs index d6d761d9..83e233ce 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/OptionsWritable/OptionsWritableConfigurationServiceCollectionExtensions.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/BuilderExtend/OptionsWritable/OptionsWritableConfigurationServiceCollectionExtensions.cs @@ -3,31 +3,30 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using System; using System.Configuration; -using Yi.Framework.WebCore.BuilderExtend.OptionsWritable; using Yi.Framework.WebCore.BuilderExtend.OptionsWritable.Internal; -namespace Yi.Framework.WebCore.BuilderExtend; +namespace Yi.Framework.WebCore.BuilderExtend.OptionsWritable; public static class OptionsWritableConfigurationServiceCollectionExtensions { - public static void ConfigureJson(this IServiceCollection services, Microsoft.Extensions.Configuration.ConfigurationManager configuration, string jsonFilePath) + public static void ConfigureJson(this IServiceCollection services, Microsoft.Extensions.Configuration.ConfigurationManager configuration, string jsonFilePath) where TOption : class, new() { - ConfigureJson(services, configuration.GetSection(typeof(TOption).Name), jsonFilePath); + services.ConfigureJson(configuration.GetSection(typeof(TOption).Name), jsonFilePath); } - public static void ConfigureJson(this IServiceCollection services, IConfigurationSection section, string jsonFilePath) + public static void ConfigureJson(this IServiceCollection services, IConfigurationSection section, string jsonFilePath) where TOption : class, new() { services.Configure(section); - services.AddTransient>(provider => + services.AddTransient>(provider => new JsonOptionsWritable(provider.GetRequiredService>(), section.Key, jsonFilePath)); } public static void ConfigureJson(this IServiceCollection services, Microsoft.Extensions.Configuration.ConfigurationManager configuration, Func jsonFilePathFunc) where TOption : class, new() { - ConfigureJson(services, configuration.GetSection(typeof(TOption).Name), jsonFilePathFunc); + services.ConfigureJson(configuration.GetSection(typeof(TOption).Name), jsonFilePathFunc); } public static void ConfigureJson(this IServiceCollection services, IConfigurationSection section, Func jsonFilePathFunc) diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/Appsettings.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/Appsettings.cs similarity index 94% rename from Yi.Framework.Net6/Yi.Framework.WebCore/Appsettings.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/Appsettings.cs index 53fedd00..0c92ee9d 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/Appsettings.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/Appsettings.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Yi.Framework.WebCore +namespace Yi.Framework.WebCore.CommonExtend { /// /// appsettings.json操作类 @@ -13,7 +13,7 @@ namespace Yi.Framework.WebCore { static IConfiguration? Configuration { get; set; } static string? contentPath { get; set; } - + public Appsettings(string contentPath) { string Path = "appsettings.json"; @@ -44,7 +44,7 @@ namespace Yi.Framework.WebCore if (sections.Any()) { - return Configuration?[string.Join(":", sections)]; + return Configuration?[string.Join(":", sections)]; } } catch (Exception) { } @@ -54,8 +54,8 @@ namespace Yi.Framework.WebCore public static bool appBool(params string[] sections) { - - return Bool(app(sections)); + + return Bool(app(sections)); } diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/HttpContextExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/HttpContextExtend.cs index 70dbdd21..33ead2df 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/HttpContextExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/HttpContextExtend.cs @@ -7,14 +7,14 @@ using System.Linq; using System.Security.Claims; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; using System.IdentityModel.Tokens.Jwt; using System.IO; using System.Text.RegularExpressions; using UAParser; using IPTools.Core; +using Yi.Framework.Model.RABC.Entitys; -namespace Yi.Framework.WebCore +namespace Yi.Framework.WebCore.CommonExtend { public static class HttpContextExtend { @@ -113,7 +113,7 @@ namespace Yi.Framework.WebCore /// public static void FileInlineHandle(this HttpContext httpContext, string fileName) { - string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.GetEncoding("UTF-8")); + string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8")); httpContext.Response.Headers.Add("Content-Disposition", "inline;filename=" + encodeFilename); } @@ -125,7 +125,7 @@ namespace Yi.Framework.WebCore /// public static void FileAttachmentHandle(this HttpContext httpContext, string fileName) { - string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.GetEncoding("UTF-8")); + string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8")); httpContext.Response.Headers.Add("Content-Disposition", "attachment;filename=" + encodeFilename); } @@ -167,7 +167,7 @@ namespace Yi.Framework.WebCore } else { - param = context.Request.QueryString.Value is null?"": context.Request.QueryString.Value.ToString(); + param = context.Request.QueryString.Value is null ? "" : context.Request.QueryString.Value.ToString(); } return param; } @@ -179,7 +179,7 @@ namespace Yi.Framework.WebCore /// public static ClientInfo GetClientInfo(this HttpContext context) { - var str = GetUserAgent(context); + var str = context.GetUserAgent(); var uaParser = Parser.GetDefault(); ClientInfo c = uaParser.Parse(str); return c; diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/ServiceLocator.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/ServiceLocator.cs similarity index 93% rename from Yi.Framework.Net6/Yi.Framework.WebCore/ServiceLocator.cs rename to Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/ServiceLocator.cs index 87a30d30..dc63df14 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/ServiceLocator.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/ServiceLocator.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using System; using Ubiety.Dns.Core.Common; -namespace Yi.Framework.WebCore +namespace Yi.Framework.WebCore.CommonExtend { public static class ServiceLocator { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs index b44816ab..6bcfa4ea 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbFiterExtend.cs @@ -1,15 +1,16 @@ using Microsoft.Extensions.DependencyInjection; using SqlSugar; -using System; using System.Linq; +using Yi.Framework.Common.Base; using Yi.Framework.Common.Const; using Yi.Framework.Common.Enum; using Yi.Framework.Common.Models; +using Yi.Framework.Core.Cache; using Yi.Framework.DTOModel; -using Yi.Framework.Model.Models; -using Yi.Framework.WebCore; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.WebCore.CommonExtend; -namespace Yi.Framework.Core +namespace Yi.Framework.WebCore.DbExtend { public class DbFiterExtend { @@ -69,7 +70,7 @@ namespace Yi.Framework.Core break; case DataScopeEnum.CUSTOM: //自定义查询 - var filter = new TableFilterItem(it => SqlFunc.Subqueryable().Where(f => f.DeptId == it.DeptId && f.RoleId == (long)role.Id).Any(), true); + var filter = new TableFilterItem(it => SqlFunc.Subqueryable().Where(f => f.DeptId == it.DeptId && f.RoleId == role.Id).Any(), true); db.QueryFilter.Add(filter); break; case DataScopeEnum.DEPT_FOLLOW: diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs index db9ca2e0..4705934d 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/DbExtend/DbSeedExtend.cs @@ -6,8 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Model.Models; -using Yi.Framework.Model.SeedData; +using Yi.Framework.Model.RABC.Entitys; +using Yi.Framework.Model.RABC.SeedData; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.WebCore.DbExtend { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/MapperHelper.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/MapperHelper.cs index 2812369f..4145acc2 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/MapperHelper.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/MapperHelper.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.WebCore.Mapper; namespace Yi.Framework.WebCore.Mapper { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs index 2b34431a..26c0f917 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/Mapper/Profile/AutoMapperProfile.cs @@ -5,7 +5,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.DTOModel.Vo; -using Yi.Framework.Model.Models; +using Yi.Framework.Model.BBS.Entitys; +using Yi.Framework.Model.RABC.Entitys; namespace Yi.Framework.WebCore.Mapper { @@ -14,11 +15,11 @@ namespace Yi.Framework.WebCore.Mapper // 添加你的实体映射关系. public AutoMapperProfile() { - CreateMap (); + CreateMap(); CreateMap(); CreateMap(); } } - + } diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/StaticPageExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/StaticPageExtension.cs index 758244f6..009be9c1 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/StaticPageExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/StaticPageExtension.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.WebCore.MiddlewareExtend { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/SignalRHub/MainHub.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/SignalRHub/MainHub.cs index f8f24f98..85b1fc2e 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/SignalRHub/MainHub.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/SignalRHub/MainHub.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Yi.Framework.Common.Enum; +using Yi.Framework.WebCore.CommonExtend; namespace Yi.Framework.WebCore.SignalRHub { diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/Yi.Framework.WebCore.csproj b/Yi.Framework.Net6/Yi.Framework.WebCore/Yi.Framework.WebCore.csproj index 79f8dded..7bf6ea1d 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/Yi.Framework.WebCore.csproj +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/Yi.Framework.WebCore.csproj @@ -15,13 +15,11 @@ - - diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/JobTest/QuartzTest.cs b/Yi.Framework.Net6/Yi.Framework.XUnitTest/JobTest/QuartzTest.cs index db317bfe..4689b209 100644 --- a/Yi.Framework.Net6/Yi.Framework.XUnitTest/JobTest/QuartzTest.cs +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/JobTest/QuartzTest.cs @@ -1,5 +1,5 @@ using Yi.Framework.Common.Const; -using Yi.Framework.Core; +using Yi.Framework.Core.Quartz; namespace Yi.Framework.XUnitTest { diff --git a/Yi.Framework.Net6/Yi.Framework.XUnitTest/Startup.cs b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Startup.cs index dcd397fe..32516009 100644 --- a/Yi.Framework.Net6/Yi.Framework.XUnitTest/Startup.cs +++ b/Yi.Framework.Net6/Yi.Framework.XUnitTest/Startup.cs @@ -8,10 +8,10 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Quartz; using Yi.Framework.WebCore.AutoFacExtend; -using Yi.Framework.WebCore.MiddlewareExtend; using Microsoft.AspNetCore.Builder; using Yi.Framework.WebCore.DbExtend; using Microsoft.AspNetCore.Hosting; +using Yi.Framework.WebCore.AspNetCoreExtensions; namespace Yi.Framework.XUnitTest { diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue index e4ac251f..5946e12a 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue @@ -374,6 +374,7 @@ function handleExport() { }; /** 用户状态修改 */ function handleStatusChange(row) { + console.log(row) let text = row.isDeleted === false ? "启用" : "停用"; proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () { return changeUserStatus(row.id, row.isDeleted); @@ -543,7 +544,7 @@ function submitForm() { } }); }; - getDeptTree(); getList(); + diff --git a/Yi.Vue3.x.Vant/components.d.ts b/Yi.Vue3.x.Vant/components.d.ts index 06b17dbb..b2477968 100644 --- a/Yi.Vue3.x.Vant/components.d.ts +++ b/Yi.Vue3.x.Vant/components.d.ts @@ -16,6 +16,7 @@ declare module '@vue/runtime-core' { RouterView: typeof import('vue-router')['RouterView'] VanActionSheet: typeof import('vant/es')['ActionSheet'] VanButton: typeof import('vant/es')['Button'] + VanCell: typeof import('vant/es')['Cell'] VanCellGroup: typeof import('vant/es')['CellGroup'] VanCol: typeof import('vant/es')['Col'] VanField: typeof import('vant/es')['Field'] @@ -26,9 +27,12 @@ declare module '@vue/runtime-core' { VanList: typeof import('vant/es')['List'] VanLoading: typeof import('vant/es')['Loading'] VanNavBar: typeof import('vant/es')['NavBar'] + VanPopup: typeof import('vant/es')['Popup'] VanPullRefresh: typeof import('vant/es')['PullRefresh'] VanRow: typeof import('vant/es')['Row'] VanSticky: typeof import('vant/es')['Sticky'] + VanSwipe: typeof import('vant/es')['Swipe'] + VanSwipeItem: typeof import('vant/es')['SwipeItem'] VanTab: typeof import('vant/es')['Tab'] VanTabbar: typeof import('vant/es')['Tabbar'] VanTabbarItem: typeof import('vant/es')['TabbarItem'] diff --git a/Yi.Vue3.x.Vant/package-lock.json b/Yi.Vue3.x.Vant/package-lock.json index 3df5a832..33c14624 100644 --- a/Yi.Vue3.x.Vant/package-lock.json +++ b/Yi.Vue3.x.Vant/package-lock.json @@ -1,8 +1,1524 @@ { "name": "yi", "version": "0.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "yi", + "version": "0.0.0", + "dependencies": { + "axios": "^1.1.2", + "json-bigint": "^1.0.0", + "pinia": "^2.0.23", + "vant": "^3.6.3", + "vue": "^3.2.37", + "vue-router": "^4.1.5", + "vuex": "^4.0.2" + }, + "devDependencies": { + "@types/json-bigint": "^1.0.1", + "@types/node": "^18.8.2", + "@vitejs/plugin-vue": "^3.1.0", + "typescript": "^4.6.4", + "unplugin-vue-components": "^0.22.7", + "vite": "^3.1.0", + "vue-tsc": "^0.40.4" + } + }, + "node_modules/@antfu/utils": { + "version": "0.5.2", + "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.5.2.tgz", + "integrity": "sha512-CQkeV+oJxUazwjlHD0/3ZD08QWKuGQkhnrKo3e6ly5pd48VUpXbb77q0xMU4+vc2CkJnDS02Eq/M9ugyX20XZA==", + "dev": true + }, + "node_modules/@babel/parser": { + "version": "7.19.3", + "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.19.3.tgz", + "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.15.10.tgz", + "integrity": "sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz", + "integrity": "sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rollup/pluginutils": { + "version": "4.2.1", + "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", + "dev": true, + "dependencies": { + "estree-walker": "^2.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/@types/json-bigint": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/json-bigint/-/json-bigint-1.0.1.tgz", + "integrity": "sha512-zpchZLNsNuzJHi6v64UBoFWAvQlPhch7XAi36FkH6tL1bbbmimIF+cS7vwkzY4u5RaSWMoflQfu+TshMPPw8uw==", + "dev": true + }, + "node_modules/@types/node": { + "version": "18.8.2", + "resolved": "https://registry.npmmirror.com/@types/node/-/node-18.8.2.tgz", + "integrity": "sha512-cRMwIgdDN43GO4xMWAfJAecYn8wV4JbsOGHNfNUIDiuYkUYAR5ec4Rj7IO2SAhFPEfpPtLtUTbbny/TCT7aDwA==", + "dev": true + }, + "node_modules/@vant/icons": { + "version": "1.8.0", + "resolved": "https://registry.npmmirror.com/@vant/icons/-/icons-1.8.0.tgz", + "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg==" + }, + "node_modules/@vant/popperjs": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/@vant/popperjs/-/popperjs-1.3.0.tgz", + "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==" + }, + "node_modules/@vant/use": { + "version": "1.4.3", + "resolved": "https://registry.npmmirror.com/@vant/use/-/use-1.4.3.tgz", + "integrity": "sha512-rSnETN7P9qT1WbItMpQxBqe3cHeK2ZFYp1sCxWUXaTeI71TqA8sOdzC36ledZ36NQgFNTch9fsRPYOkrCgZfQA==" + }, + "node_modules/@vitejs/plugin-vue": { + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-3.1.2.tgz", + "integrity": "sha512-3zxKNlvA3oNaKDYX0NBclgxTQ1xaFdL7PzwF6zj9tGFziKwmBa3Q/6XcJQxudlT81WxDjEhHmevvIC4Orc1LhQ==", + "dev": true, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "vite": "^3.0.0", + "vue": "^3.2.25" + } + }, + "node_modules/@volar/code-gen": { + "version": "0.40.13", + "resolved": "https://registry.npmmirror.com/@volar/code-gen/-/code-gen-0.40.13.tgz", + "integrity": "sha512-4gShBWuMce868OVvgyA1cU5WxHbjfEme18Tw6uVMfweZCF5fB2KECG0iPrA9D54vHk3FeHarODNwgIaaFfUBlA==", + "dev": true, + "dependencies": { + "@volar/source-map": "0.40.13" + } + }, + "node_modules/@volar/source-map": { + "version": "0.40.13", + "resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-0.40.13.tgz", + "integrity": "sha512-dbdkAB2Nxb0wLjAY5O64o3ywVWlAGONnBIoKAkXSf6qkGZM+nJxcizsoiI66K+RHQG0XqlyvjDizfnTxr+6PWg==", + "dev": true, + "dependencies": { + "@vue/reactivity": "3.2.38" + } + }, + "node_modules/@volar/source-map/node_modules/@vue/reactivity": { + "version": "3.2.38", + "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.38.tgz", + "integrity": "sha512-6L4myYcH9HG2M25co7/BSo0skKFHpAN8PhkNPM4xRVkyGl1K5M3Jx4rp5bsYhvYze2K4+l+pioN4e6ZwFLUVtw==", + "dev": true, + "dependencies": { + "@vue/shared": "3.2.38" + } + }, + "node_modules/@volar/source-map/node_modules/@vue/shared": { + "version": "3.2.38", + "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.38.tgz", + "integrity": "sha512-dTyhTIRmGXBjxJE+skC8tTWCGLCVc4wQgRRLt8+O9p5ewBAjoBwtCAkLPrtToSr1xltoe3st21Pv953aOZ7alg==", + "dev": true + }, + "node_modules/@volar/typescript-faster": { + "version": "0.40.13", + "resolved": "https://registry.npmmirror.com/@volar/typescript-faster/-/typescript-faster-0.40.13.tgz", + "integrity": "sha512-uy+TlcFkKoNlKEnxA4x5acxdxLyVDIXGSc8cYDNXpPKjBKXrQaetzCzlO3kVBqu1VLMxKNGJMTKn35mo+ILQmw==", + "dev": true, + "dependencies": { + "semver": "^7.3.7" + } + }, + "node_modules/@volar/vue-language-core": { + "version": "0.40.13", + "resolved": "https://registry.npmmirror.com/@volar/vue-language-core/-/vue-language-core-0.40.13.tgz", + "integrity": "sha512-QkCb8msi2KUitTdM6Y4kAb7/ZlEvuLcbBFOC2PLBlFuoZwyxvSP7c/dBGmKGtJlEvMX0LdCyrg5V2aBYxD38/Q==", + "dev": true, + "dependencies": { + "@volar/code-gen": "0.40.13", + "@volar/source-map": "0.40.13", + "@vue/compiler-core": "^3.2.38", + "@vue/compiler-dom": "^3.2.38", + "@vue/compiler-sfc": "^3.2.38", + "@vue/reactivity": "^3.2.38", + "@vue/shared": "^3.2.38" + } + }, + "node_modules/@volar/vue-typescript": { + "version": "0.40.13", + "resolved": "https://registry.npmmirror.com/@volar/vue-typescript/-/vue-typescript-0.40.13.tgz", + "integrity": "sha512-o7bNztwjs8JmbQjVkrnbZUOfm7q4B8ZYssETISN1tRaBdun6cfNqgpkvDYd+VUBh1O4CdksvN+5BUNnwAz4oCQ==", + "dev": true, + "dependencies": { + "@volar/code-gen": "0.40.13", + "@volar/typescript-faster": "0.40.13", + "@volar/vue-language-core": "0.40.13" + } + }, + "node_modules/@vue/compiler-core": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.40.tgz", + "integrity": "sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==", + "dependencies": { + "@babel/parser": "^7.16.4", + "@vue/shared": "3.2.40", + "estree-walker": "^2.0.2", + "source-map": "^0.6.1" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz", + "integrity": "sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw==", + "dependencies": { + "@vue/compiler-core": "3.2.40", + "@vue/shared": "3.2.40" + } + }, + "node_modules/@vue/compiler-sfc": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz", + "integrity": "sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg==", + "dependencies": { + "@babel/parser": "^7.16.4", + "@vue/compiler-core": "3.2.40", + "@vue/compiler-dom": "3.2.40", + "@vue/compiler-ssr": "3.2.40", + "@vue/reactivity-transform": "3.2.40", + "@vue/shared": "3.2.40", + "estree-walker": "^2.0.2", + "magic-string": "^0.25.7", + "postcss": "^8.1.10", + "source-map": "^0.6.1" + } + }, + "node_modules/@vue/compiler-ssr": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz", + "integrity": "sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ==", + "dependencies": { + "@vue/compiler-dom": "3.2.40", + "@vue/shared": "3.2.40" + } + }, + "node_modules/@vue/devtools-api": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.4.tgz", + "integrity": "sha512-Ku31WzpOV/8cruFaXaEZKF81WkNnvCSlBY4eOGtz5WMSdJvX1v1WWlSMGZeqUwPtQ27ZZz7B62erEMq8JDjcXw==" + }, + "node_modules/@vue/reactivity": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.40.tgz", + "integrity": "sha512-N9qgGLlZmtUBMHF9xDT4EkD9RdXde1Xbveb+niWMXuHVWQP5BzgRmE3SFyUBBcyayG4y1lhoz+lphGRRxxK4RA==", + "dependencies": { + "@vue/shared": "3.2.40" + } + }, + "node_modules/@vue/reactivity-transform": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz", + "integrity": "sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw==", + "dependencies": { + "@babel/parser": "^7.16.4", + "@vue/compiler-core": "3.2.40", + "@vue/shared": "3.2.40", + "estree-walker": "^2.0.2", + "magic-string": "^0.25.7" + } + }, + "node_modules/@vue/runtime-core": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.40.tgz", + "integrity": "sha512-U1+rWf0H8xK8aBUZhnrN97yoZfHbjgw/bGUzfgKPJl69/mXDuSg8CbdBYBn6VVQdR947vWneQBFzdhasyzMUKg==", + "dependencies": { + "@vue/reactivity": "3.2.40", + "@vue/shared": "3.2.40" + } + }, + "node_modules/@vue/runtime-dom": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.40.tgz", + "integrity": "sha512-AO2HMQ+0s2+MCec8hXAhxMgWhFhOPJ/CyRXnmTJ6XIOnJFLrH5Iq3TNwvVcODGR295jy77I6dWPj+wvFoSYaww==", + "dependencies": { + "@vue/runtime-core": "3.2.40", + "@vue/shared": "3.2.40", + "csstype": "^2.6.8" + } + }, + "node_modules/@vue/server-renderer": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.40.tgz", + "integrity": "sha512-gtUcpRwrXOJPJ4qyBpU3EyxQa4EkV8I4f8VrDePcGCPe4O/hd0BPS7v9OgjIQob6Ap8VDz9G+mGTKazE45/95w==", + "dependencies": { + "@vue/compiler-ssr": "3.2.40", + "@vue/shared": "3.2.40" + }, + "peerDependencies": { + "vue": "3.2.40" + } + }, + "node_modules/@vue/shared": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.40.tgz", + "integrity": "sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ==" + }, + "node_modules/acorn": { + "version": "8.8.0", + "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.2.tgz", + "integrity": "sha512-bznQyETwElsXl2RK7HLLwb5GPpOLlycxHCtrpDR/4RqqBzjARaOTo3jz4IgtntWUYee7Ne4S8UHd92VCuzPaWA==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/bignumber.js": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz", + "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==", + "engines": { + "node": "*" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/csstype": { + "version": "2.6.21", + "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/esbuild": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.15.10.tgz", + "integrity": "sha512-N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.15.10", + "@esbuild/linux-loong64": "0.15.10", + "esbuild-android-64": "0.15.10", + "esbuild-android-arm64": "0.15.10", + "esbuild-darwin-64": "0.15.10", + "esbuild-darwin-arm64": "0.15.10", + "esbuild-freebsd-64": "0.15.10", + "esbuild-freebsd-arm64": "0.15.10", + "esbuild-linux-32": "0.15.10", + "esbuild-linux-64": "0.15.10", + "esbuild-linux-arm": "0.15.10", + "esbuild-linux-arm64": "0.15.10", + "esbuild-linux-mips64le": "0.15.10", + "esbuild-linux-ppc64le": "0.15.10", + "esbuild-linux-riscv64": "0.15.10", + "esbuild-linux-s390x": "0.15.10", + "esbuild-netbsd-64": "0.15.10", + "esbuild-openbsd-64": "0.15.10", + "esbuild-sunos-64": "0.15.10", + "esbuild-windows-32": "0.15.10", + "esbuild-windows-64": "0.15.10", + "esbuild-windows-arm64": "0.15.10" + } + }, + "node_modules/esbuild-android-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz", + "integrity": "sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-android-arm64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz", + "integrity": "sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz", + "integrity": "sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-arm64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz", + "integrity": "sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz", + "integrity": "sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-arm64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz", + "integrity": "sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-32": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz", + "integrity": "sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz", + "integrity": "sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz", + "integrity": "sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz", + "integrity": "sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-mips64le": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz", + "integrity": "sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-ppc64le": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz", + "integrity": "sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-riscv64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz", + "integrity": "sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-s390x": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz", + "integrity": "sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-netbsd-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz", + "integrity": "sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-openbsd-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz", + "integrity": "sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-sunos-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz", + "integrity": "sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-32": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz", + "integrity": "sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz", + "integrity": "sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-arm64": { + "version": "0.15.10", + "resolved": "https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz", + "integrity": "sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + }, + "node_modules/fast-glob": { + "version": "3.2.12", + "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fastq": { + "version": "1.13.0", + "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.10.0", + "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.10.0.tgz", + "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/json-bigint": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", + "dependencies": { + "bignumber.js": "^9.0.0" + } + }, + "node_modules/local-pkg": { + "version": "0.4.2", + "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.2.tgz", + "integrity": "sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==", + "dev": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "5.1.0", + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.0.tgz", + "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/pinia": { + "version": "2.0.23", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.23.tgz", + "integrity": "sha512-N15hFf4o5STrxpNrib1IEb1GOArvPYf1zPvQVRGOO1G1d74Ak0J0lVyalX/SmrzdT4Q0nlEFjbURsmBmIGUR5Q==", + "dependencies": { + "@vue/devtools-api": "^6.4.4", + "vue-demi": "*" + }, + "peerDependencies": { + "@vue/composition-api": "^1.4.0", + "typescript": ">=4.4.4", + "vue": "^2.6.14 || ^3.2.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/pinia/node_modules/vue-demi": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, + "node_modules/postcss": { + "version": "8.4.17", + "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.17.tgz", + "integrity": "sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==", + "dependencies": { + "nanoid": "^3.3.4", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.1", + "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", + "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.9.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rollup": { + "version": "2.78.1", + "resolved": "https://registry.npmmirror.com/rollup/-/rollup-2.78.1.tgz", + "integrity": "sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==", + "dev": true, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=10.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "deprecated": "Please use @jridgewell/sourcemap-codec instead" + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/typescript": { + "version": "4.8.4", + "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.8.4.tgz", + "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", + "devOptional": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/unplugin": { + "version": "0.9.6", + "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-0.9.6.tgz", + "integrity": "sha512-YYLtfoNiie/lxswy1GOsKXgnLJTE27la/PeCGznSItk+8METYZErO+zzV9KQ/hXhPwzIJsfJ4s0m1Rl7ZCWZ4Q==", + "dev": true, + "dependencies": { + "acorn": "^8.8.0", + "chokidar": "^3.5.3", + "webpack-sources": "^3.2.3", + "webpack-virtual-modules": "^0.4.5" + } + }, + "node_modules/unplugin-vue-components": { + "version": "0.22.7", + "resolved": "https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.22.7.tgz", + "integrity": "sha512-MJEAKJF9bRykTRvJ4WXF0FNMAyt1PX3iwpu2NN+li35sAKjQv6sC1col5aZDLiwDZDo2AGwxNkzLJFKaun9qHw==", + "dev": true, + "dependencies": { + "@antfu/utils": "^0.5.2", + "@rollup/pluginutils": "^4.2.1", + "chokidar": "^3.5.3", + "debug": "^4.3.4", + "fast-glob": "^3.2.12", + "local-pkg": "^0.4.2", + "magic-string": "^0.26.3", + "minimatch": "^5.1.0", + "resolve": "^1.22.1", + "unplugin": "^0.9.5" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@babel/parser": "^7.15.8", + "vue": "2 || 3" + }, + "peerDependenciesMeta": { + "@babel/parser": { + "optional": true + } + } + }, + "node_modules/unplugin-vue-components/node_modules/magic-string": { + "version": "0.26.5", + "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.26.5.tgz", + "integrity": "sha512-yXUIYOOQnEHKHOftp5shMWpB9ImfgfDJpapa38j/qMtTj5QHWucvxP4lUtuRmHT9vAzvtpHkWKXW9xBwimXeNg==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/vant": { + "version": "3.6.3", + "resolved": "https://registry.npmmirror.com/vant/-/vant-3.6.3.tgz", + "integrity": "sha512-OmqQXgtgJgNNoGV8FzvGkm/fvXOB70ZmruOUU4iJaEmEwdsdYl+31D6niisWZLVAbGW1Xx9rLrOu9hivdxQbbg==", + "dependencies": { + "@vant/icons": "^1.8.0", + "@vant/popperjs": "^1.2.1", + "@vant/use": "^1.4.2" + }, + "peerDependencies": { + "vue": "^3.0.0" + } + }, + "node_modules/vite": { + "version": "3.1.4", + "resolved": "https://registry.npmmirror.com/vite/-/vite-3.1.4.tgz", + "integrity": "sha512-JoQI08aBjY9lycL7jcEq4p9o1xUjq5aRvdH4KWaXtkSx7e7RpAh9D3IjzDWRD4Fg44LS3oDAIOG/Kq1L+82psA==", + "dev": true, + "dependencies": { + "esbuild": "^0.15.6", + "postcss": "^8.4.16", + "resolve": "^1.22.1", + "rollup": "~2.78.0" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + }, + "peerDependencies": { + "less": "*", + "sass": "*", + "stylus": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "less": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/vue": { + "version": "3.2.40", + "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.40.tgz", + "integrity": "sha512-1mGHulzUbl2Nk3pfvI5aXYYyJUs1nm4kyvuz38u4xlQkLUn1i2R7nDbI4TufECmY8v1qNBHYy62bCaM+3cHP2A==", + "dependencies": { + "@vue/compiler-dom": "3.2.40", + "@vue/compiler-sfc": "3.2.40", + "@vue/runtime-dom": "3.2.40", + "@vue/server-renderer": "3.2.40", + "@vue/shared": "3.2.40" + } + }, + "node_modules/vue-router": { + "version": "4.1.5", + "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.5.tgz", + "integrity": "sha512-IsvoF5D2GQ/EGTs/Th4NQms9gd2NSqV+yylxIyp/OYp8xOwxmU8Kj/74E9DTSYAyH5LX7idVUngN3JSj1X4xcQ==", + "dependencies": { + "@vue/devtools-api": "^6.1.4" + }, + "peerDependencies": { + "vue": "^3.2.0" + } + }, + "node_modules/vue-tsc": { + "version": "0.40.13", + "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.40.13.tgz", + "integrity": "sha512-xzuN3g5PnKfJcNrLv4+mAjteMd5wLm5fRhW0034OfNJZY4WhB07vhngea/XeGn7wNYt16r7syonzvW/54dcNiA==", + "dev": true, + "dependencies": { + "@volar/vue-language-core": "0.40.13", + "@volar/vue-typescript": "0.40.13" + }, + "bin": { + "vue-tsc": "bin/vue-tsc.js" + }, + "peerDependencies": { + "typescript": "*" + } + }, + "node_modules/vuex": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz", + "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==", + "dependencies": { + "@vue/devtools-api": "^6.0.0-beta.11" + }, + "peerDependencies": { + "vue": "^3.0.2" + } + }, + "node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack-virtual-modules": { + "version": "0.4.5", + "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.5.tgz", + "integrity": "sha512-8bWq0Iluiv9lVf9YaqWQ9+liNgXSHICm+rg544yRgGYaR8yXZTVBaHZkINZSB2yZSWo4b0F6MIxqJezVfOEAlg==", + "dev": true + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + }, "dependencies": { "@antfu/utils": { "version": "0.5.2", @@ -96,7 +1612,8 @@ "version": "3.1.2", "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-3.1.2.tgz", "integrity": "sha512-3zxKNlvA3oNaKDYX0NBclgxTQ1xaFdL7PzwF6zj9tGFziKwmBa3Q/6XcJQxudlT81WxDjEhHmevvIC4Orc1LhQ==", - "dev": true + "dev": true, + "requires": {} }, "@volar/code-gen": { "version": "0.40.13", @@ -787,7 +2304,8 @@ "vue-demi": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==" + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "requires": {} } } }, @@ -899,7 +2417,7 @@ "version": "4.8.4", "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.8.4.tgz", "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", - "dev": true + "devOptional": true }, "unplugin": { "version": "0.9.6",