class 添加默认方法,支持老的代码

Communications/SimApiBaseRequest.cs

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

Communications/SimApiBaseResponse.cs

@@ -7,8 +7,11 @@ namespace SimApi.Communications;
 /// <summary>
 /// 基础相应
 /// </summary>
-public record SimApiBaseResponse(int Code = 200, string Message = "成功")
+public class SimApiBaseResponse(int code = 200, string message = "成功")
 {
+    public int Code { get; set; } = code;
+    public string Message { get; set; } = message;
+
     /// <summary>
     /// 默认错误代码对应提示信息
     /// </summary>
@@ -23,7 +26,7 @@ public record SimApiBaseResponse(int Code = 200, string Message = "成功")
         { 500, "服务器错误" }
     };
 
-    public SimApiBaseResponse(int code) : this(code, MsgBox.ContainsKey(code) ? MsgBox[code] : "未知错误")
+    public SimApiBaseResponse(int code) : this(code, MsgBox.GetValueOrDefault(code, "未知错误"))
     {
     }
 
@@ -49,17 +52,32 @@ public record SimApiBaseResponse(int Code = 200, string Message = "成功")
 /// 动态内容分页
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public record SimApiBasePageResponse<T>(
+public class SimApiBasePageResponse<T>() : SimApiBaseResponse
-    T List,
+{
-    int Page = 1,
+    public T List { get; set; }
-    int Count = 1,
+    public int Page { get; set; } = 1;
-    int Total = 1,
+    public int Count { get; set; } = 20;
-    int Code = 200,
+    public int Total { get; set; }
-    string Message = "成功") : SimApiBaseResponse(Code, Message);
+
+    public SimApiBasePageResponse(T list, int page, int count, int total) : this()
+    {
+        List = list;
+        Page = page;
+        Count = count;
+        Total = total;
+    }
+}
 
 /// <summary>
 /// 动态Data返回
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public record SimApiBaseResponse<T>(T Data, int Code = 200, string Message = "成功") : SimApiBaseResponse(Code,
+public class SimApiBaseResponse<T>() : SimApiBaseResponse
-    Message);
+{
+    public T Data { get; set; }
+
+    public SimApiBaseResponse(T data) : this()
+    {
+        Data = data;
+    }
+}

Configurations/SimApiDocOptions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Swashbuckle.AspNetCore.SwaggerUI;
 
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 /// <summary>
 /// 文档组配置

Configurations/SimApiOptions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 public class SimApiOptions
 {
@@ -11,7 +11,7 @@ public class SimApiOptions
     public bool EnableCors { get; set; } = true;
 
     /// <summary>
-    /// 启用SimapiAuth，一个简单的基于Header Token的认证方式。
+    /// 启用SimApiAuth，一个简单的基于Header Token的认证方式。
     /// default: false
     /// </summary>
     public bool EnableSimApiAuth { get; set; } = false;

Configurations/SimApiStorageOptions.cs

@@ -1,4 +1,4 @@
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 public class SimApiStorageOptions
 {

Configurations/SimApiSynapseOptions.cs

@@ -1,4 +1,4 @@
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 public class SimApiSynapseOptions
 {

Controllers/SimApiBaseController.cs

@@ -50,7 +50,7 @@ public class SimApiBaseController : Controller
     }
 
     /// <summary>
-    /// 检测条件，根据条件返回报错
+    /// 检测条件，根据条件返回报错 如果condition是ture报错
     /// </summary>
     /// <param name="condition">检测条件</param>
     /// <param name="code">错误代码</param>
@@ -63,6 +63,30 @@ public class SimApiBaseController : Controller
         }
     }
 
