library/simapi-net
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: library/simapi-net:8.0.5
Branches Tags
library/simapi-net:master
library/simapi-net:10.26.8.11 library/simapi-net:10.26.8.10 library/simapi-net:10.26.8.9 library/simapi-net:10.26.8.8 library/simapi-net:10.26.8.7 library/simapi-net:10.26.7.2 library/simapi-net:10.26.7.1 library/simapi-net:10.26.6.12 library/simapi-net:10.7.0 library/simapi-net:10.2606.10 library/simapi-net:10.26.6.11 library/simapi-net:10.26.06.11 library/simapi-net:10.06.10 library/simapi-net:10.6.9 library/simapi-net:10.6.8 library/simapi-net:10.6.7 library/simapi-net:10.6.6 library/simapi-net:10.6.5 library/simapi-net:10.6.3 library/simapi-net:10.6.2 library/simapi-net:10.6.1 library/simapi-net:10.6.0 library/simapi-net:10.5.2 library/simapi-net:10.5.1 library/simapi-net:10.5.0 library/simapi-net:10.4.0 library/simapi-net:10.3.5 library/simapi-net:10.3.4 library/simapi-net:10.3.3 library/simapi-net:10.3.2 library/simapi-net:10.3.1 library/simapi-net:10.3.0 library/simapi-net:10.2.1 library/simapi-net:10.2.0 library/simapi-net:10.1.8 library/simapi-net:10.1.7 library/simapi-net:10.1.6 library/simapi-net:10.1.5 library/simapi-net:10.1.4 library/simapi-net:10.1.3 library/simapi-net:10.1.2 library/simapi-net:10.1.1 library/simapi-net:10.1.0 library/simapi-net:10.0.4 library/simapi-net:10.0.3 library/simapi-net:10.0.2 library/simapi-net:10.0.1 library/simapi-net:10.0.0 library/simapi-net:9.1.4 library/simapi-net:9.1.3 library/simapi-net:9.1.2 library/simapi-net:9.1.1 library/simapi-net:9.1.0 library/simapi-net:9.0.8 library/simapi-net:9.0.7 library/simapi-net:9.0.6 library/simapi-net:9.0.5 library/simapi-net:9.0.4 library/simapi-net:9.0.3 library/simapi-net:9.0.2 library/simapi-net:9.0.1 library/simapi-net:9.0.0 library/simapi-net:8.4.7 library/simapi-net:8.4.6 library/simapi-net:8.4.5 library/simapi-net:8.4.4 library/simapi-net:8.4.3 library/simapi-net:8.4.2 library/simapi-net:8.4.1 library/simapi-net:8.4.0 library/simapi-net:8.3.5 library/simapi-net:8.3.4 library/simapi-net:8.3.3 library/simapi-net:8.3.2 library/simapi-net:8.3.1 library/simapi-net:8.3.0 library/simapi-net:8.2.9 library/simapi-net:8.2.8 library/simapi-net:8.2.7 library/simapi-net:8.2.6 library/simapi-net:8.2.5 library/simapi-net:8.2.4 library/simapi-net:8.2.3 library/simapi-net:8.2.2 library/simapi-net:8.2.1 library/simapi-net:8.2.0 library/simapi-net:8.1.9 library/simapi-net:8.1.8 library/simapi-net:8.1.7 library/simapi-net:8.1.6 library/simapi-net:8.1.5 library/simapi-net:8.1.4 library/simapi-net:8.1.3 library/simapi-net:8.1.2 library/simapi-net:8.1.1 library/simapi-net:8.1.0 library/simapi-net:8.0.9 library/simapi-net:8.0.8 library/simapi-net:8.0.7 library/simapi-net:8.0.6 library/simapi-net:8.0.5 library/simapi-net:8.0.4 library/simapi-net:8.0.3 library/simapi-net:8.0.2 library/simapi-net:8.0.1 library/simapi-net:8.0.0 library/simapi-net:7.0.9 library/simapi-net:7.0.8 library/simapi-net:7.0.7 library/simapi-net:7.0.6 library/simapi-net:7.0.5 library/simapi-net:7.0.4 library/simapi-net:7.0.3 library/simapi-net:7.0.2 library/simapi-net:6.1.7 library/simapi-net:6.1.6 library/simapi-net:6.1.5 library/simapi-net:6.1.4 library/simapi-net:6.1.3 library/simapi-net:6.1.2 library/simapi-net:6.1.1 library/simapi-net:6.1.0 library/simapi-net:6.0.9 library/simapi-net:6.0.8 library/simapi-net:6.0.7 library/simapi-net:6.0.6 library/simapi-net:6.0.5 library/simapi-net:6.0.4 library/simapi-net:6.0.3 library/simapi-net:6.0.2 library/simapi-net:6.0.1 library/simapi-net:6.0.0 library/simapi-net:5.7.3 library/simapi-net:5.7.2 library/simapi-net:5.7.1 library/simapi-net:5.7.0 library/simapi-net:5.6.8 library/simapi-net:5.6.3 library/simapi-net:5.6.2 library/simapi-net:5.6.1 library/simapi-net:5.6.0 library/simapi-net:5.5.5 library/simapi-net:5.5.1 library/simapi-net:5.5.0 library/simapi-net:5.4.1 library/simapi-net:5.4.0 library/simapi-net:5.3.4 library/simapi-net:5.3.3 library/simapi-net:5.3.2 library/simapi-net:5.3.1 library/simapi-net:5.3.0 library/simapi-net:5.2.3 library/simapi-net:5.2.2 library/simapi-net:5.2.1 library/simapi-net:5.2.0 library/simapi-net:5.1.1 library/simapi-net:5.1.0 library/simapi-net:5.0.6 library/simapi-net:5.0.5 library/simapi-net:5.0.4 library/simapi-net:5.0.3 library/simapi-net:5.0.2 library/simapi-net:5.0.1 library/simapi-net:5.0.0 library/simapi-net:1.1.3 library/simapi-net:1.1.2 library/simapi-net:1.1.1 library/simapi-net:1.1.0 library/simapi-net:1.0.5 library/simapi-net:1.0.3 library/simapi-net:1.0.2 library/simapi-net:1.0.1 library/simapi-net:1.0.0 library/simapi-net:0.5.1 library/simapi-net:0.5.0 library/simapi-net:0.4.5 library/simapi-net:0.4.2 library/simapi-net:0.4.1 library/simapi-net:0.4.0 library/simapi-net:0.3.6 library/simapi-net:0.3.5 library/simapi-net:0.3.4 library/simapi-net:0.3.3 library/simapi-net:0.3.2 library/simapi-net:0.3.1 library/simapi-net:0.3.0 library/simapi-net:0.2.10 library/simapi-net:0.2.9 library/simapi-net:0.2.8 library/simapi-net:0.2.7 library/simapi-net:0.2.6 library/simapi-net:0.2.5 library/simapi-net:0.2.4 library/simapi-net:v0.2.1 library/simapi-net:v0.1.3 library/simapi-net:v0.1.0
...
compare: library/simapi-net:8.2.3
Branches Tags
library/simapi-net:master
library/simapi-net:10.26.8.11 library/simapi-net:10.26.8.10 library/simapi-net:10.26.8.9 library/simapi-net:10.26.8.8 library/simapi-net:10.26.8.7 library/simapi-net:10.26.7.2 library/simapi-net:10.26.7.1 library/simapi-net:10.26.6.12 library/simapi-net:10.7.0 library/simapi-net:10.2606.10 library/simapi-net:10.26.6.11 library/simapi-net:10.26.06.11 library/simapi-net:10.06.10 library/simapi-net:10.6.9 library/simapi-net:10.6.8 library/simapi-net:10.6.7 library/simapi-net:10.6.6 library/simapi-net:10.6.5 library/simapi-net:10.6.3 library/simapi-net:10.6.2 library/simapi-net:10.6.1 library/simapi-net:10.6.0 library/simapi-net:10.5.2 library/simapi-net:10.5.1 library/simapi-net:10.5.0 library/simapi-net:10.4.0 library/simapi-net:10.3.5 library/simapi-net:10.3.4 library/simapi-net:10.3.3 library/simapi-net:10.3.2 library/simapi-net:10.3.1 library/simapi-net:10.3.0 library/simapi-net:10.2.1 library/simapi-net:10.2.0 library/simapi-net:10.1.8 library/simapi-net:10.1.7 library/simapi-net:10.1.6 library/simapi-net:10.1.5 library/simapi-net:10.1.4 library/simapi-net:10.1.3 library/simapi-net:10.1.2 library/simapi-net:10.1.1 library/simapi-net:10.1.0 library/simapi-net:10.0.4 library/simapi-net:10.0.3 library/simapi-net:10.0.2 library/simapi-net:10.0.1 library/simapi-net:10.0.0 library/simapi-net:9.1.4 library/simapi-net:9.1.3 library/simapi-net:9.1.2 library/simapi-net:9.1.1 library/simapi-net:9.1.0 library/simapi-net:9.0.8 library/simapi-net:9.0.7 library/simapi-net:9.0.6 library/simapi-net:9.0.5 library/simapi-net:9.0.4 library/simapi-net:9.0.3 library/simapi-net:9.0.2 library/simapi-net:9.0.1 library/simapi-net:9.0.0 library/simapi-net:8.4.7 library/simapi-net:8.4.6 library/simapi-net:8.4.5 library/simapi-net:8.4.4 library/simapi-net:8.4.3 library/simapi-net:8.4.2 library/simapi-net:8.4.1 library/simapi-net:8.4.0 library/simapi-net:8.3.5 library/simapi-net:8.3.4 library/simapi-net:8.3.3 library/simapi-net:8.3.2 library/simapi-net:8.3.1 library/simapi-net:8.3.0 library/simapi-net:8.2.9 library/simapi-net:8.2.8 library/simapi-net:8.2.7 library/simapi-net:8.2.6 library/simapi-net:8.2.5 library/simapi-net:8.2.4 library/simapi-net:8.2.3 library/simapi-net:8.2.2 library/simapi-net:8.2.1 library/simapi-net:8.2.0 library/simapi-net:8.1.9 library/simapi-net:8.1.8 library/simapi-net:8.1.7 library/simapi-net:8.1.6 library/simapi-net:8.1.5 library/simapi-net:8.1.4 library/simapi-net:8.1.3 library/simapi-net:8.1.2 library/simapi-net:8.1.1 library/simapi-net:8.1.0 library/simapi-net:8.0.9 library/simapi-net:8.0.8 library/simapi-net:8.0.7 library/simapi-net:8.0.6 library/simapi-net:8.0.5 library/simapi-net:8.0.4 library/simapi-net:8.0.3 library/simapi-net:8.0.2 library/simapi-net:8.0.1 library/simapi-net:8.0.0 library/simapi-net:7.0.9 library/simapi-net:7.0.8 library/simapi-net:7.0.7 library/simapi-net:7.0.6 library/simapi-net:7.0.5 library/simapi-net:7.0.4 library/simapi-net:7.0.3 library/simapi-net:7.0.2 library/simapi-net:6.1.7 library/simapi-net:6.1.6 library/simapi-net:6.1.5 library/simapi-net:6.1.4 library/simapi-net:6.1.3 library/simapi-net:6.1.2 library/simapi-net:6.1.1 library/simapi-net:6.1.0 library/simapi-net:6.0.9 library/simapi-net:6.0.8 library/simapi-net:6.0.7 library/simapi-net:6.0.6 library/simapi-net:6.0.5 library/simapi-net:6.0.4 library/simapi-net:6.0.3 library/simapi-net:6.0.2 library/simapi-net:6.0.1 library/simapi-net:6.0.0 library/simapi-net:5.7.3 library/simapi-net:5.7.2 library/simapi-net:5.7.1 library/simapi-net:5.7.0 library/simapi-net:5.6.8 library/simapi-net:5.6.3 library/simapi-net:5.6.2 library/simapi-net:5.6.1 library/simapi-net:5.6.0 library/simapi-net:5.5.5 library/simapi-net:5.5.1 library/simapi-net:5.5.0 library/simapi-net:5.4.1 library/simapi-net:5.4.0 library/simapi-net:5.3.4 library/simapi-net:5.3.3 library/simapi-net:5.3.2 library/simapi-net:5.3.1 library/simapi-net:5.3.0 library/simapi-net:5.2.3 library/simapi-net:5.2.2 library/simapi-net:5.2.1 library/simapi-net:5.2.0 library/simapi-net:5.1.1 library/simapi-net:5.1.0 library/simapi-net:5.0.6 library/simapi-net:5.0.5 library/simapi-net:5.0.4 library/simapi-net:5.0.3 library/simapi-net:5.0.2 library/simapi-net:5.0.1 library/simapi-net:5.0.0 library/simapi-net:1.1.3 library/simapi-net:1.1.2 library/simapi-net:1.1.1 library/simapi-net:1.1.0 library/simapi-net:1.0.5 library/simapi-net:1.0.3 library/simapi-net:1.0.2 library/simapi-net:1.0.1 library/simapi-net:1.0.0 library/simapi-net:0.5.1 library/simapi-net:0.5.0 library/simapi-net:0.4.5 library/simapi-net:0.4.2 library/simapi-net:0.4.1 library/simapi-net:0.4.0 library/simapi-net:0.3.6 library/simapi-net:0.3.5 library/simapi-net:0.3.4 library/simapi-net:0.3.3 library/simapi-net:0.3.2 library/simapi-net:0.3.1 library/simapi-net:0.3.0 library/simapi-net:0.2.10 library/simapi-net:0.2.9 library/simapi-net:0.2.8 library/simapi-net:0.2.7 library/simapi-net:0.2.6 library/simapi-net:0.2.5 library/simapi-net:0.2.4 library/simapi-net:v0.2.1 library/simapi-net:v0.1.3 library/simapi-net:v0.1.0
20 Commits
8.0.5 ... 8.2.3
Author SHA1 Message Date
xrain ac4619a789 fix warning 2024-08-03 19:19:42 +08:00
xrain 4d0f801f21 now mqtt reconnect will resub topic 2024-08-03 18:35:01 +08:00
xrain 683cf9176a add event loadbalancing 2024-07-27 01:33:17 +08:00
xrain 1ee8d941e9 fix eventserver bug 2024-07-26 19:18:59 +08:00
xrain 1d474f596a config fix 2024-07-26 08:56:01 +08:00
xrain 929ddaced3 add config store 2024-07-26 08:11:21 +08:00
xrain 82f7e0fc00 use Task insteadof while improve performance 2024-07-26 05:20:27 +08:00
xrain f4bc6dc080 fix synapse use mqtt 2024-07-26 05:03:28 +08:00
xrain 56b0490d1e fix log color 2024-07-24 21:50:46 +08:00
xrain 45e19c3561 fix log color 2024-07-24 21:43:31 +08:00
xrain 04b2be1bb7 fix bug 2024-07-21 13:50:12 +08:00
xrain f78c3a0e0d fix fullurl 不抛出异常了 2024-07-10 06:35:19 +08:00
xrain 506704fd90 fix fullurl 不抛出异常了 2024-07-10 06:29:36 +08:00
xrain 786051ddbf update pkg 2024-07-10 03:30:09 +08:00
xrain d9ff4ae422 fix upload url 2024-07-10 01:18:18 +08:00
xrain 986b4e74e6 new upload 2024-07-10 00:52:51 +08:00
xrain 2257ba5b2a new feature 2024-06-27 04:38:04 +08:00
xrain c40f8d664d default exception edit 2024-04-23 12:27:36 +08:00
xrain a1f10b9c09 class 添加默认方法,支持老的代码 2024-04-16 06:57:56 +08:00
xrain 6ef7aca8ae 将record切换回class, 不再使用CST时间,使用DateTime.Now 2024-04-16 06:29:21 +08:00
28 changed files with 784 additions and 456 deletions
Expand all files Collapse all files
Attributes/SimApiAuthAttribute.cs
+1 -1
View File
@@ -43,7 +43,7 @@ public class SimApiAuthAttribute : ActionFilterAttribute
public override void OnActionExecuting(ActionExecutingContext context) public override void OnActionExecuting(ActionExecutingContext context)
{ {
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]; var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
//检测是否登录 //检测是否登录
if (loginInfo == null) if (loginInfo == null)
{ {
Attributes/SynapseEventAttribute.cs
+2 -7
View File
@@ -3,12 +3,7 @@ using System;
namespace SimApi.Attributes; namespace SimApi.Attributes;
[AttributeUsage(AttributeTargets.Method)] [AttributeUsage(AttributeTargets.Method)]
public class SynapseEventAttribute : Attribute public class SynapseEventAttribute(string? name = null) : Attribute
{ {
public string Name { get; } public string? Name { get; } = name;
public SynapseEventAttribute(string name)
{
Name = name;
}
} }
Attributes/SynapseRpcAttribute.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace SimApi.Attributes;
[AttributeUsage(AttributeTargets.Method)] [AttributeUsage(AttributeTargets.Method)]
public class SynapseRpcAttribute : Attribute public class SynapseRpcAttribute : Attribute
{ {
public string Name { get; } public string? Name { get; }
public SynapseRpcAttribute() public SynapseRpcAttribute()
{ {
Communications/SimApiBaseRequest.cs
+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; }
}
Communications/SimApiBaseResponse.cs
+29 -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,32 @@ 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);
public SimApiBasePageResponse(T list, int page, int count, int total) : this()
{
List = list;
Page = page;
Count = count;
Total = total;
}
}
/// <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; }
public SimApiBaseResponse(T data) : this()
{
Data = data;
}
}
Communications/SimApiLoginItem.cs
+4 -2
View File
@@ -1,6 +1,8 @@
namespace SimApi.Communications; using System.Collections.Generic;
namespace SimApi.Communications;
/// <summary> /// <summary>
/// 登录信息中间件 /// 登录信息中间件
/// </summary> /// </summary>
public record SimApiLoginItem(string Id, string[] Type); public record SimApiLoginItem(string Id, string[] Type,Dictionary<string,string>? Meta = null);
Configurations/SimApiDocOptions.cs
+7 -7
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Swashbuckle.AspNetCore.SwaggerUI; using Swashbuckle.AspNetCore.SwaggerUI;
namespace SimApi.Configs; namespace SimApi.Configurations;
/// <summary> /// <summary>
/// 文档组配置 /// 文档组配置
@@ -11,17 +11,17 @@ public class SimApiDocGroupOption
/// <summary> /// <summary>
/// 文档标识 /// 文档标识
/// </summary> /// </summary>
public string Id { get; set; } public string Id { get; set; } = null!;
/// <summary> /// <summary>
/// 文档名称 /// 文档名称
/// </summary> /// </summary>
public string Name { get; set; } public string Name { get; set; } = null!;
/// <summary> /// <summary>
/// 文档描述 /// 文档描述
/// </summary> /// </summary>
public string Description { get; set; } public string Description { get; set; } = null!;
} }
/// <summary> /// <summary>
@@ -33,11 +33,11 @@ public class SimApiAuthOption
public string Description { get; set; } = "认证服务器颁发的AccessToken"; public string Description { get; set; } = "认证服务器颁发的AccessToken";
public string AuthorizationUrl { get; set; } public string AuthorizationUrl { get; set; } = null!;
public string TokenUrl { get; set; } public string TokenUrl { get; set; } = null!;
public Dictionary<string, string> Scopes { get; set; } public Dictionary<string, string> Scopes { get; set; } = null!;
} }
/// <summary> /// <summary>
Configurations/SimApiOptions.cs
+10 -10
View File
@@ -1,6 +1,6 @@
using System; using System;
namespace SimApi.Configs; namespace SimApi.Configurations;
public class SimApiOptions public class SimApiOptions
{ {
@@ -11,16 +11,16 @@ public class SimApiOptions
public bool EnableCors { get; set; } = true; public bool EnableCors { get; set; } = true;
/// <summary> /// <summary>
/// 启用SimapiAuth，一个简单的基于Header Token的认证方式。 /// 启用SimApiAuth，一个简单的基于Header Token的认证方式。
/// default: false /// default: false
/// </summary> /// </summary>
public bool EnableSimApiAuth { get; set; } = false; public bool EnableSimApiAuth { get; set; }
/// <summary> /// <summary>
/// 启用在线文档，启用后 访问 /swagger 可以查看对应的api文档。 /// 启用在线文档，启用后 访问 /swagger 可以查看对应的api文档。
/// default: false /// default: false
/// </summary> /// </summary>
public bool EnableSimApiDoc { get; set; } = false; public bool EnableSimApiDoc { get; set; }
/// <summary> /// <summary>
/// 启用异常拦截,启用后，所有的异常将被通过json反馈。 /// 启用异常拦截,启用后，所有的异常将被通过json反馈。
@@ -32,7 +32,7 @@ public class SimApiOptions
/// 开启S3兼容的存储系统。 /// 开启S3兼容的存储系统。
/// default: false /// default: false
/// </summary> /// </summary>
public bool EnableSimApiStorage { get; set; } = false; public bool EnableSimApiStorage { get; set; }
/// <summary> /// <summary>
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers /// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
@@ -50,12 +50,12 @@ public class SimApiOptions
/// 启用格式化的 Console Logger /// 启用格式化的 Console Logger
/// default: false /// default: false
/// </summary> /// </summary>
public bool EnableLogger { get; set; } = false; public bool EnableLogger { get; set; }
/// <summary> /// <summary>
/// 是否启用Synapse /// 是否启用Synapse
/// </summary> /// </summary>
public bool EnableSynapse { get; set; } = false; public bool EnableSynapse { get; set; }
/// <summary> /// <summary>
@@ -70,7 +70,7 @@ public class SimApiOptions
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new(); public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions> options = null) public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions>? options = null)
{ {
options?.Invoke(SimApiSynapseOptions); options?.Invoke(SimApiSynapseOptions);
} }
@@ -80,12 +80,12 @@ public class SimApiOptions
SimApiSynapseOptions = options; SimApiSynapseOptions = options;
} }
public void ConfigureSimApiDoc(Action<SimApiDocOptions> options = null) public void ConfigureSimApiDoc(Action<SimApiDocOptions>? options = null)
{ {
options?.Invoke(SimApiDocOptions); options?.Invoke(SimApiDocOptions);
} }
public void ConfigureSimApiStorage(Action<SimApiStorageOptions> options = null) public void ConfigureSimApiStorage(Action<SimApiStorageOptions>? options = null)
{ {
options?.Invoke(SimApiStorageOptions); options?.Invoke(SimApiStorageOptions);
} }
Configurations/SimApiStorageOptions.cs
+6 -6
View File
@@ -1,23 +1,23 @@
namespace SimApi.Configs; namespace SimApi.Configurations;
public class SimApiStorageOptions public class SimApiStorageOptions
{ {
/// <summary> /// <summary>
/// S3 服务器入口地址 /// S3 服务器入口地址
/// </summary> /// </summary>
public string Endpoint { get; set; } public string? Endpoint { get; set; }
/// <summary> /// <summary>
/// S3 服务器文件访问地址 /// S3 服务器文件访问地址
/// </summary> /// </summary>
public string ServeUrl { get; set; } public string? ServeUrl { get; set; }
/// <summary> /// <summary>
/// S3服务 Bucket /// S3服务 Bucket
/// </summary> /// </summary>
public string Bucket { get; set; } public string? Bucket { get; set; }
public string AccessKey { get; set; } public string? AccessKey { get; set; }
public string SecretKey { get; set; } public string? SecretKey { get; set; }
} }
Configurations/SimApiSynapseOptions.cs
+17 -22
View File
@@ -1,30 +1,25 @@
namespace SimApi.Configs; namespace SimApi.Configurations;
public class SimApiSynapseOptions public class SimApiSynapseOptions
{ {
public string MqHost { get; set; } /// <summary>
/// Mqtt服务器的Websocket地址
public int MqPort { get; set; } /// </summary>
public string? Websocket { get; set; }
public string MqUser { get; set; } public string? Username { get; set; }
public string? Password { get; set; }
public string MqPass { get; set; } public string? SysName { get; set; }
public string? AppName { get; set; }
public string MqVHost { get; set; } = "/"; public string? AppId { get; set; }
public string SysName { get; set; }
public string AppName { get; set; }
public string AppId { get; set; }
public int RpcTimeout { get; set; } = 3; public int RpcTimeout { get; set; } = 3;
public ushort EventProcessorNum { get; set; } = 20; /// <summary>
/// Event是否使用负载均衡
public ushort RpcProcessorNum { get; set; } = 20; /// 也就是订阅$queue主题,消息会分发给不同的AppId
/// 如果false,多个AppId都可以同时收到消息
/// </summary>
public bool EventLoadBalancing { get; set; } = false;
public bool EnableConfigStore { get; set; } = true;
public bool DisableEventClient { get; set; } = false; public bool DisableEventClient { get; set; } = false;
public bool DisableRpcClient { get; set; } = false; public bool DisableRpcClient { get; set; } = false;
} }
Controllers/SimApiBaseController.cs
+11 -13
View File
@@ -18,7 +18,7 @@ public class SimApiBaseController : Controller
/// <summary> /// <summary>
/// 当前登录用户的ID /// 当前登录用户的ID
/// </summary> /// </summary>
protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"]; protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"]!;
/// <summary> /// <summary>
/// 验证请求参数 /// 验证请求参数
@@ -26,14 +26,12 @@ public class SimApiBaseController : Controller
/// <param name="context"></param> /// <param name="context"></param>
public override void OnActionExecuting(ActionExecutingContext context) public override void OnActionExecuting(ActionExecutingContext context)
{ {
if (!context.ModelState.IsValid) if (context.ModelState.IsValid) return;
foreach (var item in context.ModelState.Values.Where(item =>
item.ValidationState == ModelValidationState.Invalid))
{ {
foreach (var item in context.ModelState.Values.Where(item => Error(400, item.Errors.First().ErrorMessage);
item.ValidationState == ModelValidationState.Invalid)) break;
{
Error(400, item.Errors.First().ErrorMessage);
break;
}
} }
} }
@@ -55,7 +53,7 @@ public class SimApiBaseController : Controller
/// <param name="condition">检测条件</param> /// <param name="condition">检测条件</param>
/// <param name="code">错误代码</param> /// <param name="code">错误代码</param>
/// <param name="message">错误描述</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) if (condition)
{ {
@@ -70,7 +68,7 @@ public class SimApiBaseController : Controller
/// <param name="condition">检测条件</param> /// <param name="condition">检测条件</param>
/// <param name="code">错误代码</param> /// <param name="code">错误代码</param>
/// <param name="message">错误描述</param> /// <param name="message">错误描述</param>
protected static void ErrorWhenTrue(bool condition, int code = 500, string message = "") protected static void ErrorWhenTrue(bool condition, int code = 400, string message = "")
{ {
ErrorWhen(condition, code, message); ErrorWhen(condition, code, message);
} }
@@ -82,7 +80,7 @@ public class SimApiBaseController : Controller
/// <param name="condition"></param> /// <param name="condition"></param>
/// <param name="code"></param> /// <param name="code"></param>
/// <param name="message"></param> /// <param name="message"></param>
protected static void ErrorWhenFalse(bool condition, int code = 500, string message = "") protected static void ErrorWhenFalse(bool condition, int code = 400, string message = "")
{ {
ErrorWhen(!condition, code, message); ErrorWhen(!condition, code, message);
} }
@@ -93,7 +91,7 @@ public class SimApiBaseController : Controller
/// <param name="condition">检测条件</param> /// <param name="condition">检测条件</param>
/// <param name="code">错误代码</param> /// <param name="code">错误代码</param>
/// <param name="message">错误描述</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); ErrorWhen(condition == null, code, message);
} }
@@ -104,6 +102,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>();
} }
} }
Controllers/SimApiCommonController.cs
+12 -3
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>
@@ -38,14 +41,20 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
[HttpPost("/auth/logout"), SimApiDoc("认证", "退出登陆")] [HttpPost("/auth/logout"), SimApiDoc("认证", "退出登陆")]
public SimApiBaseResponse Logout() public SimApiBaseResponse Logout()
{ {
string token = null; string? token = null;
if (Request.Headers.TryGetValue("Token", out var value)) if (Request.Headers.TryGetValue("Token", out var value))
{ {
token = value; token = value;
} }
auth.Logout(token); auth.Logout(token!);
return new SimApiBaseResponse(); return new SimApiBaseResponse();
} }
[HttpPost("/logined"),SimApiAuth]
public SimApiBaseResponse<SimApiLoginItem> UserInfo()
{
return new SimApiBaseResponse<SimApiLoginItem>(LoginInfo);
}
} }
Helpers/SimApiAuth.cs
+23 -4
View File
@@ -1,5 +1,6 @@
#nullable enable #nullable enable
using System; using System;
using System.Collections.Generic;
using System.Text.Json; using System.Text.Json;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using SimApi.Communications; using SimApi.Communications;
@@ -16,11 +17,12 @@ public class SimApiAuth(IDistributedCache cache)
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="type"></param> /// <param name="type"></param>
/// <param name="meta"></param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <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> /// <summary>
@@ -28,16 +30,33 @@ public class SimApiAuth(IDistributedCache cache)
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="type"></param> /// <param name="type"></param>
/// <param name="meta"></param>
/// <param name="uuid"></param> /// <param name="uuid"></param>
/// <returns></returns> /// <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(); uuid ??= Guid.NewGuid().ToString();
var loginItem = new SimApiLoginItem(id, type); var loginItem = new SimApiLoginItem(id, type, meta);
cache.SetString(uuid, JsonSerializer.Serialize(loginItem)); cache.SetString(uuid, JsonSerializer.Serialize(loginItem));
return uuid; 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>
/// 获取登陆信息 /// 获取登陆信息
/// </summary> /// </summary>
Helpers/SimApiStorage.cs
+79 -13
View File
@@ -1,19 +1,23 @@
using System; #nullable enable
using System;
using System.IO; using System.IO;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Minio; using Minio;
using SimApi.Configs; using Minio.DataModel.Args;
using SimApi.Configurations;
namespace SimApi.Helpers; namespace SimApi.Helpers;
public class SimApiStorage 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 ServeUrl { get; }
private string Endpoint { get; }
public string Bucket { get; } public string Bucket { get; }
private IHttpContextAccessor HttpContextAccessor { get; } private IHttpContextAccessor HttpContextAccessor { get; }
@@ -22,9 +26,10 @@ public class SimApiStorage
{ {
var options = apiOptions.SimApiStorageOptions; var options = apiOptions.SimApiStorageOptions;
HttpContextAccessor = httpContextAccessor; HttpContextAccessor = httpContextAccessor;
Endpoint = options.Endpoint!;
var useSsl = false; var useSsl = false;
string endpoint; string endpoint;
if (options.Endpoint.StartsWith("http://")) if (options.Endpoint!.StartsWith("http://"))
{ {
endpoint = options.Endpoint.Replace("http://", string.Empty); endpoint = options.Endpoint.Replace("http://", string.Empty);
} }
@@ -38,14 +43,16 @@ public class SimApiStorage
throw new Exception("SimApiStorage: Error Endpoint"); throw new Exception("SimApiStorage: Error Endpoint");
} }
ServeUrl = options.ServeUrl; ServeUrl = options.ServeUrl!;
Bucket = options.Bucket; if (ServeUrl.EndsWith('/')) throw new Exception("SimApiStorage: ServeUrl must not end with /");
Bucket = options.Bucket!;
var mcb = new MinioClient().WithEndpoint(endpoint) var mcb = new MinioClient().WithEndpoint(endpoint)
.WithCredentials(options.AccessKey, options.SecretKey); .WithCredentials(options.AccessKey, options.SecretKey);
if (useSsl) if (useSsl)
{ {
mcb = mcb.WithSSL(); mcb = mcb.WithSSL();
} }
Mc = mcb.Build(); Mc = mcb.Build();
var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result; var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;
@@ -61,10 +68,13 @@ public class SimApiStorage
/// <param name="path"></param> /// <param name="path"></param>
/// <param name="expire"></param> /// <param name="expire"></param>
/// <returns></returns> /// <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) CheckPath(path);
.WithObject(path).WithExpiry(expire)).Result; 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> /// <summary>
@@ -75,20 +85,38 @@ public class SimApiStorage
/// <returns></returns> /// <returns></returns>
public string GetDownloadUrl(string path, int expire = 600) public string GetDownloadUrl(string path, int expire = 600)
{ {
CheckPath(path);
path = path.TrimStart('/');
return Mc.PresignedGetObjectAsync(new PresignedGetObjectArgs().WithBucket(Bucket).WithObject(path) return Mc.PresignedGetObjectAsync(new PresignedGetObjectArgs().WithBucket(Bucket).WithObject(path)
.WithExpiry(expire)).Result; .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) Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).WithObjectSize(stream.Length)
.WithStreamData(stream).WithContentType(contentType)).Wait(); .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) 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 httpRequest = HttpContextAccessor.HttpContext?.Request;
var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}"; var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
if (string.IsNullOrEmpty(path)) 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}"; 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);
Helpers/SimApiUtil.cs
+23 -6
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;
@@ -50,16 +51,15 @@ public static class SimApiUtil
/// <returns></returns> /// <returns></returns>
public static string Md5(string source, string mode = "x2") public static string Md5(string source, string mode = "x2")
{ {
var sor = Encoding.UTF8.GetBytes(source); var sourceBytes = Encoding.UTF8.GetBytes(source);
var md5 = MD5.Create(); var result = MD5.HashData(sourceBytes);
var result = md5.ComputeHash(sor); var stringBuilder = new StringBuilder(40);
var strbul = new StringBuilder(40);
foreach (var t in result) foreach (var t in result)
{ {
strbul.Append(t.ToString(mode)); stringBuilder.Append(t.ToString(mode));
} }
return strbul.ToString(); return stringBuilder.ToString();
} }
/// <summary> /// <summary>
@@ -71,4 +71,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);
}
} }
Logger/SimApiLogger.cs
+14 -5
View File
@@ -1,16 +1,14 @@
using System; using System;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using SimApi.Helpers;
namespace SimApi.Logger; namespace SimApi.Logger;
public class SimApiLogger(string name) : ILogger public class SimApiLogger(string name) : ILogger
{ {
public IDisposable BeginScope<TState>(TState state) => default!; public IDisposable BeginScope<TState>(TState state) where TState : notnull => default!;
public bool IsEnabled(LogLevel logLevel) => true; public bool IsEnabled(LogLevel logLevel) => true;
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception,
Func<TState, Exception, string> formatter) Func<TState, Exception, string> formatter)
{ {
Console.ForegroundColor = logLevel switch Console.ForegroundColor = logLevel switch
@@ -23,11 +21,22 @@ 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: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);
Console.ResetColor();
}
}
public class EmptyDisposable : IDisposable
{
public static EmptyDisposable Instance { get; } = new EmptyDisposable();
public void Dispose()
{
} }
} }
Logger/SimApiLoggerConfiguration.cs
-15
View File
@@ -1,15 +0,0 @@
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
};
}
Middlewares/SimApiAuthMiddleware.cs
+5 -8
View File
@@ -14,21 +14,18 @@ public class SimApiAuthMiddleware(RequestDelegate next)
{ {
public Task Invoke(HttpContext httpContext, IDistributedCache cache, SimApiAuth auth) public Task Invoke(HttpContext httpContext, IDistributedCache cache, SimApiAuth auth)
{ {
string token = null; string? token = null;
if (httpContext.Request.Headers.TryGetValue("Token", out var header)) if (httpContext.Request.Headers.TryGetValue("Token", out var header))
{ {
token = header; token = header;
} }
if (!string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token)) return next(httpContext);
var login = auth.GetLogin(token);
if (login != null)
{ {
var login = auth.GetLogin(token); httpContext.Items.Add("LoginInfo", login);
if (login != null)
{
httpContext.Items.Add("LoginInfo", login);
}
} }
return next(httpContext); return next(httpContext);
} }
} }
Middlewares/SimApiExceptionMiddleware.cs
+16 -13
View File
@@ -24,12 +24,17 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
try try
{ {
await next(context); 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); throw new SimApiException(context.Response.StatusCode);
}
} }
} }
catch (SimApiException ex) catch (SimApiException ex)
@@ -42,8 +47,8 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
} }
catch (Exception ex) catch (Exception ex)
{ {
log.LogError(ex.Message); log.LogError("{Msg}", ex.Message);
log.LogError(ex.StackTrace); log.LogError("{Msg}", ex.StackTrace);
response = new SimApiBaseResponse(500, ex.Message); response = new SimApiBaseResponse(500, ex.Message);
ErrorResponse(context, response); ErrorResponse(context, response);
} }
@@ -54,13 +59,11 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
/// </summary> /// </summary>
/// <param name="context"></param> /// <param name="context"></param>
/// <param name="response"></param> /// <param name="response"></param>
private void ErrorResponse(HttpContext context, SimApiBaseResponse response) private static void ErrorResponse(HttpContext context, SimApiBaseResponse response)
{ {
if (!context.Response.HasStarted) if (context.Response.HasStarted) return;
{ context.Response.StatusCode = 200;
context.Response.StatusCode = 200; context.Response.Headers.Append("Content-Type", "application/json");
context.Response.Headers.Append("Content-Type", "application/json"); context.Response.WriteAsync(response.ToString());
context.Response.WriteAsync(response.ToString());
}
} }
} }
Models/SimApiBaseModel.cs
+6 -9
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" };
@@ -23,7 +20,7 @@ public class SimApiBaseModel
public void MapData<TS>(TS source, bool mapAll = false) public void MapData<TS>(TS source, bool mapAll = false)
{ {
//获取要赋值的源数据不为null的项目 //获取要赋值的源数据不为null的项目
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null) var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
.Select(x => new .Select(x => new
{ {
x.Name, x.Name,
@@ -52,7 +49,7 @@ public class SimApiBaseModel
public void MapData<TS>(TS source, string[] mapFields) public void MapData<TS>(TS source, string[] mapFields)
{ {
//获取要赋值的源数据不为null的项目 //获取要赋值的源数据不为null的项目
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null) var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
.Select(x => new .Select(x => new
{ {
x.Name, x.Name,
@@ -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);
} }
} }
SimApi.csproj
+5 -4
View File
@@ -15,6 +15,7 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageVersion>5.0.2</PackageVersion> <PackageVersion>5.0.2</PackageVersion>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -25,10 +26,10 @@
<Folder Include="Exceptions\"/> <Folder Include="Exceptions\"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Minio" Version="4.0.7"/> <PackageReference Include="Minio" Version="6.0.3" />
<PackageReference Include="RabbitMQ.Client" Version="6.6.0"/> <PackageReference Include="MQTTnet" Version="4.3.6.1152" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0"/> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
</ItemGroup> </ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>
SimApiExtensions.cs
+39 -7
View File
@@ -5,8 +5,9 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using SimApi.Middlewares; using SimApi.Middlewares;
using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using SimApi.Configs; using SimApi.Configurations;
using SimApi.Logger; using SimApi.Logger;
namespace SimApi; namespace SimApi;
@@ -18,7 +19,7 @@ public static class SimApiExtensions
{ {
//**********快捷添加************** //**********快捷添加**************
public static IServiceCollection AddSimApi(this IServiceCollection builder, public static IServiceCollection AddSimApi(this IServiceCollection builder,
Action<SimApiOptions> options = null) Action<SimApiOptions>? options = null)
{ {
var simApiOptions = new SimApiOptions(); var simApiOptions = new SimApiOptions();
options?.Invoke(simApiOptions); options?.Invoke(simApiOptions);
@@ -30,6 +31,7 @@ public static class SimApiExtensions
logger.AddProvider(new SimApiLoggerProvider()); logger.AddProvider(new SimApiLoggerProvider());
}); });
} }
// 是否使用 AUTH // 是否使用 AUTH
if (simApiOptions.EnableSimApiAuth) if (simApiOptions.EnableSimApiAuth)
{ {
@@ -188,17 +190,47 @@ public static class SimApiExtensions
return builder; return builder;
} }
public static IHost UseSimApi(this IHost builder)
{
var options = builder.Services.GetRequiredService<SimApiOptions>();
var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
//请求一下检测存储错误
if (options.EnableSimApiStorage)
{
logger.LogInformation("开始配置SimApiStorage...");
builder.Services.GetService<SimApiStorage>();
}
if (options.EnableLowerUrl)
{
logger.LogInformation("开始配置使用URL小写...");
}
if (options.EnableSynapse)
{
var synapse = builder.Services.GetRequiredService<Synapse>();
synapse.Init();
}
return builder;
}
/// <summary> /// <summary>
/// 使用所有SimApi自定义中间件 /// 使用所有SimApi自定义中间件
/// </summary> /// </summary>
/// <param name="builder"></param> /// <param name="builder"></param>
/// <returns></returns> /// <returns></returns>
public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder) public static WebApplication UseSimApi(this WebApplication builder)
{ {
var options = builder.ApplicationServices.GetRequiredService<SimApiOptions>(); var options = builder.Services.GetRequiredService<SimApiOptions>();
var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>(); var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
if (options.EnableForwardHeaders) if (options.EnableForwardHeaders)
{ {
logger.LogInformation("开始配置ForwardedHeaders..."); logger.LogInformation("开始配置ForwardedHeaders...");
@@ -245,7 +277,7 @@ public static class SimApiExtensions
if (options.EnableSimApiStorage) if (options.EnableSimApiStorage)
{ {
logger.LogInformation("开始配置SimApiStorage..."); logger.LogInformation("开始配置SimApiStorage...");
builder.ApplicationServices.GetService<SimApiStorage>(); builder.Services.GetService<SimApiStorage>();
} }
if (options.EnableLowerUrl) if (options.EnableLowerUrl)
@@ -255,7 +287,7 @@ public static class SimApiExtensions
if (options.EnableSynapse) if (options.EnableSynapse)
{ {
var synapse = builder.ApplicationServices.GetRequiredService<Synapse>(); var synapse = builder.Services.GetRequiredService<Synapse>();
synapse.Init(); synapse.Init();
} }
Synapse/ConfigStore.cs
+63
View File
@@ -0,0 +1,63 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using MQTTnet;
using MQTTnet.Protocol;
namespace SimApi;
public partial class Synapse
{
public event EventHandler<ConfigStoreItem>? OnConfigChanged;
private Dictionary<string, string> CurrentConfig { get; } = new();
private string ConfigStoreTopicPrefix => $"{Options.SysName}/synapse-config-store/";
private bool FireSetConfig(string key, string value)
{
if (key.Contains('#') || key.Contains('+')) return false;
var topic = $"{Options.SysName}/synapse-config-store/{key}";
var message = new MqttApplicationMessageBuilder()
.WithTopic(topic)
.WithPayload(value)
.WithRetainFlag()
.Build();
if (!Client!.IsConnected) return false;
Client!.PublishAsync(message, CancellationToken.None).Wait();
logger.LogDebug("Synapse Config Set: {Config} => {Data}", key, value);
return true;
}
private string? FireGetConfig(string key)
{
return CurrentConfig.GetValueOrDefault(key);
}
private void RunConfigStoreServer()
{
Client!.ApplicationMessageReceivedAsync += e =>
{
if (!e.ApplicationMessage.Topic.StartsWith(ConfigStoreTopicPrefix)) return Task.CompletedTask;
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
var eventName = e.ApplicationMessage.Topic.Replace(ConfigStoreTopicPrefix, string.Empty);
CurrentConfig[eventName] = reqBody;
OnConfigChanged?.Invoke(this, new ConfigStoreItem(eventName, reqBody));
logger.LogDebug("Synapse Config Changed: {Config} => {Data}", eventName, reqBody);
return Task.CompletedTask;
};
SubConfigStoreServerTopic();
}
private void SubConfigStoreServerTopic()
{
var csSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
.WithTopicFilter(o =>
o.WithTopic($"{ConfigStoreTopicPrefix}#").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
.Build();
Client!.SubscribeAsync(csSubOpts).Wait();
}
public record ConfigStoreItem(string Key, string Value);
}
Synapse/EventClient.cs
+22 -20
View File
@@ -1,31 +1,33 @@
using System;
using System.Text;
using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using System.Text.Unicode; using System.Threading;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using MQTTnet;
using SimApi.Helpers; using SimApi.Helpers;
namespace SimApi; namespace SimApi;
public partial class Synapse public partial class Synapse
{ {
private void RunEventClient() private bool FireEvent(string eventName, object? param)
{ {
EventClientChannel = CreateChannel(0, "EventClient"); string paramJson;
} if (param is string strParam)
{
private void FireEvent(string eventName, object param) paramJson = strParam;
{ }
var paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption); else
var router = $"event.{Options.AppName}.{eventName}"; {
var props = EventClientChannel.CreateBasicProperties(); paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
props.AppId = Options.AppId; }
props.MessageId = Guid.NewGuid().ToString(); var topic = $"{Options.SysName}/event/{Options.AppName}/{eventName}";
props.ReplyTo = Options.AppName; var message = new MqttApplicationMessageBuilder()
props.Type = eventName; .WithTopic(topic)
EventClientChannel.BasicPublish(Options.SysName, router, false, props, Encoding.UTF8.GetBytes(paramJson)); .WithPayload(paramJson)
Logger.LogDebug("Event Publish: {OptionsAppName}.{EventName}\n{ParamJson}", Options.AppName, eventName, .WithRetainFlag(false)
paramJson); .Build();
if (!Client!.IsConnected) return false;
Client.PublishAsync(message, CancellationToken.None).Wait();
logger.LogDebug("Synapse Event Publish: {Event}@{App} {Json}", eventName, Options.AppName, paramJson);
return true;
} }
} }
Synapse/EventServer.cs
+54 -31
View File
@@ -1,50 +1,73 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using RabbitMQ.Client.Events; using MQTTnet;
using SimApi.Helpers; using SimApi.Helpers;
namespace SimApi; namespace SimApi;
public partial class Synapse public partial class Synapse
{ {
private string EventServerTopicPrefix => $"{Options.SysName}/event/";
private void RunEventServer() private void RunEventServer()
{ {
EventServerChannel = CreateChannel(Options.EventProcessorNum, "EventServer"); Client!.ApplicationMessageReceivedAsync += e =>
var queue = $"{Options.SysName}_{Options.AppName}_event";
EventServerChannel.QueueDeclare(queue, true, false, true, null);
foreach (var ev in EventRegistry.Where(ev => !ev.Key.Contains('*') && !ev.Key.Contains('#')))
{ {
EventServerChannel.QueueBind(queue, Options.SysName, $"event.{ev.Key}", null); if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return Task.CompletedTask;
} var reqBody = e.ApplicationMessage.ConvertPayloadToString();
var consumer = new EventingBasicConsumer(EventServerChannel); var eventName = e.ApplicationMessage.Topic.Replace(EventServerTopicPrefix, string.Empty);
consumer.Received += (ch, ea) => logger.LogDebug("Synapse Event Receive: {EventName}\n{Body}", eventName, reqBody);
{ var methods = EventRegistry
var reqBody = Encoding.UTF8.GetString(ea.Body.ToArray()); .Where(x => Regex.IsMatch(eventName,
Logger.LogDebug("Event Receive: {BasicPropertiesReplyTo}.{BasicPropertiesType}\n{S}", "^" + Regex.Escape(x.Key!).Replace("\\+", "[^/]+").Replace("\\#", ".*") + "$"))
ea.BasicProperties.ReplyTo, ea.BasicProperties.Type, reqBody); .ToArray();
foreach (var method in methods)
var key = ea.RoutingKey.Replace("event.", string.Empty);
var method = EventRegistry.FirstOrDefault(x => x.Key == key);
var callClass = Sp.CreateScope().ServiceProvider.GetRequiredService(method.Class);
var mt = callClass.GetType().GetMethod(method.Method);
var pt = mt.GetParameters()[0].ParameterType;
try
{ {
mt.Invoke(callClass, pt == typeof(string) var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
? new object[] { reqBody } var mt = callClass.GetType().GetMethod(method.Method!);
: new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) }); try
EventServerChannel.BasicAck(ea.DeliveryTag, false); {
} if (mt!.GetParameters().Length == 2)
catch (Exception e) {
{ var pt = mt.GetParameters()[1].ParameterType;
Logger.LogError("Event Processor Error: {Err}", e.InnerException); mt.Invoke(callClass, pt == typeof(string)
EventServerChannel.BasicNack(ea.DeliveryTag, false, false); ? [eventName, reqBody]
: [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]);
}
else
{
mt.Invoke(callClass, [eventName]);
}
}
catch (Exception ex)
{
logger.LogError("Synapse Event Processor Error: {Err}\n{Stack}", ex.Message,ex.StackTrace);
}
} }
return Task.CompletedTask;
}; };
EventServerChannel.BasicConsume(queue, false, "", false, false, null, consumer); SubRpcServerTopic();
}
private void SubEventServerTopic()
{
foreach (var ev in EventRegistry)
{
var topic = $"{EventServerTopicPrefix}{ev.Key}";
if (Options.EventLoadBalancing)
{
topic = "$queue/" + topic;
}
var evSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
.WithTopicFilter(o => o.WithTopic(topic)).Build();
Client!.SubscribeAsync(evSubOpts).Wait();
logger.LogDebug("Synapse Event Register Event Success: {EventName}\nFull Topic: {Topic}", ev.Key, topic);
}
} }
} }
Synapse/RpcClient.cs
+66 -43
View File
@@ -1,12 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text;
using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using System.Text.Unicode; using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Serialization; using MQTTnet;
using RabbitMQ.Client.Events;
using SimApi.Communications; using SimApi.Communications;
using SimApi.Helpers; using SimApi.Helpers;
@@ -14,57 +12,82 @@ namespace SimApi;
public partial class Synapse public partial class Synapse
{ {
private Dictionary<string, byte[]> ResponseCache { get; } = new(); private Dictionary<string, TaskCompletionSource<string>> ResponseCompletionSources { get; } = new();
private string EventClientTopicPrefix => $"{Options.SysName}/{Options.AppName}/rpc/client/{Options.AppId}/";
private void RunRpcClient() private void RunRpcClient()
{ {
RpcClientChannel = CreateChannel(0, "RpcClient"); Client!.ApplicationMessageReceivedAsync += e =>
var queue = $"{Options.SysName}_{Options.AppName}_client_{Options.AppId}";
var router = $"client.{Options.AppName}.{Options.AppId}";
RpcClientChannel.QueueDeclare(queue, true, false, true, null);
RpcClientChannel.QueueBind(queue, Options.SysName, router, null);
var consumer = new EventingBasicConsumer(RpcClientChannel);
consumer.Received += (ch, ea) =>
{ {
ResponseCache.Add(ea.BasicProperties.CorrelationId, ea.Body.ToArray()); if (!e.ApplicationMessage.Topic.StartsWith(EventClientTopicPrefix)) return Task.CompletedTask;
RpcClientChannel.BasicAck(ea.DeliveryTag, false); var reqBody = e.ApplicationMessage.ConvertPayloadToString();
Logger.LogDebug( var messageId = e.ApplicationMessage.Topic.Replace(EventClientTopicPrefix, string.Empty);
"RPC Response: ({BasicPropertiesCorrelationId}) {BasicPropertiesType}@{BasicPropertiesReplyTo} -> {OptionsAppName}\n{S}", if (!ResponseCompletionSources.TryGetValue(messageId, out var tcs)) return Task.CompletedTask;
ea.BasicProperties.CorrelationId, ea.BasicProperties.Type, ea.BasicProperties.ReplyTo, Options.AppName, tcs.SetResult(reqBody);
Encoding.UTF8.GetString(ea.Body.ToArray())); ResponseCompletionSources.Remove(messageId);
return Task.CompletedTask;
}; };
RpcClientChannel.BasicConsume(queue, false, "", false, false, null, consumer); SubRpcClientTopic();
} }
private string FireRpc(string app, string action, object param) private void SubRpcClientTopic()
{ {
var paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption); var rcSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
var router = $"server.{app}"; .WithTopicFilter(o => o.WithTopic($"{EventClientTopicPrefix}+")).Build();
string response; Client!.SubscribeAsync(rcSubOpts).Wait();
var props = RpcClientChannel.CreateBasicProperties(); }
props.AppId = Options.AppId;
props.MessageId = Guid.NewGuid().ToString(); private string? FireRpc(string app, string action, object? param)
props.Type = action; {
props.ReplyTo = Options.AppName; string paramJson;
RpcClientChannel.BasicPublish(Options.SysName, router, false, props, Encoding.UTF8.GetBytes(paramJson)); if (param is string strParam)
Logger.LogDebug("RPC Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}",
props.MessageId,
Options.AppName, action, app, paramJson);
var ts = SimApiUtil.TimestampNow;
while (true)
{ {
if (SimApiUtil.TimestampNow - ts > Options.RpcTimeout) paramJson = strParam;
}
else
{
paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
}
var topic = $"{Options.SysName}/{app}/rpc/server/{action}";
var messageId = Guid.NewGuid().ToString();
var tcs = new TaskCompletionSource<string>();
ResponseCompletionSources.Add(messageId, tcs);
var message = new MqttApplicationMessageBuilder()
.WithTopic(topic)
.WithPayload(paramJson)
.WithResponseTopic($"{Options.AppName},{Options.AppId}")
.WithContentType(messageId)
.WithRetainFlag(false)
.Build();
if (!Client!.IsConnected) return null;
Client.PublishAsync(message, CancellationToken.None).Wait();
logger.LogDebug(
"Synapse RPC Client Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}", messageId,
Options.AppName, action, app, paramJson);
string response;
try
{
if (tcs.Task.Wait(Options.RpcTimeout * 1000))
{
response = tcs.Task.Result;
logger.LogDebug(
"Synapse RPC Client Response: ({BasicPropertiesCorrelationId}) {BasicPropertiesType}@{BasicPropertiesReplyTo} -> {OptionsAppName}\n{S}",
messageId, action, app, Options.AppName, response);
}
else
{ {
response = JsonSerializer.Serialize(new SimApiBaseResponse(502, "timeout"), SimApiUtil.JsonOption); response = JsonSerializer.Serialize(new SimApiBaseResponse(502, "timeout"), SimApiUtil.JsonOption);
break;
}
if (ResponseCache.TryGetValue(props.MessageId, out var value))
{
response = Encoding.UTF8.GetString(value);
ResponseCache.Remove(props.MessageId);
break;
} }
} }
catch
{
response = JsonSerializer.Serialize(new SimApiBaseResponse(500, "Synapse RPC Client Error"),
SimApiUtil.JsonOption);
}
return response; return response;
} }
} }
Synapse/RpcServer.cs
+73 -62
View File
@@ -1,14 +1,12 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Threading;
using System.Text.Encodings.Web; using System.Threading.Tasks;
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 MQTTnet;
using MQTTnet.Protocol;
using SimApi.Communications; using SimApi.Communications;
using SimApi.Exceptions; using SimApi.Exceptions;
using SimApi.Helpers; using SimApi.Helpers;
@@ -18,76 +16,89 @@ namespace SimApi;
public partial class Synapse public partial class Synapse
{ {
private string RpcServerTopicPrefix => $"{Options.SysName}/{Options.AppName}/rpc/server/";
private void RunRpcServer() private void RunRpcServer()
{ {
RpcServerChannel = CreateChannel(Options.RpcProcessorNum, "RpcServer"); Client!.ApplicationMessageReceivedAsync += e =>
var queue = $"{Options.SysName}_{Options.AppName}_server";
var router = $"server.{Options.AppName}";
RpcServerChannel.QueueDeclare(queue, true, false, true, null);
RpcServerChannel.QueueBind(queue, Options.SysName, router, null);
var consumer = new EventingBasicConsumer(RpcServerChannel);
consumer.Received += (ch, ea) =>
{ {
var reqBody = Encoding.UTF8.GetString(ea.Body.ToArray()); if (!e.ApplicationMessage.Topic.StartsWith(RpcServerTopicPrefix)) return Task.CompletedTask;
Logger.LogDebug( var reqBody = e.ApplicationMessage.ConvertPayloadToString();
"RPC Receive: ({BasicPropertiesMessageId}) {BasicPropertiesReplyTo} -> {BasicPropertiesType}@{OptionsAppName}\n{S}", var action = e.ApplicationMessage.Topic.Replace(RpcServerTopicPrefix, string.Empty);
ea.BasicProperties.MessageId, ea.BasicProperties.ReplyTo, ea.BasicProperties.Type, Options.AppName, var appInfo = e.ApplicationMessage.ResponseTopic.Split(",");
logger.LogDebug(
"Synapse RPC Server Receive: ({BasicPropertiesMessageId}) {BasicPropertiesReplyTo} -> {BasicPropertiesType}@{OptionsAppName}\n{S}",
e.ApplicationMessage.ContentType, appInfo[0], action, Options.AppName,
reqBody); reqBody);
var res = new SimApiBaseResponse(404, "method not found"); SimApiBaseResponse res;
var method = RpcRegistry.FirstOrDefault(x => x.Key == ea.BasicProperties.Type); var method = RpcRegistry.FirstOrDefault(x => x.Key == action);
if (method != null) if (method == null) return Task.CompletedTask;
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
var mt = callClass.GetType().GetMethod(method.Method!);
try
{ {
var callClass = Sp.CreateScope().ServiceProvider.GetRequiredService(method.Class); var methodParams = mt!.GetParameters();
var mt = callClass.GetType().GetMethod(method.Method); object? ret;
var param = Array.Empty<object>(); if (methodParams.Length == 0)
try {
ret = mt.Invoke(callClass, []);
}
else
{ {
var pt = mt.GetParameters()[0].ParameterType; var pt = mt.GetParameters()[0].ParameterType;
if (pt == typeof(string)) var param = pt == typeof(string)
{ ? [reqBody]
param = new[] { reqBody }; : new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
} ret = mt.Invoke(callClass, param);
else
{
var paramObj = JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption);
param = new[] { paramObj };
}
var ret = mt.Invoke(callClass, param);
res = new SimApiBaseResponse<object>(ret);
} }
catch (TargetInvocationException e)
res = new SimApiBaseResponse<object?>
{ {
if (e.InnerException is SimApiException ie) Data = ret
{ };
Logger.LogDebug("RPC调用错误: {Err}", ie.Message); }
res = new SimApiBaseResponse(ie.Code, ie.Message); catch (TargetInvocationException ex)
} {
else if (ex.InnerException is SimApiException ie)
{
res = new SimApiBaseResponse(500, e.Message);
}
}
catch (Exception e)
{ {
Logger.LogDebug("RPC调用失败: {Err}", e.Message); logger.LogDebug("Synapse RPC调用错误: {Err}", ie.Message);
res = new SimApiBaseResponse(500, e.Message); res = new SimApiBaseResponse(ie.Code, ie.Message);
} }
else
{
res = new SimApiBaseResponse(500, ex.Message);
}
}
catch (Exception ex)
{
logger.LogDebug("Synapse RPC调用失败: {Err}", ex.Message);
res = new SimApiBaseResponse(500, ex.Message);
} }
var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption); var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
var reply = $"client.{ea.BasicProperties.ReplyTo}.{ea.BasicProperties.AppId}"; var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{e.ApplicationMessage.ContentType}";
var props = RpcServerChannel.CreateBasicProperties(); var message = new MqttApplicationMessageBuilder()
props.AppId = Options.AppId; .WithTopic(reply)
props.CorrelationId = ea.BasicProperties.MessageId; .WithPayload(returnJson)
props.MessageId = Guid.NewGuid().ToString(); .WithRetainFlag(false)
props.ReplyTo = Options.AppName; .Build();
props.Type = ea.BasicProperties.Type; if (!Client.IsConnected) return Task.CompletedTask;
RpcServerChannel.BasicPublish(Options.SysName, reply, false, props, Encoding.UTF8.GetBytes(returnJson)); Client.PublishAsync(message, CancellationToken.None).Wait();
Logger.LogDebug( logger.LogDebug(
"Rpc Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}", "Synapse Rpc Server Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}",
ea.BasicProperties.MessageId, ea.BasicProperties.Type, Options.AppName, ea.BasicProperties.ReplyTo, e.ApplicationMessage.ContentType, action, Options.AppName, appInfo[0], returnJson);
returnJson);
return Task.CompletedTask;
}; };
RpcServerChannel.BasicConsume(queue, true, "", false, false, null, consumer); SubRpcServerTopic();
}
public void SubRpcServerTopic()
{
var rsSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
.WithTopicFilter(o =>
o.WithTopic($"$queue/{RpcServerTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
.Build();
Client!.SubscribeAsync(rsSubOpts).Wait();
} }
} }
Synapse/Synapse.cs
+176 -128
View File
@@ -3,188 +3,198 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using RabbitMQ.Client; using MQTTnet;
using RabbitMQ.Client.Exceptions; using MQTTnet.Client;
using MQTTnet.Formatter;
using SimApi.Attributes; using SimApi.Attributes;
using SimApi.Communications; using SimApi.Communications;
using SimApi.Configs; using SimApi.Configurations;
using SimApi.Helpers; using SimApi.Helpers;
namespace SimApi; namespace SimApi;
public partial class Synapse public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logger, IServiceProvider sp)
{ {
private IServiceProvider Sp { get; } private SimApiSynapseOptions Options { get; } = simApiOptions.SimApiSynapseOptions;
private SimApiSynapseOptions Options { get; } private MqttFactory MqttFactory { get; } = new();
public IMqttClient? Client { get; set; }
private ILogger<Synapse> Logger { get; } private List<RegisterItem> EventRegistry { get; set; } = new();
private IConnection Connection { get; set; } private List<RegisterItem> RpcRegistry { get; set; } = new();
private IModel EventClientChannel { get; set; }
private IModel EventServerChannel { get; set; }
private IModel RpcClientChannel { get; set; }
private IModel RpcServerChannel { get; set; }
private List<RegisterItem> EventRegistry { get; set; }
private List<RegisterItem> RpcRegistry { get; set; }
public Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logger, IServiceProvider sp)
{
Logger = logger;
Sp = sp;
Options = simApiOptions.SimApiSynapseOptions;
}
public void Init() public void Init()
{ {
ProcessAttribute(); logger.LogDebug("Synapse初始化配置信息: {Json}", SimApiUtil.Json(Options));
Logger.LogDebug("Synapse初始化配置信息: {Json}", SimApiUtil.Json(Options));
if (string.IsNullOrEmpty(Options.AppName) || string.IsNullOrEmpty(Options.SysName)) if (string.IsNullOrEmpty(Options.AppName) || string.IsNullOrEmpty(Options.SysName))
{ {
Logger.LogCritical("Synapse初始化失败: AppName or SysName 错误"); logger.LogCritical("Synapse初始化失败: AppName 和 SysName 不能为空");
} }
Options.AppId ??= Guid.NewGuid().ToString(); Options.AppId ??= Guid.NewGuid().ToString();
Logger.LogInformation("System Name: {SysName}\nApp Name: {AppName}\nAppId: {AppId}", Options.SysName, logger.LogInformation("Synapse Sys Name: {SysName}\nSynapse App Name: {AppName}\nSynapse App Id: {AppId}",
Options.AppName, Options.AppId); Options.SysName, Options.AppName, Options.AppId);
CreateConnection(); CreateConnection();
CheckAndCreateExchange(); ProcessAttribute();
//事件客户端 //事件客户端
if (Options.DisableEventClient) if (Options.DisableEventClient)
{ {
Logger.LogWarning("Event Client Disabled: DisableEventClient set true"); logger.LogWarning("Synapse Event Client Disabled: DisableEventClient set true");
} }
else else
{ {
RunEventClient(); logger.LogInformation("Synapse Event Client Ready");
Logger.LogInformation("Event Client Ready");
} }
//RPC客户端 //RPC客户端
if (Options.DisableRpcClient) if (Options.DisableRpcClient)
{ {
Logger.LogWarning("Rpc Client Disabled: DisableEventClient set true"); logger.LogWarning("Synapse Rpc Client Disabled: DisableEventClient set true");
} }
else else
{ {
RunRpcClient(); RunRpcClient();
Logger.LogInformation("Rpc Client Ready, Client Timeout: {OptionsRpcTimeout}s", Options.RpcTimeout); logger.LogInformation("Synapse Rpc Client Ready, Client Timeout: {OptionsRpcTimeout}s", Options.RpcTimeout);
} }
if (RpcRegistry.Count > 0) if (RpcRegistry.Count > 0)
{ {
RunRpcServer(); RunRpcServer();
} }
if (EventRegistry.Count > 0) if (EventRegistry.Count > 0)
{ {
RunEventServer(); RunEventServer();
} }
if (Options.EnableConfigStore)
{
RunConfigStoreServer();
logger.LogInformation("Synapse Config Store Ready [{SysName}] ...", Options.SysName);
}
} }
public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic param) /// <summary>
/// 调用RPC使用明确的返回值类型
/// </summary>
/// <param name="appName"></param>
/// <param name="method"></param>
/// <param name="param"></param>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic? param = null)
{ {
var res = new SimApiBaseResponse(500, "Rpc Client Disabled!"); var res = new SimApiBaseResponse(500, "Synapse Rpc Client Disabled!");
if (Options.DisableRpcClient) if (Options.DisableRpcClient)
{ {
Logger.LogError("Rpc Client Disabled!"); logger.LogError("Synapse Rpc Client Disabled!");
} }
else else
{ {
var data = FireRpc(appName, method, param); var data = FireRpc(appName, method, param);
res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption); res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption);
} }
return res as SimApiBaseResponse<T>;
return (res as SimApiBaseResponse<T>)!;
} }
public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic param) /// <summary>
/// 调用RPC使用object作为返回值类型
/// </summary>
/// <param name="appName"></param>
/// <param name="method"></param>
/// <param name="param"></param>
/// <returns></returns>
public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic? param = null)
{ {
return Rpc<object>(appName, method, param); return Rpc<object>(appName, method, param);
} }
public void Event(string eventName, dynamic param) /// <summary>
///
/// </summary>
/// <param name="eventName"></param>
/// <param name="param"></param>
public bool Event(string eventName, dynamic? param = null)
{ {
if (Options.DisableEventClient) if (!Options.DisableEventClient) return FireEvent(eventName, param);
{ logger.LogError("Synapse Event Client Disabled!");
Logger.LogError("Event Client Disabled!"); return false;
} }
else
{ /// <summary>
FireEvent(eventName, param); /// 设置一个系统配置项
} /// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
/// <returns></returns>
public bool SetConfig(string key, string value)
{
if (Options.EnableConfigStore) return FireSetConfig(key, value);
logger.LogError("Synapse Config Store Disabled!");
return false;
}
/// <summary>
/// 读取一个配置项,如果没有则为空
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
public string? GetConfig(string key)
{
if (Options.EnableConfigStore) return FireGetConfig(key);
logger.LogError("Synapse Config Store Disabled!");
return null;
} }
private void CreateConnection() private void CreateConnection()
{ {
var factory = new ConnectionFactory Client = MqttFactory.CreateMqttClient();
var clientOpts = new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500)
.WithWebSocketServer(o => o.WithUri(Options.Websocket))
.WithCredentials(Options.Username, Options.Password)
.WithClientId($"{Options.AppName}:{Options.AppId}")
.Build();
Client!.ConnectAsync(clientOpts, CancellationToken.None).Wait();
Client.ConnectedAsync += _ =>
{ {
HostName = Options.MqHost, logger.LogInformation("Synapse MQTT[{AppName}:{AppId}] 连接成功...", Options.AppName, Options.AppId);
Port = Options.MqPort, //RPC客户端
VirtualHost = Options.MqVHost, if (!Options.DisableRpcClient) SubRpcClientTopic();
UserName = Options.MqUser, if (RpcRegistry.Count > 0) SubRpcServerTopic();
Password = Options.MqPass if (EventRegistry.Count > 0) SubEventServerTopic();
if (Options.EnableConfigStore) SubConfigStoreServerTopic();
return Task.CompletedTask;
}; };
try //重连
Client.DisconnectedAsync += async _ =>
{ {
Connection = factory.CreateConnection(); logger.LogError("Synapse MQTT[{AppName}:{AppId}] 断开连接,开始重连...", Options.AppName, Options.AppId);
Logger.LogInformation("连接RabbitMQ服务器成功"); await Task.Delay(TimeSpan.FromSeconds(5));
} try
catch (BrokerUnreachableException e)
{
Logger.LogError("连接RabbitMQ失败: \n{Err}", e);
}
}
private IModel CreateChannel(ushort processNum = 0, string desc = "unknow")
{
IModel channel = null;
try
{
var log = $"Channel [{desc}] 创建成功...";
channel = Connection.CreateModel();
if (processNum != 0)
{ {
channel.BasicQos(0, processNum, false); logger.LogInformation("Synapse MQTT[{AppName}:{AppId}] 开始连接MQTT服务器...", Options.AppName, Options.AppId);
log += $"最大处理器数量: {processNum}"; Client.ConnectAsync(clientOpts).Wait();
} }
Logger.LogInformation(log); catch
} {
catch (ConnectFailureException e) logger.LogError("Synapse MQTT[{AppName}:{AppId}] 重连失败...", Options.AppName, Options.AppId);
{ }
Logger.LogError("Channel [{{Desc}}] 创建失败...\n {0}", e); };
}
return channel;
}
private void CheckAndCreateExchange()
{
var channel = CreateChannel(0, "Exchange");
try
{
channel.ExchangeDeclare(Options.SysName, ExchangeType.Topic, true, true, null);
Logger.LogDebug("Register Exchange Success");
}
catch (ConnectFailureException e)
{
Logger.LogError("Failed to declare Exchange.\n {Err}", e);
}
channel.Close();
Logger.LogDebug("Exchange Channel Closed");
} }
private void ProcessAttribute() private void ProcessAttribute()
{ {
EventRegistry = new List<RegisterItem>();
RpcRegistry = new List<RegisterItem>();
var stackTrace = new StackTrace(); var stackTrace = new StackTrace();
var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1).GetMethod(); var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1)?.GetMethod();
var assembly = callingMethod.DeclaringType.Assembly; var assembly = callingMethod?.DeclaringType?.Assembly;
var types = assembly.GetTypes(); // 获取程序集中的所有类型 var types = assembly!.GetTypes(); // 获取程序集中的所有类型
foreach (var type in types) foreach (var type in types)
{ {
var methods = type.GetMethods(); // 获取类型中的所有方法 var methods = type.GetMethods(); // 获取类型中的所有方法
@@ -193,46 +203,84 @@ public partial class Synapse
if (method.IsDefined(typeof(SynapseEventAttribute), false)) if (method.IsDefined(typeof(SynapseEventAttribute), false))
{ {
var attribute = var attribute =
(SynapseEventAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseEventAttribute)); (SynapseEventAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseEventAttribute))!;
if (attribute != null) var tmp = new RegisterItem
{ {
EventRegistry.Add(new RegisterItem Key = attribute.Name ?? method.Name,
{ Class = type,
Key = attribute.Name ?? method.Name, Method = method.Name
Class = type, };
Method = method.Name if (tmp.Key.StartsWith('/') || tmp.Key.EndsWith('/'))
}); {
logger.LogError("Synapse Event Register Error: {Key} Can't start or end of '/'", tmp.Key);
continue;
} }
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(tmp.Class!);
var mt = callClass.GetType().GetMethod(tmp.Method);
if (mt!.GetParameters().Length > 2 || mt.GetParameters().Length < 1)
{
logger.LogError(
"Synapse Event Register Error: Only one or two parameter supported. {Key} -> {Method}@{Class}",
tmp.Key, tmp.Method, tmp.Class.Name);
continue;
}
EventRegistry.Add(tmp);
} }
if (method.IsDefined(typeof(SynapseRpcAttribute), false)) if (method.IsDefined(typeof(SynapseRpcAttribute), false))
{ {
var attribute = var attribute =
(SynapseRpcAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseRpcAttribute)); (SynapseRpcAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseRpcAttribute))!;
if (attribute != null) var tmp = new RegisterItem
{ {
RpcRegistry.Add(new RegisterItem Key = attribute.Name ?? $"{type.Name}.{method.Name}",
{ Class = type,
Key = attribute.Name ?? $"{type.Name}.{method.Name}", Method = method.Name
Class = type, };
Method = method.Name if (tmp.Key.Contains('/') || tmp.Key.Contains('#') || tmp.Key.Contains('+'))
}); {
logger.LogError("Synapse Rpc Register Error: {Key} contains '/' , '#' , '+'", tmp.Key);
continue;
} }
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(tmp.Class!);
var mt = callClass.GetType().GetMethod(tmp.Method);
if (mt!.GetParameters().Length > 1)
{
logger.LogError(
"Synapse Rpc Register Error: Only one or none parameter supported. {Key} -> {Method}@{Class}",
tmp.Key, tmp.Method, tmp.Class.Name);
continue;
}
if (RpcRegistry.Any(x => x.Key == tmp.Key))
{
logger.LogError("Synapse Rpc Register Error: {Key} Already Exists -> {Method}@{Class}", tmp.Key,
tmp.Method, tmp.Class.Name);
continue;
}
RpcRegistry.Add(tmp);
} }
} }
} }
var events = EventRegistry.Aggregate(string.Empty, var events = EventRegistry.Aggregate(string.Empty,
(current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class.Name}"); (current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class!.Name}");
var rpcList = RpcRegistry.Aggregate(string.Empty, var rpcList = RpcRegistry.Aggregate(string.Empty,
(current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class.Name}"); (current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class!.Name}");
Logger.LogInformation(">>> Synapse System 读取Event方法:{Event}\n>>>Synapse System 读取RPC方法:{Rpc}", events, rpcList); if (EventRegistry.Count > 0) logger.LogInformation(" >> Synapse System 读取Event方法:{Event}", events);
if (RpcRegistry.Count > 0) logger.LogInformation(" >> Synapse System 读取RPC方法:{Rpc}", rpcList);
} }
} }
public class RegisterItem public class RegisterItem
{ {
public string Key { get; set; } public string? Key { get; init; }
public Type Class { get; set; } public Type? Class { get; init; }
public string Method { get; set; } public string? Method { get; init; }
} }