api model use record

.github/workflows/main.yml

@@ -1,21 +0,0 @@
-name: PublishNugetPackage
-
-on: [create]
-
-jobs:
-  publish:
-    name: Publish Project to Nuget
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.100'
-    - name: Publish
-      run: |
-        version=`git describe --tags`
-        dotnet build --configuration release -p:PackageVersion=$version
-        dotnet nuget push bin/release/Simcu.SimApi.$version.nupkg -k ${NUGET_APIKEY} -s https://www.nuget.org/api/v2/package
-      env:
-        NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}

.github/workflows/nuget-publish.yml

@@ -0,0 +1,24 @@
+name: PublishNugetPackage
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  publish:
+    name: Publish Project to Nuget
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.100"
+      - name: Publish
+        run: |
+          version=`git describe --tags`
+          dotnet build --configuration release -p:PackageVersion=$version
+          dotnet nuget push bin/release/Simcu.SimApi.$version.nupkg -k ${NUGET_APIKEY} -s https://www.nuget.org/api/v2/package
+        env:
+          NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}

Attributes/SimApiAuthAttribute.cs

@@ -19,13 +19,16 @@ namespace SimApi.Attributes
         //默认是user登录类型
         public SimApiAuthAttribute()
         {
-            Types = new[] { "user" };
+            Types = new[]
+            {
+                "user"
+            };
         }
 
         //只检测一种用户类型的快捷方式
         public SimApiAuthAttribute(string type)
         {
-            Types = new[] { type };
+            Types = type.Split(",");
         }
 
         //设定特定类型的检测
@@ -37,7 +40,10 @@ namespace SimApi.Attributes
         //只检测一种用户类型的快捷方式
         public SimApiAuthAttribute(string type, string url)
         {
-            Types = new[] { type };
+            Types = new[]
+            {
+                type
+            };
             new HttpPostAttribute(url);
         }
 
@@ -50,7 +56,7 @@ namespace SimApi.Attributes
                 throw new SimApiException(401);
             }
             //检测用户类型
-            if (Types.Intersect(loginInfo.Type).Count() == 0)
+            if (!Types.Intersect(loginInfo.Type).Any())
             {
                 throw new SimApiException(403);
             }

Communications/SimApiBaseRequest.cs

@@ -1,30 +1,23 @@
-using System;
+namespace SimApi.Communications
-
-namespace SimApi.Communications
 {
     /// <summary>
     /// 只有ID的请求
     /// </summary>
-    public class SimApiIdOnlyRequest
+    public record SimApiIdOnlyRequest(int Id);
-    {
+
-        public int Id { get; set; }
+    /// <summary>
-    }
+    /// 只有ID的请求(字符串)
+    /// </summary>
+    public record SimApiStringIdOnlyRequest(string Id);
 
     /// <summary>
     /// 动态类型单字段请求
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class SimApiOneFieldRequest<T>
+    public record SimApiOneFieldRequest<T>(T Data);
-    {
-        public T Data { get; set; }
-    }
 
     /// <summary>
     /// 基础分页请求
     /// </summary>
-    public class SimApiBasePageRequest
+    public record SimApiBasePageRequest(int Page, int Count);
-    {
-        public int Page { get; set; }
-        public int Count { get; set; }
-    }
 }

Communications/SimApiBaseResponse.cs

@@ -7,82 +7,38 @@ namespace SimApi.Communications
     /// <summary>
     /// 基础相应
     /// </summary>
