优化项目命名空间

ZR.Admin.WebApi/Controllers/System/ArticleController.cs

@@ -1,18 +1,8 @@
-
+using Infrastructure.Attribute;
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using Infrastructure.Attribute;
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 using Infrastructure.Model;
 using SqlSugar;
 using Mapster;

ZR.Admin.WebApi/Controllers/System/SysDeptController.cs

@@ -7,7 +7,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Common;
 using ZR.Model.System;
 using ZR.Service;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs

@@ -7,7 +7,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.Vo;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs

@@ -8,7 +8,7 @@ using ZR.Common;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.Vo;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/SysLoginController.cs

@@ -12,7 +12,7 @@ using Infrastructure;
 using Infrastructure.Attribute;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 using Hei.Captcha;
 using ZR.Common;
 

ZR.Admin.WebApi/Controllers/System/SysMenuController.cs

@@ -8,7 +8,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Service;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/SysPostController.cs

@@ -8,7 +8,7 @@ using Infrastructure.Extensions;
 using Infrastructure.Attribute;
 using Infrastructure.Enums;
 using Infrastructure;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/SysProfileController.cs

@@ -14,7 +14,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Common;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/SysRoleController.cs

@@ -8,7 +8,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.Vo;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 using ZR.Admin.WebApi.Extensions;
 
 namespace ZR.Admin.WebApi.Controllers.System

ZR.Admin.WebApi/Controllers/System/SysUserController.cs

@@ -10,7 +10,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.Vo;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs

@@ -7,7 +7,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/TasksController.cs

@@ -12,7 +12,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 using ZR.Tasks;
 
 namespace ZR.Admin.WebApi.Controllers

ZR.Admin.WebApi/Controllers/System/TasksLogController.cs

@@ -8,7 +8,7 @@ using Infrastructure.Attribute;
 using ZR.Admin.WebApi.Filters;
 using ZR.Common;
 using Infrastructure.Enums;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs

@@ -5,7 +5,7 @@ using ZR.Common;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.Vo;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.monitor
 {

ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs

@@ -8,7 +8,7 @@ using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Model.Vo;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.monitor
 {

ZR.Admin.WebApi/Extensions/TasksExtension.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Quartz.Spi;
 using System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 using ZR.Tasks;
 
 namespace ZR.Admin.WebApi.Extensions

ZR.Admin.WebApi/Filters/LogActionFilter.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using System.Text;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Filters
 {

ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Middleware
 {

ZR.Admin.WebApi/Template/Controller.cs

@@ -11,7 +11,7 @@ using Infrastructure.Attribute;
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 using Infrastructure.Model;
 using SqlSugar;
 using Mapster;

ZR.Model/ZR.Model.csproj

@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Dto\" />
     <Folder Include="Enum\" />
   </ItemGroup>
 

ZR.Service/System/ArticleCategoryService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/ArticleService.cs

@@ -1,6 +1,6 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/IService/IArticleCategoryService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface IArticleCategoryService : IBaseService<ArticleCategory>
     {

ZR.Service/System/IService/IArticleService.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface IArticleService : IBaseService<Article>
     {

ZR.Service/System/IService/ISysDeptService.cs

@@ -4,7 +4,7 @@ using System.Text;
 using ZR.Model.System;
 using ZR.Model.Vo.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysDeptService : IBaseService<SysDept>
     {

ZR.Service/System/IService/ISysDictDataService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysDictDataService : IBaseService<SysDictData>
     {

ZR.Service/System/IService/ISysDictService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     /// <summary>
     /// 

ZR.Service/System/IService/ISysFileService.cs

@@ -1,7 +1,7 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysFileService : IBaseService<SysFile>
     {

ZR.Service/System/IService/ISysLoginService.cs

@@ -5,7 +5,7 @@ using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysLoginService
     {

ZR.Service/System/IService/ISysMenuService.cs

@@ -4,7 +4,7 @@ using ZR.Model.System;
 using ZR.Model.System.Vo;
 using ZR.Model.Vo.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysMenuService: IBaseService<SysMenu>
     {

ZR.Service/System/IService/ISysOperLogService.cs

@@ -4,7 +4,7 @@ using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Service.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysOperLogService : IBaseService<SysOperLog>
     {

ZR.Service/System/IService/ISysPermissionService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysPermissionService
     {

ZR.Service/System/IService/ISysPostService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysPostService: IBaseService<SysPost>
     {

ZR.Service/System/IService/ISysRoleService.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysRoleService: IBaseService<SysRole>
     {

ZR.Service/System/IService/ISysTasksLogService.cs

@@ -1,6 +1,6 @@
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysTasksLogService : IBaseService<SysTasksLog>
     {

ZR.Service/System/IService/ISysTasksQzService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysTasksQzService: IBaseService<SysTasksQz>
     {

ZR.Service/System/IService/ISysUserPostService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysUserPostService: IBaseService<SysUserPost>
     {

ZR.Service/System/IService/ISysUserRoleService.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysUserRoleService
     {

ZR.Service/System/IService/ISysUserService.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using ZR.Model;
 using ZR.Model.System;
 
-namespace ZR.Service.IService
+namespace ZR.Service.System.IService
 {
     public interface ISysUserService : IBaseService<SysUser>
     {

ZR.Service/System/SysDeptService.cs

@@ -10,7 +10,7 @@ using ZR.Common;
 using ZR.Model.System;
 using ZR.Model.Vo.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysDictDataService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using ZR.Common;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysDictService.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysFileService.cs

@@ -1,6 +1,6 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysLoginService.cs

@@ -7,7 +7,7 @@ using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysMenuService.cs

@@ -7,7 +7,7 @@ using ZR.Model.System.Vo;
 using ZR.Model.Vo;
 using ZR.Model.Vo.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service
 {

ZR.Service/System/SysOperLogService.cs

@@ -5,7 +5,7 @@ using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysPermissionService.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysPostService.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysRoleService.cs

@@ -7,8 +7,7 @@ using System.Linq;
 using System.Text;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
-using ZR.Service.System;
 
 namespace ZR.Service
 {

ZR.Service/System/SysTasksLogService.cs

@@ -1,7 +1,7 @@
 using Infrastructure.Attribute;
 using System;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysTasksQzService.cs

@@ -1,6 +1,6 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysUserPostService.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysUserRoleService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysUserService.cs

@@ -6,7 +6,7 @@ using System.Text;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service
 {

ZR.Tasks/TaskScheduler/JobBase.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Tasks
 {