⚡优化命名空间

2023-11-23 16:28:18 +08:00 · 2023-11-23 16:28:18 +08:00 · 0d68423ce0
commit 0d68423ce0
parent 4c91f65759
89 changed files with 93 additions and 223 deletions
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
--- 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
 {
--- 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
--- 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
 {
--- 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
 {
--- 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;
+global using ZR.ServiceCore.Middleware;
+global using ZR.ServiceCore.Services;
--- 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
 {
--- 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
 {
--- a/ZR.ServiceCore/BaseService.cs
+++ b/ZR.ServiceCore/BaseService.cs
@ -1,6 +1,6 @@
 using ZR.Repository;

-namespace ZR.Service
+namespace ZR.ServiceCore
 {
    /// <summary>
    /// 基础服务定义
--- 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
 {
--- 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
 {
--- a/ZR.ServiceCore/IBaseService.cs
+++ b/ZR.ServiceCore/IBaseService.cs
@ -1,6 +1,6 @@
 using ZR.Repository;

-namespace ZR.Service
+namespace ZR.ServiceCore
 {
    /// <summary>
    /// 基础服务定义
--- 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
--- 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
 {
    /// <summary>
    /// 文章目录Service业务层处理
--- 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
 {
    /// <summary>
    /// 
--- 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
    {
--- 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
 {
    /// <summary>
    /// 多语言配置Service业务层处理
--- 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
 {
    /// <summary>
    /// 邮件发送记录Service业务层处理
--- 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
 {
    /// <summary>
    /// 邮件模板Service业务层处理
--- 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
 {
    /// <summary>
    /// 代码生成表
--- 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<ArticleCategory>
    {
--- 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<Article>
    {
--- 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
 {
    /// <summary>
    /// 多语言配置service接口
--- 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
--- 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
 {
    /// <summary>
    /// 邮件模板service接口
--- 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<GenTable>
    {
--- 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
--- 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
 {
    /// <summary>
    /// 数据差异日志service接口
--- 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
 {
    /// <summary>
    /// 参数配置service接口
--- 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<SysDept>
    {
--- 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<SysDictData>
    {
--- 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
 {
    /// <summary>
    /// 
@ -11,7 +9,7 @@ namespace ZR.Service.System.IService
    public interface ISysDictService
    {
        public List<SysDictType> GetAll();
-        public PagedInfo<SysDictType> SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager);
+        public PagedInfo<SysDictType> SelectDictTypeList(SysDictType dictType, PagerInfo pager);

        /// <summary>
        /// 校验字典类型称是否唯一
--- 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<SysFile>
    {
--- 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<SysLogininfor>
    {
--- 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<SysMenu>
    {
--- 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
 {
    /// <summary>
    /// 通知公告表service接口
--- 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
    {
--- 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
    {
--- 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<SysPost>
    {
--- 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<SysRole>
    {
--- 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<SysTasksLog>
    {
--- 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<SysTasks>
    {
--- 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
    {
--- 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<SysUserRole>
    {
--- 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<SysUser>
    {
--- 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
 {
    /// <summary>
    /// 种子数据处理
--- 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
--- 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
 {
    /// <summary>
    /// 数据差异日志Service业务层处理
--- 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
 {
    /// <summary>
    /// 参数配置Service业务层处理
--- 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
 {
    /// <summary>
    /// 部门管理
--- 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
 {
    /// <summary>
    /// 字典数据类
--- 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
 {
    /// <summary>
    /// 字典类型
--- 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
 {
    /// <summary>
    /// 文件管理
--- 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
 {
    /// <summary>
    /// 登录
--- 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
 {
    /// <summary>
    /// 菜单
--- 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
 {
    /// <summary>
    /// 通知公告表Service业务层处理
--- 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
 {
    /// <summary>
    /// 操作日志
--- 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
 {
    /// <summary>
    /// 角色权限
--- 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
 {
    /// <summary>
    /// 岗位管理
--- 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
 {
    /// <summary>
    /// 角色菜单
--- 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
 {
    /// <summary>
    /// 角色
--- 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
 {
    /// <summary>
    /// 任务日志
--- 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
 {
    /// <summary>
    /// 定时任务
--- 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
 {
    /// <summary>
    /// 用户岗位
--- 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
 {
    /// <summary>
    /// 用户角色
--- 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
 {
    /// <summary>
    /// 系统用户
--- 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
 {
--- 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
 {
--- 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
 {
--- 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
 {