diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs index 543102e..785b620 100644 --- a/ZR.Admin.WebApi/Controllers/CommonController.cs +++ b/ZR.Admin.WebApi/Controllers/CommonController.cs @@ -8,6 +8,7 @@ using ZR.Model.System; using ZR.Service.IService; using ZR.Service.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs b/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs index 5a81d8a..b4e033b 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs +++ b/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs @@ -1,9 +1,10 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; -using ZR.Model.Dto; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs index b111ace..4015401 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs @@ -3,8 +3,9 @@ using SqlSugar; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index 117bdd7..aba7e36 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -6,9 +6,9 @@ using ZR.CodeGenerator; using ZR.CodeGenerator.Model; using ZR.CodeGenerator.Service; using ZR.Model; -using ZR.Model.System.Dto; -using ZR.Model.System.Generate; using ZR.Service.System.IService; +using ZR.ServiceCore.Model.Dto; +using ZR.ServiceCore.Model.Generate; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs b/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs index e24cb0e..b5d19d9 100644 --- a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc; using MiniExcelLibs; using ZR.Admin.WebApi.Filters; using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Models; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs index 51bae9c..ad3f1d3 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs @@ -4,8 +4,9 @@ using SqlSugar; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs index 1c27be9..aba4b82 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs @@ -2,8 +2,9 @@ using System.Collections; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs index 874f484..70cbe5e 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs @@ -2,8 +2,9 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { @@ -65,14 +66,14 @@ namespace ZR.Admin.WebApi.Controllers.System /// [AllowAnonymous] [HttpPost("types")] - public IActionResult DictTypes([FromBody] List dto) + public IActionResult DictTypes([FromBody] List dto) { var list = SysDictDataService.SelectDictDataByTypes(dto.Select(f => f.DictType).ToArray()); - List dataVos = new(); + List dataVos = new(); foreach (var dic in dto) { - SysdictDataDto vo = new() + SysDictDataDto vo = new() { DictType = dic.DictType, ColumnName = dic.ColumnName, diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index 392d555..dd07416 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -3,8 +3,9 @@ using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysFieldController.cs b/ZR.Admin.WebApi/Controllers/System/SysFieldController.cs new file mode 100644 index 0000000..0779a64 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/System/SysFieldController.cs @@ -0,0 +1,10 @@ +using ZR.Admin.WebApi.Filters; + +namespace ZR.Admin.WebApi.Controllers.System; + +[Verify] +[Route("system/field")] +public class SysFieldController : BaseController +{ + +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/Controllers/System/SysFileController.cs b/ZR.Admin.WebApi/Controllers/System/SysFileController.cs index b084c21..4c29154 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysFileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysFileController.cs @@ -2,8 +2,9 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index 35696ec..ee0ccc4 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -4,9 +4,10 @@ using Microsoft.Extensions.Options; using NETCore.Encrypt; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs index 5c0bc07..075325c 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs @@ -1,8 +1,9 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs index 1e9abb4..43f2b8b 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs @@ -4,8 +4,9 @@ using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; using ZR.ServiceCore.Signalr; namespace ZR.Admin.WebApi.Controllers.System diff --git a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs index 8e65053..5ffe229 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs @@ -4,6 +4,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs index 4bac774..eb70c5c 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -3,8 +3,9 @@ using System.Net.Sockets; using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs index d39b4bc..927694c 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs @@ -2,8 +2,9 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs index d427265..59af39c 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -4,8 +4,9 @@ using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs index 366e1c2..ab780d1 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 96aa3a6..8c4ff91 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -3,8 +3,9 @@ using Quartz; using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; using ZR.Tasks; namespace ZR.Admin.WebApi.Controllers diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs index 02dee80..73b312c 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -3,8 +3,9 @@ using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs index 7550e92..4091714 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model.Dto; //创建时间:2023-08-17 namespace ZR.Admin.WebApi.Controllers diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index 712f022..7cfe948 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -5,6 +5,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Admin.WebApi.Controllers.monitor { diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index a30baeb..68e175d 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model.Dto; namespace ZR.Admin.WebApi.Controllers.monitor { diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs index e0d6109..e0d785d 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.SignalR; using ZR.Admin.WebApi.Filters; using ZR.Model; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model.Dto; using ZR.ServiceCore.Signalr; namespace ZR.Admin.WebApi.Controllers.monitor diff --git a/ZR.Admin.WebApi/Extensions/TasksExtension.cs b/ZR.Admin.WebApi/Extensions/TasksExtension.cs index b1b11b1..2c298a5 100644 --- a/ZR.Admin.WebApi/Extensions/TasksExtension.cs +++ b/ZR.Admin.WebApi/Extensions/TasksExtension.cs @@ -1,6 +1,7 @@ using Quartz.Spi; using SqlSugar.IOC; using ZR.Model.System; +using ZR.ServiceCore.Model; using ZR.Tasks; namespace ZR.Admin.WebApi.Extensions diff --git a/ZR.Admin.WebApi/GlobalUsing.cs b/ZR.Admin.WebApi/GlobalUsing.cs index 3a674ba..2fe855f 100644 --- a/ZR.Admin.WebApi/GlobalUsing.cs +++ b/ZR.Admin.WebApi/GlobalUsing.cs @@ -7,4 +7,5 @@ global using Infrastructure.Model; global using Mapster; global using Infrastructure.Extensions; global using Infrastructure.Controllers; -global using ZR.ServiceCore.Middleware; \ No newline at end of file +global using ZR.ServiceCore.Middleware; +global using Microsoft.AspNetCore.Mvc; \ No newline at end of file diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs index aa708a6..b62dc6c 100644 --- a/ZR.Admin.WebApi/Program.cs +++ b/ZR.Admin.WebApi/Program.cs @@ -1,3 +1,4 @@ +using System.Reflection; using AspNetCoreRateLimit; using Infrastructure.Converter; using Microsoft.AspNetCore.DataProtection; @@ -165,4 +166,23 @@ using (var serviceScope = app.Services.CreateScope()) await ipPolicyStore.SetAsync(optionsAccessor.Value.IpPolicyPrefix, pol); } +var serviceCoreModel = AppDomain.CurrentDomain + .GetAssemblies() + .First(it => it.FullName.Contains("ZR.ServiceCore")) + .ExportedTypes + .Where(p => p.FullName.StartsWith("ZR.ServiceCore.Model")) + .ToList(); +// var geoEntityTypes = currentAssembly[0].ExportedTypes +// .Where(p => p.FullName.StartsWith("ZR.ServiceCore.Model")) +// .ToList(); +var model = AppDomain.CurrentDomain + .GetAssemblies() + .First(it => it.FullName.Contains("ZR.Model")) + .ExportedTypes + .ToList(); +foreach (var assembly in serviceCoreModel) +{ + +} + app.Run(); \ No newline at end of file diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index a0cc978..181b790 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using System.Text; -using ZR.Model.System.Generate; namespace ZR.CodeGenerator { diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 63cbf79..6ea6ba4 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using ZR.CodeGenerator.Model; -using ZR.Model.System.Generate; +using ZR.ServiceCore.Model.Generate; namespace ZR.CodeGenerator { diff --git a/ZR.CodeGenerator/Model/GenerateDto.cs b/ZR.CodeGenerator/Model/GenerateDto.cs index db1c48d..cd4031b 100644 --- a/ZR.CodeGenerator/Model/GenerateDto.cs +++ b/ZR.CodeGenerator/Model/GenerateDto.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using ZR.Model.System.Generate; +using ZR.ServiceCore.Model.Generate; namespace ZR.CodeGenerator.Model { diff --git a/ZR.Service/HelloService.cs b/ZR.Service/HelloService.cs index 9f8ef0f..9938e9b 100644 --- a/ZR.Service/HelloService.cs +++ b/ZR.Service/HelloService.cs @@ -5,6 +5,7 @@ using ZR.Model.System; using ZR.Repository; using ZR.Service.IService; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service { diff --git a/ZR.Service/IService/IHelloService.cs b/ZR.Service/IService/IHelloService.cs index 5bb9391..422f8fa 100644 --- a/ZR.Service/IService/IHelloService.cs +++ b/ZR.Service/IService/IHelloService.cs @@ -1,4 +1,5 @@ using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.IService { diff --git a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs b/ZR.ServiceCore/Filters/ActionPermissionFilter.cs index cff36f6..013b8da 100644 --- a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs +++ b/ZR.ServiceCore/Filters/ActionPermissionFilter.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using ZR.Model.System; using ZR.Service.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.ServiceCore.Middleware { diff --git a/ZR.ServiceCore/Filters/GlobalActionMonitor.cs b/ZR.ServiceCore/Filters/GlobalActionMonitor.cs index a94ba2f..93a2216 100644 --- a/ZR.ServiceCore/Filters/GlobalActionMonitor.cs +++ b/ZR.ServiceCore/Filters/GlobalActionMonitor.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using NLog; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.ServiceCore.Middleware { diff --git a/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs b/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs index d32804d..080dedb 100644 --- a/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs +++ b/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs @@ -9,6 +9,7 @@ using System.Text.Encodings.Web; using ZR.Common; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; using textJson = System.Text.Json; namespace ZR.ServiceCore.Middleware diff --git a/ZR.ServiceCore/Model/Article.cs b/ZR.ServiceCore/Model/Article.cs index 7cb60f2..2680deb 100644 --- a/ZR.ServiceCore/Model/Article.cs +++ b/ZR.ServiceCore/Model/Article.cs @@ -1,4 +1,6 @@ -namespace ZR.Model.System +using ZR.Model.System; + +namespace ZR.ServiceCore.Model { /// /// 文章表 diff --git a/ZR.ServiceCore/Model/ArticleCategory.cs b/ZR.ServiceCore/Model/ArticleCategory.cs index 934b257..213898a 100644 --- a/ZR.ServiceCore/Model/ArticleCategory.cs +++ b/ZR.ServiceCore/Model/ArticleCategory.cs @@ -1,9 +1,4 @@ -using Newtonsoft.Json; -using SqlSugar; -using System; -using System.Collections.Generic; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 文章目录 diff --git a/ZR.ServiceCore/Model/CommonLang.cs b/ZR.ServiceCore/Model/CommonLang.cs index 883e46e..43758e4 100644 --- a/ZR.ServiceCore/Model/CommonLang.cs +++ b/ZR.ServiceCore/Model/CommonLang.cs @@ -1,9 +1,6 @@ -using Newtonsoft.Json; -using SqlSugar; -using System; using System.ComponentModel; -namespace ZR.Model.Models +namespace ZR.ServiceCore.Model { /// /// 多语言配置,数据实体对象 diff --git a/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs b/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs index c109a19..e3500f1 100644 --- a/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs +++ b/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs @@ -1,7 +1,7 @@ -using System; using System.ComponentModel.DataAnnotations; +using ZR.Model; -namespace ZR.Model.Dto +namespace ZR.ServiceCore.Model.Dto { /// /// 文章目录输入对象 diff --git a/ZR.ServiceCore/Model/Dto/ArticleDto.cs b/ZR.ServiceCore/Model/Dto/ArticleDto.cs index fd60a89..2808a45 100644 --- a/ZR.ServiceCore/Model/Dto/ArticleDto.cs +++ b/ZR.ServiceCore/Model/Dto/ArticleDto.cs @@ -1,7 +1,7 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class ArticleQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/CommonLangDto.cs b/ZR.ServiceCore/Model/Dto/CommonLangDto.cs index 1e70d80..cfd6b71 100644 --- a/ZR.ServiceCore/Model/Dto/CommonLangDto.cs +++ b/ZR.ServiceCore/Model/Dto/CommonLangDto.cs @@ -1,7 +1,6 @@ -using System; -using System.Collections.Generic; +using ZR.Model; -namespace ZR.Model.Dto +namespace ZR.ServiceCore.Model.Dto { /// /// 多语言配置输入对象 diff --git a/ZR.ServiceCore/Model/Dto/GenTableDto.cs b/ZR.ServiceCore/Model/Dto/GenTableDto.cs index ca73d06..e75f882 100644 --- a/ZR.ServiceCore/Model/Dto/GenTableDto.cs +++ b/ZR.ServiceCore/Model/Dto/GenTableDto.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; -using ZR.Model.System.Generate; +using ZR.ServiceCore.Model.Generate; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class GenTableDto { diff --git a/ZR.ServiceCore/Model/Dto/LockUserDto.cs b/ZR.ServiceCore/Model/Dto/LockUserDto.cs index 868f260..db1fc0f 100644 --- a/ZR.ServiceCore/Model/Dto/LockUserDto.cs +++ b/ZR.ServiceCore/Model/Dto/LockUserDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class LockUserDto { diff --git a/ZR.ServiceCore/Model/Dto/LoginBodyDto.cs b/ZR.ServiceCore/Model/Dto/LoginBodyDto.cs index ba408a4..2253b33 100644 --- a/ZR.ServiceCore/Model/Dto/LoginBodyDto.cs +++ b/ZR.ServiceCore/Model/Dto/LoginBodyDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class LoginBodyDto { diff --git a/ZR.ServiceCore/Model/Dto/MenuDto.cs b/ZR.ServiceCore/Model/Dto/MenuDto.cs index 32ffaed..3409667 100644 --- a/ZR.ServiceCore/Model/Dto/MenuDto.cs +++ b/ZR.ServiceCore/Model/Dto/MenuDto.cs @@ -1,9 +1,7 @@ -using MiniExcelLibs.Attributes; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using MiniExcelLibs.Attributes; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class MenuDto { diff --git a/ZR.ServiceCore/Model/Dto/RegisterDto.cs b/ZR.ServiceCore/Model/Dto/RegisterDto.cs index 53755ff..35bb868 100644 --- a/ZR.ServiceCore/Model/Dto/RegisterDto.cs +++ b/ZR.ServiceCore/Model/Dto/RegisterDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class RegisterDto { diff --git a/ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs b/ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs index b2e83ea..deaea09 100644 --- a/ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs +++ b/ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs @@ -1,8 +1,8 @@ using MiniExcelLibs.Attributes; -using SqlSugar.DbConvert; using ZR.Model.System.Enums; +using ZR.ServiceCore.Model.Enums; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class RoleMenuExportDto { diff --git a/ZR.ServiceCore/Model/Dto/RoleUserDto.cs b/ZR.ServiceCore/Model/Dto/RoleUserDto.cs index a336289..7d77f08 100644 --- a/ZR.ServiceCore/Model/Dto/RoleUserDto.cs +++ b/ZR.ServiceCore/Model/Dto/RoleUserDto.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class RoleUserQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/ScanDto.cs b/ZR.ServiceCore/Model/Dto/ScanDto.cs index 063108e..f0ba564 100644 --- a/ZR.ServiceCore/Model/Dto/ScanDto.cs +++ b/ZR.ServiceCore/Model/Dto/ScanDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class ScanDto { diff --git a/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs b/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs index 6eb8df6..a19bbe5 100644 --- a/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs +++ b/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs @@ -1,7 +1,8 @@ using System.ComponentModel.DataAnnotations; using MiniExcelLibs.Attributes; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { /// /// 数据差异日志查询对象 diff --git a/ZR.ServiceCore/Model/Dto/SysConfigDto.cs b/ZR.ServiceCore/Model/Dto/SysConfigDto.cs index 8a57b53..0324a63 100644 --- a/ZR.ServiceCore/Model/Dto/SysConfigDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysConfigDto.cs @@ -1,6 +1,6 @@ -using System; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { /// /// 参数配置输入对象模型 diff --git a/ZR.ServiceCore/Model/Dto/SysDeptDto.cs b/ZR.ServiceCore/Model/Dto/SysDeptDto.cs index ee76ddf..ce7333d 100644 --- a/ZR.ServiceCore/Model/Dto/SysDeptDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysDeptDto.cs @@ -1,4 +1,6 @@ -namespace ZR.Model.System.Dto +using ZR.Model; + +namespace ZR.ServiceCore.Model.Dto { public class SysDeptQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/SysdictDataDto.cs b/ZR.ServiceCore/Model/Dto/SysDictDataDto.cs similarity index 61% rename from ZR.ServiceCore/Model/Dto/SysdictDataDto.cs rename to ZR.ServiceCore/Model/Dto/SysDictDataDto.cs index 471a3f8..9cd81ba 100644 --- a/ZR.ServiceCore/Model/Dto/SysdictDataDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysDictDataDto.cs @@ -1,8 +1,6 @@ -using System.Collections.Generic; - -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { - public class SysdictDataDto + public class SysDictDataDto { public string DictType { get; set; } public string ColumnName { get; set; } diff --git a/ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs b/ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs index 4a39430..3ee6b40 100644 --- a/ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class SysDictTypeDto { diff --git a/ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs b/ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs index 40e4f95..ddc2956 100644 --- a/ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs @@ -1,6 +1,6 @@ -using System; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { /// /// 文件存储输入对象 diff --git a/ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs b/ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs index 54d4a18..d425241 100644 --- a/ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class SysLogininfoDto : SysBase { diff --git a/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs b/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs index 6cd4957..d1683bd 100644 --- a/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs @@ -1,6 +1,7 @@ using System.ComponentModel.DataAnnotations; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { /// /// 通知公告表输入对象 diff --git a/ZR.ServiceCore/Model/Dto/SysOperLogDto.cs b/ZR.ServiceCore/Model/Dto/SysOperLogDto.cs index 36c6937..121f39c 100644 --- a/ZR.ServiceCore/Model/Dto/SysOperLogDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysOperLogDto.cs @@ -1,6 +1,6 @@ -using System; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class SysOperLogQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/SysRoleDto.cs b/ZR.ServiceCore/Model/Dto/SysRoleDto.cs index 8ad6866..7d78f7c 100644 --- a/ZR.ServiceCore/Model/Dto/SysRoleDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysRoleDto.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class SysRoleDto : SysBase { diff --git a/ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs b/ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs index fd801f1..d8943b6 100644 --- a/ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; - -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class SysRoleMenuDto { diff --git a/ZR.ServiceCore/Model/Dto/SysUserDto.cs b/ZR.ServiceCore/Model/Dto/SysUserDto.cs index 9d07520..ecbc9cf 100644 --- a/ZR.ServiceCore/Model/Dto/SysUserDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysUserDto.cs @@ -1,6 +1,4 @@ -using System; - -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class SysUserDto { diff --git a/ZR.ServiceCore/Model/Dto/TasksDto.cs b/ZR.ServiceCore/Model/Dto/TasksDto.cs index 6da320b..3999fac 100644 --- a/ZR.ServiceCore/Model/Dto/TasksDto.cs +++ b/ZR.ServiceCore/Model/Dto/TasksDto.cs @@ -1,7 +1,7 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using ZR.Model; -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class TasksQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/TasksLogDto.cs b/ZR.ServiceCore/Model/Dto/TasksLogDto.cs index 2567dc7..74495e4 100644 --- a/ZR.ServiceCore/Model/Dto/TasksLogDto.cs +++ b/ZR.ServiceCore/Model/Dto/TasksLogDto.cs @@ -1,6 +1,4 @@ -using System; - -namespace ZR.Model.System.Dto +namespace ZR.ServiceCore.Model.Dto { public class TasksLogQueryDto { diff --git a/ZR.ServiceCore/Model/Enums/MenuStatus.cs b/ZR.ServiceCore/Model/Enums/MenuStatus.cs index b648ca1..14a54b0 100644 --- a/ZR.ServiceCore/Model/Enums/MenuStatus.cs +++ b/ZR.ServiceCore/Model/Enums/MenuStatus.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace ZR.Model.System.Enums +namespace ZR.ServiceCore.Model.Enums { /// /// 菜单状态(0正常 1停用) diff --git a/ZR.ServiceCore/Model/Generate/GenTable.cs b/ZR.ServiceCore/Model/Generate/GenTable.cs index 6e3199e..1ab69ac 100644 --- a/ZR.ServiceCore/Model/Generate/GenTable.cs +++ b/ZR.ServiceCore/Model/Generate/GenTable.cs @@ -1,7 +1,4 @@ -using SqlSugar; -using System.Collections.Generic; - -namespace ZR.Model.System.Generate +namespace ZR.ServiceCore.Model.Generate { /// /// 代码生成表 diff --git a/ZR.ServiceCore/Model/Generate/GenTableColumn.cs b/ZR.ServiceCore/Model/Generate/GenTableColumn.cs index 917fc78..57eaa78 100644 --- a/ZR.ServiceCore/Model/Generate/GenTableColumn.cs +++ b/ZR.ServiceCore/Model/Generate/GenTableColumn.cs @@ -1,8 +1,4 @@ -using SqlSugar; -using System; -using System.Linq; - -namespace ZR.Model.System.Generate +namespace ZR.ServiceCore.Model.Generate { /// /// 代码生成表字段 diff --git a/ZR.ServiceCore/Model/SqlDiffLog.cs b/ZR.ServiceCore/Model/SqlDiffLog.cs index 0b64277..5c31cbb 100644 --- a/ZR.ServiceCore/Model/SqlDiffLog.cs +++ b/ZR.ServiceCore/Model/SqlDiffLog.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { [SugarTable("SqlDiffLog", "数据差异日志")] [Tenant("0")] diff --git a/ZR.ServiceCore/Model/SysBase.cs b/ZR.ServiceCore/Model/SysBase.cs index 7d6a922..3704056 100644 --- a/ZR.ServiceCore/Model/SysBase.cs +++ b/ZR.ServiceCore/Model/SysBase.cs @@ -1,9 +1,6 @@ using MiniExcelLibs.Attributes; -using Newtonsoft.Json; -using SqlSugar; -using System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { //[EpplusTable(PrintHeaders = true, AutofitColumns = true, AutoCalculate = true, ShowTotal = true)] public class SysBase diff --git a/ZR.ServiceCore/Model/SysConfig.cs b/ZR.ServiceCore/Model/SysConfig.cs index 764cf52..5708a6a 100644 --- a/ZR.ServiceCore/Model/SysConfig.cs +++ b/ZR.ServiceCore/Model/SysConfig.cs @@ -1,6 +1,6 @@ -using SqlSugar; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 参数配置,数据实体对象 diff --git a/ZR.ServiceCore/Model/SysDept.cs b/ZR.ServiceCore/Model/SysDept.cs index 1817f13..fdbe2fc 100644 --- a/ZR.ServiceCore/Model/SysDept.cs +++ b/ZR.ServiceCore/Model/SysDept.cs @@ -1,4 +1,6 @@ -namespace ZR.Model.System +using ZR.Model.System; + +namespace ZR.ServiceCore.Model { /// /// 部门表 diff --git a/ZR.ServiceCore/Model/SysDictData.cs b/ZR.ServiceCore/Model/SysDictData.cs index 915b3ca..d7d2aed 100644 --- a/ZR.ServiceCore/Model/SysDictData.cs +++ b/ZR.ServiceCore/Model/SysDictData.cs @@ -1,6 +1,6 @@ -using SqlSugar; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 字典数据表 diff --git a/ZR.ServiceCore/Model/SysDictType.cs b/ZR.ServiceCore/Model/SysDictType.cs index c323a63..d9a5ae2 100644 --- a/ZR.ServiceCore/Model/SysDictType.cs +++ b/ZR.ServiceCore/Model/SysDictType.cs @@ -1,6 +1,6 @@ -using SqlSugar; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 字典类型表 diff --git a/ZR.ServiceCore/Model/SysField.cs b/ZR.ServiceCore/Model/SysField.cs new file mode 100644 index 0000000..2be2b30 --- /dev/null +++ b/ZR.ServiceCore/Model/SysField.cs @@ -0,0 +1,14 @@ +namespace ZR.ServiceCore.Model; + +[SugarTable("sys_field")] +[Tenant("0")] +public class SysField +{ + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } + + public string FieldName { get; set; } + + public string FullName { get; set; } +} \ No newline at end of file diff --git a/ZR.ServiceCore/Model/SysFile.cs b/ZR.ServiceCore/Model/SysFile.cs index cc8eb1d..0f65979 100644 --- a/ZR.ServiceCore/Model/SysFile.cs +++ b/ZR.ServiceCore/Model/SysFile.cs @@ -1,8 +1,4 @@ -using Newtonsoft.Json; -using SqlSugar; -using System; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { [Tenant("0")] [SugarTable("sys_file", "文件存储表")] diff --git a/ZR.ServiceCore/Model/SysLogininfor.cs b/ZR.ServiceCore/Model/SysLogininfor.cs index 79b979c..c17de28 100644 --- a/ZR.ServiceCore/Model/SysLogininfor.cs +++ b/ZR.ServiceCore/Model/SysLogininfor.cs @@ -1,7 +1,4 @@ -using SqlSugar; -using System; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// sys_logininfor 表 diff --git a/ZR.ServiceCore/Model/SysMenu.cs b/ZR.ServiceCore/Model/SysMenu.cs index 59f590f..1c24bff 100644 --- a/ZR.ServiceCore/Model/SysMenu.cs +++ b/ZR.ServiceCore/Model/SysMenu.cs @@ -1,7 +1,6 @@ -using SqlSugar; -using System.Collections.Generic; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// Sys_menu表 diff --git a/ZR.ServiceCore/Model/SysNotice.cs b/ZR.ServiceCore/Model/SysNotice.cs index ff00e34..a09e0e4 100644 --- a/ZR.ServiceCore/Model/SysNotice.cs +++ b/ZR.ServiceCore/Model/SysNotice.cs @@ -1,6 +1,6 @@ -using SqlSugar; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 通知公告表 diff --git a/ZR.ServiceCore/Model/SysOperLog.cs b/ZR.ServiceCore/Model/SysOperLog.cs index 3eed289..5fb0469 100644 --- a/ZR.ServiceCore/Model/SysOperLog.cs +++ b/ZR.ServiceCore/Model/SysOperLog.cs @@ -1,9 +1,6 @@ using MiniExcelLibs.Attributes; -using SqlSugar; -using System; -using System.ComponentModel; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { [SugarTable("sys_oper_log", "操作日志表")] [Tenant("0")] diff --git a/ZR.ServiceCore/Model/SysPost.cs b/ZR.ServiceCore/Model/SysPost.cs index 26edfcf..9a0f6b4 100644 --- a/ZR.ServiceCore/Model/SysPost.cs +++ b/ZR.ServiceCore/Model/SysPost.cs @@ -1,6 +1,6 @@ -using SqlSugar; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { [SugarTable("sys_post", "岗位表")] [Tenant("0")] diff --git a/ZR.ServiceCore/Model/SysRole.cs b/ZR.ServiceCore/Model/SysRole.cs index 3f48946..a2e9e0c 100644 --- a/ZR.ServiceCore/Model/SysRole.cs +++ b/ZR.ServiceCore/Model/SysRole.cs @@ -1,6 +1,6 @@ -using SqlSugar; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 角色表 sys_role diff --git a/ZR.ServiceCore/Model/SysRoleDept.cs b/ZR.ServiceCore/Model/SysRoleDept.cs index 168d048..bb40cce 100644 --- a/ZR.ServiceCore/Model/SysRoleDept.cs +++ b/ZR.ServiceCore/Model/SysRoleDept.cs @@ -1,6 +1,4 @@ -using SqlSugar; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { [SugarTable("sys_role_dept", "角色部门")] [Tenant(0)] diff --git a/ZR.ServiceCore/Model/SysRoleField.cs b/ZR.ServiceCore/Model/SysRoleField.cs new file mode 100644 index 0000000..ad4803d --- /dev/null +++ b/ZR.ServiceCore/Model/SysRoleField.cs @@ -0,0 +1,10 @@ +namespace ZR.ServiceCore.Model; + +[SugarTable("sys_role_field")] +[Tenant("0")] +public class SysRoleField +{ + public long FieldId { get; set; } + + public long RoleId { get; set; } +} \ No newline at end of file diff --git a/ZR.ServiceCore/Model/SysRoleMenu.cs b/ZR.ServiceCore/Model/SysRoleMenu.cs index b0b7bd1..21b228e 100644 --- a/ZR.ServiceCore/Model/SysRoleMenu.cs +++ b/ZR.ServiceCore/Model/SysRoleMenu.cs @@ -1,7 +1,4 @@ -using Newtonsoft.Json; -using SqlSugar; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 角色菜单 diff --git a/ZR.ServiceCore/Model/SysTasks.cs b/ZR.ServiceCore/Model/SysTasks.cs index b1a413c..5e4f489 100644 --- a/ZR.ServiceCore/Model/SysTasks.cs +++ b/ZR.ServiceCore/Model/SysTasks.cs @@ -1,8 +1,7 @@ -using SqlSugar; -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// ///计划任务 diff --git a/ZR.ServiceCore/Model/SysTasksLog.cs b/ZR.ServiceCore/Model/SysTasksLog.cs index 88fbcfc..ed0a637 100644 --- a/ZR.ServiceCore/Model/SysTasksLog.cs +++ b/ZR.ServiceCore/Model/SysTasksLog.cs @@ -1,7 +1,4 @@ -using SqlSugar; -using System; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 任务日志 diff --git a/ZR.ServiceCore/Model/SysUser.cs b/ZR.ServiceCore/Model/SysUser.cs index ff55b72..56e80fc 100644 --- a/ZR.ServiceCore/Model/SysUser.cs +++ b/ZR.ServiceCore/Model/SysUser.cs @@ -1,10 +1,7 @@ using MiniExcelLibs.Attributes; -using Newtonsoft.Json; -using SqlSugar; -using System; -using System.Collections.Generic; +using ZR.Model.System; -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 用户表 diff --git a/ZR.ServiceCore/Model/SysUserPost.cs b/ZR.ServiceCore/Model/SysUserPost.cs index 7eadfd0..d76aac9 100644 --- a/ZR.ServiceCore/Model/SysUserPost.cs +++ b/ZR.ServiceCore/Model/SysUserPost.cs @@ -1,6 +1,4 @@ -using SqlSugar; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 用户岗位 diff --git a/ZR.ServiceCore/Model/SysUserRole.cs b/ZR.ServiceCore/Model/SysUserRole.cs index c1570dc..a3bd54f 100644 --- a/ZR.ServiceCore/Model/SysUserRole.cs +++ b/ZR.ServiceCore/Model/SysUserRole.cs @@ -1,6 +1,4 @@ -using SqlSugar; - -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { /// /// 用户角色关联表 用户N-1 角色 diff --git a/ZR.ServiceCore/Model/UserConstants.cs b/ZR.ServiceCore/Model/UserConstants.cs index e023591..309d18a 100644 --- a/ZR.ServiceCore/Model/UserConstants.cs +++ b/ZR.ServiceCore/Model/UserConstants.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System +namespace ZR.ServiceCore.Model { public class UserConstants { diff --git a/ZR.ServiceCore/Model/Vo/RouterVo.cs b/ZR.ServiceCore/Model/Vo/RouterVo.cs index dae4a9c..8d579e7 100644 --- a/ZR.ServiceCore/Model/Vo/RouterVo.cs +++ b/ZR.ServiceCore/Model/Vo/RouterVo.cs @@ -1,7 +1,4 @@ -using Newtonsoft.Json; -using System.Collections.Generic; - -namespace ZR.Model.System.Vo +namespace ZR.ServiceCore.Model.Vo { /// /// 路由展示 diff --git a/ZR.ServiceCore/Model/Vo/TreeSelectVo.cs b/ZR.ServiceCore/Model/Vo/TreeSelectVo.cs index a12b62a..02a5737 100644 --- a/ZR.ServiceCore/Model/Vo/TreeSelectVo.cs +++ b/ZR.ServiceCore/Model/Vo/TreeSelectVo.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Vo +namespace ZR.ServiceCore.Model.Vo { /// /// Treeselect树结构实体类 diff --git a/ZR.ServiceCore/Services/ArticleCategoryService.cs b/ZR.ServiceCore/Services/ArticleCategoryService.cs index 9f33e26..7ce1b01 100644 --- a/ZR.ServiceCore/Services/ArticleCategoryService.cs +++ b/ZR.ServiceCore/Services/ArticleCategoryService.cs @@ -2,10 +2,11 @@ using SqlSugar; using System.Collections.Generic; using ZR.Model; -using ZR.Model.Dto; using ZR.Model.System; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/ArticleService.cs b/ZR.ServiceCore/Services/ArticleService.cs index 1889e89..63d9939 100644 --- a/ZR.ServiceCore/Services/ArticleService.cs +++ b/ZR.ServiceCore/Services/ArticleService.cs @@ -3,9 +3,10 @@ using SqlSugar; using System; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/CommonLangService.cs b/ZR.ServiceCore/Services/CommonLangService.cs index c4660b3..1e56cc0 100644 --- a/ZR.ServiceCore/Services/CommonLangService.cs +++ b/ZR.ServiceCore/Services/CommonLangService.cs @@ -3,10 +3,10 @@ using SqlSugar; using System; using System.Linq; using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Models; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/GenTableService.cs b/ZR.ServiceCore/Services/GenTableService.cs index 958d8d7..aae9325 100644 --- a/ZR.ServiceCore/Services/GenTableService.cs +++ b/ZR.ServiceCore/Services/GenTableService.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; using ZR.Model; -using ZR.Model.System.Generate; using ZR.Service.System.IService; +using ZR.ServiceCore.Model.Generate; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs b/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs index 9ee2bc5..947840f 100644 --- a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs +++ b/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using ZR.Model; -using ZR.Model.Dto; using ZR.Model.System; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/IArticleService.cs b/ZR.ServiceCore/Services/IService/IArticleService.cs index 0785ea6..fc4e918 100644 --- a/ZR.ServiceCore/Services/IService/IArticleService.cs +++ b/ZR.ServiceCore/Services/IService/IArticleService.cs @@ -1,6 +1,7 @@ using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ICommonLangService.cs b/ZR.ServiceCore/Services/IService/ICommonLangService.cs index 7afd4d5..613892d 100644 --- a/ZR.ServiceCore/Services/IService/ICommonLangService.cs +++ b/ZR.ServiceCore/Services/IService/ICommonLangService.cs @@ -1,6 +1,6 @@ using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Models; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/IGenTableService.cs b/ZR.ServiceCore/Services/IService/IGenTableService.cs index eaafa58..80b53ad 100644 --- a/ZR.ServiceCore/Services/IService/IGenTableService.cs +++ b/ZR.ServiceCore/Services/IService/IGenTableService.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.Collections.Generic; using ZR.Model; -using ZR.Model.System.Generate; +using ZR.ServiceCore.Model.Generate; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs b/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs index 2df07ce..692baae 100644 --- a/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs +++ b/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs @@ -1,6 +1,7 @@ using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysConfigService.cs b/ZR.ServiceCore/Services/IService/ISysConfigService.cs index ba8ddec..621c406 100644 --- a/ZR.ServiceCore/Services/IService/ISysConfigService.cs +++ b/ZR.ServiceCore/Services/IService/ISysConfigService.cs @@ -1,5 +1,6 @@ using System; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysDeptService.cs b/ZR.ServiceCore/Services/IService/ISysDeptService.cs index 0559ee5..8dcfe31 100644 --- a/ZR.ServiceCore/Services/IService/ISysDeptService.cs +++ b/ZR.ServiceCore/Services/IService/ISysDeptService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Model.System.Vo; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; +using ZR.ServiceCore.Model.Vo; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysDictDataService.cs b/ZR.ServiceCore/Services/IService/ISysDictDataService.cs index b0db87d..1f87513 100644 --- a/ZR.ServiceCore/Services/IService/ISysDictDataService.cs +++ b/ZR.ServiceCore/Services/IService/ISysDictDataService.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using ZR.Model; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysDictService.cs b/ZR.ServiceCore/Services/IService/ISysDictService.cs index 37be554..b157e5c 100644 --- a/ZR.ServiceCore/Services/IService/ISysDictService.cs +++ b/ZR.ServiceCore/Services/IService/ISysDictService.cs @@ -2,6 +2,7 @@ using System.Text; using ZR.Model; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysFileService.cs b/ZR.ServiceCore/Services/IService/ISysFileService.cs index e76ffd3..6b59bb3 100644 --- a/ZR.ServiceCore/Services/IService/ISysFileService.cs +++ b/ZR.ServiceCore/Services/IService/ISysFileService.cs @@ -1,8 +1,8 @@ using Infrastructure.Attribute; using Microsoft.AspNetCore.Http; using System.Threading.Tasks; -using ZR.Model.Models; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysLoginService.cs b/ZR.ServiceCore/Services/IService/ISysLoginService.cs index 15d6ba8..799a589 100644 --- a/ZR.ServiceCore/Services/IService/ISysLoginService.cs +++ b/ZR.ServiceCore/Services/IService/ISysLoginService.cs @@ -2,7 +2,8 @@ using System; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysMenuService.cs b/ZR.ServiceCore/Services/IService/ISysMenuService.cs index 5896af8..a30e023 100644 --- a/ZR.ServiceCore/Services/IService/ISysMenuService.cs +++ b/ZR.ServiceCore/Services/IService/ISysMenuService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; -using ZR.Model.System.Dto; using ZR.Model.System; -using ZR.Model.System.Vo; -using ZR.Model.System.Generate; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; +using ZR.ServiceCore.Model.Generate; +using ZR.ServiceCore.Model.Vo; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysNoticeService.cs b/ZR.ServiceCore/Services/IService/ISysNoticeService.cs index 2544aa8..f48d26b 100644 --- a/ZR.ServiceCore/Services/IService/ISysNoticeService.cs +++ b/ZR.ServiceCore/Services/IService/ISysNoticeService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysOperLogService.cs b/ZR.ServiceCore/Services/IService/ISysOperLogService.cs index f96402e..f979cf2 100644 --- a/ZR.ServiceCore/Services/IService/ISysOperLogService.cs +++ b/ZR.ServiceCore/Services/IService/ISysOperLogService.cs @@ -1,6 +1,7 @@ using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysPermissionService.cs b/ZR.ServiceCore/Services/IService/ISysPermissionService.cs index f0ea833..4b603d6 100644 --- a/ZR.ServiceCore/Services/IService/ISysPermissionService.cs +++ b/ZR.ServiceCore/Services/IService/ISysPermissionService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysPostService.cs b/ZR.ServiceCore/Services/IService/ISysPostService.cs index e65092a..7501b7f 100644 --- a/ZR.ServiceCore/Services/IService/ISysPostService.cs +++ b/ZR.ServiceCore/Services/IService/ISysPostService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using ZR.Model.System; using ZR.Repository; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysRoleService.cs b/ZR.ServiceCore/Services/IService/ISysRoleService.cs index 151b296..c3cfedf 100644 --- a/ZR.ServiceCore/Services/IService/ISysRoleService.cs +++ b/ZR.ServiceCore/Services/IService/ISysRoleService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs b/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs index 381796a..aa8e12a 100644 --- a/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs +++ b/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using ZR.Model.System; using ZR.Repository; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs b/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs index 959f757..3023f6e 100644 --- a/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs +++ b/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs @@ -1,6 +1,7 @@ using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserPostService.cs b/ZR.ServiceCore/Services/IService/ISysUserPostService.cs index dc871a2..241c760 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserPostService.cs +++ b/ZR.ServiceCore/Services/IService/ISysUserPostService.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs b/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs index 42d54eb..3375259 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs +++ b/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserService.cs b/ZR.ServiceCore/Services/IService/ISysUserService.cs index a074e85..42a6f9c 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserService.cs +++ b/ZR.ServiceCore/Services/IService/ISysUserService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System.IService { diff --git a/ZR.ServiceCore/Services/SeedDataService.cs b/ZR.ServiceCore/Services/SeedDataService.cs index 72ac52e..57fc537 100644 --- a/ZR.ServiceCore/Services/SeedDataService.cs +++ b/ZR.ServiceCore/Services/SeedDataService.cs @@ -2,6 +2,7 @@ using SqlSugar.IOC; using ZR.Common; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SqlDiffLogService.cs b/ZR.ServiceCore/Services/SqlDiffLogService.cs index 0b88efd..892ed56 100644 --- a/ZR.ServiceCore/Services/SqlDiffLogService.cs +++ b/ZR.ServiceCore/Services/SqlDiffLogService.cs @@ -4,9 +4,10 @@ using SqlSugar; using System; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysConfigService.cs b/ZR.ServiceCore/Services/SysConfigService.cs index 308674d..deb6a83 100644 --- a/ZR.ServiceCore/Services/SysConfigService.cs +++ b/ZR.ServiceCore/Services/SysConfigService.cs @@ -1,6 +1,7 @@ using Infrastructure.Attribute; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysDeptService.cs b/ZR.ServiceCore/Services/SysDeptService.cs index 3669322..7d27ddf 100644 --- a/ZR.ServiceCore/Services/SysDeptService.cs +++ b/ZR.ServiceCore/Services/SysDeptService.cs @@ -7,9 +7,10 @@ using System.Collections.Generic; using System.Linq; using ZR.Common; using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Model.System.Vo; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; +using ZR.ServiceCore.Model.Vo; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysDictDataService.cs b/ZR.ServiceCore/Services/SysDictDataService.cs index f09917b..8ebb0c8 100644 --- a/ZR.ServiceCore/Services/SysDictDataService.cs +++ b/ZR.ServiceCore/Services/SysDictDataService.cs @@ -7,6 +7,7 @@ using ZR.Common; using ZR.Model; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysDictService.cs b/ZR.ServiceCore/Services/SysDictService.cs index 53e7785..87f2aa9 100644 --- a/ZR.ServiceCore/Services/SysDictService.cs +++ b/ZR.ServiceCore/Services/SysDictService.cs @@ -7,6 +7,7 @@ using System.Linq; using ZR.Model; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysFileService.cs b/ZR.ServiceCore/Services/SysFileService.cs index e37eb24..0c49caf 100644 --- a/ZR.ServiceCore/Services/SysFileService.cs +++ b/ZR.ServiceCore/Services/SysFileService.cs @@ -10,6 +10,7 @@ using System.Text; using ZR.Common; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysLoginService.cs b/ZR.ServiceCore/Services/SysLoginService.cs index 2a3dbd7..a862156 100644 --- a/ZR.ServiceCore/Services/SysLoginService.cs +++ b/ZR.ServiceCore/Services/SysLoginService.cs @@ -5,9 +5,10 @@ using Microsoft.AspNetCore.Http; using UAParser; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysMenuService.cs b/ZR.ServiceCore/Services/SysMenuService.cs index 828665a..0f1e327 100644 --- a/ZR.ServiceCore/Services/SysMenuService.cs +++ b/ZR.ServiceCore/Services/SysMenuService.cs @@ -6,11 +6,13 @@ using System.Collections.Generic; using System.Linq; using ZR.Common; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Model.System.Enums; -using ZR.Model.System.Generate; -using ZR.Model.System.Vo; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; +using ZR.ServiceCore.Model.Enums; +using ZR.ServiceCore.Model.Generate; +using ZR.ServiceCore.Model.Vo; namespace ZR.Service { diff --git a/ZR.ServiceCore/Services/SysNoticeService.cs b/ZR.ServiceCore/Services/SysNoticeService.cs index 5743e15..2c7d00b 100644 --- a/ZR.ServiceCore/Services/SysNoticeService.cs +++ b/ZR.ServiceCore/Services/SysNoticeService.cs @@ -3,8 +3,9 @@ using SqlSugar; using System.Collections.Generic; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysOperLogService.cs b/ZR.ServiceCore/Services/SysOperLogService.cs index dcfa2aa..ac1fe44 100644 --- a/ZR.ServiceCore/Services/SysOperLogService.cs +++ b/ZR.ServiceCore/Services/SysOperLogService.cs @@ -4,9 +4,10 @@ using Infrastructure.Extensions; using SqlSugar; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysPermissionService.cs b/ZR.ServiceCore/Services/SysPermissionService.cs index 00beb93..b9aef33 100644 --- a/ZR.ServiceCore/Services/SysPermissionService.cs +++ b/ZR.ServiceCore/Services/SysPermissionService.cs @@ -3,6 +3,7 @@ using Infrastructure.Attribute; using System.Collections.Generic; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysPostService.cs b/ZR.ServiceCore/Services/SysPostService.cs index 21e832c..b80f9b2 100644 --- a/ZR.ServiceCore/Services/SysPostService.cs +++ b/ZR.ServiceCore/Services/SysPostService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysRoleMenuService.cs b/ZR.ServiceCore/Services/SysRoleMenuService.cs index dbd2b37..a8b145d 100644 --- a/ZR.ServiceCore/Services/SysRoleMenuService.cs +++ b/ZR.ServiceCore/Services/SysRoleMenuService.cs @@ -1,6 +1,7 @@ using Infrastructure.Attribute; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysRoleService.cs b/ZR.ServiceCore/Services/SysRoleService.cs index 952a983..45da1cd 100644 --- a/ZR.ServiceCore/Services/SysRoleService.cs +++ b/ZR.ServiceCore/Services/SysRoleService.cs @@ -7,9 +7,10 @@ using System.Collections.Generic; using System.Linq; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service { diff --git a/ZR.ServiceCore/Services/SysTasksLogService.cs b/ZR.ServiceCore/Services/SysTasksLogService.cs index 61c9ec6..5a6b74d 100644 --- a/ZR.ServiceCore/Services/SysTasksLogService.cs +++ b/ZR.ServiceCore/Services/SysTasksLogService.cs @@ -6,6 +6,7 @@ using ZR.Model; using ZR.Model.System; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysTasksQzService.cs b/ZR.ServiceCore/Services/SysTasksQzService.cs index 0d12a87..42d92c6 100644 --- a/ZR.ServiceCore/Services/SysTasksQzService.cs +++ b/ZR.ServiceCore/Services/SysTasksQzService.cs @@ -5,9 +5,10 @@ using SqlSugar; using System; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysUserPostService.cs b/ZR.ServiceCore/Services/SysUserPostService.cs index 110328a..fb1bc33 100644 --- a/ZR.ServiceCore/Services/SysUserPostService.cs +++ b/ZR.ServiceCore/Services/SysUserPostService.cs @@ -3,6 +3,7 @@ using SqlSugar; using System.Linq; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysUserRoleService.cs b/ZR.ServiceCore/Services/SysUserRoleService.cs index 40b70fd..9bc5ae0 100644 --- a/ZR.ServiceCore/Services/SysUserRoleService.cs +++ b/ZR.ServiceCore/Services/SysUserRoleService.cs @@ -4,9 +4,10 @@ using SqlSugar; using System.Collections.Generic; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service.System { diff --git a/ZR.ServiceCore/Services/SysUserService.cs b/ZR.ServiceCore/Services/SysUserService.cs index 8cb03fb..6ffe5bb 100644 --- a/ZR.ServiceCore/Services/SysUserService.cs +++ b/ZR.ServiceCore/Services/SysUserService.cs @@ -9,9 +9,10 @@ using System.Linq; using ZR.Common; using ZR.Model; using ZR.Model.System; -using ZR.Model.System.Dto; using ZR.Repository; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Dto; namespace ZR.Service { diff --git a/ZR.ServiceCore/SqlSugar/DataPermi.cs b/ZR.ServiceCore/SqlSugar/DataPermi.cs index e9cc866..77b77dc 100644 --- a/ZR.ServiceCore/SqlSugar/DataPermi.cs +++ b/ZR.ServiceCore/SqlSugar/DataPermi.cs @@ -1,6 +1,7 @@ using Infrastructure; using SqlSugar.IOC; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.ServiceCore.SqlSugar { diff --git a/ZR.ServiceCore/SqlSugar/InitTable.cs b/ZR.ServiceCore/SqlSugar/InitTable.cs index 88a4f90..20c8c77 100644 --- a/ZR.ServiceCore/SqlSugar/InitTable.cs +++ b/ZR.ServiceCore/SqlSugar/InitTable.cs @@ -1,7 +1,7 @@ using SqlSugar.IOC; -using ZR.Model.Models; using ZR.Model.System; -using ZR.Model.System.Generate; +using ZR.ServiceCore.Model; +using ZR.ServiceCore.Model.Generate; namespace ZR.ServiceCore.SqlSugar { diff --git a/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs b/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs index d7be7ce..c161d07 100644 --- a/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs +++ b/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using SqlSugar.IOC; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.ServiceCore.SqlSugar { diff --git a/ZR.Tasks/ITaskSchedulerServer.cs b/ZR.Tasks/ITaskSchedulerServer.cs index f8f040e..7bd6822 100644 --- a/ZR.Tasks/ITaskSchedulerServer.cs +++ b/ZR.Tasks/ITaskSchedulerServer.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Tasks { diff --git a/ZR.Tasks/TaskScheduler/JobBase.cs b/ZR.Tasks/TaskScheduler/JobBase.cs index 208473b..9ee09e6 100644 --- a/ZR.Tasks/TaskScheduler/JobBase.cs +++ b/ZR.Tasks/TaskScheduler/JobBase.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using ZR.Common; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Tasks { diff --git a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs index e96b7ca..03a490e 100644 --- a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs +++ b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs @@ -8,6 +8,7 @@ using System; using System.Threading.Tasks; using ZR.Model.System; using ZR.Service.System.IService; +using ZR.ServiceCore.Model; namespace ZR.Tasks.TaskScheduler { diff --git a/ZR.Tasks/TaskSchedulerServer.cs b/ZR.Tasks/TaskSchedulerServer.cs index 455c8a6..5e40fef 100644 --- a/ZR.Tasks/TaskSchedulerServer.cs +++ b/ZR.Tasks/TaskSchedulerServer.cs @@ -12,6 +12,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using ZR.Model.System; +using ZR.ServiceCore.Model; namespace ZR.Tasks {