代码优化

Tiobon.Core.Api/Controllers/BlogController.cs

@@ -1,5 +1,4 @@
-using Tiobon.Core.SwaggerHelper;
+using Serilog;
-using Serilog;
 using StackExchange.Profiling;
 using static Tiobon.Core.Extensions.CustomApiVersion;
 
@@ -9,7 +8,7 @@ namespace Tiobon.Core.Controllers
     /// 博客管理
     /// </summary>
     [Produces("application/json")]
-    [Route("api/Tiobon")]
+    [Route("api/Tiobon"), ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class TiobonController : BaseApiController
     {
         public ITiobonArticleServices _TiobonArticleServices { get; set; }

Tiobon.Core.Api/Controllers/DbFirst/DbFirstController.cs

@@ -1,17 +1,11 @@
-using Tiobon.Core.Common;
+using Tiobon.Core.Common.DB;
-using Tiobon.Core.Common.DB;
 using Tiobon.Core.Common.Seed;
-using Tiobon.Core.Model;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Hosting;
 using SqlSugar;
-using System.Linq;
 
 namespace Tiobon.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
-    [ApiController]
+    [ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Assistant)]
     //[Authorize(Permissions.Name)]
     public class DbFirstController : ControllerBase
     {

Tiobon.Core.Api/Controllers/DbFirst/MigrateController.cs

@@ -1,25 +1,10 @@
-using Tiobon.Core.Common.Helper;
+using Magicodes.ExporterAndImporter.Core;
-using Tiobon.Core.IServices;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.Models;
-using Magicodes.ExporterAndImporter.Core;
 using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Hosting;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tiobon.Core.Repository.UnitOfWorks;
 
 namespace Tiobon.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
-    [ApiController]
+    [ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Assistant)]
     //[Authorize(Permissions.Name)]
     public class MigrateController : ControllerBase
     {

Tiobon.Core.Api/Controllers/DepartmentController.cs

@@ -2,7 +2,7 @@
 {
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class DepartmentController : BaseApiController
     {
         private readonly IDepartmentServices _departmentServices;

Tiobon.Core.Api/Controllers/HealthCheckController.cs

@@ -4,7 +4,7 @@
     /// 健康检查
     /// </summary>
     [Route("[controller]")]
-    [ApiController]
+    [ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class HealthCheckController : ControllerBase
     {
         /// <summary>

Tiobon.Core.Api/Controllers/ImgController.cs

@@ -5,7 +5,7 @@
     /// </summary>
     [Route("api/[controller]")]
     [ApiController]
-    [Authorize]
+    [Authorize, ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class ImgController : BaseApiController
     {
 

Tiobon.Core.Api/Controllers/LoginController.cs

@@ -12,7 +12,7 @@ namespace Tiobon.Core.Controllers
     /// 登录管理【无权限】
     /// </summary>
     [Produces("application/json")]
-    [Route("api/Login")]
+    [Route("api/Login"), ApiExplorerSettings(GroupName = Grouping.GroupName_Auth)]
     [AllowAnonymous]
     public class LoginController : BaseApiController
     {

Tiobon.Core.Api/Controllers/ModuleController.cs

@@ -5,7 +5,7 @@
     /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class ModuleController : BaseApiController
     {
         readonly IModuleServices _moduleServices;

Tiobon.Core.Api/Controllers/MonitorController.cs

@@ -8,7 +8,7 @@ namespace Tiobon.Core.Controllers
 {
     [Route("api/[Controller]/[action]")]
     [ApiController]
-    [AllowAnonymous]
+    [AllowAnonymous, ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class MonitorController : BaseApiController
     {
         private readonly IHubContext<ChatHub> _hubContext;

Tiobon.Core.Api/Controllers/NacosController.cs

@@ -7,7 +7,7 @@ namespace Tiobon.Core.Api.Controllers
     /// </summary>
     [Produces("application/json")]
     [Route("api/[Controller]/[action]")]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class NacosController : BaseApiController
     {
 

Tiobon.Core.Api/Controllers/PayController.cs

@@ -5,7 +5,7 @@
     /// </summary>
     [Produces("application/json")]
     [Route("api/Pay")]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class PayController : Controller
     { 
         private readonly ILogger<PayController> _logger;

Tiobon.Core.Api/Controllers/PermissionController.cs

@@ -10,7 +10,7 @@ namespace Tiobon.Core.Controllers
     /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class PermissionController : BaseApiController
     {
         readonly IUnitOfWorkManage _unitOfWorkManage;

Tiobon.Core.Api/Controllers/RoleController.cs

@@ -5,7 +5,7 @@
     /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class RoleController : BaseApiController
     {
         readonly IRoleServices _roleServices;

Tiobon.Core.Api/Controllers/SignalRTestController.cs

@@ -8,7 +8,7 @@ namespace Tiobon.Core.Api.Controllers;
 /// </summary>
 [Route("api/[controller]/[action]")]
 [ApiController]
-[Authorize]
+[Authorize, ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
 public class SignalRTestController : BaseApiController
 {
     private readonly IHubContext<ChatHub, IChatClient> _hubContext;

Tiobon.Core.Api/Controllers/SplitDemoController.cs

@@ -5,7 +5,7 @@
     /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class SplitDemoController : ControllerBase
     {
         readonly ISplitDemoServices splitDemoServices;

Tiobon.Core.Api/Controllers/Systems/CacheManageController.cs

@@ -1,16 +1,11 @@
 using Tiobon.Core.Common.Caches;
-using Tiobon.Core.Controllers;
-using Tiobon.Core.Model;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
 namespace Tiobon.Core.Api.Controllers.Systems;
 
 /// <summary>
 /// 缓存管理
 /// </summary>
 [Route("api/Systems/[controller]")]
-[ApiController]
+[ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Assistant)]
 [Authorize(Permissions.Name)]
 public class CacheManageController : BaseApiController
 {

Tiobon.Core.Api/Controllers/Systems/DataBaseController.cs

@@ -1,14 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using Tiobon.Core.Common;
 using Tiobon.Core.Common.DB;
-using Tiobon.Core.Controllers;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.Models;
 using Tiobon.Core.Model.Systems.DataBase;
 using Tiobon.Core.Model.Tenants;
 using Mapster;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 
 namespace Tiobon.Core.Api.Controllers.Systems;
@@ -17,7 +11,7 @@ namespace Tiobon.Core.Api.Controllers.Systems;
 /// 数据库管理
 /// </summary>
 [Route("api/Systems/[controller]/[action]")]
-[ApiController]
+[ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Assistant)]
 [Authorize(Permissions.Name)]
 public class DataBaseController : BaseApiController
 {

Tiobon.Core.Api/Controllers/Systems/DynamicCodeFirstController.cs

@@ -1,11 +1,5 @@
 using Tiobon.Core.Common.DB.Extension;
-using Tiobon.Core.Controllers;
-using Tiobon.Core.Model;
 using Tiobon.Core.Model.Models.RootTkey;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using NetTaste;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
 using SqlSugar;
 
 namespace Tiobon.Core.Api.Controllers.Systems;
@@ -14,7 +8,7 @@ namespace Tiobon.Core.Api.Controllers.Systems;
 /// 动态建表 CURD
 /// </summary>
 [Route("api/Systems/[controller]/[action]")]
-[ApiController]
+[ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Assistant)]
 [Authorize(Permissions.Name)]
 public class DynamicCodeFirstController : BaseApiController
 {

Tiobon.Core.Api/Controllers/TasksQzController.cs

@@ -6,7 +6,7 @@ namespace Tiobon.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class TasksQzController : ControllerBase
     {
         private readonly ITasksQzServices _tasksQzServices;

Tiobon.Core.Api/Controllers/Tenant/TenantByDbController.cs

@@ -1,10 +1,4 @@
-using Tiobon.Core.Common.HttpContextUser;
+using Tiobon.Core.IServices.BASE;
-using Tiobon.Core.Controllers;
-using Tiobon.Core.IServices.BASE;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Tiobon.Core.Api.Controllers.Tenant;
 
@@ -13,7 +7,7 @@ namespace Tiobon.Core.Api.Controllers.Tenant;
 /// </summary>
 [Produces("application/json")]
 [Route("api/Tenant/ByDb")]
-[Authorize]
+[Authorize, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
 public class TenantByDbController : BaseApiController
 {
     private readonly IBaseServices<SubLibraryBusinessTable> _services;

Tiobon.Core.Api/Controllers/Tenant/TenantByIdController.cs

@@ -1,10 +1,4 @@
-using Tiobon.Core.Common.HttpContextUser;
+using Tiobon.Core.IServices.BASE;
-using Tiobon.Core.Controllers;
-using Tiobon.Core.IServices.BASE;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Tiobon.Core.Api.Controllers.Tenant;
 
@@ -13,7 +7,7 @@ namespace Tiobon.Core.Api.Controllers.Tenant;
 /// </summary>
 [Produces("application/json")]
 [Route("api/Tenant/ById")]
-[Authorize]
+[Authorize, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
 public class TenantByIdController : BaseApiController
 {
     private readonly IBaseServices<BusinessTable> _services;

Tiobon.Core.Api/Controllers/Tenant/TenantByTableController.cs

@@ -1,10 +1,4 @@
-using Tiobon.Core.Common.HttpContextUser;
+using Tiobon.Core.IServices.BASE;
-using Tiobon.Core.Controllers;
-using Tiobon.Core.IServices.BASE;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Tiobon.Core.Api.Controllers.Tenant;
 
@@ -13,7 +7,7 @@ namespace Tiobon.Core.Api.Controllers.Tenant;
 /// </summary>
 [Produces("application/json")]
 [Route("api/Tenant/ByTable")]
-[Authorize]
+[Authorize, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
 public class TenantByTableController : BaseApiController
 {
     private readonly IBaseServices<MultiBusinessTable> _services;

Tiobon.Core.Api/Controllers/Tenant/TenantManagerController.cs

@@ -1,18 +1,11 @@
-using Tiobon.Core.Controllers;
+namespace Tiobon.Core.Api.Controllers.Tenant;
-using Tiobon.Core.IServices;
-using Tiobon.Core.Model;
-using Tiobon.Core.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Tiobon.Core.Api.Controllers.Tenant;
 
 /// <summary>
 /// 租户管理
 /// </summary>
 [Produces("application/json")]
 [Route("api/TenantManager")]
-[Authorize]
+[Authorize, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
 public class TenantManagerController : BaseApiController
 {
     private readonly ITenantService _services;

Tiobon.Core.Api/Controllers/TopicController.cs

@@ -4,7 +4,7 @@
     /// 类别管理【无权限】
     /// </summary>
     [Route("api/[controller]")]
-    [ApiController]
+    [ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     [AllowAnonymous]
     public class TopicController : ControllerBase
     {

Tiobon.Core.Api/Controllers/TopicDetailController.cs

@@ -5,7 +5,7 @@
     /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class TopicDetailController : ControllerBase
     {
         readonly ITopicServices _topicServices;

Tiobon.Core.Api/Controllers/TransactionController.cs

@@ -1,7 +1,7 @@
 namespace Tiobon.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
-    [ApiController]
+    [ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     [AllowAnonymous]
     public class TransactionController : ControllerBase
     {

Tiobon.Core.Api/Controllers/UserController.cs

@@ -7,7 +7,7 @@ namespace Tiobon.Core.Controllers
     /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class UserController : BaseApiController
     {
         private readonly IUnitOfWorkManage _unitOfWorkManage;

Tiobon.Core.Api/Controllers/UserRoleController.cs

@@ -6,7 +6,7 @@
     [Produces("application/json")]
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_System)]
     public class UserRoleController : Controller
     {
         private readonly ISysUserInfoServices _sysUserInfoServices;

Tiobon.Core.Api/Controllers/ValuesController.cs

@@ -13,7 +13,7 @@ namespace Tiobon.Core.Controllers
     /// Values控制器
     /// </summary>
     [Route("api/[controller]/[action]")]
-    [ApiController]
+    [ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     //[Authorize]
     //[Authorize(Roles = "Admin,Client")]
     //[Authorize(Policy = "SystemOrAdmin")]

Tiobon.Core.Api/Controllers/WeChatCompanyController.cs

@@ -5,7 +5,7 @@ namespace Tiobon.Core.Controllers
 	/// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_WeChat)]
     public partial class WeChatCompanyController : Controller
     {
         readonly IWeChatCompanyServices _WeChatCompanyServices;

Tiobon.Core.Api/Controllers/WeChatConfigController.cs

@@ -5,7 +5,7 @@ namespace Tiobon.Core.Controllers
 	/// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_WeChat)]
     public partial class WeChatConfigController : Controller
     {
         readonly IWeChatConfigServices _WeChatConfigServices;

Tiobon.Core.Api/Controllers/WeChatController.cs

@@ -5,7 +5,7 @@
     /// </summary>   
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_WeChat)]
     public partial class WeChatController : Controller
     {
         readonly IWeChatConfigServices _weChatConfigServices;

Tiobon.Core.Api/Controllers/WeChatPushLogController.cs

@@ -5,7 +5,7 @@ namespace Tiobon.Core.Controllers
 	/// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_WeChat)]
     public partial class WeChatPushLogController : Controller
     {
         readonly IWeChatPushLogServices _WeChatPushLogServices;

Tiobon.Core.Api/Controllers/WeChatSubController.cs

@@ -5,7 +5,7 @@ namespace Tiobon.Core.Controllers
 	/// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_WeChat)]
     public partial class WeChatSubController : Controller
     {
         readonly IWeChatSubServices _WeChatSubServices;

Tiobon.Core.Api/Controllers/v1/ApbController.cs

@@ -1,12 +1,9 @@
-using System.Collections.Generic;
+using static Tiobon.Core.Extensions.CustomApiVersion;
-using Tiobon.Core.SwaggerHelper;
-using Microsoft.AspNetCore.Mvc;
-using static Tiobon.Core.Extensions.CustomApiVersion;
 
 namespace Tiobon.Core.Controllers.v1
 {
     [Route("api/[controller]")]
-    [ApiController]
+    [ApiController, ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class ApbController : ControllerBase
     {
 

Tiobon.Core.Api/Controllers/v2/ApbController.cs

@@ -1,15 +1,8 @@
-using Tiobon.Core.SwaggerHelper;
+namespace Tiobon.Core.Controllers.v2
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using static Tiobon.Core.Extensions.CustomApiVersion;
-
-namespace Tiobon.Core.Controllers.v2
 {
-    [CustomRoute(ApiVersions.V2)]
     //[Route("api/[controller]")]
     [ApiController]
-    [Authorize(Permissions.Name)]
+    [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Other)]
     public class ApbController : ControllerBase
     {
 

Tiobon.Core.Extensions/ServiceExtensions/SwaggerSetup.cs

@@ -187,6 +187,17 @@ namespace Tiobon.Core.Extensions
                 }
             },
             new SwaggerApiInfo
+            {
+                UrlPrefix = Grouping.GroupName_Assistant,
+                Name = "工具模块",
+                OpenApiInfo = new OpenApiInfo
+                {
+                    Version = version,
+                    Title = "工具模块",
+                    Description = "自助测量程序/中央站...",
+                }
+            },
+            new SwaggerApiInfo
             {
                 UrlPrefix = Grouping.GroupName_Other,
                 Name = "其他模块",
@@ -196,6 +207,16 @@ namespace Tiobon.Core.Extensions
                     Title = "其他模块",
                     Description = "其他...",
                 }
+            }, new SwaggerApiInfo
+            {
+                UrlPrefix = Grouping.GroupName_WeChat,
+                Name = "微信模块",
+                OpenApiInfo = new OpenApiInfo
+                {
+                    Version = version,
+                    Title = "微信模块",
+                    Description = "小程序..."
+                }
             },
             new SwaggerApiInfo
             {
@@ -249,6 +270,14 @@ namespace Tiobon.Core.Extensions
             /// Ghra
             /// </summary>
             public const string GroupName_Ghra = "Ghra";
+            /// <summary>
+            /// 辅助工具
+            /// </summary>
+            public const string GroupName_Assistant = "assistant";
+            /// <summary>
+            /// 微信
+            /// </summary>
+            public const string GroupName_WeChat = " wechat";
         }
     }