update to .net6

.github/workflows/nuget-publish.yml

@@ -1,6 +1,9 @@
 name: PublishNugetPackage
 
-on: [create]
+on:
+  push:
+    tags:
+    - '*'
 
 jobs:
   publish:

Communications/SimApiBaseRequest.cs

@@ -1,4 +1,5 @@
 using System;
+
 namespace SimApi.Communications
 {
     /// <summary>
@@ -9,6 +10,15 @@ namespace SimApi.Communications
         public int Id { get; set; }
     }
 
+    /// <summary>
+    /// 动态类型单字段请求
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class SimApiOneFieldRequest<T>
+    {
+        public T Data { get; set; }
+    }
+
     /// <summary>
     /// 基础分页请求
     /// </summary>
@@ -17,4 +27,4 @@ namespace SimApi.Communications
         public int Page { get; set; }
         public int Count { get; set; }
     }
-}
+}

Communications/SimApiBaseResponse.cs

@@ -95,7 +95,7 @@ namespace SimApi.Communications
             {
                 IgnoreReadOnlyProperties = true,
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Converters = { new JsonStringEnumConverter() }
+                Converters = {new JsonStringEnumConverter()}
             });
         }
     }
@@ -110,10 +110,13 @@ namespace SimApi.Communications
         /// 动态内容列表
         /// </summary>
         public T List { get; set; }
+
         //当前页码
         public int Page { get; set; }
+
         //每页条数
         public int Count { get; set; }
+
         //总计条数
         public int Total { get; set; }
     }

Configurations/SimApiDocOptions.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using Swashbuckle.AspNetCore.SwaggerUI;
+
+namespace SimApi.Configs
+{
+    /// <summary>
+    /// 文档组配置
+    /// </summary>
+    public class SimApiDocGroupOption
+    {
+        /// <summary>
+        /// 文档标识
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 文档名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 文档描述
+        /// </summary>
+        public string Description { get; set; }
+    }
+
+    /// <summary>
+    /// 授权配置, Type支持 "SimApiAuth","ClientCredentials","Implicit","AuthorizationCode"
+    /// </summary>
+    public class SimApiAuthOption
+    {
+        public string[] Type { get; set; } = new[] {"SimApiAuth"};
+        public string Description { get; set; } = "认证服务器颁发的AccessToken";
+        public string AuthorizationUrl { get; set; }
+        public string TokenUrl { get; set; }
+        public Dictionary<string, string> Scopes { get; set; }
+    }
+
+    /// <summary>
+    /// 文档配置
+    /// </summary>
+    public class SimApiDocOptions
+    {
+        /// <summary>
+        /// 文档组配置
+        /// </summary>
+        public SimApiDocGroupOption[] ApiGroups { get; set; } = new[]
+        {
+            new SimApiDocGroupOption
+            {
+                Id = "api",
+                Name = "Api",
+                Description = "Api接口文档"
+            }
+        };
+
+        /// <summary>
+        /// 授权配置
+        /// </summary>
+        public SimApiAuthOption ApiAuth { get; set; } = new SimApiAuthOption();
+
+        /// <summary>
+        /// 文档页面标题
+        /// </summary>
+        public string DocumentTitle { get; set; } = "API接口文档";
+        
+        /// <summary>
+        /// 接口支持的调用方式
+        /// </summary>
+        public SubmitMethod[] SupportedMethod { get; set; } = new[] {SubmitMethod.Post};
+    }
+}

Configurations/SimApiOptions.cs

@@ -0,0 +1,29 @@
+using System;
+
+namespace SimApi.Configs
+{
+    public class SimApiOptions
+    {
+        public bool EnableCors { get; set; } = true;
+        public bool EnableSimApiAuth { get; set; } = false;
+        public bool EnableSimApiDoc { get; set; } = true;
+        public bool EnableSimApiException { get; set; } = true;
+        public bool EnableSimApiStorage { get; set; } = false;
+        public bool EnableForwardHeaders { get; set; } = true;
+        public bool EnableLowerUrl { get; set; } = true;
+        public bool EnableLogger { get; set; } = true;
+        public SimApiDocOptions SimApiDocOptions { get; set; } = new SimApiDocOptions();
+        public SimApiStorageOptions SimApiStorageOptions { get; set; } = new SimApiStorageOptions();
+
+
+        public void ConfigureSimApiDoc(Action<SimApiDocOptions> options = null)
+        {
+            options?.Invoke(SimApiDocOptions);
+        }
+
+        public void ConfigureSimApiStorage(Action<SimApiStorageOptions> options = null)
+        {
+            options?.Invoke(SimApiStorageOptions);
+        }
+    }
+}

