wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化项目命名空间

Browse Source
This commit is contained in:
izory 2021-09-16 19:07:49 +08:00
parent ced13d7b10
commit 086ccbfb6d
37 changed files with 50 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/System/ArticleController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
View File

@ -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;

2
ZR.Admin.WebApi/Template/Controller.cs
View File

@ -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;

11
ZR.Admin.WebApi/Template/ControllersTemplate.txt
View File

@ -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
/// <returns></returns>
[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
/// <returns></returns>
[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 不能为空")); }

2
ZR.Model/Dto/System/ArticleDto.cs → ZR.Model/System/Dto/ArticleDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/LoginBodyDto.cs → ZR.Model/System/Dto/LoginBodyDto.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.Dto.System
namespace ZR.Model.System.Dto
{
public class LoginBodyDto
{

2
ZR.Model/Dto/System/MenuDto.cs → ZR.Model/System/Dto/MenuDto.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace ZR.Model.Dto.System
namespace ZR.Model.System.Dto
{
public class MenuDto
{

2
ZR.Model/Dto/System/RoleUsersCreateDto.cs → ZR.Model/System/Dto/RoleUsersCreateDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/SysFileQueryDto.cs → ZR.Model/System/Dto/SysFileQueryDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/SysLogininfoDto.cs → ZR.Model/System/Dto/SysLogininfoDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/SysOperLogDto.cs → ZR.Model/System/Dto/SysOperLogDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/SysRoleDto.cs → ZR.Model/System/Dto/SysRoleDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/SysUserDto.cs → ZR.Model/System/Dto/SysUserDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/TasksDto.cs → ZR.Model/System/Dto/TasksDto.cs
View File

@ -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
{

2
ZR.Model/Dto/System/TasksLogDto.cs → ZR.Model/System/Dto/TasksLogDto.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace ZR.Model.Dto.System
namespace ZR.Model.System.Dto
{
public class TasksLogQueryDto
{

0
ZR.Model/Vo/System/RouterVo.cs → ZR.Model/System/Vo/RouterVo.cs
View File

0
ZR.Model/Vo/System/TreeSelectVo.cs → ZR.Model/System/Vo/TreeSelectVo.cs
View File

2
ZR.Repository/System/ArticleRepository.cs
View File

@ -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

2
ZR.Repository/System/SysLogininfoRepository.cs
View File

@ -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

2
ZR.Repository/System/SysMenuRepository.cs
View File

@ -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

2
ZR.Repository/System/SysOperLogRepository.cs
View File

@ -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

2
ZR.Service/IService/IArticleService.cs
View File

@ -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

2
ZR.Service/IService/ISysLoginService.cs
View File

@ -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

2
ZR.Service/IService/ISysMenuService.cs
View File

@ -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;

2
ZR.Service/IService/ISysOperLogService.cs
View File

@ -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;

2
ZR.Service/IService/ISysUserRoleService.cs
View File

@ -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

2
ZR.Service/System/SysLoginService.cs
View File

@ -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;

2
ZR.Service/System/SysMenuService.cs
View File

@ -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;

2
ZR.Service/System/SysOperLogService.cs
View File

@ -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;

2
ZR.Service/System/SysUserRoleService.cs
View File

@ -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;

65
ZRAdmin.xml
View File

@ -92,7 +92,7 @@
文章接口
</summary>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.ArticleController.Query(ZR.Model.Dto.System.ArticleQueryDto)">
<member name="M:ZR.Admin.WebApi.Controllers.ArticleController.Query(ZR.Model.System.Dto.ArticleQueryDto)">
<summary>
查询文章列表
</summary>
@ -175,7 +175,7 @@
<param name="infoIds"></param>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.monitor.SysOperlogController.OperList(ZR.Model.Dto.System.SysOperLogDto)">
<member name="M:ZR.Admin.WebApi.Controllers.monitor.SysOperlogController.OperList(ZR.Model.System.Dto.SysOperLogDto)">
<summary>
查询操作日志
</summary>
@ -345,7 +345,7 @@
登录
</summary>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.System.SysLoginController.Login(ZR.Model.Dto.System.LoginBodyDto)">
<member name="M:ZR.Admin.WebApi.Controllers.System.SysLoginController.Login(ZR.Model.System.Dto.LoginBodyDto)">
<summary>
登录
</summary>
@ -424,7 +424,7 @@
<param name="menuId"></param>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.System.SysMenuController.ChangeSort(ZR.Model.Dto.System.MenuDto)">
<member name="M:ZR.Admin.WebApi.Controllers.System.SysMenuController.ChangeSort(ZR.Model.System.Dto.MenuDto)">
<summary>
保存排序
</summary>
@ -481,7 +481,7 @@
</summary>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.System.SysProfileController.UpdateProfile(ZR.Model.Dto.System.SysUserDto)">
<member name="M:ZR.Admin.WebApi.Controllers.System.SysProfileController.UpdateProfile(ZR.Model.System.Dto.SysUserDto)">
<summary>
修改用户
</summary>
@ -620,13 +620,13 @@
<param name="roleId"></param>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.System.SysUserRoleController.Create(ZR.Model.Dto.System.RoleUsersCreateDto)">
<member name="M:ZR.Admin.WebApi.Controllers.System.SysUserRoleController.Create(ZR.Model.System.Dto.RoleUsersCreateDto)">
<summary>
添加角色用户
</summary>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.System.SysUserRoleController.Delete(ZR.Model.Dto.System.RoleUsersCreateDto)">
<member name="M:ZR.Admin.WebApi.Controllers.System.SysUserRoleController.Delete(ZR.Model.System.Dto.RoleUsersCreateDto)">
<summary>
删除角色用户
</summary>
@ -640,7 +640,7 @@
<param name="roleId"></param>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.System.TasksLogController.GetList(ZR.Model.PagerInfo,ZR.Model.Dto.System.TasksLogQueryDto)">
<member name="M:ZR.Admin.WebApi.Controllers.System.TasksLogController.GetList(ZR.Model.PagerInfo,ZR.Model.System.Dto.TasksLogQueryDto)">
<summary>
查询日志
</summary>
@ -666,7 +666,7 @@
计划任务
</summary>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.TasksController.Query(ZR.Model.Dto.System.TasksQueryDto,ZR.Model.PagerInfo)">
<member name="M:ZR.Admin.WebApi.Controllers.TasksController.Query(ZR.Model.System.Dto.TasksQueryDto,ZR.Model.PagerInfo)">
<summary>
查询计划任务列表
</summary>
@ -679,13 +679,13 @@
<param name="id">编码</param>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.TasksController.Create(ZR.Model.Dto.System.TasksCreateDto)">
<member name="M:ZR.Admin.WebApi.Controllers.TasksController.Create(ZR.Model.System.Dto.TasksCreateDto)">
<summary>
添加任务
</summary>
<returns></returns>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.TasksController.Update(ZR.Model.Dto.System.TasksUpdateDto)">
<member name="M:ZR.Admin.WebApi.Controllers.TasksController.Update(ZR.Model.System.Dto.TasksUpdateDto)">
<summary>
更新任务
</summary>
@ -733,7 +733,7 @@
文件管理接口
</summary>
</member>
<member name="M:ZR.Admin.WebApi.Controllers.SysFile1Controller.Query(ZR.Model.Dto.System.SysFileQueryDto)">
<member name="M:ZR.Admin.WebApi.Controllers.SysFile1Controller.Query(ZR.Model.System.Dto.SysFileQueryDto)">
<summary>
查询文件管理列表
</summary>
@ -920,46 +920,5 @@
</summary>
<param name="services"></param>
</member>
<member name="T:ZRAdmin.Controllers.GiftController">
<summary>
代码自动生成
</summary>
</member>
<member name="F:ZRAdmin.Controllers.GiftController._GiftService">
<summary>
接口
</summary>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Query(ZR.Model.Dto.GiftQueryDto)">
<summary>
查询列表
</summary>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Get(System.Int32)">
<summary>
查询详情
</summary>
<param name="GiftId"></param>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Create(ZR.Model.Dto.GiftDto)">
<summary>
添加
</summary>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Update(ZR.Model.Dto.GiftDto)">
<summary>
更新
</summary>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Delete(System.Int32)">
<summary>
删除
</summary>
<returns></returns>
</member>
</members>
</doc>