diff --git a/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs b/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs index 0b1da0b..4b64550 100644 --- a/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs +++ b/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; using ZR.Model.Dto; using ZR.Model.System; -using ZR.Service.System.IService; + namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs b/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs index 411debc..b8719bc 100644 --- a/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs +++ b/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs @@ -3,7 +3,7 @@ using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs index a1ced9d..c2c53a6 100644 --- a/ZR.Admin.WebApi/Controllers/CommonController.cs +++ b/ZR.Admin.WebApi/Controllers/CommonController.cs @@ -3,8 +3,6 @@ using Microsoft.Extensions.Options; using ZR.Admin.WebApi.Filters; using ZR.Model.System; using ZR.Service.IService; -using ZR.Service.System; -using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/Email/EmailTplController.cs b/ZR.Admin.WebApi/Controllers/Email/EmailTplController.cs index 10dea80..1fa248e 100644 --- a/ZR.Admin.WebApi/Controllers/Email/EmailTplController.cs +++ b/ZR.Admin.WebApi/Controllers/Email/EmailTplController.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; using ZR.Model.Dto; -using ZR.Service.System.ISystemService; using ZR.ServiceCore.Model; //创建时间：2023-11-12 diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index 61fb659..8b83cad 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.CodeGenerator; using ZR.CodeGenerator.Model; @@ -8,7 +7,6 @@ using ZR.CodeGenerator.Service; using ZR.Model; using ZR.Model.System.Dto; using ZR.Model.System.Generate; -using ZR.Service.System.IService; 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..ede76f4 100644 --- a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs @@ -1,11 +1,9 @@ -using Infrastructure.Extensions; 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; 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..7c3cb67 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs @@ -1,11 +1,8 @@ -using Infrastructure.Extensions; using Microsoft.AspNetCore.Mvc; 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; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs index 2b53ac6..af3c1bf 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs @@ -3,7 +3,6 @@ using System.Collections; using ZR.Admin.WebApi.Filters; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; 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 05d7dac..7142e0d 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs @@ -3,7 +3,6 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index a978d22..c92e4e6 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -4,7 +4,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Admin.WebApi/Controllers/System/SysFileController.cs b/ZR.Admin.WebApi/Controllers/System/SysFileController.cs index b084c21..5afd397 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysFileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysFileController.cs @@ -3,7 +3,6 @@ using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Controllers { diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index d4c7599..e6d8880 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -4,10 +4,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Infrastructure.Helper; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System; -using ZR.Service.System.IService; using ZR.ServiceCore.Model.Dto; -using ZR.ServiceCore.Services; 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 13e9b84..4b7c9e2 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs @@ -2,7 +2,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + 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 14057b8..0c3b91b 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs @@ -5,7 +5,6 @@ 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.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..9a1b360 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs @@ -3,7 +3,7 @@ using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Service.System.IService; + 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 61304a2..ef25f09 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -1,9 +1,8 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; -using ZR.Infrastructure.Helper; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + 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 790a8d9..21b00fe 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs @@ -3,7 +3,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + 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 9242360..7896312 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -5,7 +5,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + 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..b8b77f1 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; + 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 c5daacd..f1897a3 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -4,7 +4,7 @@ using SqlSugar; using ZR.Admin.WebApi.Filters; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + 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..4a5be4d 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -4,7 +4,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + 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..e46cae0 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; + //创建时间：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..3f21586 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -4,7 +4,7 @@ using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Service.System.IService; + 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..7200207 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -2,7 +2,7 @@ using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model.System.Dto; -using ZR.Service.System.IService; + namespace ZR.Admin.WebApi.Controllers.monitor { diff --git a/ZR.Admin.WebApi/GlobalUsing.cs b/ZR.Admin.WebApi/GlobalUsing.cs index 3a674ba..89190fa 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 ZR.ServiceCore.Services; \ No newline at end of file diff --git a/ZR.Service/HelloService.cs b/ZR.Service/HelloService.cs index 9f8ef0f..1c45ec4 100644 --- a/ZR.Service/HelloService.cs +++ b/ZR.Service/HelloService.cs @@ -4,7 +4,8 @@ using SqlSugar.IOC; using ZR.Model.System; using ZR.Repository; using ZR.Service.IService; -using ZR.Service.System.IService; +using ZR.ServiceCore; +using ZR.ServiceCore.Services; namespace ZR.Service { diff --git a/ZR.Service/IService/IHelloService.cs b/ZR.Service/IService/IHelloService.cs index 5bb9391..14ec5cb 100644 --- a/ZR.Service/IService/IHelloService.cs +++ b/ZR.Service/IService/IHelloService.cs @@ -1,4 +1,5 @@ using ZR.Model.System; +using ZR.ServiceCore; namespace ZR.Service.IService { diff --git a/ZR.ServiceCore/BaseService.cs b/ZR.ServiceCore/BaseService.cs index 94a06b4..fd5c703 100644 --- a/ZR.ServiceCore/BaseService.cs +++ b/ZR.ServiceCore/BaseService.cs @@ -1,6 +1,6 @@ using ZR.Repository; -namespace ZR.Service +namespace ZR.ServiceCore { /// /// 基础服务定义 diff --git a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs b/ZR.ServiceCore/Filters/ActionPermissionFilter.cs index b6cec49..7c89b79 100644 --- a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs +++ b/ZR.ServiceCore/Filters/ActionPermissionFilter.cs @@ -3,8 +3,7 @@ using Infrastructure.Model; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using ZR.Model.System; -using ZR.Service.System; -using ZR.Service.System.IService; +using ZR.ServiceCore.Services; namespace ZR.ServiceCore.Middleware { diff --git a/ZR.ServiceCore/Filters/GlobalActionMonitor.cs b/ZR.ServiceCore/Filters/GlobalActionMonitor.cs index a94ba2f..4a986c3 100644 --- a/ZR.ServiceCore/Filters/GlobalActionMonitor.cs +++ b/ZR.ServiceCore/Filters/GlobalActionMonitor.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using NLog; using ZR.Model.System; -using ZR.Service.System.IService; +using ZR.ServiceCore.Services; namespace ZR.ServiceCore.Middleware { diff --git a/ZR.ServiceCore/IBaseService.cs b/ZR.ServiceCore/IBaseService.cs index 3bd68d1..5b1158a 100644 --- a/ZR.ServiceCore/IBaseService.cs +++ b/ZR.ServiceCore/IBaseService.cs @@ -1,6 +1,6 @@ using ZR.Repository; -namespace ZR.Service +namespace ZR.ServiceCore { /// /// 基础服务定义 diff --git a/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs b/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs index d32804d..3660ae4 100644 --- a/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs +++ b/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs @@ -8,7 +8,7 @@ using NLog; using System.Text.Encodings.Web; using ZR.Common; using ZR.Model.System; -using ZR.Service.System.IService; +using ZR.ServiceCore.Services; using textJson = System.Text.Json; namespace ZR.ServiceCore.Middleware diff --git a/ZR.ServiceCore/Services/ArticleCategoryService.cs b/ZR.ServiceCore/Services/ArticleCategoryService.cs index 9f33e26..b84a90e 100644 --- a/ZR.ServiceCore/Services/ArticleCategoryService.cs +++ b/ZR.ServiceCore/Services/ArticleCategoryService.cs @@ -1,13 +1,10 @@ using Infrastructure.Attribute; -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; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 文章目录Service业务层处理 diff --git a/ZR.ServiceCore/Services/ArticleService.cs b/ZR.ServiceCore/Services/ArticleService.cs index 1889e89..f111736 100644 --- a/ZR.ServiceCore/Services/ArticleService.cs +++ b/ZR.ServiceCore/Services/ArticleService.cs @@ -1,13 +1,10 @@ using Infrastructure.Attribute; -using SqlSugar; -using System; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; using ZR.Repository; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// diff --git a/ZR.ServiceCore/Services/CacheService.cs b/ZR.ServiceCore/Services/CacheService.cs index 7594b4f..7dd31a1 100644 --- a/ZR.ServiceCore/Services/CacheService.cs +++ b/ZR.ServiceCore/Services/CacheService.cs @@ -1,6 +1,6 @@ using ZR.Common; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { public class CacheService { diff --git a/ZR.ServiceCore/Services/CommonLangService.cs b/ZR.ServiceCore/Services/CommonLangService.cs index c4660b3..4b8e232 100644 --- a/ZR.ServiceCore/Services/CommonLangService.cs +++ b/ZR.ServiceCore/Services/CommonLangService.cs @@ -1,14 +1,10 @@ using Infrastructure.Attribute; -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; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 多语言配置Service业务层处理 diff --git a/ZR.ServiceCore/Services/EmailLogService.cs b/ZR.ServiceCore/Services/EmailLogService.cs index 56ecd6e..d8ecb17 100644 --- a/ZR.ServiceCore/Services/EmailLogService.cs +++ b/ZR.ServiceCore/Services/EmailLogService.cs @@ -2,11 +2,9 @@ using Infrastructure.Attribute; using ZR.Model; using ZR.Model.Dto; using ZR.Repository; -using ZR.Service; using ZR.ServiceCore.Model; -using ZR.ServiceCore.Services; -namespace ZR.ServiceCore +namespace ZR.ServiceCore.Services { /// /// 邮件发送记录Service业务层处理 diff --git a/ZR.ServiceCore/Services/EmailTplService.cs b/ZR.ServiceCore/Services/EmailTplService.cs index 4619921..62569b8 100644 --- a/ZR.ServiceCore/Services/EmailTplService.cs +++ b/ZR.ServiceCore/Services/EmailTplService.cs @@ -2,10 +2,9 @@ using Infrastructure.Attribute; using ZR.Model; using ZR.Model.Dto; using ZR.Repository; -using ZR.Service.System.ISystemService; using ZR.ServiceCore.Model; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 邮件模板Service业务层处理 diff --git a/ZR.ServiceCore/Services/GenTableService.cs b/ZR.ServiceCore/Services/GenTableService.cs index 958d8d7..9450181 100644 --- a/ZR.ServiceCore/Services/GenTableService.cs +++ b/ZR.ServiceCore/Services/GenTableService.cs @@ -1,14 +1,8 @@ using Infrastructure.Attribute; -using Infrastructure.Extensions; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; using ZR.Model; using ZR.Model.System.Generate; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 代码生成表 diff --git a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs b/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs index 9ee2bc5..80843ce 100644 --- a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs +++ b/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; -using ZR.Model; +using ZR.Model; using ZR.Model.Dto; using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface IArticleCategoryService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/IArticleService.cs b/ZR.ServiceCore/Services/IService/IArticleService.cs index 0785ea6..7ef570d 100644 --- a/ZR.ServiceCore/Services/IService/IArticleService.cs +++ b/ZR.ServiceCore/Services/IService/IArticleService.cs @@ -2,7 +2,7 @@ using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface IArticleService : IBaseService
{ diff --git a/ZR.ServiceCore/Services/IService/ICommonLangService.cs b/ZR.ServiceCore/Services/IService/ICommonLangService.cs index 7afd4d5..7ebd77d 100644 --- a/ZR.ServiceCore/Services/IService/ICommonLangService.cs +++ b/ZR.ServiceCore/Services/IService/ICommonLangService.cs @@ -2,7 +2,7 @@ using ZR.Model; using ZR.Model.Dto; using ZR.Model.Models; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { /// /// 多语言配置service接口 diff --git a/ZR.ServiceCore/Services/IService/IEmailLogService.cs b/ZR.ServiceCore/Services/IService/IEmailLogService.cs index 6b02431..2a6dc86 100644 --- a/ZR.ServiceCore/Services/IService/IEmailLogService.cs +++ b/ZR.ServiceCore/Services/IService/IEmailLogService.cs @@ -1,6 +1,5 @@ using ZR.Model; using ZR.Model.Dto; -using ZR.Service; using ZR.ServiceCore.Model; namespace ZR.ServiceCore.Services diff --git a/ZR.ServiceCore/Services/IService/IEmailTplService.cs b/ZR.ServiceCore/Services/IService/IEmailTplService.cs index d28e00a..40f1041 100644 --- a/ZR.ServiceCore/Services/IService/IEmailTplService.cs +++ b/ZR.ServiceCore/Services/IService/IEmailTplService.cs @@ -2,7 +2,7 @@ using ZR.Model; using ZR.Model.Dto; using ZR.ServiceCore.Model; -namespace ZR.Service.System.ISystemService +namespace ZR.ServiceCore.Services { /// /// 邮件模板service接口 diff --git a/ZR.ServiceCore/Services/IService/IGenTableService.cs b/ZR.ServiceCore/Services/IService/IGenTableService.cs index eaafa58..7024ef5 100644 --- a/ZR.ServiceCore/Services/IService/IGenTableService.cs +++ b/ZR.ServiceCore/Services/IService/IGenTableService.cs @@ -1,9 +1,7 @@ -using SqlSugar; -using System.Collections.Generic; -using ZR.Model; +using ZR.Model; using ZR.Model.System.Generate; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface IGenTableService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISmsCodeLogService.cs b/ZR.ServiceCore/Services/IService/ISmsCodeLogService.cs index b4f9994..b92da8a 100644 --- a/ZR.ServiceCore/Services/IService/ISmsCodeLogService.cs +++ b/ZR.ServiceCore/Services/IService/ISmsCodeLogService.cs @@ -1,6 +1,5 @@ using ZR.Model; using ZR.Model.Dto; -using ZR.Service; using ZR.ServiceCore.Model; namespace ZR.ServiceCore.Services diff --git a/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs b/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs index 2df07ce..d5fd7a0 100644 --- a/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs +++ b/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs @@ -2,7 +2,7 @@ using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { /// /// 数据差异日志service接口 diff --git a/ZR.ServiceCore/Services/IService/ISysConfigService.cs b/ZR.ServiceCore/Services/IService/ISysConfigService.cs index ba8ddec..1253dc1 100644 --- a/ZR.ServiceCore/Services/IService/ISysConfigService.cs +++ b/ZR.ServiceCore/Services/IService/ISysConfigService.cs @@ -1,7 +1,7 @@ using System; using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { /// /// 参数配置service接口 diff --git a/ZR.ServiceCore/Services/IService/ISysDeptService.cs b/ZR.ServiceCore/Services/IService/ISysDeptService.cs index 0559ee5..44b0432 100644 --- a/ZR.ServiceCore/Services/IService/ISysDeptService.cs +++ b/ZR.ServiceCore/Services/IService/ISysDeptService.cs @@ -3,7 +3,7 @@ using ZR.Model.System; using ZR.Model.System.Dto; using ZR.Model.System.Vo; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysDeptService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysDictDataService.cs b/ZR.ServiceCore/Services/IService/ISysDictDataService.cs index b0db87d..2fa22ca 100644 --- a/ZR.ServiceCore/Services/IService/ISysDictDataService.cs +++ b/ZR.ServiceCore/Services/IService/ISysDictDataService.cs @@ -2,7 +2,7 @@ using ZR.Model; using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysDictDataService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysDictService.cs b/ZR.ServiceCore/Services/IService/ISysDictService.cs index 37be554..1da7160 100644 --- a/ZR.ServiceCore/Services/IService/ISysDictService.cs +++ b/ZR.ServiceCore/Services/IService/ISysDictService.cs @@ -1,9 +1,7 @@ -using System.Collections.Generic; -using System.Text; -using ZR.Model; +using ZR.Model; using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { /// /// @@ -11,7 +9,7 @@ namespace ZR.Service.System.IService public interface ISysDictService { public List GetAll(); - public PagedInfo SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager); + public PagedInfo SelectDictTypeList(SysDictType dictType, PagerInfo pager); /// /// 校验字典类型称是否唯一 diff --git a/ZR.ServiceCore/Services/IService/ISysFileService.cs b/ZR.ServiceCore/Services/IService/ISysFileService.cs index 2482bc7..403a59a 100644 --- a/ZR.ServiceCore/Services/IService/ISysFileService.cs +++ b/ZR.ServiceCore/Services/IService/ISysFileService.cs @@ -1,10 +1,7 @@ -using Infrastructure.Attribute; -using Microsoft.AspNetCore.Http; -using System.Threading.Tasks; -using ZR.Model.Models; +using Microsoft.AspNetCore.Http; using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysFileService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysLoginService.cs b/ZR.ServiceCore/Services/IService/ISysLoginService.cs index b3ac59b..651a5dc 100644 --- a/ZR.ServiceCore/Services/IService/ISysLoginService.cs +++ b/ZR.ServiceCore/Services/IService/ISysLoginService.cs @@ -3,7 +3,7 @@ using ZR.Model.System; using ZR.Model.System.Dto; using ZR.ServiceCore.Model.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysLoginService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysMenuService.cs b/ZR.ServiceCore/Services/IService/ISysMenuService.cs index 5896af8..ad5ca63 100644 --- a/ZR.ServiceCore/Services/IService/ISysMenuService.cs +++ b/ZR.ServiceCore/Services/IService/ISysMenuService.cs @@ -1,10 +1,9 @@ -using System.Collections.Generic; +using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Model.System; -using ZR.Model.System.Vo; using ZR.Model.System.Generate; +using ZR.Model.System.Vo; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysMenuService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysNoticeService.cs b/ZR.ServiceCore/Services/IService/ISysNoticeService.cs index 2544aa8..c6cd398 100644 --- a/ZR.ServiceCore/Services/IService/ISysNoticeService.cs +++ b/ZR.ServiceCore/Services/IService/ISysNoticeService.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { /// /// 通知公告表service接口 diff --git a/ZR.ServiceCore/Services/IService/ISysOperLogService.cs b/ZR.ServiceCore/Services/IService/ISysOperLogService.cs index f96402e..a8a1083 100644 --- a/ZR.ServiceCore/Services/IService/ISysOperLogService.cs +++ b/ZR.ServiceCore/Services/IService/ISysOperLogService.cs @@ -2,7 +2,7 @@ using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysOperLogService { diff --git a/ZR.ServiceCore/Services/IService/ISysPermissionService.cs b/ZR.ServiceCore/Services/IService/ISysPermissionService.cs index f0ea833..bd844d2 100644 --- a/ZR.ServiceCore/Services/IService/ISysPermissionService.cs +++ b/ZR.ServiceCore/Services/IService/ISysPermissionService.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ZR.Model.System; +using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysPermissionService { diff --git a/ZR.ServiceCore/Services/IService/ISysPostService.cs b/ZR.ServiceCore/Services/IService/ISysPostService.cs index e65092a..bf129af 100644 --- a/ZR.ServiceCore/Services/IService/ISysPostService.cs +++ b/ZR.ServiceCore/Services/IService/ISysPostService.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using ZR.Model.System; -using ZR.Repository; +using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysPostService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysRoleService.cs b/ZR.ServiceCore/Services/IService/ISysRoleService.cs index 151b296..c762baa 100644 --- a/ZR.ServiceCore/Services/IService/ISysRoleService.cs +++ b/ZR.ServiceCore/Services/IService/ISysRoleService.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; -using ZR.Model; +using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysRoleService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs b/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs index 381796a..6c8ce43 100644 --- a/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs +++ b/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs @@ -1,8 +1,6 @@ -using System.Threading.Tasks; -using ZR.Model.System; -using ZR.Repository; +using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysTasksLogService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs b/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs index 959f757..5f4eb38 100644 --- a/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs +++ b/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs @@ -2,7 +2,7 @@ using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysTasksQzService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserPostService.cs b/ZR.ServiceCore/Services/IService/ISysUserPostService.cs index dc871a2..794efea 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserPostService.cs +++ b/ZR.ServiceCore/Services/IService/ISysUserPostService.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; -using ZR.Model.System; +using ZR.Model.System; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysUserPostService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs b/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs index 42d54eb..6dd5ac8 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs +++ b/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; -using ZR.Model; +using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysUserRoleService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserService.cs b/ZR.ServiceCore/Services/IService/ISysUserService.cs index faf5bd1..411983b 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserService.cs +++ b/ZR.ServiceCore/Services/IService/ISysUserService.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; -using ZR.Model; +using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -namespace ZR.Service.System.IService +namespace ZR.ServiceCore.Services { public interface ISysUserService : IBaseService { diff --git a/ZR.ServiceCore/Services/SeedDataService.cs b/ZR.ServiceCore/Services/SeedDataService.cs index fe88b98..e8a0142 100644 --- a/ZR.ServiceCore/Services/SeedDataService.cs +++ b/ZR.ServiceCore/Services/SeedDataService.cs @@ -3,7 +3,7 @@ using SqlSugar.IOC; using ZR.Common; using ZR.Model.System; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 种子数据处理 diff --git a/ZR.ServiceCore/Services/SmsCodeLogService.cs b/ZR.ServiceCore/Services/SmsCodeLogService.cs index f686288..913fbb9 100644 --- a/ZR.ServiceCore/Services/SmsCodeLogService.cs +++ b/ZR.ServiceCore/Services/SmsCodeLogService.cs @@ -2,7 +2,6 @@ using Infrastructure.Attribute; using ZR.Model; using ZR.Model.Dto; using ZR.Repository; -using ZR.Service; using ZR.ServiceCore.Model; namespace ZR.ServiceCore.Services diff --git a/ZR.ServiceCore/Services/SqlDiffLogService.cs b/ZR.ServiceCore/Services/SqlDiffLogService.cs index 0b88efd..cb04fdd 100644 --- a/ZR.ServiceCore/Services/SqlDiffLogService.cs +++ b/ZR.ServiceCore/Services/SqlDiffLogService.cs @@ -1,14 +1,10 @@ using Infrastructure.Attribute; -using Infrastructure.Extensions; -using SqlSugar; -using System; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; using ZR.Repository; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 数据差异日志Service业务层处理 diff --git a/ZR.ServiceCore/Services/SysConfigService.cs b/ZR.ServiceCore/Services/SysConfigService.cs index 308674d..ee73f0b 100644 --- a/ZR.ServiceCore/Services/SysConfigService.cs +++ b/ZR.ServiceCore/Services/SysConfigService.cs @@ -1,8 +1,7 @@ using Infrastructure.Attribute; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 参数配置Service业务层处理 diff --git a/ZR.ServiceCore/Services/SysDeptService.cs b/ZR.ServiceCore/Services/SysDeptService.cs index 3669322..475f978 100644 --- a/ZR.ServiceCore/Services/SysDeptService.cs +++ b/ZR.ServiceCore/Services/SysDeptService.cs @@ -1,17 +1,11 @@ using Infrastructure; using Infrastructure.Attribute; -using Infrastructure.Extensions; -using SqlSugar; -using System; -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; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 部门管理 diff --git a/ZR.ServiceCore/Services/SysDictDataService.cs b/ZR.ServiceCore/Services/SysDictDataService.cs index f09917b..e07449b 100644 --- a/ZR.ServiceCore/Services/SysDictDataService.cs +++ b/ZR.ServiceCore/Services/SysDictDataService.cs @@ -1,14 +1,9 @@ using Infrastructure.Attribute; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; using ZR.Common; using ZR.Model; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 字典数据类 diff --git a/ZR.ServiceCore/Services/SysDictService.cs b/ZR.ServiceCore/Services/SysDictService.cs index 53e7785..9d22722 100644 --- a/ZR.ServiceCore/Services/SysDictService.cs +++ b/ZR.ServiceCore/Services/SysDictService.cs @@ -1,14 +1,9 @@ using Infrastructure; using Infrastructure.Attribute; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; using ZR.Model; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 字典类型 diff --git a/ZR.ServiceCore/Services/SysFileService.cs b/ZR.ServiceCore/Services/SysFileService.cs index d905800..deb4167 100644 --- a/ZR.ServiceCore/Services/SysFileService.cs +++ b/ZR.ServiceCore/Services/SysFileService.cs @@ -9,9 +9,8 @@ using System.Security.Cryptography; using System.Text; using ZR.Common; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 文件管理 diff --git a/ZR.ServiceCore/Services/SysLoginService.cs b/ZR.ServiceCore/Services/SysLoginService.cs index 4f4d63e..5281f7d 100644 --- a/ZR.ServiceCore/Services/SysLoginService.cs +++ b/ZR.ServiceCore/Services/SysLoginService.cs @@ -6,10 +6,9 @@ using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; using ZR.Repository; -using ZR.Service.System.IService; using ZR.ServiceCore.Model.Dto; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 登录 diff --git a/ZR.ServiceCore/Services/SysMenuService.cs b/ZR.ServiceCore/Services/SysMenuService.cs index 42da926..149400c 100644 --- a/ZR.ServiceCore/Services/SysMenuService.cs +++ b/ZR.ServiceCore/Services/SysMenuService.cs @@ -1,18 +1,12 @@ using Infrastructure.Attribute; -using Infrastructure.Extensions; -using SqlSugar; -using System; -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; -namespace ZR.Service +namespace ZR.ServiceCore.Services { /// /// 菜单 diff --git a/ZR.ServiceCore/Services/SysNoticeService.cs b/ZR.ServiceCore/Services/SysNoticeService.cs index 7c938a0..83de077 100644 --- a/ZR.ServiceCore/Services/SysNoticeService.cs +++ b/ZR.ServiceCore/Services/SysNoticeService.cs @@ -1,12 +1,9 @@ using Infrastructure.Attribute; -using SqlSugar; -using System.Collections.Generic; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 通知公告表Service业务层处理 diff --git a/ZR.ServiceCore/Services/SysOperLogService.cs b/ZR.ServiceCore/Services/SysOperLogService.cs index 6fb14ec..7fb5cc9 100644 --- a/ZR.ServiceCore/Services/SysOperLogService.cs +++ b/ZR.ServiceCore/Services/SysOperLogService.cs @@ -1,14 +1,10 @@ -using Infrastructure; -using Infrastructure.Attribute; -using Infrastructure.Extensions; -using SqlSugar; +using Infrastructure.Attribute; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; using ZR.Repository; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 操作日志 diff --git a/ZR.ServiceCore/Services/SysPermissionService.cs b/ZR.ServiceCore/Services/SysPermissionService.cs index 00beb93..fc06f15 100644 --- a/ZR.ServiceCore/Services/SysPermissionService.cs +++ b/ZR.ServiceCore/Services/SysPermissionService.cs @@ -1,10 +1,8 @@ using Infrastructure; using Infrastructure.Attribute; -using System.Collections.Generic; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 角色权限 diff --git a/ZR.ServiceCore/Services/SysPostService.cs b/ZR.ServiceCore/Services/SysPostService.cs index 21e832c..cfbabf1 100644 --- a/ZR.ServiceCore/Services/SysPostService.cs +++ b/ZR.ServiceCore/Services/SysPostService.cs @@ -1,9 +1,7 @@ using Infrastructure.Attribute; -using System.Collections.Generic; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 岗位管理 diff --git a/ZR.ServiceCore/Services/SysRoleMenuService.cs b/ZR.ServiceCore/Services/SysRoleMenuService.cs index dbd2b37..d9fe59d 100644 --- a/ZR.ServiceCore/Services/SysRoleMenuService.cs +++ b/ZR.ServiceCore/Services/SysRoleMenuService.cs @@ -1,8 +1,7 @@ using Infrastructure.Attribute; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 角色菜单 diff --git a/ZR.ServiceCore/Services/SysRoleService.cs b/ZR.ServiceCore/Services/SysRoleService.cs index 3f45fbb..5386853 100644 --- a/ZR.ServiceCore/Services/SysRoleService.cs +++ b/ZR.ServiceCore/Services/SysRoleService.cs @@ -1,17 +1,12 @@ using Infrastructure; using Infrastructure.Attribute; -using SqlSugar; -using System; using System.Collections; -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; -namespace ZR.Service +namespace ZR.ServiceCore.Services { /// /// 角色 diff --git a/ZR.ServiceCore/Services/SysTasksLogService.cs b/ZR.ServiceCore/Services/SysTasksLogService.cs index 61c9ec6..c450941 100644 --- a/ZR.ServiceCore/Services/SysTasksLogService.cs +++ b/ZR.ServiceCore/Services/SysTasksLogService.cs @@ -1,13 +1,7 @@ using Infrastructure.Attribute; -using System; -using System.Linq.Expressions; -using System.Threading.Tasks; -using ZR.Model; using ZR.Model.System; -using ZR.Repository; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 任务日志 diff --git a/ZR.ServiceCore/Services/SysTasksQzService.cs b/ZR.ServiceCore/Services/SysTasksQzService.cs index 0d12a87..cf71a05 100644 --- a/ZR.ServiceCore/Services/SysTasksQzService.cs +++ b/ZR.ServiceCore/Services/SysTasksQzService.cs @@ -1,15 +1,10 @@ -using Infrastructure; -using Infrastructure.Attribute; -using Infrastructure.Extensions; -using SqlSugar; -using System; +using Infrastructure.Attribute; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; using ZR.Repository; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 定时任务 diff --git a/ZR.ServiceCore/Services/SysUserPostService.cs b/ZR.ServiceCore/Services/SysUserPostService.cs index 110328a..9bb0e37 100644 --- a/ZR.ServiceCore/Services/SysUserPostService.cs +++ b/ZR.ServiceCore/Services/SysUserPostService.cs @@ -1,10 +1,7 @@ using Infrastructure.Attribute; -using SqlSugar; -using System.Linq; using ZR.Model.System; -using ZR.Service.System.IService; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 用户岗位 diff --git a/ZR.ServiceCore/Services/SysUserRoleService.cs b/ZR.ServiceCore/Services/SysUserRoleService.cs index 40b70fd..2c567b5 100644 --- a/ZR.ServiceCore/Services/SysUserRoleService.cs +++ b/ZR.ServiceCore/Services/SysUserRoleService.cs @@ -1,14 +1,10 @@ using Infrastructure.Attribute; -using Infrastructure.Extensions; -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; -namespace ZR.Service.System +namespace ZR.ServiceCore.Services { /// /// 用户角色 diff --git a/ZR.ServiceCore/Services/SysUserService.cs b/ZR.ServiceCore/Services/SysUserService.cs index 17d955d..5555d9c 100644 --- a/ZR.ServiceCore/Services/SysUserService.cs +++ b/ZR.ServiceCore/Services/SysUserService.cs @@ -7,9 +7,8 @@ using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; using ZR.Repository; -using ZR.Service.System.IService; -namespace ZR.Service +namespace ZR.ServiceCore.Services { /// /// 系统用户 diff --git a/ZR.ServiceCore/Signalr/MessageHub.cs b/ZR.ServiceCore/Signalr/MessageHub.cs index 28e32bd..a21d728 100644 --- a/ZR.ServiceCore/Signalr/MessageHub.cs +++ b/ZR.ServiceCore/Signalr/MessageHub.cs @@ -5,8 +5,8 @@ using Mapster; using Microsoft.AspNetCore.SignalR; using System.Web; using UAParser; -using ZR.Service.System.IService; using ZR.ServiceCore.Model.Dto; +using ZR.ServiceCore.Services; namespace ZR.ServiceCore.Signalr { diff --git a/ZR.Tasks/TaskScheduler/JobBase.cs b/ZR.Tasks/TaskScheduler/JobBase.cs index 208473b..11c1001 100644 --- a/ZR.Tasks/TaskScheduler/JobBase.cs +++ b/ZR.Tasks/TaskScheduler/JobBase.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Threading.Tasks; using ZR.Common; using ZR.Model.System; -using ZR.Service.System.IService; +using ZR.ServiceCore.Services; namespace ZR.Tasks { diff --git a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs index e96b7ca..1ea38e3 100644 --- a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs +++ b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs @@ -7,7 +7,6 @@ using SqlSugar.IOC; using System; using System.Threading.Tasks; using ZR.Model.System; -using ZR.Service.System.IService; namespace ZR.Tasks.TaskScheduler { diff --git a/ZR.Tasks/TaskScheduler/Job_SqlExecute.cs b/ZR.Tasks/TaskScheduler/Job_SqlExecute.cs index 4296aef..499a0d4 100644 --- a/ZR.Tasks/TaskScheduler/Job_SqlExecute.cs +++ b/ZR.Tasks/TaskScheduler/Job_SqlExecute.cs @@ -5,9 +5,8 @@ using Quartz; using Quartz.Impl; using Quartz.Impl.Triggers; using SqlSugar.IOC; -using System; using System.Threading.Tasks; -using ZR.Service.System.IService; +using ZR.ServiceCore.Services; namespace ZR.Tasks.TaskScheduler {