From 1a00db4c1244391400ea2e996ca42623203fd632 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 11 Apr 2024 13:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Controllers/ImgController.cs  |  8 +--
 .../Filter/CustomRouteAttribute.cs            |  4 +-
 .../Filter/GlobalAuthorizeFilter.cs           |  2 -
 .../Filter/GlobalExceptionFilter.cs           |  7 +--
 .../Filter/GlobalRoutePrefixFilter.cs         |  1 -
 .../Filter/UseServiceDIAttribute.cs           |  3 +-
 Tiobon.Core.Api/Filter/UserRegisterVo.cs      |  1 -
 Tiobon.Core.IServices/BASE/IBaseServices.cs   |  9 ++--
 Tiobon.Core.Model/MessageModel.cs             |  5 +-
 Tiobon.Core.Repository/BASE/BaseRepository.cs | 54 +++++++------------
 Tiobon.Core.Services/BASE/BaseServices.cs     | 50 ++++++-----------
 11 files changed, 48 insertions(+), 96 deletions(-)

diff --git a/Tiobon.Core.Api/Controllers/ImgController.cs b/Tiobon.Core.Api/Controllers/ImgController.cs
index 3c8d1ce9..5ce38a3f 100644
--- a/Tiobon.Core.Api/Controllers/ImgController.cs
+++ b/Tiobon.Core.Api/Controllers/ImgController.cs
@@ -8,7 +8,7 @@
     [Authorize]
     public class ImgController : BaseApiController
     {
-        
+
         private readonly IWebHostEnvironment _env;
 
         public ImgController(IWebHostEnvironment webHostEnvironment)
@@ -46,13 +46,13 @@
         /// <returns></returns>
         [HttpPost]
         [Route("/images/Upload/Pic")]
-        public async Task<MessageModel<string>> InsertPicture([FromForm]UploadFileDto dto)
+        public async Task<MessageModel<string>> InsertPicture([FromForm] UploadFileDto dto)
         {
-            
+
             if (dto.file == null || !dto.file.Any()) return Failed("请选择上传的文件。");
             //格式限制
             var allowType = new string[] { "image/jpg", "image/png", "image/jpeg" };
-            
+
             var allowedFile = dto.file.Where(c => allowType.Contains(c.ContentType));
             if (!allowedFile.Any()) return Failed("图片格式错误");
             if (allowedFile.Sum(c => c.Length) > 1024 * 1024 * 4) return Failed("图片过大");
diff --git a/Tiobon.Core.Api/Filter/CustomRouteAttribute.cs b/Tiobon.Core.Api/Filter/CustomRouteAttribute.cs
index cce851bc..ad55d008 100644
--- a/Tiobon.Core.Api/Filter/CustomRouteAttribute.cs
+++ b/Tiobon.Core.Api/Filter/CustomRouteAttribute.cs
@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using System;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using static Tiobon.Core.Extensions.CustomApiVersion;
 
 namespace Tiobon.Core.SwaggerHelper
diff --git a/Tiobon.Core.Api/Filter/GlobalAuthorizeFilter.cs b/Tiobon.Core.Api/Filter/GlobalAuthorizeFilter.cs
index 51b39b84..30cb7cdd 100644
--- a/Tiobon.Core.Api/Filter/GlobalAuthorizeFilter.cs
+++ b/Tiobon.Core.Api/Filter/GlobalAuthorizeFilter.cs
@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.AspNetCore.Mvc.Filters;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Tiobon.Core.Filter
 {
diff --git a/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs b/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
index 4d935e36..777e39d6 100644
--- a/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
+++ b/Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
@@ -1,9 +1,4 @@
-using Tiobon.Core.Common;
-using Tiobon.Core.Common.Helper;
-using Tiobon.Core.Common.LogHelper;
-using Tiobon.Core.Hubs;
-using Tiobon.Core.Model;
-using Microsoft.AspNetCore.Mvc;
+using Tiobon.Core.Hubs;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.SignalR;
 using StackExchange.Profiling;
diff --git a/Tiobon.Core.Api/Filter/GlobalRoutePrefixFilter.cs b/Tiobon.Core.Api/Filter/GlobalRoutePrefixFilter.cs
index f84fc514..a9a5bb59 100644
--- a/Tiobon.Core.Api/Filter/GlobalRoutePrefixFilter.cs
+++ b/Tiobon.Core.Api/Filter/GlobalRoutePrefixFilter.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Routing;
-using System.Linq;
 
 namespace Tiobon.Core.Filter
 {
diff --git a/Tiobon.Core.Api/Filter/UseServiceDIAttribute.cs b/Tiobon.Core.Api/Filter/UseServiceDIAttribute.cs
index 5b7e0258..d213225f 100644
--- a/Tiobon.Core.Api/Filter/UseServiceDIAttribute.cs
+++ b/Tiobon.Core.Api/Filter/UseServiceDIAttribute.cs
@@ -1,5 +1,4 @@
-using Tiobon.Core.IServices;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Tiobon.Core.Filter
 {
diff --git a/Tiobon.Core.Api/Filter/UserRegisterVo.cs b/Tiobon.Core.Api/Filter/UserRegisterVo.cs
index a0a4a486..d48f9c69 100644
--- a/Tiobon.Core.Api/Filter/UserRegisterVo.cs
+++ b/Tiobon.Core.Api/Filter/UserRegisterVo.cs
@@ -1,5 +1,4 @@
 using FluentValidation;
-using System.Text.RegularExpressions;
 
 namespace Tiobon.Core.Filter
 {
diff --git a/Tiobon.Core.IServices/BASE/IBaseServices.cs b/Tiobon.Core.IServices/BASE/IBaseServices.cs
index 0c448ae5..f1210c8b 100644
--- a/Tiobon.Core.IServices/BASE/IBaseServices.cs
+++ b/Tiobon.Core.IServices/BASE/IBaseServices.cs
@@ -1,10 +1,7 @@
-using Tiobon.Core.Model;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Data;
+using System.Data;
 using System.Linq.Expressions;
-using System.Threading.Tasks;
+using SqlSugar;
+using Tiobon.Core.Model;
 
 namespace Tiobon.Core.IServices.BASE
 {
diff --git a/Tiobon.Core.Model/MessageModel.cs b/Tiobon.Core.Model/MessageModel.cs
index 1d41f7f7..28ead746 100644
--- a/Tiobon.Core.Model/MessageModel.cs
+++ b/Tiobon.Core.Model/MessageModel.cs
@@ -31,7 +31,8 @@
         /// </summary>
         /// <param name="msg">消息</param>
         /// <returns></returns>
-        public static MessageModel<T> Success(string msg) {
+        public static MessageModel<T> Success(string msg)
+        {
             return Message(true, msg, default);
         }
         /// <summary>
@@ -70,7 +71,7 @@
         /// <param name="msg">消息</param>
         /// <param name="response">数据</param>
         /// <returns></returns>
-        public static MessageModel<T> Message(bool success,string msg, T response )
+        public static MessageModel<T> Message(bool success, string msg, T response)
         {
             return new MessageModel<T>() { msg = msg, response = response, success = success };
         }
diff --git a/Tiobon.Core.Repository/BASE/BaseRepository.cs b/Tiobon.Core.Repository/BASE/BaseRepository.cs
index af26cb32..3227bab3 100644
--- a/Tiobon.Core.Repository/BASE/BaseRepository.cs
+++ b/Tiobon.Core.Repository/BASE/BaseRepository.cs
@@ -1,18 +1,14 @@
-using Tiobon.Core.Common;
+using System.Data;
+using System.Linq.Expressions;
+using System.Reflection;
+using SqlSugar;
+using Tiobon.Core.Common;
 using Tiobon.Core.Common.DB;
 using Tiobon.Core.IRepository.Base;
 using Tiobon.Core.Model;
 using Tiobon.Core.Model.Models;
 using Tiobon.Core.Model.Tenants;
 using Tiobon.Core.Repository.UnitOfWorks;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Threading.Tasks;
 
 namespace Tiobon.Core.Repository.Base
 {
@@ -78,8 +74,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:根据ID查询一条数据
-        /// 作　　者:Tiobon.Core
+        /// 根据ID查询一条数据
         /// </summary>
         /// <param name="objId">id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
         /// <param name="blnUseCache">是否使用缓存</param>
@@ -91,8 +86,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:根据ID查询数据
-        /// 作　　者:Tiobon.Core
+        /// 根据ID查询数据
         /// </summary>
         /// <param name="lstIds">id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
         /// <returns>数据实体列表</returns>
@@ -246,8 +240,7 @@ namespace Tiobon.Core.Repository.Base
 
 
         /// <summary>
-        /// 功能描述:查询所有数据
-        /// 作　　者:Tiobon.Core
+        /// 查询所有数据
         /// </summary>
         /// <returns>数据列表</returns>
         public async Task<List<TEntity>> Query()
@@ -256,8 +249,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:查询数据列表
-        /// 作　　者:Tiobon.Core
+        /// 查询数据列表
         /// </summary>
         /// <param name="where">条件</param>
         /// <returns>数据列表</returns>
@@ -267,8 +259,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:查询数据列表
-        /// 作　　者:Tiobon.Core
+        /// 查询数据列表
         /// </summary>
         /// <param name="whereExpression">whereExpression</param>
         /// <returns>数据列表</returns>
@@ -278,8 +269,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:按照特定列查询数据列表
-        /// 作　　者:Tiobon.Core
+        /// 按照特定列查询数据列表
         /// </summary>
         /// <typeparam name="TResult"></typeparam>
         /// <param name="expression"></param>
@@ -290,8 +280,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:按照特定列查询数据列表带条件排序
-        /// 作　　者:Tiobon.Core
+        /// 按照特定列查询数据列表带条件排序
         /// </summary>
         /// <typeparam name="TResult"></typeparam>
         /// <param name="whereExpression">过滤条件</param>
@@ -304,8 +293,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:查询一个列表
-        /// 作　　者:Tiobon.Core
+        /// 查询一个列表
         /// </summary>
         /// <param name="whereExpression">条件表达式</param>
         /// <param name="orderByFields">排序字段，如name asc,age desc</param>
@@ -316,7 +304,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:查询一个列表
+        /// 查询一个列表
         /// </summary>
         /// <param name="whereExpression"></param>
         /// <param name="orderByExpression"></param>
@@ -329,8 +317,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:查询一个列表
-        /// 作　　者:Tiobon.Core
+        /// 查询一个列表
         /// </summary>
         /// <param name="where">条件</param>
         /// <param name="orderByFields">排序字段，如name asc,age desc</param>
@@ -342,8 +329,7 @@ namespace Tiobon.Core.Repository.Base
 
 
         /// <summary>
-        /// 功能描述:查询前N条数据
-        /// 作　　者:Tiobon.Core
+        /// 查询前N条数据
         /// </summary>
         /// <param name="whereExpression">条件表达式</param>
         /// <param name="top">前N条</param>
@@ -358,8 +344,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:查询前N条数据
-        /// 作　　者:Tiobon.Core
+        /// 查询前N条数据
         /// </summary>
         /// <param name="where">条件</param>
         /// <param name="top">前N条</param>
@@ -396,8 +381,6 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:分页查询
-        /// 作　　者:Tiobon.Core
         /// </summary>
         /// <param name="whereExpression">条件表达式</param>
         /// <param name="pageIndex">页码（下标0）</param>
@@ -415,8 +398,7 @@ namespace Tiobon.Core.Repository.Base
         }
 
         /// <summary>
-        /// 功能描述:分页查询
-        /// 作　　者:Tiobon.Core
+        /// 分页查询
         /// </summary>
         /// <param name="where">条件</param>
         /// <param name="pageIndex">页码（下标0）</param>
diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs
index 3e6ff3c2..b0178d45 100644
--- a/Tiobon.Core.Services/BASE/BaseServices.cs
+++ b/Tiobon.Core.Services/BASE/BaseServices.cs
@@ -1,13 +1,10 @@
-using Tiobon.Core.Common.Helper;
+using System.Data;
+using System.Linq.Expressions;
+using SqlSugar;
+using Tiobon.Core.Common.Helper;
 using Tiobon.Core.IRepository.Base;
 using Tiobon.Core.IServices.BASE;
 using Tiobon.Core.Model;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
 
 namespace Tiobon.Core.Services.BASE
 {
@@ -29,8 +26,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:根据ID查询一条数据
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 根据ID查询一条数据
         /// </summary>
         /// <param name="objId">id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
         /// <param name="blnUseCache">是否使用缓存</param>
@@ -41,8 +37,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:根据ID查询数据
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 根据ID查询数据
         /// </summary>
         /// <param name="lstIds">id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
         /// <returns>数据实体列表</returns>
@@ -143,8 +138,7 @@ namespace Tiobon.Core.Services.BASE
 
 
         /// <summary>
-        /// 功能描述:查询所有数据
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 查询所有数据
         /// </summary>
         /// <returns>数据列表</returns>
         public async Task<List<TEntity>> Query()
@@ -153,8 +147,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:查询数据列表
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 查询数据列表
         /// </summary>
         /// <param name="where">条件</param>
         /// <returns>数据列表</returns>
@@ -164,8 +157,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:查询数据列表
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 查询数据列表
         /// </summary>
         /// <param name="whereExpression">whereExpression</param>
         /// <returns>数据列表</returns>
@@ -175,8 +167,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:按照特定列查询数据列表
-        /// 作　　者:Tiobon.Core
+        /// 按照特定列查询数据列表
         /// </summary>
         /// <typeparam name="TResult"></typeparam>
         /// <param name="expression"></param>
@@ -187,8 +178,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:按照特定列查询数据列表带条件排序
-        /// 作　　者:Tiobon.Core
+        /// 按照特定列查询数据列表带条件排序
         /// </summary>
         /// <typeparam name="TResult"></typeparam>
         /// <param name="whereExpression">过滤条件</param>
@@ -201,8 +191,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:查询一个列表
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 查询一个列表
         /// </summary>
         /// <param name="whereExpression">条件表达式</param>
         /// <param name="strOrderByFileds">排序字段，如name asc,age desc</param>
@@ -218,8 +207,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:查询一个列表
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 查询一个列表
         /// </summary>
         /// <param name="where">条件</param>
         /// <param name="orderByFileds">排序字段，如name asc,age desc</param>
@@ -252,8 +240,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:查询前N条数据
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 查询前N条数据
         /// </summary>
         /// <param name="whereExpression">条件表达式</param>
         /// <param name="top">前N条</param>
@@ -265,8 +252,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:查询前N条数据
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 查询前N条数据
         /// </summary>
         /// <param name="where">条件</param>
         /// <param name="top">前N条</param>
@@ -281,8 +267,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:分页查询
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 分页查询
         /// </summary>
         /// <param name="whereExpression">条件表达式</param>
         /// <param name="pageIndex">页码（下标0）</param>
@@ -303,8 +288,7 @@ namespace Tiobon.Core.Services.BASE
         }
 
         /// <summary>
-        /// 功能描述:分页查询
-        /// 作　　者:AZLinli.Tiobon.Core
+        /// 分页查询
         /// </summary>
         /// <param name="where">条件</param>
         /// <param name="pageIndex">页码（下标0）</param>