Configurations/SimApiStorageOptions.cs

@@ -0,0 +1,11 @@
+namespace SimApi.Configs
+{
+    public class SimApiStorageOptions
+    {
+        public string Endpoint { get; set; }
+        public string ServeUrl { get; set; }
+        public string Bucket { get; set; }
+        public string AccessKey { get; set; }
+        public string SecretKey { get; set; }
+    }
+}

Controllers/SimApiBaseController.cs

@@ -47,7 +47,7 @@ namespace SimApi.Controllers
         /// <param name="code">错误代码</param>
         /// <param name="message">错误描述(若是常规错误,代码可自动带取描述)</param>
         /// <returns></returns>
-        protected static void Error(int code = 500, string message = "服务器错误")
+        protected static void Error(int code = 500, string message = "")
         {
             throw new SimApiException(code, message);
         }
@@ -58,7 +58,7 @@ namespace SimApi.Controllers
         /// <param name="condition">检测条件</param>
         /// <param name="code">错误代码</param>
         /// <param name="message">错误描述</param>
-        protected static void ErrorWhen(bool condition, int code = 500, string message = "服务器错误")
+        protected static void ErrorWhen(bool condition, int code = 500, string message = "")
         {
             if (condition)
             {
@@ -72,7 +72,7 @@ namespace SimApi.Controllers
         /// <param name="condition">检测条件</param>
         /// <param name="code">错误代码</param>
         /// <param name="message">错误描述</param>
-        protected static void ErrorWhenNull(object condition, int code = 404, string message = "资源不存在")
+        protected static void ErrorWhenNull(object condition, int code = 404, string message = "")
         {
             ErrorWhen(condition == null, code, message);
         }

Controllers/SimApiCommonController.cs

@@ -6,6 +6,7 @@ using SimApi.Helpers;
 
 namespace SimApi.Controllers
 {
+    [ApiExplorerSettings(GroupName = "api")]
     public class YYCommonController : SimApiBaseController
     {
         private SimApiAuth Auth { get; }
@@ -37,7 +38,7 @@ namespace SimApi.Controllers
         public SimApiBaseResponse<int> CheckLogin()
         {
             ErrorWhenNull(LoginInfo, 401);
-            return new SimApiBaseResponse<int> { Data = LoginInfo.Id };
+            return new SimApiBaseResponse<int> {Data = LoginInfo.Id};
         }
 
         /// <summary>
@@ -53,8 +54,9 @@ namespace SimApi.Controllers
             {
                 token = Request.Headers["Token"];
             }
+
             Auth.Logout(token);
             return new SimApiBaseResponse();
         }
     }
-}
+}

Helpers/SimApiStorage.cs

