Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码简化

Browse Source
master
xiaochanghai 1 year ago
parent 6ff2098317
commit 1a00db4c12
11 changed files with 48 additions and 96 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      Tiobon.Core.Api/Controllers/ImgController.cs
  2. 4
      Tiobon.Core.Api/Filter/CustomRouteAttribute.cs
  3. 2
      Tiobon.Core.Api/Filter/GlobalAuthorizeFilter.cs
  4. 7
      Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
  5. 1
      Tiobon.Core.Api/Filter/GlobalRoutePrefixFilter.cs
  6. 3
      Tiobon.Core.Api/Filter/UseServiceDIAttribute.cs
  7. 1
      Tiobon.Core.Api/Filter/UserRegisterVo.cs
  8. 9
      Tiobon.Core.IServices/BASE/IBaseServices.cs
  9. 5
      Tiobon.Core.Model/MessageModel.cs
  10. 54
      Tiobon.Core.Repository/BASE/BaseRepository.cs
  11. 50
      Tiobon.Core.Services/BASE/BaseServices.cs

8
Tiobon.Core.Api/Controllers/ImgController.cs
Unescape View File

@ -8,7 +8,7 @@
[Authorize] [Authorize]
public class ImgController : BaseApiController public class ImgController : BaseApiController
{ {
private readonly IWebHostEnvironment _env; private readonly IWebHostEnvironment _env;
public ImgController(IWebHostEnvironment webHostEnvironment) public ImgController(IWebHostEnvironment webHostEnvironment)
@ -46,13 +46,13 @@
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("/images/Upload/Pic")] [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("请选择上传的文件。"); if (dto.file == null || !dto.file.Any()) return Failed("请选择上传的文件。");
//格式限制 //格式限制
var allowType = new string[] { "image/jpg", "image/png", "image/jpeg" }; var allowType = new string[] { "image/jpg", "image/png", "image/jpeg" };
var allowedFile = dto.file.Where(c => allowType.Contains(c.ContentType)); var allowedFile = dto.file.Where(c => allowType.Contains(c.ContentType));
if (!allowedFile.Any()) return Failed("图片格式错误"); if (!allowedFile.Any()) return Failed("图片格式错误");
if (allowedFile.Sum(c => c.Length) > 1024 * 1024 * 4) return Failed("图片过大"); if (allowedFile.Sum(c => c.Length) > 1024 * 1024 * 4) return Failed("图片过大");

4
Tiobon.Core.Api/Filter/CustomRouteAttribute.cs
Unescape View File

@ -1,6 +1,4 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Microsoft.AspNetCore.Mvc.ApiExplorer;
using System;
using static Tiobon.Core.Extensions.CustomApiVersion; using static Tiobon.Core.Extensions.CustomApiVersion;
namespace Tiobon.Core.SwaggerHelper namespace Tiobon.Core.SwaggerHelper

2
Tiobon.Core.Api/Filter/GlobalAuthorizeFilter.cs
Unescape View File

@ -1,8 +1,6 @@
using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ApplicationModels;
using Microsoft.AspNetCore.Mvc.Authorization; using Microsoft.AspNetCore.Mvc.Authorization;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using System.Linq;
using System.Threading.Tasks;
namespace Tiobon.Core.Filter namespace Tiobon.Core.Filter
{ {

7
Tiobon.Core.Api/Filter/GlobalExceptionFilter.cs
Unescape View File

@ -1,9 +1,4 @@
using Tiobon.Core.Common; using Tiobon.Core.Hubs;
using Tiobon.Core.Common.Helper;
using Tiobon.Core.Common.LogHelper;
using Tiobon.Core.Hubs;
using Tiobon.Core.Model;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using StackExchange.Profiling; using StackExchange.Profiling;

1
Tiobon.Core.Api/Filter/GlobalRoutePrefixFilter.cs
Unescape View File

@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ApplicationModels;
using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.Routing;
using System.Linq;
namespace Tiobon.Core.Filter namespace Tiobon.Core.Filter
{ {

3
Tiobon.Core.Api/Filter/UseServiceDIAttribute.cs
Unescape View File

@ -1,5 +1,4 @@
using Tiobon.Core.IServices; using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.Filters;
namespace Tiobon.Core.Filter namespace Tiobon.Core.Filter
{ {

1
Tiobon.Core.Api/Filter/UserRegisterVo.cs
Unescape View File

@ -1,5 +1,4 @@
using FluentValidation; using FluentValidation;
using System.Text.RegularExpressions;
namespace Tiobon.Core.Filter namespace Tiobon.Core.Filter
{ {

9
Tiobon.Core.IServices/BASE/IBaseServices.cs
Unescape View File

@ -1,10 +1,7 @@
using Tiobon.Core.Model; using System.Data;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading.Tasks; using SqlSugar;
using Tiobon.Core.Model;
namespace Tiobon.Core.IServices.BASE namespace Tiobon.Core.IServices.BASE
{ {

5
Tiobon.Core.Model/MessageModel.cs
Unescape View File

@ -31,7 +31,8 @@
/// </summary> /// </summary>
/// <param name="msg">消息</param> /// <param name="msg">消息</param>
/// <returns></returns> /// <returns></returns>
public static MessageModel<T> Success(string msg) { public static MessageModel<T> Success(string msg)
{
return Message(true, msg, default); return Message(true, msg, default);
} }
/// <summary> /// <summary>
@ -70,7 +71,7 @@
/// <param name="msg">消息</param> /// <param name="msg">消息</param>
/// <param name="response">数据</param> /// <param name="response">数据</param>
/// <returns></returns> /// <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 }; return new MessageModel<T>() { msg = msg, response = response, success = success };
} }

54
Tiobon.Core.Repository/BASE/BaseRepository.cs
Unescape View File

@ -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.Common.DB;
using Tiobon.Core.IRepository.Base; using Tiobon.Core.IRepository.Base;
using Tiobon.Core.Model; using Tiobon.Core.Model;
using Tiobon.Core.Model.Models; using Tiobon.Core.Model.Models;
using Tiobon.Core.Model.Tenants; using Tiobon.Core.Model.Tenants;
using Tiobon.Core.Repository.UnitOfWorks; 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 namespace Tiobon.Core.Repository.Base
{ {
@ -78,8 +74,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:根据ID查询一条数据 /// 根据ID查询一条数据
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="objId">id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param> /// <param name="objId">id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
/// <param name="blnUseCache">是否使用缓存</param> /// <param name="blnUseCache">是否使用缓存</param>
@ -91,8 +86,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:根据ID查询数据 /// 根据ID查询数据
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="lstIds">id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param> /// <param name="lstIds">id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
/// <returns>数据实体列表</returns> /// <returns>数据实体列表</returns>
@ -246,8 +240,7 @@ namespace Tiobon.Core.Repository.Base
/// <summary> /// <summary>
/// 功能描述:查询所有数据 /// 查询所有数据
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <returns>数据列表</returns> /// <returns>数据列表</returns>
public async Task<List<TEntity>> Query() public async Task<List<TEntity>> Query()
@ -256,8 +249,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:查询数据列表 /// 查询数据列表
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <returns>数据列表</returns> /// <returns>数据列表</returns>
@ -267,8 +259,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:查询数据列表 /// 查询数据列表
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">whereExpression</param> /// <param name="whereExpression">whereExpression</param>
/// <returns>数据列表</returns> /// <returns>数据列表</returns>
@ -278,8 +269,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:按照特定列查询数据列表 /// 按照特定列查询数据列表
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <typeparam name="TResult"></typeparam> /// <typeparam name="TResult"></typeparam>
/// <param name="expression"></param> /// <param name="expression"></param>
@ -290,8 +280,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:按照特定列查询数据列表带条件排序 /// 按照特定列查询数据列表带条件排序
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <typeparam name="TResult"></typeparam> /// <typeparam name="TResult"></typeparam>
/// <param name="whereExpression">过滤条件</param> /// <param name="whereExpression">过滤条件</param>
@ -304,8 +293,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:查询一个列表 /// 查询一个列表
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">条件表达式</param> /// <param name="whereExpression">条件表达式</param>
/// <param name="orderByFields">排序字段，如name asc,age desc</param> /// <param name="orderByFields">排序字段，如name asc,age desc</param>
@ -316,7 +304,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:查询一个列表 /// 查询一个列表
/// </summary> /// </summary>
/// <param name="whereExpression"></param> /// <param name="whereExpression"></param>
/// <param name="orderByExpression"></param> /// <param name="orderByExpression"></param>
@ -329,8 +317,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:查询一个列表 /// 查询一个列表
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <param name="orderByFields">排序字段，如name asc,age desc</param> /// <param name="orderByFields">排序字段，如name asc,age desc</param>
@ -342,8 +329,7 @@ namespace Tiobon.Core.Repository.Base
/// <summary> /// <summary>
/// 功能描述:查询前N条数据 /// 查询前N条数据
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">条件表达式</param> /// <param name="whereExpression">条件表达式</param>
/// <param name="top">前N条</param> /// <param name="top">前N条</param>
@ -358,8 +344,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:查询前N条数据 /// 查询前N条数据
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <param name="top">前N条</param> /// <param name="top">前N条</param>
@ -396,8 +381,6 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:分页查询
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">条件表达式</param> /// <param name="whereExpression">条件表达式</param>
/// <param name="pageIndex">页码（下标0）</param> /// <param name="pageIndex">页码（下标0）</param>
@ -415,8 +398,7 @@ namespace Tiobon.Core.Repository.Base
} }
/// <summary> /// <summary>
/// 功能描述:分页查询 /// 分页查询
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <param name="pageIndex">页码（下标0）</param> /// <param name="pageIndex">页码（下标0）</param>

50
Tiobon.Core.Services/BASE/BaseServices.cs
Unescape View File

@ -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.IRepository.Base;
using Tiobon.Core.IServices.BASE; using Tiobon.Core.IServices.BASE;
using Tiobon.Core.Model; 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 namespace Tiobon.Core.Services.BASE
{ {
@ -29,8 +26,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:根据ID查询一条数据 /// 根据ID查询一条数据
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="objId">id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param> /// <param name="objId">id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
/// <param name="blnUseCache">是否使用缓存</param> /// <param name="blnUseCache">是否使用缓存</param>
@ -41,8 +37,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:根据ID查询数据 /// 根据ID查询数据
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="lstIds">id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param> /// <param name="lstIds">id列表（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件</param>
/// <returns>数据实体列表</returns> /// <returns>数据实体列表</returns>
@ -143,8 +138,7 @@ namespace Tiobon.Core.Services.BASE
/// <summary> /// <summary>
/// 功能描述:查询所有数据 /// 查询所有数据
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <returns>数据列表</returns> /// <returns>数据列表</returns>
public async Task<List<TEntity>> Query() public async Task<List<TEntity>> Query()
@ -153,8 +147,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:查询数据列表 /// 查询数据列表
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <returns>数据列表</returns> /// <returns>数据列表</returns>
@ -164,8 +157,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:查询数据列表 /// 查询数据列表
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">whereExpression</param> /// <param name="whereExpression">whereExpression</param>
/// <returns>数据列表</returns> /// <returns>数据列表</returns>
@ -175,8 +167,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:按照特定列查询数据列表 /// 按照特定列查询数据列表
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <typeparam name="TResult"></typeparam> /// <typeparam name="TResult"></typeparam>
/// <param name="expression"></param> /// <param name="expression"></param>
@ -187,8 +178,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:按照特定列查询数据列表带条件排序 /// 按照特定列查询数据列表带条件排序
/// 作　　者:Tiobon.Core
/// </summary> /// </summary>
/// <typeparam name="TResult"></typeparam> /// <typeparam name="TResult"></typeparam>
/// <param name="whereExpression">过滤条件</param> /// <param name="whereExpression">过滤条件</param>
@ -201,8 +191,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:查询一个列表 /// 查询一个列表
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">条件表达式</param> /// <param name="whereExpression">条件表达式</param>
/// <param name="strOrderByFileds">排序字段，如name asc,age desc</param> /// <param name="strOrderByFileds">排序字段，如name asc,age desc</param>
@ -218,8 +207,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:查询一个列表 /// 查询一个列表
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <param name="orderByFileds">排序字段，如name asc,age desc</param> /// <param name="orderByFileds">排序字段，如name asc,age desc</param>
@ -252,8 +240,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:查询前N条数据 /// 查询前N条数据
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">条件表达式</param> /// <param name="whereExpression">条件表达式</param>
/// <param name="top">前N条</param> /// <param name="top">前N条</param>
@ -265,8 +252,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:查询前N条数据 /// 查询前N条数据
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <param name="top">前N条</param> /// <param name="top">前N条</param>
@ -281,8 +267,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:分页查询 /// 分页查询
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="whereExpression">条件表达式</param> /// <param name="whereExpression">条件表达式</param>
/// <param name="pageIndex">页码（下标0）</param> /// <param name="pageIndex">页码（下标0）</param>
@ -303,8 +288,7 @@ namespace Tiobon.Core.Services.BASE
} }
/// <summary> /// <summary>
/// 功能描述:分页查询 /// 分页查询
/// 作　　者:AZLinli.Tiobon.Core
/// </summary> /// </summary>
/// <param name="where">条件</param> /// <param name="where">条件</param>
/// <param name="pageIndex">页码（下标0）</param> /// <param name="pageIndex">页码（下标0）</param>

Write Preview
Loading…
Cancel
Save