-    public class SimApiBaseResponse
+    public record SimApiBaseResponse(int Code = 200, string Message = "成功")
     {
-        /// <summary>
-        /// 错误代码
-        /// </summary>
-        public int Code { get; set; }
-
-        /// <summary>
-        /// 错误描述
-        /// </summary>
-        public string Message { get; set; }
-
         /// <summary>
         /// 默认错误代码对应提示信息
         /// </summary>
-        private readonly Dictionary<int, string> MsgBox = new Dictionary<int, string>()
+        private static readonly Dictionary<int, string> MsgBox = new()
         {
-            {200, "成功"},
+            {
-            {204, "没有数据"},
+                200, "成功"
-            {400, "参数错误"},
+            },
-            {401, "需要登录"},
+            {
-            {403, "无权访问"},
+                204, "没有数据"
-            {404, "接口不存在"},
+            },
-            {500, "服务器错误"}
+            {
+                400, "参数错误"
+            },
+            {
+                401, "需要登录"
+            },
+            {
+                403, "无权访问"
+            },
+            {
+                404, "接口不存在"
+            },
+            {
+                500, "服务器错误"
+            }
         };
 
-        /// <summary>
+        public SimApiBaseResponse(int code) : this(code, MsgBox.ContainsKey(code) ? MsgBox[code] : "未知错误")
-        /// 返回一个成功的空结果
-        /// </summary>
-        public SimApiBaseResponse()
         {
-            SetCode(200);
-        }
-
-
-        /// <summary>
-        /// 返回指定代码的描述
-        /// </summary>
-        /// <param name="code">错误代码</param>
-        public SimApiBaseResponse(int code)
-        {
-            SetCode(code);
-        }
-
-        /// <summary>
-        /// 返回指定代码的结果,并自定义提示信息
-        /// </summary>
-        /// <param name="code">错误代码</param>
-        /// <param name="message">错误信息</param>
-        public SimApiBaseResponse(int code, string message)
-        {
-            SetCodeMsg(code, message);
-        }
-
-        /// <summary>
-        /// 设置响应结果的错误代码
-        /// </summary>
-        /// <param name="code">错误代码</param>
-        public void SetCode(int code)
-        {
-            Code = code;
-            Message = MsgBox.ContainsKey(code) ? MsgBox[code] : "未知错误";
-        }
-
-        /// <summary>
-        /// 设置响应结果的错误代码和错误描述
-        /// </summary>
-        /// <param name="code">错误代码</param>
-        /// <param name="message">错误描述</param>
-        public void SetCodeMsg(int code, string message)
-        {
-            SetCode(code);
-            if (!string.IsNullOrEmpty(message))
-            {
-                Message = message;
-            }
         }
 
         /// <summary>
@@ -95,7 +51,10 @@ namespace SimApi.Communications
             {
                 IgnoreReadOnlyProperties = true,
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Converters = {new JsonStringEnumConverter()}
+                Converters =
+                {
+                    new JsonStringEnumConverter()
+                }
             });
         }
     }
@@ -104,32 +63,14 @@ namespace SimApi.Communications
     /// 动态内容分页
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class SimApiBasePageResponse<T> : SimApiBaseResponse
+    public record SimApiBasePageResponse<T>
-    {
+    (T List, int Page = 1, int Count = 1, int Total = 1, int Code = 200,
-        /// <summary>
+        string Message = "成功") : SimApiBaseResponse(Code, Message);
-        /// 动态内容列表
-        /// </summary>
-        public T List { get; set; }
-
-        //当前页码
-        public int Page { get; set; }
-
-        //每页条数
-        public int Count { get; set; }
-
-        //总计条数
-        public int Total { get; set; }
-    }
 
     /// <summary>
     /// 动态Data返回
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class SimApiBaseResponse<T> : SimApiBaseResponse
+    public record SimApiBaseResponse<T>(T Data, int Code = 200, string Message = "成功") : SimApiBaseResponse(Code,
-    {
+        Message);
-        /// <summary>
-        /// 动态内容列表
-        /// </summary>
-        public T Data { get; set; }
-    }
 }

Communications/SimApiLoginItem.cs

@@ -1,14 +1,7 @@
-using System;
+namespace SimApi.Communications
-namespace SimApi.Communications
 {
     /// <summary>
     /// 登录信息中间件
     /// </summary>
-    public class SimApiLoginItem
+    public record SimApiLoginItem(string Id, string[] Type);
-    {
-        //登录用户的ID
-        public int Id { get; set; }
-        //登录用户来源
-        public string[] Type { get; set; }
-    }
 }

Configurations/SimApiOptions.cs

