将record切换回class, 不再使用CST时间,使用DateTime.Now

This commit is contained in:
2024-04-16 06:29:21 +08:00
parent 4171756c54
commit 6ef7aca8ae
8 changed files with 71 additions and 32 deletions
+20 -5
View File
@@ -1,22 +1,37 @@
namespace SimApi.Communications; using System.ComponentModel.DataAnnotations;
namespace SimApi.Communications;
/// <summary> /// <summary>
/// 只有ID的请求 /// 只有ID的请求
/// </summary> /// </summary>
public record SimApiIdOnlyRequest(int Id); public class SimApiIdOnlyRequest
{
[Required] public int Id { get; set; }
}
/// <summary> /// <summary>
/// 只有ID的请求(字符串) /// 只有ID的请求(字符串)
/// </summary> /// </summary>
public record SimApiStringIdOnlyRequest(string Id); public class SimApiStringIdOnlyRequest
{
[Required] public string Id { get; set; }
}
/// <summary> /// <summary>
/// 动态类型单字段请求 /// 动态类型单字段请求
/// </summary> /// </summary>
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
public record SimApiOneFieldRequest<T>(T Data); public class SimApiOneFieldRequest<T>
{
[Required] public T Data { get; set; }
}
/// <summary> /// <summary>
/// 基础分页请求 /// 基础分页请求
/// </summary> /// </summary>
public record SimApiBasePageRequest(int Page, int Count); public class SimApiBasePageRequest
{
[Required] public int Page { get; set; }
[Required] public int Count { get; set; }
}
+16 -11
View File
@@ -7,8 +7,11 @@ namespace SimApi.Communications;
/// <summary> /// <summary>
/// 基础相应 /// 基础相应
/// </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>
/// 默认错误代码对应提示信息 /// 默认错误代码对应提示信息
/// </summary> /// </summary>
@@ -23,7 +26,7 @@ public record SimApiBaseResponse(int Code = 200, string Message = "成功")
{ 500, "服务器错误" } { 500, "服务器错误" }
}; };
public SimApiBaseResponse(int code) : this(code, MsgBox.ContainsKey(code) ? MsgBox[code] : "未知错误") public SimApiBaseResponse(int code) : this(code, MsgBox.GetValueOrDefault(code, "未知错误"))
{ {
} }
@@ -49,17 +52,19 @@ public record SimApiBaseResponse(int Code = 200, string Message = "成功")
/// 动态内容分页 /// 动态内容分页
/// </summary> /// </summary>
/// <typeparam name="T"></typeparam> /// <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); }
/// <summary> /// <summary>
/// 动态Data返回 /// 动态Data返回
/// </summary> /// </summary>
/// <typeparam name="T"></typeparam> /// <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; }
}
+1 -1
View File
@@ -104,6 +104,6 @@ public class SimApiBaseController : Controller
/// <returns></returns> /// <returns></returns>
protected SimApiBaseResponse<string> UploadFile() protected SimApiBaseResponse<string> UploadFile()
{ {
return new SimApiBaseResponse<string>(null); return new SimApiBaseResponse<string>();
} }
} }
+5 -2
View File
@@ -28,7 +28,10 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
public SimApiBaseResponse<string> CheckLogin() public SimApiBaseResponse<string> CheckLogin()
{ {
ErrorWhenNull(LoginInfo, 401); ErrorWhenNull(LoginInfo, 401);
return new SimApiBaseResponse<string>(LoginInfo.Id); return new SimApiBaseResponse<string>
{
Data = LoginInfo.Id
};
} }
/// <summary> /// <summary>
@@ -45,7 +48,7 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
token = value; token = value;
} }
auth.Logout(token); auth.Logout(token!);
return new SimApiBaseResponse(); return new SimApiBaseResponse();
} }
} }
+18
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
@@ -71,4 +72,21 @@ public static class SimApiUtil
{ {
return JsonSerializer.Serialize(obj, JsonOption); 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);
}
} }
+2 -1
View File
@@ -23,11 +23,12 @@ public class SimApiLogger(string name) : ILogger
_ => ConsoleColor.White _ => ConsoleColor.White
}; };
var message = 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) if (exception != null)
{ {
message += $"{exception}\n"; message += $"{exception}\n";
} }
Console.WriteLine(message); Console.WriteLine(message);
} }
} }
+4 -7
View File
@@ -7,14 +7,11 @@ namespace SimApi.Models;
public class SimApiBaseModel 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" }; protected virtual string[] MapperIgnoreField { get; set; } = { "Id", "CreatedAt", "UpdatedAt" };
@@ -84,6 +81,6 @@ public class SimApiBaseModel
/// <returns></returns> /// <returns></returns>
public void UpdateTime() public void UpdateTime()
{ {
GetType().GetProperty(UpdatedTimeField)?.SetValue(this, SimApiUtil.CstNow); GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
} }
} }
+5 -5
View File
@@ -2,10 +2,6 @@ using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; 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.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using RabbitMQ.Client.Events; using RabbitMQ.Client.Events;
@@ -52,8 +48,12 @@ public partial class Synapse
var paramObj = JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption); var paramObj = JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption);
param = new[] { paramObj }; param = new[] { paramObj };
} }
var ret = mt.Invoke(callClass, param); var ret = mt.Invoke(callClass, param);
res = new SimApiBaseResponse<object>(ret); res = new SimApiBaseResponse<object>
{
Data = ret
};
} }
catch (TargetInvocationException e) catch (TargetInvocationException e)
{ {