change log for once output

.github/workflows/nuget-publish.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.100"
+          dotnet-version: "7.0.100"
       - name: Publish
         run: |
           version=`git describe --tags`

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,39 +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 class SimApiStringIdOnlyRequest
+    public record SimApiStringIdOnlyRequest(string Id);
-    {
-        public string Id { get; set; }
-    }
 
     /// <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,16 +1,7 @@
-using System;
+namespace SimApi.Communications
-
-namespace SimApi.Communications
 {
     /// <summary>
     /// 登录信息中间件
     /// </summary>
-    public class SimApiLoginItem
+    public record SimApiLoginItem(string Id, string[] Type);
-    {
-        //登录用户的ID
-        public string Id { get; set; }
-
-        //登录用户来源
-        public string[] Type { 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,7 +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>
@@ -38,10 +36,7 @@ namespace SimApi.Controllers
         public SimApiBaseResponse<string> CheckLogin()
         {
             ErrorWhenNull(LoginInfo, 401);
-            return new SimApiBaseResponse<string>
+            return new SimApiBaseResponse<string>(LoginInfo.Id);
-            {
-                Data = LoginInfo.Id
-            };
         }
 
         /// <summary>

Helpers/SimApiAuth.cs

@@ -25,7 +25,10 @@ namespace SimApi.Helpers
         /// <returns></returns>
         public string Login(string id, string type = "user", string token = null)
         {
-            return Login(id, new[] { type }, token);
+            return Login(id, new[]
+            {
+                type
+            }, token);
         }
 
         /// <summary>
@@ -36,15 +39,8 @@ namespace SimApi.Helpers
         /// <returns></returns>
         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);
             }
         }
-
     }
 }

Logger/SimApiLogger.cs

@@ -20,7 +20,6 @@ namespace SimApi.Logger
         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,
@@ -28,18 +27,15 @@ namespace SimApi.Logger
                 LogLevel.Warning => ConsoleColor.Yellow,
                 LogLevel.Error => ConsoleColor.Red,
                 LogLevel.Critical => ConsoleColor.DarkRed,
-                _ => defautColor
+                _ => ConsoleColor.White
             };
-            Console.WriteLine(
+            var message =
-                $"[ {Name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
+                $"[ {Name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]\n{state}\n";
-            Console.ForegroundColor = defautColor;
-            Console.WriteLine($"{state}");
             if (exception != null)
             {
-                Console.WriteLine($"{exception}");
+                message += $"{exception}\n";
             }
-
+            Console.WriteLine(message);
-            Console.WriteLine();
         }
     }
 }

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,6 +68,8 @@ 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");
@@ -76,3 +77,4 @@ namespace SimApi.Middlewares
             }
         }
     }
+}

Models/SimApiBaseModel.cs

@@ -32,16 +32,13 @@ namespace SimApi.Models
                     x.PropertyType
                 })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
-            foreach (var sp in sourceProps)
+            foreach (var sp in sourceProps.Where(sp =>
-            {
+                         targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
-                //检查源对象不为空的属性是否在目标对象中存在
+                         (!MapperIgnoreField.Contains(sp.Key) || mapAll)))
-                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();
         }
@@ -64,16 +61,13 @@ namespace SimApi.Models
                     x.PropertyType
                 })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
-            foreach (var sp in sourceProps)
+            foreach (var sp in sourceProps.Where(sp =>
-            {
+                         targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
-                //检查源对象不为空的属性是否在目标对象中存在
+                         mapFields.Contains(sp.Key)))
-                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();
         }

README.md

@@ -1,7 +1,6 @@
 # YYApi 基于Asp.net Core 3/5的一个基础辅助包
 
-![CI](https://github.com/YY-Tech/YYApi/workflows/CI/badge.svg)
+[![PublishNugetPackage](https://github.com/simcu/simapi-net/actions/workflows/nuget-publish.yml/badge.svg)](https://github.com/simcu/simapi-net/actions/workflows/nuget-publish.yml)
-
 ### 包含了以下组件:
 
 1. 统一的参数检测,基础认证服务

SimApi.csproj

@@ -14,7 +14,7 @@
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageVersion>5.0.2</PackageVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,9 +27,9 @@
     <Folder Include="Configurations\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Minio" Version="4.0.4" />
+    <PackageReference Include="Minio" Version="4.0.7" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>