@@ -4,13 +4,62 @@ namespace SimApi.Configs
 {
     public class SimApiOptions
     {
+        /// <summary>
+        /// 启用全部Cors，对于开发前后分离的时候很有用。
+        /// default: true
+        /// </summary>
+        public bool EnableCors { get; set; } = true;
+
+        /// <summary>
+        /// 启用SimapiAuth，一个简单的基于Header Token的认证方式。
+        /// default: false
+        /// </summary>
         public bool EnableSimApiAuth { get; set; } = false;
-        public bool EnableSimApiDoc { get; set; } = true;
+
+        /// <summary>
+        /// 启用在线文档，启用后 访问 /swagger 可以查看对应的api文档。
+        /// default: false
+        /// </summary>
+        public bool EnableSimApiDoc { get; set; } = false;
+
+        /// <summary>
+        /// 启用异常拦截,启用后，所有的异常将被通过json反馈。
+        /// default: true
+        /// </summary>
         public bool EnableSimApiException { get; set; } = true;
+
+        /// <summary>
+        /// 开启S3兼容的存储系统。
+        /// default: false
+        /// </summary>
         public bool EnableSimApiStorage { get; set; } = false;
+
+        /// <summary>
+        /// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
+        /// default: true
+        /// </summary>
         public bool EnableForwardHeaders { get; set; } = true;
+
+        /// <summary>
+        /// 将所有的url都格式化为小写字母
+        /// default: true
+        /// </summary>
         public bool EnableLowerUrl { get; set; } = true;
+
+        /// <summary>
+        /// 启用格式化的 Console Logger
+        /// default: false
+        /// </summary>
+        public bool EnableLogger { get; set; } = false;
+
+        /// <summary>
+        /// Swagger文档相关配置，需要启用 EnableSimApiDoc
+        /// </summary>
         public SimApiDocOptions SimApiDocOptions { get; set; } = new SimApiDocOptions();
+
+        /// <summary>
+        /// S3兼容的存储系统配置，需要启用 EnableSimApiStorage
+        /// </summary>
         public SimApiStorageOptions SimApiStorageOptions { get; set; } = new SimApiStorageOptions();
 
 

Configurations/SimApiStorageOptions.cs

@@ -2,10 +2,23 @@ namespace SimApi.Configs
 {
     public class SimApiStorageOptions
     {
+        /// <summary>
+        /// S3 服务器入口地址
+        /// </summary>
         public string Endpoint { get; set; }
+
+        /// <summary>
+        /// S3 服务器文件访问地址
+        /// </summary>
         public string ServeUrl { get; set; }
+
+        /// <summary>
+        /// S3服务 Bucket
+        /// </summary>
         public string Bucket { get; set; }
+
         public string AccessKey { get; set; }
+
         public string SecretKey { get; set; }
     }
 }

Controllers/SimApiBaseController.cs

@@ -29,16 +29,14 @@ namespace SimApi.Controllers
         {
             if (!context.ModelState.IsValid)
             {
-                foreach (var item in context.ModelState.Values)
+                foreach (var item in context.ModelState.Values.Where(item =>
-                {
+                             item.ValidationState == ModelValidationState.Invalid))
-                    if (item.ValidationState == ModelValidationState.Invalid)
                 {
                     Error(400, item.Errors.First().ErrorMessage);
                     break;
                 }
             }
         }
-        }
 
 
         /// <summary>
@@ -83,9 +81,7 @@ namespace SimApi.Controllers
         /// <returns></returns>
         protected SimApiBaseResponse<string> UploadFile()
         {
-            return new SimApiBaseResponse<string>();
+            return new SimApiBaseResponse<string>(null);
         }
-
-
     }
 }

Controllers/SimApiCommonController.cs

@@ -25,9 +25,7 @@ namespace SimApi.Controllers
         [ApiExplorerSettings(IgnoreApi = true)]
         public SimApiBaseResponse ExceptionHandler(int code)
         {
-            var response = new SimApiBaseResponse();
+            return new SimApiBaseResponse(code);
-            response.SetCode(code);
-            return response;
         }
 
         /// <summary>
