From 6ff2098317d8332a18f86bec20b719ba30b9945d Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 11 Apr 2024 11:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=B2=BE=E7=AE=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BaseApiController.cs | 8 ++------ Tiobon.Core.Api/Controllers/BlogController.cs | 11 +---------- .../Controllers/DepartmentController.cs | 13 +------------ .../Controllers/HealthCheckController.cs | 4 +--- Tiobon.Core.Api/Controllers/ImgController.cs | 7 +------ Tiobon.Core.Api/Controllers/LoginController.cs | 6 ------ Tiobon.Core.Api/Controllers/ModuleController.cs | 10 +--------- .../Controllers/MonitorController.cs | 12 +----------- Tiobon.Core.Api/Controllers/NacosController.cs | 7 +------ Tiobon.Core.Api/Controllers/PayController.cs | 8 +------- .../Controllers/PermissionController.cs | 10 ---------- Tiobon.Core.Api/Controllers/RoleController.cs | 9 +-------- .../Controllers/SignalRTestController.cs | 3 --- .../Controllers/SplitDemoController.cs | 10 +--------- .../Controllers/TasksQzController.cs | 10 +--------- Tiobon.Core.Api/Controllers/TopicController.cs | 8 +------- .../Controllers/TopicDetailController.cs | 9 +-------- .../Controllers/TransactionController.cs | 9 +-------- Tiobon.Core.Api/Controllers/UserController.cs | 12 +----------- .../Controllers/UserRoleController.cs | 10 +--------- Tiobon.Core.Api/Controllers/ValuesController.cs | 15 +-------------- .../Controllers/WeChatCompanyController.cs | 6 ------ .../Controllers/WeChatConfigController.cs | 6 ------ Tiobon.Core.Api/Controllers/WeChatController.cs | 8 +------- .../Controllers/WeChatPushLogController.cs | 6 ------ .../Controllers/WeChatSubController.cs | 6 ------ Tiobon.Core.Api/GlobalUsings.cs | 17 +++++++++++++++++ 27 files changed, 37 insertions(+), 203 deletions(-) create mode 100644 Tiobon.Core.Api/GlobalUsings.cs diff --git a/Tiobon.Core.Api/Controllers/BaseApiController.cs b/Tiobon.Core.Api/Controllers/BaseApiController.cs index 40c2ca22..4ac75933 100644 --- a/Tiobon.Core.Api/Controllers/BaseApiController.cs +++ b/Tiobon.Core.Api/Controllers/BaseApiController.cs @@ -1,10 +1,6 @@ -using Tiobon.Core.Model; -using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { - public class BaseApiController : Controller + public class BaseApiController : Controller { [NonAction] public MessageModel Success(T data, string msg = "成功") diff --git a/Tiobon.Core.Api/Controllers/BlogController.cs b/Tiobon.Core.Api/Controllers/BlogController.cs index c2f286df..5eb36083 100644 --- a/Tiobon.Core.Api/Controllers/BlogController.cs +++ b/Tiobon.Core.Api/Controllers/BlogController.cs @@ -1,13 +1,4 @@ -using System.Linq.Expressions; -using System.Text.RegularExpressions; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels; -using Tiobon.Core.SwaggerHelper; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; +using Tiobon.Core.SwaggerHelper; using Serilog; using StackExchange.Profiling; using static Tiobon.Core.Extensions.CustomApiVersion; diff --git a/Tiobon.Core.Api/Controllers/DepartmentController.cs b/Tiobon.Core.Api/Controllers/DepartmentController.cs index a10d1fc3..d76d500b 100644 --- a/Tiobon.Core.Api/Controllers/DepartmentController.cs +++ b/Tiobon.Core.Api/Controllers/DepartmentController.cs @@ -1,15 +1,4 @@ -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Controllers; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json; -using System.Linq.Expressions; -using System.Text; - -namespace Tiobon.Core.Api.Controllers +namespace Tiobon.Core.Api.Controllers { [Route("api/[controller]/[action]")] [ApiController] diff --git a/Tiobon.Core.Api/Controllers/HealthCheckController.cs b/Tiobon.Core.Api/Controllers/HealthCheckController.cs index 21d95955..d0718456 100644 --- a/Tiobon.Core.Api/Controllers/HealthCheckController.cs +++ b/Tiobon.Core.Api/Controllers/HealthCheckController.cs @@ -1,6 +1,4 @@ -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 健康检查 diff --git a/Tiobon.Core.Api/Controllers/ImgController.cs b/Tiobon.Core.Api/Controllers/ImgController.cs index 6b80f162..3c8d1ce9 100644 --- a/Tiobon.Core.Api/Controllers/ImgController.cs +++ b/Tiobon.Core.Api/Controllers/ImgController.cs @@ -1,9 +1,4 @@ -using Tiobon.Core.Model; -using Tiobon.Core.Model.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 图片管理 diff --git a/Tiobon.Core.Api/Controllers/LoginController.cs b/Tiobon.Core.Api/Controllers/LoginController.cs index 62a67d09..42f54f80 100644 --- a/Tiobon.Core.Api/Controllers/LoginController.cs +++ b/Tiobon.Core.Api/Controllers/LoginController.cs @@ -1,12 +1,6 @@ using Tiobon.Core.AuthHelper; using Tiobon.Core.AuthHelper.OverWrite; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.ViewModels; using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using Tiobon.Core.Common.Swagger; diff --git a/Tiobon.Core.Api/Controllers/ModuleController.cs b/Tiobon.Core.Api/Controllers/ModuleController.cs index 92483045..d0461a31 100644 --- a/Tiobon.Core.Api/Controllers/ModuleController.cs +++ b/Tiobon.Core.Api/Controllers/ModuleController.cs @@ -1,12 +1,4 @@ -using System.Linq.Expressions; -using Tiobon.Core.Common.HttpContextUser; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 接口管理 diff --git a/Tiobon.Core.Api/Controllers/MonitorController.cs b/Tiobon.Core.Api/Controllers/MonitorController.cs index ea05fe41..fbb25f41 100644 --- a/Tiobon.Core.Api/Controllers/MonitorController.cs +++ b/Tiobon.Core.Api/Controllers/MonitorController.cs @@ -1,17 +1,7 @@ -using Tiobon.Core.Common; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Common.LogHelper; -using Tiobon.Core.Hubs; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; +using Tiobon.Core.Hubs; using Microsoft.AspNetCore.SignalR; -using Newtonsoft.Json; using System.Diagnostics; using System.Runtime.InteropServices; -using System.Text; using Tiobon.Core.Extensions.Middlewares; namespace Tiobon.Core.Controllers diff --git a/Tiobon.Core.Api/Controllers/NacosController.cs b/Tiobon.Core.Api/Controllers/NacosController.cs index 34e769a1..08a2828b 100644 --- a/Tiobon.Core.Api/Controllers/NacosController.cs +++ b/Tiobon.Core.Api/Controllers/NacosController.cs @@ -1,9 +1,4 @@ -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Controllers; -using Tiobon.Core.Model; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Nacos.V2; +using Nacos.V2; namespace Tiobon.Core.Api.Controllers { diff --git a/Tiobon.Core.Api/Controllers/PayController.cs b/Tiobon.Core.Api/Controllers/PayController.cs index 4cd154fd..3d14a9fe 100644 --- a/Tiobon.Core.Api/Controllers/PayController.cs +++ b/Tiobon.Core.Api/Controllers/PayController.cs @@ -1,10 +1,4 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 建行聚合支付类 diff --git a/Tiobon.Core.Api/Controllers/PermissionController.cs b/Tiobon.Core.Api/Controllers/PermissionController.cs index a07f7712..de6135fd 100644 --- a/Tiobon.Core.Api/Controllers/PermissionController.cs +++ b/Tiobon.Core.Api/Controllers/PermissionController.cs @@ -1,15 +1,5 @@ using Tiobon.Core.AuthHelper; using Tiobon.Core.AuthHelper.OverWrite; -using Tiobon.Core.Common; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Common.HttpContextUser; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Repository.UnitOfWorks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System.Security.Claims; diff --git a/Tiobon.Core.Api/Controllers/RoleController.cs b/Tiobon.Core.Api/Controllers/RoleController.cs index 0a97758c..f60fe08a 100644 --- a/Tiobon.Core.Api/Controllers/RoleController.cs +++ b/Tiobon.Core.Api/Controllers/RoleController.cs @@ -1,11 +1,4 @@ -using Tiobon.Core.Common.HttpContextUser; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 角色管理 diff --git a/Tiobon.Core.Api/Controllers/SignalRTestController.cs b/Tiobon.Core.Api/Controllers/SignalRTestController.cs index d894d0ce..7429cae2 100644 --- a/Tiobon.Core.Api/Controllers/SignalRTestController.cs +++ b/Tiobon.Core.Api/Controllers/SignalRTestController.cs @@ -1,7 +1,4 @@ -using Tiobon.Core.Controllers; using Tiobon.Core.Hubs; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; namespace Tiobon.Core.Api.Controllers; diff --git a/Tiobon.Core.Api/Controllers/SplitDemoController.cs b/Tiobon.Core.Api/Controllers/SplitDemoController.cs index c6b22ce2..401a7594 100644 --- a/Tiobon.Core.Api/Controllers/SplitDemoController.cs +++ b/Tiobon.Core.Api/Controllers/SplitDemoController.cs @@ -1,12 +1,4 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Repository.UnitOfWorks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using System.Linq.Expressions; - -namespace Tiobon.Core.Api.Controllers +namespace Tiobon.Core.Api.Controllers { /// /// 分表demo diff --git a/Tiobon.Core.Api/Controllers/TasksQzController.cs b/Tiobon.Core.Api/Controllers/TasksQzController.cs index 3f25ebcb..296615ce 100644 --- a/Tiobon.Core.Api/Controllers/TasksQzController.cs +++ b/Tiobon.Core.Api/Controllers/TasksQzController.cs @@ -1,13 +1,5 @@ -using System.Linq.Expressions; -using System.Reflection; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels; -using Tiobon.Core.Repository.UnitOfWorks; +using System.Reflection; using Tiobon.Core.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; using Quartz; namespace Tiobon.Core.Controllers diff --git a/Tiobon.Core.Api/Controllers/TopicController.cs b/Tiobon.Core.Api/Controllers/TopicController.cs index c424e269..fb2beb23 100644 --- a/Tiobon.Core.Api/Controllers/TopicController.cs +++ b/Tiobon.Core.Api/Controllers/TopicController.cs @@ -1,10 +1,4 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 类别管理【无权限】 diff --git a/Tiobon.Core.Api/Controllers/TopicDetailController.cs b/Tiobon.Core.Api/Controllers/TopicDetailController.cs index e083fccb..1f2f36d8 100644 --- a/Tiobon.Core.Api/Controllers/TopicDetailController.cs +++ b/Tiobon.Core.Api/Controllers/TopicDetailController.cs @@ -1,11 +1,4 @@ -using Tiobon.Core.Common.Helper; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// Tibug 管理 diff --git a/Tiobon.Core.Api/Controllers/TransactionController.cs b/Tiobon.Core.Api/Controllers/TransactionController.cs index 83a6c129..acb5a8b5 100644 --- a/Tiobon.Core.Api/Controllers/TransactionController.cs +++ b/Tiobon.Core.Api/Controllers/TransactionController.cs @@ -1,11 +1,4 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Repository.UnitOfWorks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { [Route("api/[controller]/[action]")] [ApiController] diff --git a/Tiobon.Core.Api/Controllers/UserController.cs b/Tiobon.Core.Api/Controllers/UserController.cs index 522394a0..f2b51ec9 100644 --- a/Tiobon.Core.Api/Controllers/UserController.cs +++ b/Tiobon.Core.Api/Controllers/UserController.cs @@ -1,14 +1,4 @@ -using AutoMapper; -using Tiobon.Core.AuthHelper.OverWrite; -using Tiobon.Core.Common.Helper; -using Tiobon.Core.Common.HttpContextUser; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels; -using Tiobon.Core.Repository.UnitOfWorks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; +using Tiobon.Core.AuthHelper.OverWrite; namespace Tiobon.Core.Controllers { diff --git a/Tiobon.Core.Api/Controllers/UserRoleController.cs b/Tiobon.Core.Api/Controllers/UserRoleController.cs index 47862888..21e32d03 100644 --- a/Tiobon.Core.Api/Controllers/UserRoleController.cs +++ b/Tiobon.Core.Api/Controllers/UserRoleController.cs @@ -1,12 +1,4 @@ -using AutoMapper; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 用户角色关系 diff --git a/Tiobon.Core.Api/Controllers/ValuesController.cs b/Tiobon.Core.Api/Controllers/ValuesController.cs index 8bdf35f5..5d622ec2 100644 --- a/Tiobon.Core.Api/Controllers/ValuesController.cs +++ b/Tiobon.Core.Api/Controllers/ValuesController.cs @@ -1,24 +1,11 @@ -using AutoMapper; -using Tiobon.Core.Common; -using Tiobon.Core.Common.HttpContextUser; -using Tiobon.Core.Common.Https.HttpPolly; +using Tiobon.Core.Common.Https.HttpPolly; using Tiobon.Core.Common.Option; using Tiobon.Core.EventBus; using Tiobon.Core.EventBus.EventHandling; using Tiobon.Core.Extensions; using Tiobon.Core.Filter; -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Tiobon.Core.Model.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using RabbitMQ.Client; -using RabbitMQ.Client.Events; using System.ComponentModel.DataAnnotations; -using System.Linq.Expressions; -using System.Text; namespace Tiobon.Core.Controllers { diff --git a/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs b/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs index 9bb79e05..02d867c2 100644 --- a/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatCompanyController.cs @@ -1,9 +1,3 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - namespace Tiobon.Core.Controllers { /// diff --git a/Tiobon.Core.Api/Controllers/WeChatConfigController.cs b/Tiobon.Core.Api/Controllers/WeChatConfigController.cs index 49cef6fd..0caaae90 100644 --- a/Tiobon.Core.Api/Controllers/WeChatConfigController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatConfigController.cs @@ -1,9 +1,3 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - namespace Tiobon.Core.Controllers { /// diff --git a/Tiobon.Core.Api/Controllers/WeChatController.cs b/Tiobon.Core.Api/Controllers/WeChatController.cs index 14a1dcf8..cfbd6b79 100644 --- a/Tiobon.Core.Api/Controllers/WeChatController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatController.cs @@ -1,10 +1,4 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.ViewModels; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Tiobon.Core.Controllers +namespace Tiobon.Core.Controllers { /// /// 微信公众号管理 diff --git a/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs b/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs index 4cdcc834..7c72403a 100644 --- a/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatPushLogController.cs @@ -1,9 +1,3 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - namespace Tiobon.Core.Controllers { /// diff --git a/Tiobon.Core.Api/Controllers/WeChatSubController.cs b/Tiobon.Core.Api/Controllers/WeChatSubController.cs index dc369115..cb0163d3 100644 --- a/Tiobon.Core.Api/Controllers/WeChatSubController.cs +++ b/Tiobon.Core.Api/Controllers/WeChatSubController.cs @@ -1,9 +1,3 @@ -using Tiobon.Core.IServices; -using Tiobon.Core.Model; -using Tiobon.Core.Model.Models; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - namespace Tiobon.Core.Controllers { /// diff --git a/Tiobon.Core.Api/GlobalUsings.cs b/Tiobon.Core.Api/GlobalUsings.cs new file mode 100644 index 00000000..e1792547 --- /dev/null +++ b/Tiobon.Core.Api/GlobalUsings.cs @@ -0,0 +1,17 @@ +global using System.Linq.Expressions; +global using System.Text; +global using System.Text.RegularExpressions; +global using AutoMapper; +global using Microsoft.AspNetCore.Authorization; +global using Microsoft.AspNetCore.Mvc; +global using Newtonsoft.Json; +global using Tiobon.Core.Common; +global using Tiobon.Core.Common.Helper; +global using Tiobon.Core.Common.HttpContextUser; +global using Tiobon.Core.Common.LogHelper; +global using Tiobon.Core.Controllers; +global using Tiobon.Core.IServices; +global using Tiobon.Core.Model; +global using Tiobon.Core.Model.Models; +global using Tiobon.Core.Model.ViewModels; +global using Tiobon.Core.Repository.UnitOfWorks;