+
+    /// <summary>
+    /// 检测条件，根据条件返回报错 如果condition是ture报错
+    /// </summary>
+    /// <param name="condition">检测条件</param>
+    /// <param name="code">错误代码</param>
+    /// <param name="message">错误描述</param>
+    protected static void ErrorWhenTrue(bool condition, int code = 500, string message = "")
+    {
+        ErrorWhen(condition, code, message);
+    }
+
+
+    /// <summary>
+    /// 如果condition是false 报错
+    /// </summary>
+    /// <param name="condition"></param>
+    /// <param name="code"></param>
+    /// <param name="message"></param>
+    protected static void ErrorWhenFalse(bool condition, int code = 500, string message = "")
+    {
+        ErrorWhen(!condition, code, message);
+    }
+
     /// <summary>
     /// 检测给定的变量是否为NUll
     /// </summary>
@@ -80,6 +104,6 @@ public class SimApiBaseController : Controller
     /// <returns></returns>
     protected SimApiBaseResponse<string> UploadFile()
     {
-        return new SimApiBaseResponse<string>(null);
+        return new SimApiBaseResponse<string>();
     }
 }

Controllers/SimApiCommonController.cs

@@ -28,7 +28,10 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
     public SimApiBaseResponse<string> CheckLogin()
     {
         ErrorWhenNull(LoginInfo, 401);
-        return new SimApiBaseResponse<string>(LoginInfo.Id);
+        return new SimApiBaseResponse<string>
+        {
+            Data = LoginInfo.Id
+        };
     }
 
     /// <summary>
@@ -45,7 +48,7 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
             token = value;
         }
 
-        auth.Logout(token);
+        auth.Logout(token!);
         return new SimApiBaseResponse();
     }
 }

Helpers/SimApiStorage.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using Microsoft.AspNetCore.Http;
 using Minio;
-using SimApi.Configs;
+using SimApi.Configurations;
 
 namespace SimApi.Helpers;
 
@@ -14,7 +14,7 @@ public class SimApiStorage
 
     private string ServeUrl { get; }
 
-    public string Bucket { get; }
+    private string Bucket { get; }
 
     private IHttpContextAccessor HttpContextAccessor { get; }
 
@@ -46,6 +46,7 @@ public class SimApiStorage
         {
             mcb = mcb.WithSSL();
         }
+
         Mc = mcb.Build();
 
         var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;

Helpers/SimApiUtil.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Encodings.Web;
@@ -71,4 +72,21 @@ public static class SimApiUtil
     {
         return JsonSerializer.Serialize(obj, JsonOption);
     }
+
+    /// <summary>
+    /// 分页
+    /// </summary>
+    /// <param name="query"></param>
+    /// <param name="page">页码</param>
+    /// <param name="count">每页数量</param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IQueryable<T> Paginate<T>(this IQueryable<T> query, int page, int count)
+    {
+        if (page < 1)
+            page = 1;
+        if (count <= 0)
+            count = 10;
+        return query.Skip((page - 1) * count).Take(count);
+    }
 }

Logger/SimApiLogger.cs

@@ -23,11 +23,12 @@ public class SimApiLogger(string name) : ILogger
             _ => ConsoleColor.White
         };
         var message =
-            $"[ {name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]\n{state}\n";
+            $"[ {name} ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]\n{state}\n";
         if (exception != null)
         {
             message += $"{exception}\n";
         }
+
         Console.WriteLine(message);
     }
 }

Models/SimApiBaseModel.cs

@@ -7,14 +7,11 @@ namespace SimApi.Models;
 
 public class SimApiBaseModel
 {
-    [Column(Order = 1)]
+    [Column(Order = 1)] public string Id { get; set; } = Guid.NewGuid().ToString();
-    public string Id { get; set; } = Guid.NewGuid().ToString();
 
-    [Column(Order = 9998)]
+    [Column(Order = 9998)] public DateTime UpdatedAt { get; set; } = DateTime.Now;
-    public DateTime UpdatedAt { get; set; } = SimApiUtil.CstNow;
 
-    [Column(Order = 9999)]
+    [Column(Order = 9999)] public DateTime CreatedAt { get; set; } = DateTime.Now;
-    public DateTime CreatedAt { get; set; } = SimApiUtil.CstNow;
 
     protected virtual string[] MapperIgnoreField { get; set; } = { "Id", "CreatedAt", "UpdatedAt" };
 
@@ -84,6 +81,6 @@ public class SimApiBaseModel
     /// <returns></returns>
     public void UpdateTime()
     {
-        GetType().GetProperty(UpdatedTimeField)?.SetValue(this, SimApiUtil.CstNow);
+        GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
     }
 }