@@ -35,10 +33,10 @@ namespace SimApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost("/auth/check"), SimApiDoc("认证", "检测登陆")]
-        public SimApiBaseResponse<int> CheckLogin()
+        public SimApiBaseResponse<string> CheckLogin()
         {
             ErrorWhenNull(LoginInfo, 401);
-            return new SimApiBaseResponse<int> {Data = LoginInfo.Id};
+            return new SimApiBaseResponse<string>(LoginInfo.Id);
         }
 
         /// <summary>

Helpers/SimApiAuth.cs

@@ -23,9 +23,12 @@ namespace SimApi.Helpers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public string Login(int id, string type = "user", string token = null)
+        public string Login(string id, string type = "user", string token = null)
         {
-            return Login(id, new[] { type }, token);
+            return Login(id, new[]
+            {
+                type
+            }, token);
         }
 
         /// <summary>
@@ -34,17 +37,10 @@ namespace SimApi.Helpers
         /// <param name="id"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public string Login(int id, string[] type, string uuid = null)
+        public string Login(string id, string[] type, string uuid = null)
         {
-            if (uuid == null)
+            uuid ??= Guid.NewGuid().ToString();
-            {
+            var loginItem = new SimApiLoginItem(id, type);
-                uuid = Guid.NewGuid().ToString();
-            }
-            var loginItem = new SimApiLoginItem
-            {
-                Id = id,
-                Type = type
-            };
             Cache.SetString(uuid, JsonSerializer.Serialize(loginItem));
             return uuid;
         }
@@ -60,6 +56,5 @@ namespace SimApi.Helpers
                 Cache.Remove(uuid);
             }
         }
-
     }
 }

Helpers/SimApiStorage.cs

@@ -10,8 +10,13 @@ namespace SimApi.Helpers
     public class SimApiStorage
     {
         private MinioClient Mc { get; }
+
+        public MinioClient Client => Mc;
+
         private string ServeUrl { get; }
-        private string Bucket { get; }
+
+        public string Bucket { get; }
+
         private IHttpContextAccessor HttpContextAccessor { get; }
 
         public SimApiStorage(SimApiOptions apiOptions, IHttpContextAccessor httpContextAccessor)
@@ -19,7 +24,7 @@ namespace SimApi.Helpers
             var options = apiOptions.SimApiStorageOptions;
             HttpContextAccessor = httpContextAccessor;
             var useSsl = false;
-            var endpoint = string.Empty;
+            string endpoint;
             if (options.Endpoint.StartsWith("http://"))
             {
                 endpoint = options.Endpoint.Replace("http://", string.Empty);
@@ -36,40 +41,57 @@ namespace SimApi.Helpers
 
             ServeUrl = options.ServeUrl;
             Bucket = options.Bucket;
+            var mcb = new MinioClient().WithEndpoint(endpoint)
+                .WithCredentials(options.AccessKey, options.SecretKey);
             if (useSsl)
             {
-                Mc = new MinioClient(endpoint, options.AccessKey, options.SecretKey).WithSSL();
+                mcb = mcb.WithSSL();
-            }
-            else
-            {
-                Mc = new MinioClient(endpoint, options.AccessKey, options.SecretKey);
             }
+            Mc = mcb.Build();
 
-            bool found = Mc.BucketExistsAsync(Bucket).Result;
+            var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;
             if (!found)
             {
-                Mc.MakeBucketAsync(Bucket).Wait();
+                Mc.MakeBucketAsync(new MakeBucketArgs().WithBucket(Bucket)).Wait();
             }
         }
 
-        public string UploadFile(string path, Stream stream)
+        /// <summary>
+        /// 获取上传的URL
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="expire"></param>
+        /// <returns></returns>
+        public string GetUploadUrl(string path, int expire = 7200)
         {
-            try
+            return Mc.PresignedPutObjectAsync(new PresignedPutObjectArgs().WithBucket(Bucket)
+                .WithObject(path).WithExpiry(expire)).Result;
+        }
+
+        /// <summary>
+        /// 获取下载的URL
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="expire"></param>
+        /// <returns></returns>
+        public string GetDownloadUrl(string path, int expire = 600)
         {
-                Mc.PutObjectAsync(Bucket, path, stream, stream.Length).Wait();
+            return Mc.PresignedGetObjectAsync(new PresignedGetObjectArgs().WithBucket(Bucket).WithObject(path)
+                .WithExpiry(expire)).Result;
+        }
+
+
+        public string UploadFile(string path, Stream stream, string contentType = "image/png")
+        {
+            Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).WithObjectSize(stream.Length)
+                .WithStreamData(stream).WithContentType(contentType)).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 httpRequest = HttpContextAccessor.HttpContext?.Request;
-            var url = $"{httpRequest.Scheme}://{httpRequest.Host}";
+            var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
             if (string.IsNullOrEmpty(path))
             {
                 return path;

Helpers/SimApiUtil.cs

@@ -1,12 +1,31 @@
 using System;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using System.Text.RegularExpressions;
+using System.Text.Unicode;
 
 namespace SimApi.Helpers
 {
     public static class SimApiUtil
     {
+        /// <summary>
+        /// 当前CST时间
+        /// </summary>
+        public static DateTime CstNow
+        {
+            get => DateTime.UtcNow.AddHours(8);
+        }
+
+        /// <summary>
+        /// 当前秒级时间戳
+        /// </summary>
+        public static double TimestampNow
+        {
+            get => (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalSeconds;
+        }
+
         /// <summary>
         /// 检测手机号是否正确
         /// </summary>
@@ -14,7 +33,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);
         }
 
@@ -38,11 +57,17 @@ namespace SimApi.Helpers
             return strbul.ToString();
         }
 
-        public static void Log(string message, string type = "Information")
+        /// <summary>
+        /// 将对象序列化成JSON （控制台输出中文不会被编码）
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static string Json(object obj)
         {
-            Console.WriteLine($"[ SimApi ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {type} ]");
+            return JsonSerializer.Serialize(obj, new JsonSerializerOptions
-            Console.WriteLine(message);
+            {
-            Console.WriteLine("");
+                Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+            });
         }
     }
 }

