Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56b0490d1e | ||
|
|
45e19c3561 | ||
|
|
04b2be1bb7 | ||
|
|
f78c3a0e0d | ||
|
|
506704fd90 | ||
|
|
786051ddbf | ||
|
|
d9ff4ae422 | ||
|
|
986b4e74e6 | ||
|
|
2257ba5b2a | ||
|
|
c40f8d664d | ||
|
|
a1f10b9c09 | ||
|
|
6ef7aca8ae | ||
|
|
4171756c54 |
@@ -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; }
|
||||
}
|
||||
@@ -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>(
|
||||
T List,
|
||||
int Page = 1,
|
||||
int Count = 1,
|
||||
int Total = 1,
|
||||
int Code = 200,
|
||||
string Message = "成功") : SimApiBaseResponse(Code, Message);
|
||||
public class SimApiBasePageResponse<T>() : SimApiBaseResponse
|
||||
{
|
||||
public T List { get; set; }
|
||||
public int Page { get; set; } = 1;
|
||||
public int Count { get; set; } = 20;
|
||||
public int Total { get; set; }
|
||||
|
||||
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,
|
||||
Message);
|
||||
public class SimApiBaseResponse<T>() : SimApiBaseResponse
|
||||
{
|
||||
public T Data { get; set; }
|
||||
|
||||
public SimApiBaseResponse(T data) : this()
|
||||
{
|
||||
Data = data;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
namespace SimApi.Communications;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace SimApi.Communications;
|
||||
|
||||
/// <summary>
|
||||
/// 登录信息中间件
|
||||
/// </summary>
|
||||
public record SimApiLoginItem(string Id, string[] Type);
|
||||
public record SimApiLoginItem(string Id, string[] Type,Dictionary<string,string> Meta = null);
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Swashbuckle.AspNetCore.SwaggerUI;
|
||||
|
||||
namespace SimApi.Configs;
|
||||
namespace SimApi.Configurations;
|
||||
|
||||
/// <summary>
|
||||
/// 文档组配置
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace SimApi.Configs;
|
||||
namespace SimApi.Configurations;
|
||||
|
||||
public class SimApiStorageOptions
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace SimApi.Configs;
|
||||
namespace SimApi.Configurations;
|
||||
|
||||
public class SimApiSynapseOptions
|
||||
{
|
||||
|
||||
@@ -50,12 +50,12 @@ public class SimApiBaseController : Controller
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检测条件,根据条件返回报错
|
||||
/// 检测条件,根据条件返回报错 如果condition是ture报错
|
||||
/// </summary>
|
||||
/// <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 = 400, string message = "")
|
||||
{
|
||||
if (condition)
|
||||
{
|
||||
@@ -63,13 +63,37 @@ 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 = 400, 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 = 400, string message = "")
|
||||
{
|
||||
ErrorWhen(!condition, code, message);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检测给定的变量是否为NUll
|
||||
/// </summary>
|
||||
/// <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);
|
||||
}
|
||||
@@ -80,6 +104,6 @@ public class SimApiBaseController : Controller
|
||||
/// <returns></returns>
|
||||
protected SimApiBaseResponse<string> UploadFile()
|
||||
{
|
||||
return new SimApiBaseResponse<string>(null);
|
||||
return new SimApiBaseResponse<string>();
|
||||
}
|
||||
}
|
||||
@@ -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,13 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
|
||||
token = value;
|
||||
}
|
||||
|
||||
auth.Logout(token);
|
||||
auth.Logout(token!);
|
||||
return new SimApiBaseResponse();
|
||||
}
|
||||
|
||||
[HttpPost("/logined"),SimApiAuth]
|
||||
public SimApiBaseResponse<SimApiLoginItem> UserInfo()
|
||||
{
|
||||
return new SimApiBaseResponse<SimApiLoginItem>(LoginInfo);
|
||||
}
|
||||
}
|
||||
+23
-4
@@ -1,5 +1,6 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text.Json;
|
||||
using Microsoft.Extensions.Caching.Distributed;
|
||||
using SimApi.Communications;
|
||||
@@ -16,11 +17,12 @@ public class SimApiAuth(IDistributedCache cache)
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="type"></param>
|
||||
/// <param name="meta"></param>
|
||||
/// <param name="token"></param>
|
||||
/// <returns></returns>
|
||||
public string Login(string id, string type = "user", string token = null)
|
||||
public string Login(string id, Dictionary<string, string>? meta = null, string type = "user", string? token = null)
|
||||
{
|
||||
return Login(id, new[] { type }, token);
|
||||
return Login(id, meta, new[] { type }, token);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -28,16 +30,33 @@ public class SimApiAuth(IDistributedCache cache)
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="type"></param>
|
||||
/// <param name="meta"></param>
|
||||
/// <param name="uuid"></param>
|
||||
/// <returns></returns>
|
||||
public string Login(string id, string[] type, string uuid = null)
|
||||
// ReSharper disable once MemberCanBePrivate.Global
|
||||
public string Login(string id, Dictionary<string, string>? meta, string[] type, string? uuid = null)
|
||||
{
|
||||
uuid ??= Guid.NewGuid().ToString();
|
||||
var loginItem = new SimApiLoginItem(id, type);
|
||||
var loginItem = new SimApiLoginItem(id, type, meta);
|
||||
cache.SetString(uuid, JsonSerializer.Serialize(loginItem));
|
||||
return uuid;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设置登录的Meta信息
|
||||
/// </summary>
|
||||
/// <param name="token"></param>
|
||||
/// <param name="meta"></param>
|
||||
/// <returns></returns>
|
||||
public bool SetMeta(string token, Dictionary<string, string> meta)
|
||||
{
|
||||
var login = GetLogin(token);
|
||||
if (login == null) { return false; }
|
||||
var newLogin = new SimApiLoginItem(login.Id, login.Type, login.Meta);
|
||||
cache.SetString(token,JsonSerializer.Serialize(newLogin));
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取登陆信息
|
||||
/// </summary>
|
||||
|
||||
+76
-10
@@ -1,19 +1,23 @@
|
||||
using System;
|
||||
#nullable enable
|
||||
using System;
|
||||
using System.IO;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Minio;
|
||||
using SimApi.Configs;
|
||||
using Minio.DataModel.Args;
|
||||
using SimApi.Configurations;
|
||||
|
||||
namespace SimApi.Helpers;
|
||||
|
||||
public class SimApiStorage
|
||||
{
|
||||
private MinioClient Mc { get; }
|
||||
private IMinioClient Mc { get; }
|
||||
|
||||
public MinioClient Client => Mc;
|
||||
public IMinioClient Client => Mc;
|
||||
|
||||
private string ServeUrl { get; }
|
||||
|
||||
private string Endpoint { get; }
|
||||
|
||||
public string Bucket { get; }
|
||||
|
||||
private IHttpContextAccessor HttpContextAccessor { get; }
|
||||
@@ -22,6 +26,7 @@ public class SimApiStorage
|
||||
{
|
||||
var options = apiOptions.SimApiStorageOptions;
|
||||
HttpContextAccessor = httpContextAccessor;
|
||||
Endpoint = options.Endpoint;
|
||||
var useSsl = false;
|
||||
string endpoint;
|
||||
if (options.Endpoint.StartsWith("http://"))
|
||||
@@ -39,6 +44,7 @@ public class SimApiStorage
|
||||
}
|
||||
|
||||
ServeUrl = options.ServeUrl;
|
||||
if (ServeUrl.EndsWith('/')) throw new Exception("SimApiStorage: ServeUrl must not end with /");
|
||||
Bucket = options.Bucket;
|
||||
var mcb = new MinioClient().WithEndpoint(endpoint)
|
||||
.WithCredentials(options.AccessKey, options.SecretKey);
|
||||
@@ -46,6 +52,7 @@ public class SimApiStorage
|
||||
{
|
||||
mcb = mcb.WithSSL();
|
||||
}
|
||||
|
||||
Mc = mcb.Build();
|
||||
|
||||
var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;
|
||||
@@ -61,10 +68,13 @@ public class SimApiStorage
|
||||
/// <param name="path"></param>
|
||||
/// <param name="expire"></param>
|
||||
/// <returns></returns>
|
||||
public string GetUploadUrl(string path, int expire = 7200)
|
||||
public GetUploadUrlResponse GetUploadUrl(string path, int expire = 7200)
|
||||
{
|
||||
return Mc.PresignedPutObjectAsync(new PresignedPutObjectArgs().WithBucket(Bucket)
|
||||
.WithObject(path).WithExpiry(expire)).Result;
|
||||
CheckPath(path);
|
||||
var obj = path.TrimStart('/');
|
||||
var uploadUrl = Mc.PresignedPutObjectAsync(new PresignedPutObjectArgs().WithBucket(Bucket)
|
||||
.WithObject(obj).WithExpiry(expire)).Result;
|
||||
return new GetUploadUrlResponse(uploadUrl, $"{ServeUrl}{path}", path);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -75,20 +85,38 @@ public class SimApiStorage
|
||||
/// <returns></returns>
|
||||
public string GetDownloadUrl(string path, int expire = 600)
|
||||
{
|
||||
CheckPath(path);
|
||||
path = path.TrimStart('/');
|
||||
return Mc.PresignedGetObjectAsync(new PresignedGetObjectArgs().WithBucket(Bucket).WithObject(path)
|
||||
.WithExpiry(expire)).Result;
|
||||
}
|
||||
|
||||
|
||||
public string UploadFile(string path, Stream stream, string contentType = "image/png")
|
||||
/// <summary>
|
||||
/// 直接上传文件
|
||||
/// </summary>
|
||||
/// <param name="path"></param>
|
||||
/// <param name="stream"></param>
|
||||
/// <param name="contentType"></param>
|
||||
public void UploadFile(string path, Stream stream, string contentType = "image/png")
|
||||
{
|
||||
CheckPath(path);
|
||||
path = path.TrimStart('/');
|
||||
Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).WithObjectSize(stream.Length)
|
||||
.WithStreamData(stream).WithContentType(contentType)).Wait();
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 使用path获取完整的访问URL
|
||||
/// </summary>
|
||||
/// <param name="path"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="Exception"></exception>
|
||||
public string FullUrl(string path)
|
||||
{
|
||||
if (string.IsNullOrEmpty(path)) return path;
|
||||
if(path.StartsWith("http://") || path.StartsWith("https://")) return path;
|
||||
if (!(path.StartsWith('/') || path.StartsWith("~/"))) return path;
|
||||
var httpRequest = HttpContextAccessor.HttpContext?.Request;
|
||||
var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
|
||||
if (string.IsNullOrEmpty(path))
|
||||
@@ -98,4 +126,42 @@ public class SimApiStorage
|
||||
|
||||
return path.StartsWith('~') ? string.Concat(url, path.AsSpan(1, path.Length - 1)) : $"{ServeUrl}{path}";
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取一个Path得访问URL
|
||||
/// </summary>
|
||||
/// <param name="path"></param>
|
||||
/// <returns></returns>
|
||||
public string? GetUrl(string? path)
|
||||
{
|
||||
if (string.IsNullOrEmpty(path)) return path;
|
||||
if (path.StartsWith("~/"))
|
||||
{
|
||||
var httpRequest = HttpContextAccessor.HttpContext?.Request;
|
||||
var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
|
||||
return string.Concat(url, path.AsSpan(1, path.Length - 1));
|
||||
}
|
||||
if (path.StartsWith('/'))
|
||||
{
|
||||
return $"{ServeUrl}{path}";
|
||||
}
|
||||
return path;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 从URL中获取相对路径 (如果url不是当前服务器的url,则原样返回)
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <returns></returns>
|
||||
public string? GetPath(string? url)
|
||||
{
|
||||
return url?.Replace($"{Endpoint}/{Bucket}", string.Empty).Replace(ServeUrl,string.Empty);
|
||||
}
|
||||
|
||||
private void CheckPath(string path)
|
||||
{
|
||||
if (!path.StartsWith('/')) throw new Exception("path must start with /");
|
||||
}
|
||||
}
|
||||
|
||||
public record GetUploadUrlResponse(string UploadUrl, string DownloadUrl, string Path);
|
||||
+23
-6
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using System.Text.Encodings.Web;
|
||||
@@ -50,16 +51,15 @@ public static class SimApiUtil
|
||||
/// <returns></returns>
|
||||
public static string Md5(string source, string mode = "x2")
|
||||
{
|
||||
var sor = Encoding.UTF8.GetBytes(source);
|
||||
var md5 = MD5.Create();
|
||||
var result = md5.ComputeHash(sor);
|
||||
var strbul = new StringBuilder(40);
|
||||
var sourceBytes = Encoding.UTF8.GetBytes(source);
|
||||
var result = MD5.HashData(sourceBytes);
|
||||
var stringBuilder = new StringBuilder(40);
|
||||
foreach (var t in result)
|
||||
{
|
||||
strbul.Append(t.ToString(mode));
|
||||
stringBuilder.Append(t.ToString(mode));
|
||||
}
|
||||
|
||||
return strbul.ToString();
|
||||
return stringBuilder.ToString();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -71,4 +71,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);
|
||||
}
|
||||
}
|
||||
@@ -23,11 +23,13 @@ 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);
|
||||
Console.ResetColor();
|
||||
}
|
||||
}
|
||||
@@ -24,12 +24,17 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
|
||||
try
|
||||
{
|
||||
await next(context);
|
||||
if (context.Response.StatusCode != 200)
|
||||
switch (context.Response.StatusCode)
|
||||
{
|
||||
if (!new[] { 301, 302 }.Contains(context.Response.StatusCode))
|
||||
{
|
||||
case 200:
|
||||
break;
|
||||
case 404:
|
||||
throw new SimApiException(context.Response.StatusCode, "请求的接口不存在");
|
||||
case 301:
|
||||
case 302:
|
||||
break;
|
||||
default:
|
||||
throw new SimApiException(context.Response.StatusCode);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (SimApiException ex)
|
||||
@@ -42,8 +47,8 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
log.LogError(ex.Message);
|
||||
log.LogError(ex.StackTrace);
|
||||
log.LogError("{Msg}", ex.Message);
|
||||
log.LogError("{Msg}", ex.StackTrace);
|
||||
response = new SimApiBaseResponse(500, ex.Message);
|
||||
ErrorResponse(context, response);
|
||||
}
|
||||
@@ -54,13 +59,11 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
|
||||
/// </summary>
|
||||
/// <param name="context"></param>
|
||||
/// <param name="response"></param>
|
||||
private void ErrorResponse(HttpContext context, SimApiBaseResponse response)
|
||||
private static void ErrorResponse(HttpContext context, SimApiBaseResponse response)
|
||||
{
|
||||
if (!context.Response.HasStarted)
|
||||
{
|
||||
context.Response.StatusCode = 200;
|
||||
context.Response.Headers.Append("Content-Type", "application/json");
|
||||
context.Response.WriteAsync(response.ToString());
|
||||
}
|
||||
if (context.Response.HasStarted) return;
|
||||
context.Response.StatusCode = 200;
|
||||
context.Response.Headers.Append("Content-Type", "application/json");
|
||||
context.Response.WriteAsync(response.ToString());
|
||||
}
|
||||
}
|
||||
@@ -7,14 +7,11 @@ namespace SimApi.Models;
|
||||
|
||||
public class SimApiBaseModel
|
||||
{
|
||||
[Column(Order = 1)]
|
||||
public string Id { get; set; } = Guid.NewGuid().ToString();
|
||||
[Column(Order = 1)] public string Id { get; set; } = Guid.NewGuid().ToString();
|
||||
|
||||
[Column(Order = 9998)]
|
||||
public DateTime UpdatedAt { get; set; } = SimApiUtil.CstNow;
|
||||
[Column(Order = 9998)] public DateTime UpdatedAt { get; set; } = DateTime.Now;
|
||||
|
||||
[Column(Order = 9999)]
|
||||
public DateTime CreatedAt { get; set; } = SimApiUtil.CstNow;
|
||||
[Column(Order = 9999)] public DateTime CreatedAt { get; set; } = DateTime.Now;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -25,10 +25,10 @@
|
||||
<Folder Include="Exceptions\"/>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Minio" Version="4.0.7"/>
|
||||
<PackageReference Include="RabbitMQ.Client" Version="6.6.0"/>
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/>
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0"/>
|
||||
<PackageReference Include="Minio" Version="6.0.3" />
|
||||
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
|
||||
</ItemGroup>
|
||||
<ProjectExtensions>
|
||||
<MonoDevelop>
|
||||
|
||||
+3
-1
@@ -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...");
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Text.Encodings.Web;
|
||||
using System.Text.Json;
|
||||
using System.Text.Unicode;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json.Serialization;
|
||||
using RabbitMQ.Client.Events;
|
||||
using SimApi.Communications;
|
||||
using SimApi.Helpers;
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
+10
-1
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user