@@ -0,0 +1,97 @@
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Minio;
+using Minio.Exceptions;
+using SimApi.Configs;
+
+namespace SimApi.Helpers
+{
+    public class SimApiStorage
+    {
+        private MinioClient Mc { get; }
+
+        public MinioClient Client => Mc;
+
+        private string ServeUrl { get; }
+        private string Bucket { get; }
+        private IHttpContextAccessor HttpContextAccessor { get; }
+
+        public SimApiStorage(SimApiOptions apiOptions, IHttpContextAccessor httpContextAccessor)
+        {
+            var options = apiOptions.SimApiStorageOptions;
+            HttpContextAccessor = httpContextAccessor;
+            var useSsl = false;
+            var endpoint = string.Empty;
+            if (options.Endpoint.StartsWith("http://"))
+            {
+                endpoint = options.Endpoint.Replace("http://", string.Empty);
+            }
+            else if (options.Endpoint.StartsWith("https://"))
+            {
+                endpoint = options.Endpoint.Replace("https://", string.Empty);
+                useSsl = true;
+            }
+            else
+            {
+                throw new Exception("SimApiStorage: Error Endpoint");
+            }
+
+            ServeUrl = options.ServeUrl;
+            Bucket = options.Bucket;
+            if (useSsl)
+            {
+                Mc = new MinioClient(endpoint, options.AccessKey, options.SecretKey).WithSSL();
+            }
+            else
+            {
+                Mc = new MinioClient(endpoint, options.AccessKey, options.SecretKey);
+            }
+
+            bool found = Mc.BucketExistsAsync(Bucket).Result;
+            if (!found)
+            {
+                Mc.MakeBucketAsync(Bucket).Wait();
+            }
+        }
+
+        public string GetUploadUrl(string path, int expire = 7200)
+        {
+            try
+            {
+                return Mc.PresignedPutObjectAsync(Bucket, path, expire).Result;
+            }
+            catch (MinioException e)
+            {
+                Console.WriteLine("Error occurred: " + e);
+                return e.Message;
+            }
+        }
+
+        public string UploadFile(string path, Stream stream)
+        {
+            try
+            {
+                Mc.PutObjectAsync(Bucket, path, stream, stream.Length).Wait();
+                return null;
+            }
+            catch (MinioException e)
+            {
+                Console.WriteLine("Error occurred: " + e);
+                return e.Message;
+            }
+        }
+
+        public string FullUrl(string path)
+        {
+            var httpRequest = HttpContextAccessor.HttpContext.Request;
+            var url = $"{httpRequest.Scheme}://{httpRequest.Host}";
+            if (string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            return path.StartsWith("~") ? url + path.Substring(1, path.Length - 1) : $"{ServeUrl}{path}";
+        }
+    }
+}

Helpers/SimApiUpload.cs

@@ -1,103 +0,0 @@
-using System;
-using System.IO;
-using Microsoft.AspNetCore.Hosting;
-
-namespace SimApi.Helpers
-{
-    public class SimApiUpload
-    {
-        private string FilePathFolder = "/uploads/";
-        public string FilePath
-        {
-            set
-            {
-                if (!value.StartsWith("/"))
-                {
-                    FilePathFolder = $"/{value}";
-                }
-                if (!FilePathFolder.EndsWith("/"))
-                {
-                    FilePathFolder += "/";
-                }
-            }
-            get
-            {
-                return FilePathFolder;
-            }
-        }
-
-        private IWebHostEnvironment Env { get; }
-
-        public SimApiUpload(IWebHostEnvironment env)
-        {
-            Env = env;
-        }
-
-        public class SimApiUploadInfo
-        {
-            public string Path { get; set; }
-            public int Size { get; set; }
-        }
-
-        /// <summary>
-        /// 保存base64文件,如果有标头按照标头自动识别
-        /// </summary>
-        /// <param name="base64"></param>
-        /// <param name="ext">扩展名</param>
-        /// <param name="path">存放路径</param>
-        /// <param name="fileName">文件名</param>
-        /// <returns></returns>
-        public SimApiUploadInfo SaveFile(string base64, string ext = null, string path = null, string fileName = null)
-        {
-            byte[] bt;
-            var filePath = FilePath + path;
-            if (fileName == null)
-            {
-                fileName = Guid.NewGuid().ToString();
-            }
-            var baseArr = base64.Split(";");
-            if (baseArr.Length == 2)
-            {
-                var info = baseArr[0].Split(":")[1].Split("/");
-                if (path == null)
-                {
-                    filePath += $"{info[0]}/";
-                }
-                if (ext == null)
-                {
-                    ext = info[1];
-                }
-                var data = baseArr[1].Split(",");
-                bt = Convert.FromBase64String(data[1]);
-            }
-            else
-            {
-                bt = Convert.FromBase64String(base64);
-            }
-            var fn = fileName + (string.IsNullOrEmpty(ext) ? string.Empty : $".{ext}");
-            return WriteFile(filePath, fn, bt);
-        }
-
-        /// <summary>
-        /// 把数据写入文件
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="fileName"></param>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public SimApiUploadInfo WriteFile(string filePath, string fileName, byte[] data)
-        {
-            var realPath = Directory.GetCurrentDirectory() + "/wwwroot" + filePath;
-            if (!Directory.Exists(realPath))
-            {
-                Directory.CreateDirectory(realPath);
-            }
-            File.WriteAllBytes(realPath + fileName, data);
-            return new SimApiUploadInfo
-            {
-                Path = filePath + fileName,
-                Size = data.Length
-            };
-        }
-    }
-}

Helpers/SimApiUtil.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -14,7 +13,7 @@ namespace SimApi.Helpers
         /// <returns></returns>
         public static bool CheckCell(string cell)
         {
-            var regex = new Regex("^1[34578]\\d{9}$");
+            var regex = new Regex("^1[3456789]\\d{9}$");
             return regex.IsMatch(cell);
         }
 

Logger/SimApiLogger.cs

@@ -0,0 +1,50 @@
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace SimApi.Logger
+{
+    public class SimApiLogger : ILogger
+    {
+        private string Name { get; }
+
+        public SimApiLogger(string name)
+        {
+            Name = name;
+        }
+
+        public IDisposable BeginScope<TState>(TState state)
+        {
+            return null;
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return true;
+        }
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception,
+            Func<TState, Exception, string> formatter)
+        {
+            var defautColor = Console.ForegroundColor;
+            Console.ForegroundColor = logLevel switch
+            {
+                LogLevel.Debug => ConsoleColor.DarkMagenta,
+                LogLevel.Information => ConsoleColor.DarkCyan,
+                LogLevel.Warning => ConsoleColor.Yellow,
+                LogLevel.Error => ConsoleColor.Red,
+                LogLevel.Critical => ConsoleColor.DarkRed,
+                _ => defautColor
+            };
+            Console.WriteLine(
+                $"[ {Name} ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
+            Console.ForegroundColor = defautColor;
+            Console.WriteLine($"{state}");
+            if (exception != null)
+            {
+                Console.WriteLine($"{exception}");
+            }
+
+            Console.WriteLine();
+        }
+    }
+}

Logger/SimApiLoggerProvider.cs

@@ -0,0 +1,22 @@
+using System.Collections.Concurrent;
+using Microsoft.Extensions.Logging;
+
+namespace SimApi.Logger
+{
+    public class SimApiLoggerProvider : ILoggerProvider
+    {
+        private readonly ConcurrentDictionary<string, SimApiLogger> _loggers =
+            new ConcurrentDictionary<string, SimApiLogger>();
+
+
+        public ILogger CreateLogger(string categoryName)
+        {
+            return _loggers.GetOrAdd(categoryName, name => new SimApiLogger(name));
+        }
+
+        public void Dispose()
+        {
+            _loggers.Clear();
+        }
+    }
+}

Middlewares/SimApiExceptionMiddleware.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using SimApi.Communications;
@@ -32,6 +33,13 @@ namespace SimApi.Middlewares
             try
             {
                 await Next(context);
+                if (context.Response.StatusCode != 200)
+                {
+                    if (!new[] {301, 302}.Contains(context.Response.StatusCode))
+                    {
+                        throw new SimApiException(context.Response.StatusCode);
+                    }
+                }
             }
             catch (SimApiException ex)
             {
@@ -43,6 +51,7 @@ namespace SimApi.Middlewares
                 {
                     response.SetCodeMsg(ex.Code, ex.Message);
                 }
+
                 ErrorResponse(context, response);
             }
             catch (Exception ex)

Models/SimApiBaseModel.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+
+namespace SimApi.Models
+{
+    public class SimApiBaseModel
+    {
+        protected virtual string[] MapperIgnoreField { get; set; } = {"Id", "CreatedAt", "UpdatedAt"};
+        protected virtual string UpdatedTimeField { get; set; } = "UpdatedAt";
+
+        public void MapData<TS>(TS source, bool mapAll = false)
+        {
+            //获取要赋值的源数据不为null的项目
+            var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
+                .Select(x => new {x.Name, x.PropertyType})
+                .ToDictionary(x => x.Name, x => x.PropertyType);
+
+            //获取目标对象的属性信息
+            var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
+                .ToDictionary(x => x.Name, x => x.PropertyType);
+            foreach (var sp in sourceProps)
+            {
+                //检查源对象不为空的属性是否在目标对象中存在
+                if (targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
+                    (!MapperIgnoreField.Contains(sp.Key) || mapAll))
+                {
+                    GetType().GetProperty(sp.Key)?
+                        .SetValue(this, source.GetType().GetProperty(sp.Key)?.GetValue(source));
+                }
+            }
+
+            UpdateTime();
+        }
+
+        public void MapData<TS>(TS source, string[] mapFields)
+        {
+            //获取要赋值的源数据不为null的项目
+            var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
+                .Select(x => new {x.Name, x.PropertyType})
+                .ToDictionary(x => x.Name, x => x.PropertyType);
+
+            //获取目标对象的属性信息
+            var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
+                .ToDictionary(x => x.Name, x => x.PropertyType);
+            foreach (var sp in sourceProps)
+            {
+                //检查源对象不为空的属性是否在目标对象中存在
+                if (targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
+                    mapFields.Contains(sp.Key))
+                {
+                    GetType().GetProperty(sp.Key)?
+                        .SetValue(this, source.GetType().GetProperty(sp.Key)?.GetValue(source));
+                }
+            }
+
+            UpdateTime();
+        }
+
+        /// <summary>
+        /// 更新update时间
+        /// </summary>
+        /// <returns></returns>
+        public void UpdateTime()
+        {
+            GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
+        }
+    }
+}

README.md

@@ -1,4 +1,4 @@
-# YYApi 基于Asp.net Core 3的一个基础辅助包
+# YYApi 基于Asp.net Core 3/5的一个基础辅助包
 
 ![CI](https://github.com/YY-Tech/YYApi/workflows/CI/badge.svg)
 
@@ -23,43 +23,33 @@ namespace Controllers
 }
 ```
 
-2. 基于Swagger的API文档服务
 
+统一配置，现在只需要进行AddSimApi的配置， Configure中直接 UseSimApi即可。
 ```C#
-#Startup.cs
-
-	services.AddSimApiDoc("文档名称", "文档描述");
-
-	app.UseSimApiDoc("名称",SubmitMethod[])
-
-#控制器中可以直接使用特性
-
-	[SimApiDoc("分组","名称")]
+services.AddSimApi(options =>
+{
+   options.ConfigureSimApiDoc(options =>
+   {
+     options.ApiGroups = new[]
+     {
+        new SimApiDocGroupOption
+            {Id = "admin", Name = "后台管理接口", Description = "本接口调用需要Scope：sac.api.admin"},
+        new SimApiDocGroupOption
+            {Id = "user-v1", Name = "用户中心接口", Description = "本接口调用需要Scope：sac.api.user"}
+     };
+     options.ApiAuth = new SimApiAuthOption
+       {
+         Type = new[] {"ClientCredentials", "Implicit", "AuthorizationCode"},
+         Scopes = new Dictionary<string, string>
+            {
+              {"sac.api.user", "用户信息接口权限"},
+              {"sac.api.admin", "后台管理API"}
+            },
+         AuthorizationUrl = "/connect/authorize",
+         TokenUrl = "/connect/token"
+       };
+     });
+     options.EnableSimApiStorage = true;
+     options.SimApiStorageOptions = Configuration.GetSection("S3").Get<SimApiStorageOptions>();
+});
 ```
-
-3. 简单的基于Redis的登录TOKEN服务
-
-```C#
-#Startup.cs
-service.AddSimApiAuth();
-```
-添加时候, 可以从DI中获取 Auth 类,调用 Auth.Set(int,string) 将用户ID/类型和生成的Token绑定,本方法返回缓存中的Key名称
-
-```C#
-#Startup.cs
-app.UseSimApiAuth();
-```
-调用本中间件,然后再需要登录认证的地方,使用 [YYAuth] 特性,即可完成检测登录相关的操作,
-如果需要获取用户的ID, 只需要 直接使用 LoginId 属性即可获取
-
-4. 统一返回
-所有Response 均需要继承 SimApiBaseResponse类
-
-
-5. 异常处理
-本异常中间件封装了API错误的异常处理,控制器可以使用 Error(int,string) 直接返回API错误
-
-```C#
-#Startup.cs
-app.UseSimApiException();
-```

SimApi.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PackOnBuild>true</PackOnBuild>
     <Version>0.2.3</Version>
@@ -15,6 +14,7 @@
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageVersion>5.0.2</PackageVersion>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'YYApi' " />
@@ -25,10 +25,12 @@
     <Folder Include="Middlewares\" />
     <Folder Include="Attributes\" />
     <Folder Include="Exceptions\" />
+    <Folder Include="Configurations\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.6.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.6.3" />
+    <PackageReference Include="Minio" Version="3.1.13" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.2.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>

SimApiExtensions.cs

@@ -3,178 +3,235 @@ using SimApi.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerUI;
 using SimApi.Middlewares;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.Logging;
+using SimApi.Configs;
+using SimApi.Logger;
 
 namespace SimApi
 {
     /// <summary>
     /// 加入系统的扩展信息
     /// </summary>
-    public static class Extensions
+    public static class SimApiExtensions
     {
-        public static string DocumentTitle = "";
-        public static string DocumentDescription = "";
-
         //**********快捷添加**************
-
-        /// <summary>
-        /// 添加整个SimAPI,同时增加CORS规则
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="title"></param>
-        /// <param name="description"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddSimApi(this IServiceCollection builder, string title,
-            string description = null)
+        public static IServiceCollection AddSimApi(this IServiceCollection builder,
+            Action<SimApiOptions> options = null)
         {
-            return builder.AddSimApiAuth().AddSimApiDoc(title, description).AddCors().AddSimApiUpload();
+            var simApiOptions = new SimApiOptions();
+            options?.Invoke(simApiOptions);
+
+            // 是否使用SIMAUTH
+            if (simApiOptions.EnableSimApiAuth)
+            {
+                builder.AddScoped<SimApiAuth>();
+            }
+
+            if (simApiOptions.EnableCors)
+            {
+                builder.AddCors(cors => cors.AddPolicy("any",
+                    policy => { policy.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin(); }));
+            }
+
+            // 使用SimApiDoc
+            if (simApiOptions.EnableSimApiDoc)
+            {
+                var docOptions = simApiOptions.SimApiDocOptions;
+                builder.AddSwaggerGen(x =>
+                {
+                    foreach (var group in docOptions.ApiGroups)
+                    {
+                        x.SwaggerDoc(group.Id, new OpenApiInfo {Title = group.Name, Description = group.Description});
+                    }
+
+                    x.EnableAnnotations();
+                    var haveOauth = false;
+                    var haveSimApiAuth = false;
+                    var oauthFlows = new OpenApiOAuthFlows();
+                    foreach (var auth in docOptions.ApiAuth.Type)
+                    {
+                        switch (auth)
+                        {
+                            case "SimApiAuth":
+                                x.AddSecurityRequirement(new OpenApiSecurityRequirement
+                                {
+                                    {
+                                        new OpenApiSecurityScheme
+                                        {
+                                            Reference = new OpenApiReference
+                                                {Type = ReferenceType.SecurityScheme, Id = "HeaderToken"}
+                                        },
+                                        new[] {"readAccess", "writeAccess"}
+                                    }
+                                });
+                                haveSimApiAuth = true;
+                                break;
+                            case "ClientCredentials":
+                                oauthFlows.ClientCredentials = new OpenApiOAuthFlow
+                                {
+                                    TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
+                                    Scopes = docOptions.ApiAuth.Scopes
+                                };
+                                haveOauth = true;
+                                break;
+                            case "Implicit":
+                                oauthFlows.Implicit = new OpenApiOAuthFlow
+                                {
+                                    AuthorizationUrl = new Uri(docOptions.ApiAuth.AuthorizationUrl,
+                                        UriKind.RelativeOrAbsolute),
+                                    Scopes = docOptions.ApiAuth.Scopes
+                                };
+                                haveOauth = true;
+                                break;
+                            case "AuthorizationCode":
+                                oauthFlows.AuthorizationCode = new OpenApiOAuthFlow
+                                {
+                                    TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
+                                    AuthorizationUrl = new Uri(docOptions.ApiAuth.AuthorizationUrl,
+                                        UriKind.RelativeOrAbsolute),
+                                    Scopes = docOptions.ApiAuth.Scopes
+                                };
+                                haveOauth = true;
+                                break;
+                            case "Password":
+                                oauthFlows.Password = new OpenApiOAuthFlow
+                                {
+                                    TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
+                                    Scopes = docOptions.ApiAuth.Scopes
+                                };
+                                haveOauth = true;
+                                break;
+                        }
+                    }
+
+                    if (haveOauth)
+                    {
+                        x.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
+                        {
+                            Type = SecuritySchemeType.OAuth2,
+                            Flows = oauthFlows,
+                            Description = docOptions.ApiAuth.Description,
+                            In = ParameterLocation.Header
+                        });
+                        x.AddSecurityRequirement(new OpenApiSecurityRequirement
+                        {
+                            {
+                                new OpenApiSecurityScheme
+                                {
+                                    Reference = new OpenApiReference
+                                        {Type = ReferenceType.SecurityScheme, Id = "oauth2"}
+                                },
+                                new[] {"SimApiAuth"}
+                            }
+                        });
+                    }
+
+                    if (haveSimApiAuth)
+                    {
+                        x.AddSecurityDefinition("HeaderToken",
+                            new OpenApiSecurityScheme {Name = "Token", In = ParameterLocation.Header});
+                    }
+                });
+            }
+
+            // 使用Header转发，应对代理后获取真实ip
+            if (simApiOptions.EnableForwardHeaders)
+            {
+                builder.Configure<ForwardedHeadersOptions>(options =>
+                {
+                    options.ForwardedHeaders = ForwardedHeaders.All;
+                    options.KnownNetworks.Clear();
+                    options.KnownProxies.Clear();
+                });
+            }
+
+            if (simApiOptions.EnableLowerUrl)
+            {
+                builder.AddRouting(options => options.LowercaseUrls = true);
+            }
+
+            if (simApiOptions.EnableSimApiStorage)
+            {
+                builder.AddHttpContextAccessor();
+                builder.AddSingleton<SimApiStorage>();
+            }
+
+            builder.AddSingleton(simApiOptions);
+            return builder;
         }
 
         /// <summary>
         ///  使用所有SimApi自定义中间件
         /// </summary>
         /// <param name="builder"></param>
-        /// <param name="title"></param>
-        /// <param name="staticFileroot"></param>
-        /// <param name="submitMethods"></param>
         /// <returns></returns>
-        public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder, params SubmitMethod[] submitMethods)
+        public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder)
         {
-            return builder.UseSimApiException().UseSimApiDoc(submitMethods).UseMiddleware<SimApiAuthMiddleware>().UseCors(x => x.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin()).UseSimApiUpload();
-        }
-
-
-
-        //*********组件快捷方式*************
-
-        /// <summary>
-        /// 添加自定义授权认证中间价
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddSimApiAuth(this IServiceCollection builder)
-        {
-            return builder.AddScoped<SimApiAuth>();
-        }
-
-        /// <summary>
-        /// 添加Base64上传组件
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddSimApiUpload(this IServiceCollection builder)
-        {
-            return builder.AddSingleton<SimApiUpload>();
-        }
-
-        /// <summary>
-        /// 添加Api文档服务
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="title">文档标题</param>
-        /// <param name="description">文档描述</param>
-        /// <returns></returns>
-        public static IServiceCollection AddSimApiDoc(this IServiceCollection builder, string title,
-            string description = null)
-        {
-            DocumentTitle = title;
-            DocumentDescription = description;
-            return builder.AddSwaggerGen(x =>
+            var options = builder.ApplicationServices.GetService<SimApiOptions>();
+            if (options.EnableLogger)
             {
-                x.SwaggerDoc("api", new OpenApiInfo { Title = DocumentTitle, Description = DocumentDescription });
-                x.EnableAnnotations();
-                x.AddSecurityRequirement(new OpenApiSecurityRequirement
+                builder.ApplicationServices.GetService<ILoggerFactory>().AddProvider(new SimApiLoggerProvider());
+            }
+
+            var logger = builder.ApplicationServices.GetService<ILogger<SimApiLogger>>();
+
+            if (options.EnableForwardHeaders)
+            {
+                logger.LogInformation("开始配置ForwardedHeaders...");
+                builder.UseForwardedHeaders();
+            }
+
+            if (options.EnableCors)
+            {
+                logger.LogInformation("开始配置Cors全部允许...");
+                builder.UseCors("any");
+            }
+
+            if (options.EnableSimApiAuth)
+            {
+                logger.LogInformation("开始配置SimApiAuth...");
+                builder.UseMiddleware<SimApiAuthMiddleware>();
+            }
+
+            if (options.EnableSimApiDoc)
+            {
+                logger.LogInformation("开始配置SimApiDoc...");
+                var docOptions = options.SimApiDocOptions;
+                builder.UseSwagger(x => x.RouteTemplate = "/swagger/{documentName}.json").UseSwaggerUI(x =>
                 {
+                    x.DocumentTitle = docOptions.DocumentTitle;
+                    foreach (var group in docOptions.ApiGroups)
                     {
-                        new OpenApiSecurityScheme
-                        {
-                            Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "HeaderToken"}
-                        },
-                        new[] {"readAccess", "writeAccess"}
+                        x.SwaggerEndpoint($"/swagger/{group.Id}.json", name: group.Name);
                     }
+
+                    x.EnableValidator();
+                    x.SupportedSubmitMethods(docOptions.SupportedMethod);
+                    x.DisplayRequestDuration();
                 });
-                x.AddSecurityDefinition("HeaderToken",
-                    new OpenApiSecurityScheme { Name = "Token", In = ParameterLocation.Header });
-            });
-        }
+            }
 
-
-        /// <summary>
-        /// 使用异常中间价扩展
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <returns></returns>
-        public static IApplicationBuilder UseSimApiException(this IApplicationBuilder builder)
-        {
-            return builder.UseMiddleware<SimApiExceptionMiddleware>();
-        }
-
-        /// <summary>
-        /// 配置上传组件必须
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <returns></returns>
-        public static IApplicationBuilder UseSimApiUpload(this IApplicationBuilder builder)
-        {
-            return builder.UseStaticFiles(new StaticFileOptions
+            if (options.EnableSimApiException)
             {
-                DefaultContentType = "application/x-msdownload",
-                ServeUnknownFileTypes = true
-            });
-        }
+                logger.LogInformation("开始配置SimApiException...");
+                builder.UseMiddleware<SimApiExceptionMiddleware>();
+            }
 
-        /// <summary>
-        /// 使用文档UI
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="title">文档标题</param>
-        /// <param name="submitMethods">文档支持的提交方式(如果不指定,默认使用POST)</param>
-        /// <returns></returns>
-        public static IApplicationBuilder UseSimApiDoc(this IApplicationBuilder builder, params SubmitMethod[] submitMethods)
-        {
-            return builder.UseSwagger(x => x.RouteTemplate = "docs/{documentName}.json").UseSwaggerUI(x =>
+            //请求一下检测存储错误
+            if (options.EnableSimApiStorage)
             {
-                x.RoutePrefix = "docs";
-                x.DocumentTitle = DocumentTitle;
-                x.SwaggerEndpoint("/docs/api.json", name: DocumentTitle);
-                x.EnableValidator();
-                if (submitMethods.Length > 0)
-                {
-                    x.SupportedSubmitMethods(submitMethods);
-                }
-                else
-                {
-                    x.SupportedSubmitMethods(SubmitMethod.Post);
-                }
+                logger.LogInformation("开始配置SimApiStorage...");
+                builder.ApplicationServices.GetService<SimApiStorage>();
+            }
 
-                x.DisplayRequestDuration();
-            });
+            if (options.EnableLowerUrl)
+            {
+                logger.LogInformation("开始配置使用URL小写...");
+            }
+
+            return builder;
         }
-
-
-        /// <summary>
-        /// 同时使用Api文档和异常处理中间件
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="title">文档标题</param>
-        /// <param name="submitMethods">API提交方式定义</param>
-        /// <returns></returns>
-        public static IApplicationBuilder UseSimApiDocEx(this IApplicationBuilder builder, params SubmitMethod[] submitMethods)
-        {
-            return builder.UseSimApiException().UseSimApiDoc(submitMethods);
-        }
-
-        /// <summary>
-        /// 使用自定义认证中间件（依赖IDistributedCache）
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <returns></returns>
-        public static IApplicationBuilder UseSimApiAuth(this IApplicationBuilder builder)
-        {
-            return builder.UseMiddleware<SimApiAuthMiddleware>();
-        }
-
-
     }
 }