Logger/SimApiLogger.cs

@@ -0,0 +1,45 @@
+using System;
+using Microsoft.Extensions.Logging;
+using SimApi.Helpers;
+
+namespace SimApi.Logger
+{
+    public class SimApiLogger : ILogger
+    {
+        private string Name { get; }
+
+        public SimApiLogger(string name)
+        {
+            Name = name;
+        }
+
+        public IDisposable BeginScope<TState>(TState state) => default!;
+
+        public bool IsEnabled(LogLevel logLevel) => 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} ][ {SimApiUtil.CstNow.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/SimApiLoggerConfiguration.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+
+namespace SimApi.Logger;
+
+public class SimApiLoggerConfiguration
+{
+    public int EventId { get; set; }
+
+    public Dictionary<LogLevel, ConsoleColor> LogLevels { get; set; } = new()
+    {
+        [LogLevel.Information] = ConsoleColor.Green
+    };
+}

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

@@ -14,6 +14,7 @@ namespace SimApi.Middlewares
     public class SimApiExceptionMiddleware
     {
         private RequestDelegate Next { get; }
+
         private ILogger<SimApiExceptionMiddleware> Log { get; }
 
         public SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExceptionMiddleware> log)
@@ -35,7 +36,10 @@ namespace SimApi.Middlewares
                 await Next(context);
                 if (context.Response.StatusCode != 200)
                 {
-                    if (!new[] {301, 302}.Contains(context.Response.StatusCode))
+                    if (!new[]
+                        {
+                            301, 302
+                        }.Contains(context.Response.StatusCode))
                     {
                         throw new SimApiException(context.Response.StatusCode);
                     }
@@ -43,14 +47,9 @@ namespace SimApi.Middlewares
             }
             catch (SimApiException ex)
             {
-                if (string.IsNullOrEmpty(ex.Message))
+                response = string.IsNullOrEmpty(ex.Message)
-                {
+                    ? new SimApiBaseResponse(ex.Code)
-                    response.SetCode(ex.Code);
+                    : new SimApiBaseResponse(ex.Code, ex.Message);
-                }
-                else
-                {
-                    response.SetCodeMsg(ex.Code, ex.Message);
-                }
 
                 ErrorResponse(context, response);
             }
@@ -58,7 +57,7 @@ namespace SimApi.Middlewares
             {
                 Log.LogError(ex.Message);
                 Log.LogError(ex.StackTrace);
-                response.SetCodeMsg(500, ex.Message);
+                response = new SimApiBaseResponse(500, ex.Message);
                 ErrorResponse(context, response);
             }
         }
@@ -69,10 +68,13 @@ namespace SimApi.Middlewares
         /// <param name="context"></param>
         /// <param name="response"></param>
         private void ErrorResponse(HttpContext context, SimApiBaseResponse response)
+        {
+            if (!context.Response.HasStarted)
             {
                 context.Response.StatusCode = 200;
                 context.Response.Headers.Add("Content-Type", "application/json");
                 context.Response.WriteAsync(response.ToString());
             }
         }
+    }
 }

