From 086ccbfb6df94212df339fa43e2049e9bf5abf3b Mon Sep 17 00:00:00 2001 From: izory <791736813@qq.com> Date: Thu, 16 Sep 2021 19:07:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/System/ArticleController.cs | 2 +- .../Controllers/System/SysLoginController.cs | 2 +- .../Controllers/System/SysMenuController.cs | 2 +- .../System/SysProfileController.cs | 2 +- .../System/SysUserRoleController.cs | 2 +- .../Controllers/System/TasksController.cs | 2 +- .../Controllers/System/TasksLogController.cs | 2 +- .../System/monitor/SysOperlogController.cs | 2 +- ZR.Admin.WebApi/Template/Controller.cs | 2 +- .../Template/ControllersTemplate.txt | 11 ++-- .../{Dto/System => System/Dto}/ArticleDto.cs | 2 +- .../System => System/Dto}/LoginBodyDto.cs | 2 +- .../{Dto/System => System/Dto}/MenuDto.cs | 2 +- .../Dto}/RoleUsersCreateDto.cs | 2 +- .../System => System/Dto}/SysFileQueryDto.cs | 2 +- .../System => System/Dto}/SysLogininfoDto.cs | 2 +- .../System => System/Dto}/SysOperLogDto.cs | 2 +- .../{Dto/System => System/Dto}/SysRoleDto.cs | 2 +- .../{Dto/System => System/Dto}/SysUserDto.cs | 2 +- .../{Dto/System => System/Dto}/TasksDto.cs | 2 +- .../{Dto/System => System/Dto}/TasksLogDto.cs | 2 +- ZR.Model/{Vo/System => System/Vo}/RouterVo.cs | 0 .../{Vo/System => System/Vo}/TreeSelectVo.cs | 0 ZR.Repository/System/ArticleRepository.cs | 2 +- .../System/SysLogininfoRepository.cs | 2 +- ZR.Repository/System/SysMenuRepository.cs | 2 +- ZR.Repository/System/SysOperLogRepository.cs | 2 +- ZR.Service/IService/IArticleService.cs | 2 +- ZR.Service/IService/ISysLoginService.cs | 2 +- ZR.Service/IService/ISysMenuService.cs | 2 +- ZR.Service/IService/ISysOperLogService.cs | 2 +- ZR.Service/IService/ISysUserRoleService.cs | 2 +- ZR.Service/System/SysLoginService.cs | 2 +- ZR.Service/System/SysMenuService.cs | 2 +- ZR.Service/System/SysOperLogService.cs | 2 +- ZR.Service/System/SysUserRoleService.cs | 2 +- ZRAdmin.xml | 65 ++++--------------- 37 files changed, 50 insertions(+), 92 deletions(-) rename ZR.Model/{Dto/System => System/Dto}/ArticleDto.cs (91%) rename ZR.Model/{Dto/System => System/Dto}/LoginBodyDto.cs (95%) rename ZR.Model/{Dto/System => System/Dto}/MenuDto.cs (96%) rename ZR.Model/{Dto/System => System/Dto}/RoleUsersCreateDto.cs (95%) rename ZR.Model/{Dto/System => System/Dto}/SysFileQueryDto.cs (81%) rename ZR.Model/{Dto/System => System/Dto}/SysLogininfoDto.cs (94%) rename ZR.Model/{Dto/System => System/Dto}/SysOperLogDto.cs (96%) rename ZR.Model/{Dto/System => System/Dto}/SysRoleDto.cs (94%) rename ZR.Model/{Dto/System => System/Dto}/SysUserDto.cs (94%) rename ZR.Model/{Dto/System => System/Dto}/TasksDto.cs (99%) rename ZR.Model/{Dto/System => System/Dto}/TasksLogDto.cs (95%) rename ZR.Model/{Vo/System => System/Vo}/RouterVo.cs (100%) rename ZR.Model/{Vo/System => System/Vo}/TreeSelectVo.cs (100%) diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs index 6f73f98..6b82736 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs @@ -16,7 +16,7 @@ using ZR.Service.IService; using Infrastructure.Model; using SqlSugar; using Mapster; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using Infrastructure.Enums; using Infrastructure; using ZR.Admin.WebApi.Extensions; diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index b363ab8..29be694 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -11,7 +11,7 @@ using Infrastructure.Model; using Infrastructure; using Infrastructure.Attribute; using ZR.Model.System; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Service.IService; using Hei.Captcha; using ZR.Common; diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs index 27dd846..f5ab9f6 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs @@ -5,7 +5,7 @@ using Infrastructure.Model; using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Service; using ZR.Service.IService; diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs index d1e2172..ce015f9 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -12,7 +12,7 @@ using System.IO; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Common; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Service.IService; diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs index a801832..fe24e0f 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs @@ -5,7 +5,7 @@ using System; using System.Linq; using ZR.Admin.WebApi.Filters; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Service.IService; diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index ad60385..8135252 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Service.IService; using ZR.Tasks; diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs index ca842ca..52bd37b 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using Infrastructure.Extensions; using Infrastructure.Attribute; diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index fd76f8f..9e70b7c 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Filters; using ZR.Common; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Model.Vo; using ZR.Service.IService; diff --git a/ZR.Admin.WebApi/Template/Controller.cs b/ZR.Admin.WebApi/Template/Controller.cs index 6b343ed..e1edef3 100644 --- a/ZR.Admin.WebApi/Template/Controller.cs +++ b/ZR.Admin.WebApi/Template/Controller.cs @@ -15,7 +15,7 @@ using ZR.Service.IService; using Infrastructure.Model; using SqlSugar; using Mapster; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using Infrastructure.Enums; using Infrastructure; using ZR.Admin.WebApi.Extensions; diff --git a/ZR.Admin.WebApi/Template/ControllersTemplate.txt b/ZR.Admin.WebApi/Template/ControllersTemplate.txt index fb276b9..02131cb 100644 --- a/ZR.Admin.WebApi/Template/ControllersTemplate.txt +++ b/ZR.Admin.WebApi/Template/ControllersTemplate.txt @@ -13,7 +13,6 @@ using {ModelsNamespace}.Models; using {ServicesNamespace}.Business; using {ApiControllerNamespace}.Extensions; using {ApiControllerNamespace}.Filters; -using {ApiControllerNamespace}.Controllers; namespace {ApiControllerNamespace}.Controllers { @@ -40,7 +39,7 @@ namespace {ApiControllerNamespace}.Controllers /// [HttpGet("list")] [ActionPermissionFilter(Permission = "{Permission}:list")] - public IActionResult Query([FromQuery] {ModelName}QueryDto parm) + public IActionResult Query{ModelName}([FromQuery] {ModelName}QueryDto parm) { //开始拼装查询条件 var predicate = Expressionable.Create<{ModelName}>(); @@ -60,7 +59,7 @@ namespace {ApiControllerNamespace}.Controllers /// [HttpGet("{{PrimaryKey}}")] [ActionPermissionFilter(Permission = "{Permission}:query")] - public IActionResult Get({KeyTypeName} {PrimaryKey}) + public IActionResult Get{ModelName}({KeyTypeName} {PrimaryKey}) { var response = _{ModelName}Service.GetId({PrimaryKey}); @@ -74,7 +73,7 @@ namespace {ApiControllerNamespace}.Controllers [HttpPost] [ActionPermissionFilter(Permission = "{Permission}:add")] [Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)] - public IActionResult Create([FromBody] {ModelName}Dto parm) + public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm) { if (parm == null) { @@ -94,7 +93,7 @@ namespace {ApiControllerNamespace}.Controllers [HttpPut] [ActionPermissionFilter(Permission = "{Permission}:update")] [Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)] - public IActionResult Update([FromBody] {ModelName}Dto parm) + public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm) { if (parm == null) { @@ -120,7 +119,7 @@ namespace {ApiControllerNamespace}.Controllers [HttpDelete("{{PrimaryKey}}")] [ActionPermissionFilter(Permission = "{Permission}:delete")] [Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)] - public IActionResult Delete({KeyTypeName} {PrimaryKey} = 0) + public IActionResult Delete{ModelName}({KeyTypeName} {PrimaryKey} = 0) { if ({PrimaryKey} <= 0) { return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); } diff --git a/ZR.Model/Dto/System/ArticleDto.cs b/ZR.Model/System/Dto/ArticleDto.cs similarity index 91% rename from ZR.Model/Dto/System/ArticleDto.cs rename to ZR.Model/System/Dto/ArticleDto.cs index ff5a3c0..368b1ea 100644 --- a/ZR.Model/Dto/System/ArticleDto.cs +++ b/ZR.Model/System/Dto/ArticleDto.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class ArticleQueryDto: PagerInfo { diff --git a/ZR.Model/Dto/System/LoginBodyDto.cs b/ZR.Model/System/Dto/LoginBodyDto.cs similarity index 95% rename from ZR.Model/Dto/System/LoginBodyDto.cs rename to ZR.Model/System/Dto/LoginBodyDto.cs index cf0fa0b..6bb2246 100644 --- a/ZR.Model/Dto/System/LoginBodyDto.cs +++ b/ZR.Model/System/Dto/LoginBodyDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class LoginBodyDto { diff --git a/ZR.Model/Dto/System/MenuDto.cs b/ZR.Model/System/Dto/MenuDto.cs similarity index 96% rename from ZR.Model/Dto/System/MenuDto.cs rename to ZR.Model/System/Dto/MenuDto.cs index ac241f7..0fa5671 100644 --- a/ZR.Model/Dto/System/MenuDto.cs +++ b/ZR.Model/System/Dto/MenuDto.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class MenuDto { diff --git a/ZR.Model/Dto/System/RoleUsersCreateDto.cs b/ZR.Model/System/Dto/RoleUsersCreateDto.cs similarity index 95% rename from ZR.Model/Dto/System/RoleUsersCreateDto.cs rename to ZR.Model/System/Dto/RoleUsersCreateDto.cs index 2ba0cfb..456621a 100644 --- a/ZR.Model/Dto/System/RoleUsersCreateDto.cs +++ b/ZR.Model/System/Dto/RoleUsersCreateDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Text; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class RoleUsersCreateDto { diff --git a/ZR.Model/Dto/System/SysFileQueryDto.cs b/ZR.Model/System/Dto/SysFileQueryDto.cs similarity index 81% rename from ZR.Model/Dto/System/SysFileQueryDto.cs rename to ZR.Model/System/Dto/SysFileQueryDto.cs index 5c3d018..868534d 100644 --- a/ZR.Model/Dto/System/SysFileQueryDto.cs +++ b/ZR.Model/System/Dto/SysFileQueryDto.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class SysFileQueryDto : PagerInfo { diff --git a/ZR.Model/Dto/System/SysLogininfoDto.cs b/ZR.Model/System/Dto/SysLogininfoDto.cs similarity index 94% rename from ZR.Model/Dto/System/SysLogininfoDto.cs rename to ZR.Model/System/Dto/SysLogininfoDto.cs index 7d5bc43..a125b9a 100644 --- a/ZR.Model/Dto/System/SysLogininfoDto.cs +++ b/ZR.Model/System/Dto/SysLogininfoDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using ZR.Model.System; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class SysLogininfoDto : SysBase { diff --git a/ZR.Model/Dto/System/SysOperLogDto.cs b/ZR.Model/System/Dto/SysOperLogDto.cs similarity index 96% rename from ZR.Model/Dto/System/SysOperLogDto.cs rename to ZR.Model/System/Dto/SysOperLogDto.cs index e686da1..23bd3cb 100644 --- a/ZR.Model/Dto/System/SysOperLogDto.cs +++ b/ZR.Model/System/Dto/SysOperLogDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using ZR.Model.System; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class SysOperLogDto : SysBase { diff --git a/ZR.Model/Dto/System/SysRoleDto.cs b/ZR.Model/System/Dto/SysRoleDto.cs similarity index 94% rename from ZR.Model/Dto/System/SysRoleDto.cs rename to ZR.Model/System/Dto/SysRoleDto.cs index 7ba3d47..5a29195 100644 --- a/ZR.Model/Dto/System/SysRoleDto.cs +++ b/ZR.Model/System/Dto/SysRoleDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using ZR.Model.System; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class SysRoleDto: SysBase { diff --git a/ZR.Model/Dto/System/SysUserDto.cs b/ZR.Model/System/Dto/SysUserDto.cs similarity index 94% rename from ZR.Model/Dto/System/SysUserDto.cs rename to ZR.Model/System/Dto/SysUserDto.cs index ef7df57..6841ef6 100644 --- a/ZR.Model/Dto/System/SysUserDto.cs +++ b/ZR.Model/System/Dto/SysUserDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using ZR.Model.System; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class SysUserDto { diff --git a/ZR.Model/Dto/System/TasksDto.cs b/ZR.Model/System/Dto/TasksDto.cs similarity index 99% rename from ZR.Model/Dto/System/TasksDto.cs rename to ZR.Model/System/Dto/TasksDto.cs index bc190bc..f41827f 100644 --- a/ZR.Model/Dto/System/TasksDto.cs +++ b/ZR.Model/System/Dto/TasksDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Text; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class TasksQueryDto { diff --git a/ZR.Model/Dto/System/TasksLogDto.cs b/ZR.Model/System/Dto/TasksLogDto.cs similarity index 95% rename from ZR.Model/Dto/System/TasksLogDto.cs rename to ZR.Model/System/Dto/TasksLogDto.cs index 7c573e4..0284234 100644 --- a/ZR.Model/Dto/System/TasksLogDto.cs +++ b/ZR.Model/System/Dto/TasksLogDto.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ZR.Model.Dto.System +namespace ZR.Model.System.Dto { public class TasksLogQueryDto { diff --git a/ZR.Model/Vo/System/RouterVo.cs b/ZR.Model/System/Vo/RouterVo.cs similarity index 100% rename from ZR.Model/Vo/System/RouterVo.cs rename to ZR.Model/System/Vo/RouterVo.cs diff --git a/ZR.Model/Vo/System/TreeSelectVo.cs b/ZR.Model/System/Vo/TreeSelectVo.cs similarity index 100% rename from ZR.Model/Vo/System/TreeSelectVo.cs rename to ZR.Model/System/Vo/TreeSelectVo.cs diff --git a/ZR.Repository/System/ArticleRepository.cs b/ZR.Repository/System/ArticleRepository.cs index 5b0cd75..57001a7 100644 --- a/ZR.Repository/System/ArticleRepository.cs +++ b/ZR.Repository/System/ArticleRepository.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; namespace ZR.Repository.System diff --git a/ZR.Repository/System/SysLogininfoRepository.cs b/ZR.Repository/System/SysLogininfoRepository.cs index 1bdb962..f91a88d 100644 --- a/ZR.Repository/System/SysLogininfoRepository.cs +++ b/ZR.Repository/System/SysLogininfoRepository.cs @@ -2,7 +2,7 @@ using Infrastructure.Extensions; using System.Collections.Generic; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; namespace ZR.Repository.System diff --git a/ZR.Repository/System/SysMenuRepository.cs b/ZR.Repository/System/SysMenuRepository.cs index 0332b87..3fafa0b 100644 --- a/ZR.Repository/System/SysMenuRepository.cs +++ b/ZR.Repository/System/SysMenuRepository.cs @@ -3,7 +3,7 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; namespace ZR.Repository.System diff --git a/ZR.Repository/System/SysOperLogRepository.cs b/ZR.Repository/System/SysOperLogRepository.cs index 840de43..9c47b11 100644 --- a/ZR.Repository/System/SysOperLogRepository.cs +++ b/ZR.Repository/System/SysOperLogRepository.cs @@ -2,7 +2,7 @@ using Infrastructure.Extensions; using System.Collections.Generic; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; namespace ZR.Repository.System diff --git a/ZR.Service/IService/IArticleService.cs b/ZR.Service/IService/IArticleService.cs index 9e9dcd7..deadeba 100644 --- a/ZR.Service/IService/IArticleService.cs +++ b/ZR.Service/IService/IArticleService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; namespace ZR.Service.IService diff --git a/ZR.Service/IService/ISysLoginService.cs b/ZR.Service/IService/ISysLoginService.cs index 22272e2..41a88ba 100644 --- a/ZR.Service/IService/ISysLoginService.cs +++ b/ZR.Service/IService/ISysLoginService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; namespace ZR.Service.IService diff --git a/ZR.Service/IService/ISysMenuService.cs b/ZR.Service/IService/ISysMenuService.cs index 04c90c4..a7360e3 100644 --- a/ZR.Service/IService/ISysMenuService.cs +++ b/ZR.Service/IService/ISysMenuService.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Model.System.Vo; using ZR.Model.Vo.System; diff --git a/ZR.Service/IService/ISysOperLogService.cs b/ZR.Service/IService/ISysOperLogService.cs index eef404e..ed0640d 100644 --- a/ZR.Service/IService/ISysOperLogService.cs +++ b/ZR.Service/IService/ISysOperLogService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Service.System; diff --git a/ZR.Service/IService/ISysUserRoleService.cs b/ZR.Service/IService/ISysUserRoleService.cs index 55d4b01..f701711 100644 --- a/ZR.Service/IService/ISysUserRoleService.cs +++ b/ZR.Service/IService/ISysUserRoleService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; namespace ZR.Service.IService diff --git a/ZR.Service/System/SysLoginService.cs b/ZR.Service/System/SysLoginService.cs index 8758e1b..3cf3f9f 100644 --- a/ZR.Service/System/SysLoginService.cs +++ b/ZR.Service/System/SysLoginService.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using ZR.Common; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Repository.System; using ZR.Service.IService; diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs index c4d702e..98b4001 100644 --- a/ZR.Service/System/SysMenuService.cs +++ b/ZR.Service/System/SysMenuService.cs @@ -1,7 +1,7 @@ using Infrastructure.Attribute; using System.Collections.Generic; using System.Linq; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Model.System.Vo; using ZR.Model.Vo; diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs index 668accd..cb174f8 100644 --- a/ZR.Service/System/SysOperLogService.cs +++ b/ZR.Service/System/SysOperLogService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using ZR.Common; using ZR.Model; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Repository.System; using ZR.Service.IService; diff --git a/ZR.Service/System/SysUserRoleService.cs b/ZR.Service/System/SysUserRoleService.cs index a42cbf4..c3fe77f 100644 --- a/ZR.Service/System/SysUserRoleService.cs +++ b/ZR.Service/System/SysUserRoleService.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; -using ZR.Model.Dto.System; +using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Repository.System; using ZR.Service.IService; diff --git a/ZRAdmin.xml b/ZRAdmin.xml index 1e06da6..8133d63 100644 --- a/ZRAdmin.xml +++ b/ZRAdmin.xml @@ -92,7 +92,7 @@ 文章接口 - + 查询文章列表 @@ -175,7 +175,7 @@ - + 查询操作日志 @@ -345,7 +345,7 @@ 登录 - + 登录 @@ -424,7 +424,7 @@ - + 保存排序 @@ -481,7 +481,7 @@ - + 修改用户 @@ -620,13 +620,13 @@ - + 添加角色用户 - + 删除角色用户 @@ -640,7 +640,7 @@ - + 查询日志 @@ -666,7 +666,7 @@ 计划任务 - + 查询计划任务列表 @@ -679,13 +679,13 @@ 编码 - + 添加任务 - + 更新任务 @@ -733,7 +733,7 @@ 文件管理接口 - + 查询文件管理列表 @@ -920,46 +920,5 @@ - - - 代码自动生成 - - - - - 接口 - - - - - 查询列表 - - - - - - 查询详情 - - - - - - - 添加 - - - - - - 更新 - - - - - - 删除 - - -