SimApiExtensions.cs

@@ -6,7 +6,7 @@ using Microsoft.OpenApi.Models;
 using SimApi.Middlewares;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Logging;
-using SimApi.Configs;
+using SimApi.Configurations;
 using SimApi.Logger;
 
 namespace SimApi;
@@ -30,6 +30,7 @@ public static class SimApiExtensions
                 logger.AddProvider(new SimApiLoggerProvider());
             });
         }
+
         // 是否使用 AUTH
         if (simApiOptions.EnableSimApiAuth)
         {
@@ -199,6 +200,7 @@ public static class SimApiExtensions
 
         var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>();
 
+        logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
         if (options.EnableForwardHeaders)
         {
             logger.LogInformation("开始配置ForwardedHeaders...");

Synapse/RpcServer.cs

@@ -2,10 +2,6 @@ using System;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Text.Unicode;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using RabbitMQ.Client.Events;
@@ -52,8 +48,12 @@ public partial class Synapse
                         var paramObj = JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption);
                         param = new[] { paramObj };
                     }
+
                     var ret = mt.Invoke(callClass, param);
-                    res = new SimApiBaseResponse<object>(ret);
+                    res = new SimApiBaseResponse<object>
+                    {
+                        Data = ret
+                    };
                 }
                 catch (TargetInvocationException e)
                 {

Synapse/Synapse.cs

@@ -8,7 +8,7 @@ using RabbitMQ.Client;
 using RabbitMQ.Client.Exceptions;
 using SimApi.Attributes;
 using SimApi.Communications;
-using SimApi.Configs;
+using SimApi.Configurations;
 using SimApi.Helpers;
 
 namespace SimApi;
@@ -50,6 +50,7 @@ public partial class Synapse
         {
             Logger.LogCritical("Synapse初始化失败: AppName or SysName 错误");
         }
+
         Options.AppId ??= Guid.NewGuid().ToString();
         Logger.LogInformation("System Name: {SysName}\nApp Name: {AppName}\nAppId: {AppId}", Options.SysName,
             Options.AppName, Options.AppId);
@@ -76,10 +77,12 @@ public partial class Synapse
             RunRpcClient();
             Logger.LogInformation("Rpc Client Ready, Client Timeout: {OptionsRpcTimeout}s", Options.RpcTimeout);
         }
+
         if (RpcRegistry.Count > 0)
         {
             RunRpcServer();
         }
+
         if (EventRegistry.Count > 0)
         {
             RunEventServer();
@@ -99,6 +102,7 @@ public partial class Synapse
             var data = FireRpc(appName, method, param);
             res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption);
         }
+
         return res as SimApiBaseResponse<T>;
     }
 
@@ -152,12 +156,14 @@ public partial class Synapse
                 channel.BasicQos(0, processNum, false);
                 log += $"最大处理器数量: {processNum}";
             }
+
             Logger.LogInformation(log);
         }
         catch (ConnectFailureException e)
         {
             Logger.LogError("Channel [{{Desc}}] 创建失败...\n {0}", e);
         }
+
         return channel;
     }
 
@@ -173,6 +179,7 @@ public partial class Synapse
         {
             Logger.LogError("Failed to declare Exchange.\n {Err}", e);
         }
+
         channel.Close();
         Logger.LogDebug("Exchange Channel Closed");
     }
@@ -204,6 +211,7 @@ public partial class Synapse
                         });
                     }
                 }
+
                 if (method.IsDefined(typeof(SynapseRpcAttribute), false))
                 {
                     var attribute =
@@ -220,6 +228,7 @@ public partial class Synapse
                 }
             }
         }
+
         var events = EventRegistry.Aggregate(string.Empty,
             (current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class.Name}");
         var rpcList = RpcRegistry.Aggregate(string.Empty,