Models/SimApiBaseModel.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+using SimApi.Helpers;
+
+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.Where(sp =>
+                         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.Where(sp =>
+                         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, SimApiUtil.CstNow);
+        }
+    }
+}

Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true
   },
   "profiles": {
-    "YYApi": {
+    "SimApi": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {

SimApi.csproj

@@ -14,10 +14,9 @@
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageVersion>5.0.2</PackageVersion>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'YYApi' " />
   <ItemGroup>
     <Folder Include="Helpers\" />
     <Folder Include="Communications\" />
@@ -28,9 +27,9 @@
     <Folder Include="Configurations\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Minio" Version="3.1.13" />
+    <PackageReference Include="Minio" Version="4.0.7" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>

SimApiExtensions.cs

@@ -5,7 +5,9 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
 using SimApi.Middlewares;
 using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.Logging;
 using SimApi.Configs;
+using SimApi.Logger;
 
 namespace SimApi
 {
@@ -20,13 +22,26 @@ namespace SimApi
         {
             var simApiOptions = new SimApiOptions();
             options?.Invoke(simApiOptions);
-
+            if (simApiOptions.EnableLogger)
-            // 是否使用SIMAUTH
+            {
+                builder.AddLogging(logger =>
+                {
+                    logger.ClearProviders();
+                    logger.AddProvider(new SimApiLoggerProvider());
+                });
+            }
+            // 是否使用 AUTH
             if (simApiOptions.EnableSimApiAuth)
             {
                 builder.AddScoped<SimApiAuth>();
             }
 
+            if (simApiOptions.EnableCors)
+            {
+                builder.AddCors(cors => cors.AddPolicy("any",
+                    policy => { policy.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin(); }));
+            }
+
             // 使用SimApiDoc
             if (simApiOptions.EnableSimApiDoc)
             {
@@ -35,7 +50,11 @@ namespace SimApi
                 {
                     foreach (var group in docOptions.ApiGroups)
                     {
-                        x.SwaggerDoc(group.Id, new OpenApiInfo {Title = group.Name, Description = group.Description});
+                        x.SwaggerDoc(group.Id, new OpenApiInfo
+                        {
+                            Title = group.Name,
+                            Description = group.Description
+                        });
                     }
 
                     x.EnableAnnotations();
@@ -53,9 +72,15 @@ namespace SimApi
                                         new OpenApiSecurityScheme
                                         {
                                             Reference = new OpenApiReference
-                                                {Type = ReferenceType.SecurityScheme, Id = "HeaderToken"}
+                                            {
+                                                Type = ReferenceType.SecurityScheme,
+                                                Id = "HeaderToken"
+                                            }
                                         },
-                                        new[] {"readAccess", "writeAccess"}
+                                        new[]
+                                        {
+                                            "readAccess", "writeAccess"
+                                        }
                                     }
                                 });
                                 haveSimApiAuth = true;
@@ -87,6 +112,14 @@ namespace SimApi
                                 };
                                 haveOauth = true;
                                 break;
+                            case "Password":
+                                oauthFlows.Password = new OpenApiOAuthFlow
+                                {
+                                    TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
+                                    Scopes = docOptions.ApiAuth.Scopes
+                                };
+                                haveOauth = true;
+                                break;
                         }
                     }
 
@@ -105,9 +138,15 @@ namespace SimApi
                                 new OpenApiSecurityScheme
                                 {
                                     Reference = new OpenApiReference
-                                        {Type = ReferenceType.SecurityScheme, Id = "oauth2"}
+                                    {
+                                        Type = ReferenceType.SecurityScheme,
+                                        Id = "oauth2"
+                                    }
                                 },
-                                new[] {"SimApiAuth"}
+                                new[]
+                                {
+                                    "SimApiAuth"
+                                }
                             }
                         });
                     }
@@ -115,7 +154,11 @@ namespace SimApi
                     if (haveSimApiAuth)
                     {
                         x.AddSecurityDefinition("HeaderToken",
-                            new OpenApiSecurityScheme {Name = "Token", In = ParameterLocation.Header});
+                            new OpenApiSecurityScheme
+                            {
+                                Name = "Token",
+                                In = ParameterLocation.Header
+                            });
                     }
                 });
             }
@@ -123,21 +166,22 @@ namespace SimApi
             // 使用Header转发，应对代理后获取真实ip
             if (simApiOptions.EnableForwardHeaders)
             {
-                builder.Configure<ForwardedHeadersOptions>(options =>
+                builder.Configure<ForwardedHeadersOptions>(fwOptions =>
                 {
-                    options.ForwardedHeaders = ForwardedHeaders.All;
+                    fwOptions.ForwardedHeaders = ForwardedHeaders.All;
-                    options.KnownNetworks.Clear();
+                    fwOptions.KnownNetworks.Clear();
-                    options.KnownProxies.Clear();
+                    fwOptions.KnownProxies.Clear();
                 });
             }
 
             if (simApiOptions.EnableLowerUrl)
             {
-                builder.AddRouting(options => options.LowercaseUrls = true);
+                builder.AddRouting(rOptions => rOptions.LowercaseUrls = true);
             }
 
             if (simApiOptions.EnableSimApiStorage)
             {
+                builder.AddHttpContextAccessor();
                 builder.AddSingleton<SimApiStorage>();
             }
 
@@ -152,22 +196,31 @@ namespace SimApi
         /// <returns></returns>
         public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder)
         {
-            var options = builder.ApplicationServices.GetService<SimApiOptions>();
+            var options = builder.ApplicationServices.GetRequiredService<SimApiOptions>();
+
+            var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>();
+
             if (options.EnableForwardHeaders)
             {
-                SimApiUtil.Log("开始配置ForwardedHeaders...");
+                logger.LogInformation("开始配置ForwardedHeaders...");
                 builder.UseForwardedHeaders();
             }
 
+            if (options.EnableCors)
+            {
+                logger.LogInformation("开始配置Cors全部允许...");
+                builder.UseCors("any");
+            }
+
             if (options.EnableSimApiAuth)
             {
-                SimApiUtil.Log("开始配置SimApiAuth...");
+                logger.LogInformation("开始配置SimApiAuth...");
                 builder.UseMiddleware<SimApiAuthMiddleware>();
             }
 
             if (options.EnableSimApiDoc)
             {
-                SimApiUtil.Log("开始配置SimApiDoc...");
+                logger.LogInformation("开始配置SimApiDoc...");
                 var docOptions = options.SimApiDocOptions;
                 builder.UseSwagger(x => x.RouteTemplate = "/swagger/{documentName}.json").UseSwaggerUI(x =>
                 {
@@ -185,20 +238,20 @@ namespace SimApi
 
             if (options.EnableSimApiException)
             {
-                SimApiUtil.Log("开始配置SimApiException...");
+                logger.LogInformation("开始配置SimApiException...");
                 builder.UseMiddleware<SimApiExceptionMiddleware>();
             }
 
             //请求一下检测存储错误
             if (options.EnableSimApiStorage)
             {
-                SimApiUtil.Log("开始配置SimApiStorage...");
+                logger.LogInformation("开始配置SimApiStorage...");
                 builder.ApplicationServices.GetService<SimApiStorage>();
             }
 
             if (options.EnableLowerUrl)
             {
-                SimApiUtil.Log("开始配置使用URL小写...");
+                logger.LogInformation("开始配置使用URL小写...");
             }
 
             return builder;