Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
683cf9176a | ||
|
|
1ee8d941e9 | ||
|
|
1d474f596a | ||
|
|
929ddaced3 | ||
|
|
82f7e0fc00 | ||
|
|
f4bc6dc080 | ||
|
|
56b0490d1e | ||
|
|
45e19c3561 | ||
|
|
04b2be1bb7 | ||
|
|
f78c3a0e0d | ||
|
|
506704fd90 | ||
|
|
786051ddbf | ||
|
|
d9ff4ae422 | ||
|
|
986b4e74e6 | ||
|
|
2257ba5b2a | ||
|
|
c40f8d664d | ||
|
|
a1f10b9c09 | ||
|
|
6ef7aca8ae | ||
|
|
4171756c54 | ||
|
|
c68cfa6192 | ||
|
|
8344567ac6 | ||
|
|
99b26d99f6 | ||
|
|
cb291691d5 | ||
|
|
47a48d0103 | ||
|
|
4c50acc309 | ||
|
|
be9092bf3c | ||
|
|
345aaa261e |
@@ -14,7 +14,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v1
|
uses: actions/setup-dotnet@v1
|
||||||
with:
|
with:
|
||||||
dotnet-version: "7.0.100"
|
dotnet-version: "8.0.200"
|
||||||
- name: Publish
|
- name: Publish
|
||||||
run: |
|
run: |
|
||||||
version=`git describe --tags`
|
version=`git describe --tags`
|
||||||
|
|||||||
@@ -5,61 +5,54 @@ using Microsoft.AspNetCore.Mvc.Filters;
|
|||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
using SimApi.Exceptions;
|
using SimApi.Exceptions;
|
||||||
|
|
||||||
namespace SimApi.Attributes
|
namespace SimApi.Attributes;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检测登录中间件
|
||||||
|
/// </summary>
|
||||||
|
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
|
||||||
|
public class SimApiAuthAttribute : ActionFilterAttribute
|
||||||
{
|
{
|
||||||
/// <summary>
|
private string[] Types { get; }
|
||||||
/// 检测登录中间件
|
|
||||||
/// </summary>
|
|
||||||
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
|
//默认是user登录类型
|
||||||
public class SimApiAuthAttribute : ActionFilterAttribute
|
public SimApiAuthAttribute()
|
||||||
{
|
{
|
||||||
private string[] Types { get; }
|
Types = new[] { "user" };
|
||||||
|
}
|
||||||
|
|
||||||
|
//只检测一种用户类型的快捷方式
|
||||||
|
public SimApiAuthAttribute(string type)
|
||||||
|
{
|
||||||
|
Types = type.Split(",");
|
||||||
|
}
|
||||||
|
|
||||||
//默认是user登录类型
|
//设定特定类型的检测
|
||||||
public SimApiAuthAttribute()
|
public SimApiAuthAttribute(string[] types)
|
||||||
|
{
|
||||||
|
Types = types;
|
||||||
|
}
|
||||||
|
|
||||||
|
//只检测一种用户类型的快捷方式
|
||||||
|
public SimApiAuthAttribute(string type, string url)
|
||||||
|
{
|
||||||
|
Types = new[] { type };
|
||||||
|
new HttpPostAttribute(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnActionExecuting(ActionExecutingContext context)
|
||||||
|
{
|
||||||
|
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
|
||||||
|
//检测是否登录
|
||||||
|
if (loginInfo == null)
|
||||||
{
|
{
|
||||||
Types = new[]
|
throw new SimApiException(401);
|
||||||
{
|
|
||||||
"user"
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
//检测用户类型
|
||||||
//只检测一种用户类型的快捷方式
|
if (!Types.Intersect(loginInfo.Type).Any())
|
||||||
public SimApiAuthAttribute(string type)
|
|
||||||
{
|
{
|
||||||
Types = type.Split(",");
|
throw new SimApiException(403);
|
||||||
}
|
|
||||||
|
|
||||||
//设定特定类型的检测
|
|
||||||
public SimApiAuthAttribute(string[] types)
|
|
||||||
{
|
|
||||||
Types = types;
|
|
||||||
}
|
|
||||||
|
|
||||||
//只检测一种用户类型的快捷方式
|
|
||||||
public SimApiAuthAttribute(string type, string url)
|
|
||||||
{
|
|
||||||
Types = new[]
|
|
||||||
{
|
|
||||||
type
|
|
||||||
};
|
|
||||||
new HttpPostAttribute(url);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void OnActionExecuting(ActionExecutingContext context)
|
|
||||||
{
|
|
||||||
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"];
|
|
||||||
//检测是否登录
|
|
||||||
if (loginInfo == null)
|
|
||||||
{
|
|
||||||
throw new SimApiException(401);
|
|
||||||
}
|
|
||||||
//检测用户类型
|
|
||||||
if (!Types.Intersect(loginInfo.Type).Any())
|
|
||||||
{
|
|
||||||
throw new SimApiException(403);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,24 @@
|
|||||||
using System;
|
using System;
|
||||||
using Swashbuckle.AspNetCore.Annotations;
|
using Swashbuckle.AspNetCore.Annotations;
|
||||||
|
|
||||||
namespace SimApi.Attributes
|
namespace SimApi.Attributes;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 快捷自定义接口文档类
|
||||||
|
/// </summary>
|
||||||
|
[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
|
||||||
|
public class SimApiDocAttribute : SwaggerOperationAttribute
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 快捷自定义接口文档类
|
/// 定义接口说明
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
|
/// <param name="tag">接口分组</param>
|
||||||
public class SimApiDocAttribute : SwaggerOperationAttribute
|
/// <param name="name">接口名称</param>
|
||||||
|
public SimApiDocAttribute(string tag, string name)
|
||||||
{
|
{
|
||||||
/// <summary>
|
Tags = new[] { tag };
|
||||||
/// 定义接口说明
|
Summary = name;
|
||||||
/// </summary>
|
// Consumes = new[] {"application/json"};
|
||||||
/// <param name="tag">接口分组</param>
|
// Produces = new[] {"application/json"};
|
||||||
/// <param name="name">接口名称</param>
|
|
||||||
public SimApiDocAttribute(string tag, string name)
|
|
||||||
{
|
|
||||||
Tags = new[] { tag };
|
|
||||||
Summary = name;
|
|
||||||
// Consumes = new[] {"application/json"};
|
|
||||||
// Produces = new[] {"application/json"};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -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()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,23 +1,37 @@
|
|||||||
namespace SimApi.Communications
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
|
||||||
|
namespace SimApi.Communications;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 只有ID的请求
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiIdOnlyRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
[Required] public int Id { get; set; }
|
||||||
/// 只有ID的请求
|
}
|
||||||
/// </summary>
|
|
||||||
public record SimApiIdOnlyRequest(int Id);
|
|
||||||
|
|
||||||
/// <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; }
|
||||||
}
|
}
|
||||||
@@ -2,75 +2,82 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace SimApi.Communications
|
namespace SimApi.Communications;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 基础相应
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiBaseResponse(int code = 200, string message = "成功")
|
||||||
{
|
{
|
||||||
|
public int Code { get; set; } = code;
|
||||||
|
public string Message { get; set; } = message;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 基础相应
|
/// 默认错误代码对应提示信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public record SimApiBaseResponse(int Code = 200, string Message = "成功")
|
private static readonly Dictionary<int, string> MsgBox = new()
|
||||||
{
|
{
|
||||||
/// <summary>
|
{ 200, "成功" },
|
||||||
/// 默认错误代码对应提示信息
|
{ 204, "没有数据" },
|
||||||
/// </summary>
|
{ 400, "参数错误" },
|
||||||
private static readonly Dictionary<int, string> MsgBox = new()
|
{ 401, "需要登录" },
|
||||||
{
|
{ 403, "无权访问" },
|
||||||
{
|
{ 404, "接口不存在" },
|
||||||
200, "成功"
|
{ 500, "服务器错误" }
|
||||||
},
|
};
|
||||||
{
|
|
||||||
204, "没有数据"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
400, "参数错误"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
401, "需要登录"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
403, "无权访问"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
404, "接口不存在"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
500, "服务器错误"
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public SimApiBaseResponse(int code) : this(code, MsgBox.ContainsKey(code) ? MsgBox[code] : "未知错误")
|
public SimApiBaseResponse(int code) : this(code, MsgBox.GetValueOrDefault(code, "未知错误"))
|
||||||
{
|
{
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 序列化为JSON字符串
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
public override string ToString()
|
|
||||||
{
|
|
||||||
return JsonSerializer.Serialize(this, new JsonSerializerOptions
|
|
||||||
{
|
|
||||||
IgnoreReadOnlyProperties = true,
|
|
||||||
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
||||||
Converters =
|
|
||||||
{
|
|
||||||
new JsonStringEnumConverter()
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 动态内容分页
|
/// 序列化为JSON字符串
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <returns></returns>
|
||||||
public record SimApiBasePageResponse<T>
|
public override string ToString()
|
||||||
(T List, int Page = 1, int Count = 1, int Total = 1, int Code = 200,
|
{
|
||||||
string Message = "成功") : SimApiBaseResponse(Code, Message);
|
return JsonSerializer.Serialize(this, new JsonSerializerOptions
|
||||||
|
{
|
||||||
|
IgnoreReadOnlyProperties = true,
|
||||||
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
||||||
|
Converters =
|
||||||
|
{
|
||||||
|
new JsonStringEnumConverter()
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 动态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 SimApiBasePageResponse<T>() : SimApiBaseResponse
|
||||||
Message);
|
{
|
||||||
|
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 class SimApiBaseResponse<T>() : SimApiBaseResponse
|
||||||
|
{
|
||||||
|
public T Data { get; set; }
|
||||||
|
|
||||||
|
public SimApiBaseResponse(T data) : this()
|
||||||
|
{
|
||||||
|
Data = data;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
namespace SimApi.Communications
|
using System.Collections.Generic;
|
||||||
{
|
|
||||||
/// <summary>
|
namespace SimApi.Communications;
|
||||||
/// 登录信息中间件
|
|
||||||
/// </summary>
|
/// <summary>
|
||||||
public record SimApiLoginItem(string Id, string[] Type);
|
/// 登录信息中间件
|
||||||
}
|
/// </summary>
|
||||||
|
public record SimApiLoginItem(string Id, string[] Type,Dictionary<string,string>? Meta = null);
|
||||||
@@ -1,73 +1,75 @@
|
|||||||
using System;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Generic;
|
|
||||||
using Swashbuckle.AspNetCore.SwaggerUI;
|
using Swashbuckle.AspNetCore.SwaggerUI;
|
||||||
|
|
||||||
namespace SimApi.Configs
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文档组配置
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiDocGroupOption
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 文档标识
|
||||||
|
/// </summary>
|
||||||
|
public string Id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文档名称
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文档描述
|
||||||
|
/// </summary>
|
||||||
|
public string Description { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 授权配置, Type支持 "SimApiAuth","ClientCredentials","Implicit","AuthorizationCode"
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiAuthOption
|
||||||
|
{
|
||||||
|
public string[] Type { get; set; } = new[] { "SimApiAuth" };
|
||||||
|
|
||||||
|
public string Description { get; set; } = "认证服务器颁发的AccessToken";
|
||||||
|
|
||||||
|
public string AuthorizationUrl { get; set; }
|
||||||
|
|
||||||
|
public string TokenUrl { get; set; }
|
||||||
|
|
||||||
|
public Dictionary<string, string> Scopes { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文档配置
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiDocOptions
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 文档组配置
|
/// 文档组配置
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SimApiDocGroupOption
|
public SimApiDocGroupOption[] ApiGroups { get; set; } = new[]
|
||||||
{
|
{
|
||||||
/// <summary>
|
new SimApiDocGroupOption
|
||||||
/// 文档标识
|
|
||||||
/// </summary>
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 文档名称
|
|
||||||
/// </summary>
|
|
||||||
public string Name { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 文档描述
|
|
||||||
/// </summary>
|
|
||||||
public string Description { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 授权配置, Type支持 "SimApiAuth","ClientCredentials","Implicit","AuthorizationCode"
|
|
||||||
/// </summary>
|
|
||||||
public class SimApiAuthOption
|
|
||||||
{
|
|
||||||
public string[] Type { get; set; } = new[] {"SimApiAuth"};
|
|
||||||
public string Description { get; set; } = "认证服务器颁发的AccessToken";
|
|
||||||
public string AuthorizationUrl { get; set; }
|
|
||||||
public string TokenUrl { get; set; }
|
|
||||||
public Dictionary<string, string> Scopes { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 文档配置
|
|
||||||
/// </summary>
|
|
||||||
public class SimApiDocOptions
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 文档组配置
|
|
||||||
/// </summary>
|
|
||||||
public SimApiDocGroupOption[] ApiGroups { get; set; } = new[]
|
|
||||||
{
|
{
|
||||||
new SimApiDocGroupOption
|
Id = "api",
|
||||||
{
|
Name = "Api",
|
||||||
Id = "api",
|
Description = "Api接口文档"
|
||||||
Name = "Api",
|
}
|
||||||
Description = "Api接口文档"
|
};
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 授权配置
|
/// 授权配置
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public SimApiAuthOption ApiAuth { get; set; } = new SimApiAuthOption();
|
public SimApiAuthOption ApiAuth { get; set; } = new SimApiAuthOption();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 文档页面标题
|
/// 文档页面标题
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string DocumentTitle { get; set; } = "API接口文档";
|
public string DocumentTitle { get; set; } = "API接口文档";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 接口支持的调用方式
|
/// 接口支持的调用方式
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public SubmitMethod[] SupportedMethod { get; set; } = new[] {SubmitMethod.Post};
|
public SubmitMethod[] SupportedMethod { get; set; } = new[] { SubmitMethod.Post };
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,93 +1,92 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace SimApi.Configs
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiOptions
|
||||||
{
|
{
|
||||||
public class SimApiOptions
|
/// <summary>
|
||||||
|
/// 启用全部Cors,对于开发前后分离的时候很有用。
|
||||||
|
/// default: true
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableCors { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启用SimApiAuth,一个简单的基于Header Token的认证方式。
|
||||||
|
/// default: false
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableSimApiAuth { get; set; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启用在线文档,启用后 访问 /swagger 可以查看对应的api文档。
|
||||||
|
/// default: false
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableSimApiDoc { get; set; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启用异常拦截,启用后,所有的异常将被通过json反馈。
|
||||||
|
/// default: true
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableSimApiException { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 开启S3兼容的存储系统。
|
||||||
|
/// default: false
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableSimApiStorage { get; set; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
||||||
|
/// default: true
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableForwardHeaders { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 将所有的url都格式化为小写字母
|
||||||
|
/// default: true
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableLowerUrl { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启用格式化的 Console Logger
|
||||||
|
/// default: false
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableLogger { get; set; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否启用Synapse
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableSynapse { get; set; } = false;
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Swagger文档相关配置,需要启用 EnableSimApiDoc
|
||||||
|
/// </summary>
|
||||||
|
public SimApiDocOptions SimApiDocOptions { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// S3兼容的存储系统配置,需要启用 EnableSimApiStorage
|
||||||
|
/// </summary>
|
||||||
|
public SimApiStorageOptions SimApiStorageOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions> options = null)
|
||||||
{
|
{
|
||||||
/// <summary>
|
options?.Invoke(SimApiSynapseOptions);
|
||||||
/// 启用全部Cors,对于开发前后分离的时候很有用。
|
}
|
||||||
/// default: true
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableCors { get; set; } = true;
|
|
||||||
|
|
||||||
/// <summary>
|
public void ConfigureSimApiSynapse(SimApiSynapseOptions options)
|
||||||
/// 启用SimapiAuth,一个简单的基于Header Token的认证方式。
|
{
|
||||||
/// default: false
|
SimApiSynapseOptions = options;
|
||||||
/// </summary>
|
}
|
||||||
public bool EnableSimApiAuth { get; set; } = false;
|
|
||||||
|
|
||||||
/// <summary>
|
public void ConfigureSimApiDoc(Action<SimApiDocOptions> options = null)
|
||||||
/// 启用在线文档,启用后 访问 /swagger 可以查看对应的api文档。
|
{
|
||||||
/// default: false
|
options?.Invoke(SimApiDocOptions);
|
||||||
/// </summary>
|
}
|
||||||
public bool EnableSimApiDoc { get; set; } = false;
|
|
||||||
|
|
||||||
/// <summary>
|
public void ConfigureSimApiStorage(Action<SimApiStorageOptions> options = null)
|
||||||
/// 启用异常拦截,启用后,所有的异常将被通过json反馈。
|
{
|
||||||
/// default: true
|
options?.Invoke(SimApiStorageOptions);
|
||||||
/// </summary>
|
|
||||||
public bool EnableSimApiException { get; set; } = true;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 开启S3兼容的存储系统。
|
|
||||||
/// default: false
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableSimApiStorage { get; set; } = false;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
|
||||||
/// default: true
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableForwardHeaders { get; set; } = true;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 将所有的url都格式化为小写字母
|
|
||||||
/// default: true
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableLowerUrl { get; set; } = true;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 启用格式化的 Console Logger
|
|
||||||
/// default: false
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableLogger { get; set; } = false;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 是否启用Synapse
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableSynapse { get; set; } = false;
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Swagger文档相关配置,需要启用 EnableSimApiDoc
|
|
||||||
/// </summary>
|
|
||||||
public SimApiDocOptions SimApiDocOptions { get; set; } = new SimApiDocOptions();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// S3兼容的存储系统配置,需要启用 EnableSimApiStorage
|
|
||||||
/// </summary>
|
|
||||||
public SimApiStorageOptions SimApiStorageOptions { get; set; } = new SimApiStorageOptions();
|
|
||||||
|
|
||||||
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new SimApiSynapseOptions();
|
|
||||||
|
|
||||||
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions> options = null)
|
|
||||||
{
|
|
||||||
options?.Invoke(SimApiSynapseOptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ConfigureSimApiSynapse(SimApiSynapseOptions options)
|
|
||||||
{
|
|
||||||
SimApiSynapseOptions = options;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ConfigureSimApiDoc(Action<SimApiDocOptions> options = null)
|
|
||||||
{
|
|
||||||
options?.Invoke(SimApiDocOptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ConfigureSimApiStorage(Action<SimApiStorageOptions> options = null)
|
|
||||||
{
|
|
||||||
options?.Invoke(SimApiStorageOptions);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,24 +1,23 @@
|
|||||||
namespace SimApi.Configs
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiStorageOptions
|
||||||
{
|
{
|
||||||
public class SimApiStorageOptions
|
/// <summary>
|
||||||
{
|
/// S3 服务器入口地址
|
||||||
/// <summary>
|
/// </summary>
|
||||||
/// S3 服务器入口地址
|
public string? Endpoint { get; set; }
|
||||||
/// </summary>
|
|
||||||
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; }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -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;
|
||||||
}
|
}
|
||||||
@@ -4,84 +4,106 @@ using Microsoft.AspNetCore.Mvc.Filters;
|
|||||||
using Microsoft.AspNetCore.Mvc.ModelBinding;
|
using Microsoft.AspNetCore.Mvc.ModelBinding;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using SimApi.Exceptions;
|
using SimApi.Exceptions;
|
||||||
using SimApi.Attributes;
|
|
||||||
|
|
||||||
namespace SimApi.Controllers
|
namespace SimApi.Controllers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 基础控制器,所有控制器均继承本控制器
|
||||||
|
/// 1. 自动验证请求参数
|
||||||
|
/// 2. 报错返回
|
||||||
|
/// 3. 错误回馈页面
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiBaseController : Controller
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 基础控制器,所有控制器均继承本控制器
|
/// 当前登录用户的ID
|
||||||
/// 1. 自动验证请求参数
|
|
||||||
/// 2. 报错返回
|
|
||||||
/// 3. 错误回馈页面
|
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SimApiBaseController : Controller
|
protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"]!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 验证请求参数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context"></param>
|
||||||
|
public override void OnActionExecuting(ActionExecutingContext context)
|
||||||
{
|
{
|
||||||
/// <summary>
|
if (!context.ModelState.IsValid)
|
||||||
/// 当前登录用户的ID
|
|
||||||
/// </summary>
|
|
||||||
protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"];
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 验证请求参数
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="context"></param>
|
|
||||||
public override void OnActionExecuting(ActionExecutingContext context)
|
|
||||||
{
|
{
|
||||||
if (!context.ModelState.IsValid)
|
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 错误返回
|
/// 错误返回
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="code">错误代码</param>
|
/// <param name="code">错误代码</param>
|
||||||
/// <param name="message">错误描述(若是常规错误,代码可自动带取描述)</param>
|
/// <param name="message">错误描述(若是常规错误,代码可自动带取描述)</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected static void Error(int code = 500, string message = "")
|
protected static void Error(int code = 500, string message = "")
|
||||||
|
{
|
||||||
|
throw new SimApiException(code, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检测条件,根据条件返回报错 如果condition是ture报错
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="condition">检测条件</param>
|
||||||
|
/// <param name="code">错误代码</param>
|
||||||
|
/// <param name="message">错误描述</param>
|
||||||
|
protected static void ErrorWhen(bool condition, int code = 400, string message = "")
|
||||||
|
{
|
||||||
|
if (condition)
|
||||||
{
|
{
|
||||||
throw new SimApiException(code, message);
|
Error(code, message);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <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>
|
|
||||||
/// 检测条件,根据条件返回报错
|
/// <summary>
|
||||||
/// </summary>
|
/// 如果condition是false 报错
|
||||||
/// <param name="condition">检测条件</param>
|
/// </summary>
|
||||||
/// <param name="code">错误代码</param>
|
/// <param name="condition"></param>
|
||||||
/// <param name="message">错误描述</param>
|
/// <param name="code"></param>
|
||||||
protected static void ErrorWhen(bool condition, int code = 500, string message = "")
|
/// <param name="message"></param>
|
||||||
{
|
protected static void ErrorWhenFalse(bool condition, int code = 400, string message = "")
|
||||||
if (condition)
|
{
|
||||||
{
|
ErrorWhen(!condition, code, message);
|
||||||
Error(code, message);
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 检测给定的变量是否为NUll
|
/// 检测给定的变量是否为NUll
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 上传文件
|
/// 上传文件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected SimApiBaseResponse<string> UploadFile()
|
protected SimApiBaseResponse<string> UploadFile()
|
||||||
{
|
{
|
||||||
return new SimApiBaseResponse<string>(null);
|
return new SimApiBaseResponse<string>();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,60 +1,60 @@
|
|||||||
using System;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using SimApi.Attributes;
|
using SimApi.Attributes;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Controllers
|
namespace SimApi.Controllers;
|
||||||
|
|
||||||
|
[ApiExplorerSettings(GroupName = "api")]
|
||||||
|
public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
|
||||||
{
|
{
|
||||||
[ApiExplorerSettings(GroupName = "api")]
|
/// <summary>
|
||||||
public class YYCommonController : SimApiBaseController
|
/// 错误回馈页面
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="code">错误代码</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpGet("exception/{code:int}")]
|
||||||
|
[ApiExplorerSettings(IgnoreApi = true)]
|
||||||
|
public SimApiBaseResponse ExceptionHandler(int code)
|
||||||
{
|
{
|
||||||
private SimApiAuth Auth { get; }
|
return new SimApiBaseResponse(code);
|
||||||
|
}
|
||||||
|
|
||||||
public YYCommonController(SimApiAuth auth)
|
/// <summary>
|
||||||
|
/// 检测用户登陆的控制器
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost("/auth/check"), SimApiDoc("认证", "检测登陆")]
|
||||||
|
public SimApiBaseResponse<string> CheckLogin()
|
||||||
|
{
|
||||||
|
ErrorWhenNull(LoginInfo, 401);
|
||||||
|
return new SimApiBaseResponse<string>
|
||||||
{
|
{
|
||||||
Auth = auth;
|
Data = LoginInfo.Id
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 退出登陆
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost("/auth/logout"), SimApiDoc("认证", "退出登陆")]
|
||||||
|
public SimApiBaseResponse Logout()
|
||||||
|
{
|
||||||
|
string? token = null;
|
||||||
|
|
||||||
|
if (Request.Headers.TryGetValue("Token", out var value))
|
||||||
|
{
|
||||||
|
token = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
auth.Logout(token!);
|
||||||
/// 错误回馈页面
|
return new SimApiBaseResponse();
|
||||||
/// </summary>
|
}
|
||||||
/// <param name="code">错误代码</param>
|
|
||||||
/// <returns></returns>
|
[HttpPost("/logined"),SimApiAuth]
|
||||||
[HttpGet("exception/{code:int}")]
|
public SimApiBaseResponse<SimApiLoginItem> UserInfo()
|
||||||
[ApiExplorerSettings(IgnoreApi = true)]
|
{
|
||||||
public SimApiBaseResponse ExceptionHandler(int code)
|
return new SimApiBaseResponse<SimApiLoginItem>(LoginInfo);
|
||||||
{
|
|
||||||
return new SimApiBaseResponse(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 检测用户登陆的控制器
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
[HttpPost("/auth/check"), SimApiDoc("认证", "检测登陆")]
|
|
||||||
public SimApiBaseResponse<string> CheckLogin()
|
|
||||||
{
|
|
||||||
ErrorWhenNull(LoginInfo, 401);
|
|
||||||
return new SimApiBaseResponse<string>(LoginInfo.Id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 退出登陆
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
[HttpPost("/auth/logout"), SimApiDoc("认证", "退出登陆")]
|
|
||||||
public SimApiBaseResponse Logout()
|
|
||||||
{
|
|
||||||
string token = null;
|
|
||||||
|
|
||||||
if (Request.Headers.ContainsKey("Token"))
|
|
||||||
{
|
|
||||||
token = Request.Headers["Token"];
|
|
||||||
}
|
|
||||||
|
|
||||||
Auth.Logout(token);
|
|
||||||
return new SimApiBaseResponse();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,16 +1,11 @@
|
|||||||
using System;
|
using System;
|
||||||
namespace SimApi.Exceptions
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Api错误捕获异常
|
|
||||||
/// </summary>
|
|
||||||
public class SimApiException : Exception
|
|
||||||
{
|
|
||||||
public int Code { get; }
|
|
||||||
|
|
||||||
public SimApiException(int code, string message = "") : base(message)
|
namespace SimApi.Exceptions;
|
||||||
{
|
|
||||||
Code = code;
|
/// <summary>
|
||||||
}
|
/// Api错误捕获异常
|
||||||
}
|
/// </summary>
|
||||||
}
|
public class SimApiException(int code, string message = "") : Exception(message)
|
||||||
|
{
|
||||||
|
public int Code { get; } = code;
|
||||||
|
}
|
||||||
+65
-43
@@ -1,60 +1,82 @@
|
|||||||
|
#nullable enable
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.Extensions.Caching.Distributed;
|
using Microsoft.Extensions.Caching.Distributed;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
|
|
||||||
namespace SimApi.Helpers
|
namespace SimApi.Helpers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 认证助手
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiAuth(IDistributedCache cache)
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 认证助手
|
/// 产生一个Token记录并返回Token
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SimApiAuth
|
/// <param name="id"></param>
|
||||||
|
/// <param name="type"></param>
|
||||||
|
/// <param name="meta"></param>
|
||||||
|
/// <param name="token"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string Login(string id, Dictionary<string, string>? meta = null, string type = "user", string? token = null)
|
||||||
{
|
{
|
||||||
private IDistributedCache Cache { get; }
|
return Login(id, meta, new[] { type }, token);
|
||||||
|
}
|
||||||
|
|
||||||
public SimApiAuth(IDistributedCache cache)
|
/// <summary>
|
||||||
{
|
/// 产生一个Token并记录用户ID角色[多角色]
|
||||||
Cache = cache;
|
/// </summary>
|
||||||
}
|
/// <param name="id"></param>
|
||||||
|
/// <param name="type"></param>
|
||||||
|
/// <param name="meta"></param>
|
||||||
|
/// <param name="uuid"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
// 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, meta);
|
||||||
|
cache.SetString(uuid, JsonSerializer.Serialize(loginItem));
|
||||||
|
return uuid;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 产生一个Token记录并返回Token
|
/// 设置登录的Meta信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="id"></param>
|
/// <param name="token"></param>
|
||||||
/// <returns></returns>
|
/// <param name="meta"></param>
|
||||||
public string Login(string id, string type = "user", string token = null)
|
/// <returns></returns>
|
||||||
{
|
public bool SetMeta(string token, Dictionary<string, string> meta)
|
||||||
return Login(id, new[]
|
{
|
||||||
{
|
var login = GetLogin(token);
|
||||||
type
|
if (login == null) { return false; }
|
||||||
}, token);
|
var newLogin = new SimApiLoginItem(login.Id, login.Type, login.Meta);
|
||||||
}
|
cache.SetString(token,JsonSerializer.Serialize(newLogin));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 产生一个Token并记录用户ID角色[多角色]
|
/// 获取登陆信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="id"></param>
|
/// <param name="token"></param>
|
||||||
/// <param name="type"></param>
|
/// <returns></returns>
|
||||||
/// <returns></returns>
|
public SimApiLoginItem? GetLogin(string token)
|
||||||
public string Login(string id, string[] type, string uuid = null)
|
{
|
||||||
{
|
var login = cache.GetString(token);
|
||||||
uuid ??= Guid.NewGuid().ToString();
|
return login != null ? JsonSerializer.Deserialize<SimApiLoginItem>(login) : default;
|
||||||
var loginItem = new SimApiLoginItem(id, type);
|
}
|
||||||
Cache.SetString(uuid, JsonSerializer.Serialize(loginItem));
|
|
||||||
return uuid;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 退出登陆
|
/// 退出登陆
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="uuid">登陆标识</param>
|
/// <param name="uuid">登陆标识</param>
|
||||||
public void Logout(string uuid)
|
public void Logout(string uuid)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(uuid))
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(uuid))
|
cache.Remove(uuid);
|
||||||
{
|
|
||||||
Cache.Remove(uuid);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+146
-82
@@ -1,103 +1,167 @@
|
|||||||
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 Minio.Exceptions;
|
using Minio.DataModel.Args;
|
||||||
using SimApi.Configs;
|
using SimApi.Configurations;
|
||||||
|
|
||||||
namespace SimApi.Helpers
|
namespace SimApi.Helpers;
|
||||||
|
|
||||||
|
public class SimApiStorage
|
||||||
{
|
{
|
||||||
public class SimApiStorage
|
private IMinioClient Mc { get; }
|
||||||
|
|
||||||
|
public IMinioClient Client => Mc;
|
||||||
|
|
||||||
|
private string ServeUrl { get; }
|
||||||
|
|
||||||
|
private string Endpoint { get; }
|
||||||
|
|
||||||
|
public string Bucket { get; }
|
||||||
|
|
||||||
|
private IHttpContextAccessor HttpContextAccessor { get; }
|
||||||
|
|
||||||
|
public SimApiStorage(SimApiOptions apiOptions, IHttpContextAccessor httpContextAccessor)
|
||||||
{
|
{
|
||||||
private MinioClient Mc { get; }
|
var options = apiOptions.SimApiStorageOptions;
|
||||||
|
HttpContextAccessor = httpContextAccessor;
|
||||||
public MinioClient Client => Mc;
|
Endpoint = options.Endpoint!;
|
||||||
|
var useSsl = false;
|
||||||
private string ServeUrl { get; }
|
string endpoint;
|
||||||
|
if (options.Endpoint!.StartsWith("http://"))
|
||||||
public string Bucket { get; }
|
|
||||||
|
|
||||||
private IHttpContextAccessor HttpContextAccessor { get; }
|
|
||||||
|
|
||||||
public SimApiStorage(SimApiOptions apiOptions, IHttpContextAccessor httpContextAccessor)
|
|
||||||
{
|
{
|
||||||
var options = apiOptions.SimApiStorageOptions;
|
endpoint = options.Endpoint.Replace("http://", string.Empty);
|
||||||
HttpContextAccessor = httpContextAccessor;
|
}
|
||||||
var useSsl = false;
|
else if (options.Endpoint.StartsWith("https://"))
|
||||||
string endpoint;
|
{
|
||||||
if (options.Endpoint.StartsWith("http://"))
|
endpoint = options.Endpoint.Replace("https://", string.Empty);
|
||||||
{
|
useSsl = true;
|
||||||
endpoint = options.Endpoint.Replace("http://", string.Empty);
|
}
|
||||||
}
|
else
|
||||||
else if (options.Endpoint.StartsWith("https://"))
|
{
|
||||||
{
|
throw new Exception("SimApiStorage: Error Endpoint");
|
||||||
endpoint = options.Endpoint.Replace("https://", string.Empty);
|
|
||||||
useSsl = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new Exception("SimApiStorage: Error Endpoint");
|
|
||||||
}
|
|
||||||
|
|
||||||
ServeUrl = options.ServeUrl;
|
|
||||||
Bucket = options.Bucket;
|
|
||||||
var mcb = new MinioClient().WithEndpoint(endpoint)
|
|
||||||
.WithCredentials(options.AccessKey, options.SecretKey);
|
|
||||||
if (useSsl)
|
|
||||||
{
|
|
||||||
mcb = mcb.WithSSL();
|
|
||||||
}
|
|
||||||
Mc = mcb.Build();
|
|
||||||
|
|
||||||
var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;
|
|
||||||
if (!found)
|
|
||||||
{
|
|
||||||
Mc.MakeBucketAsync(new MakeBucketArgs().WithBucket(Bucket)).Wait();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
ServeUrl = options.ServeUrl!;
|
||||||
/// 获取上传的URL
|
if (ServeUrl.EndsWith('/')) throw new Exception("SimApiStorage: ServeUrl must not end with /");
|
||||||
/// </summary>
|
Bucket = options.Bucket!;
|
||||||
/// <param name="path"></param>
|
var mcb = new MinioClient().WithEndpoint(endpoint)
|
||||||
/// <param name="expire"></param>
|
.WithCredentials(options.AccessKey, options.SecretKey);
|
||||||
/// <returns></returns>
|
if (useSsl)
|
||||||
public string GetUploadUrl(string path, int expire = 7200)
|
|
||||||
{
|
{
|
||||||
return Mc.PresignedPutObjectAsync(new PresignedPutObjectArgs().WithBucket(Bucket)
|
mcb = mcb.WithSSL();
|
||||||
.WithObject(path).WithExpiry(expire)).Result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
Mc = mcb.Build();
|
||||||
/// 获取下载的URL
|
|
||||||
/// </summary>
|
var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;
|
||||||
/// <param name="path"></param>
|
if (!found)
|
||||||
/// <param name="expire"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public string GetDownloadUrl(string path, int expire = 600)
|
|
||||||
{
|
{
|
||||||
return Mc.PresignedGetObjectAsync(new PresignedGetObjectArgs().WithBucket(Bucket).WithObject(path)
|
Mc.MakeBucketAsync(new MakeBucketArgs().WithBucket(Bucket)).Wait();
|
||||||
.WithExpiry(expire)).Result;
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取上传的URL
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="path"></param>
|
||||||
|
/// <param name="expire"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public GetUploadUrlResponse GetUploadUrl(string path, int expire = 7200)
|
||||||
|
{
|
||||||
|
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>
|
||||||
|
/// 获取下载的URL
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="path"></param>
|
||||||
|
/// <param name="expire"></param>
|
||||||
|
/// <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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <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();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <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))
|
||||||
|
{
|
||||||
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return path.StartsWith('~') ? string.Concat(url, path.AsSpan(1, path.Length - 1)) : $"{ServeUrl}{path}";
|
||||||
|
}
|
||||||
|
|
||||||
public string UploadFile(string path, Stream stream, string contentType = "image/png")
|
/// <summary>
|
||||||
{
|
/// 获取一个Path得访问URL
|
||||||
Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).WithObjectSize(stream.Length)
|
/// </summary>
|
||||||
.WithStreamData(stream).WithContentType(contentType)).Wait();
|
/// <param name="path"></param>
|
||||||
return null;
|
/// <returns></returns>
|
||||||
}
|
public string? GetUrl(string? path)
|
||||||
|
{
|
||||||
public string FullUrl(string path)
|
if (string.IsNullOrEmpty(path)) return path;
|
||||||
|
if (path.StartsWith("~/"))
|
||||||
{
|
{
|
||||||
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))
|
return string.Concat(url, path.AsSpan(1, path.Length - 1));
|
||||||
{
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
|
|
||||||
return path.StartsWith("~") ? url + path.Substring(1, path.Length - 1) : $"{ServeUrl}{path}";
|
|
||||||
}
|
}
|
||||||
|
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);
|
||||||
+72
-56
@@ -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;
|
||||||
@@ -7,69 +8,84 @@ using System.Text.Json.Serialization;
|
|||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Text.Unicode;
|
using System.Text.Unicode;
|
||||||
|
|
||||||
namespace SimApi.Helpers
|
namespace SimApi.Helpers;
|
||||||
|
|
||||||
|
public static class SimApiUtil
|
||||||
{
|
{
|
||||||
public static class SimApiUtil
|
/// <summary>
|
||||||
|
/// 当前CST时间
|
||||||
|
/// </summary>
|
||||||
|
public static DateTime CstNow => DateTime.UtcNow.AddHours(8);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// JSON序列化常规选项
|
||||||
|
/// </summary>
|
||||||
|
public static JsonSerializerOptions JsonOption => new()
|
||||||
{
|
{
|
||||||
/// <summary>
|
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All),
|
||||||
/// 当前CST时间
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
||||||
/// </summary>
|
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
|
||||||
public static DateTime CstNow => DateTime.UtcNow.AddHours(8);
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// JSON序列化常规选项
|
/// 当前秒级时间戳
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static JsonSerializerOptions JsonOption => new()
|
public static double TimestampNow => (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalSeconds;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检测手机号是否正确
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cell">手机号码</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static bool CheckCell(string cell)
|
||||||
|
{
|
||||||
|
var regex = new Regex("^1[3456789]\\d{9}$");
|
||||||
|
return regex.IsMatch(cell);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// MD5加密字符串
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="source">源字符串</param>
|
||||||
|
/// <param name="mode">加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string Md5(string source, string mode = "x2")
|
||||||
|
{
|
||||||
|
var sourceBytes = Encoding.UTF8.GetBytes(source);
|
||||||
|
var result = MD5.HashData(sourceBytes);
|
||||||
|
var stringBuilder = new StringBuilder(40);
|
||||||
|
foreach (var t in result)
|
||||||
{
|
{
|
||||||
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All),
|
stringBuilder.Append(t.ToString(mode));
|
||||||
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
||||||
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
|
|
||||||
};
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 当前秒级时间戳
|
|
||||||
/// </summary>
|
|
||||||
public static double TimestampNow => (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalSeconds;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 检测手机号是否正确
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="cell">手机号码</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static bool CheckCell(string cell)
|
|
||||||
{
|
|
||||||
var regex = new Regex("^1[3456789]\\d{9}$");
|
|
||||||
return regex.IsMatch(cell);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
return stringBuilder.ToString();
|
||||||
/// MD5加密字符串
|
}
|
||||||
/// </summary>
|
|
||||||
/// <param name="source">源字符串</param>
|
|
||||||
/// <param name="mode">加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位</param>
|
|
||||||
/// <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);
|
|
||||||
foreach (var t in result)
|
|
||||||
{
|
|
||||||
strbul.Append(t.ToString(mode));
|
|
||||||
}
|
|
||||||
|
|
||||||
return strbul.ToString();
|
/// <summary>
|
||||||
}
|
/// 将对象序列化成JSON (控制台输出中文不会被编码)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="obj"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string Json(object obj)
|
||||||
|
{
|
||||||
|
return JsonSerializer.Serialize(obj, JsonOption);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 将对象序列化成JSON (控制台输出中文不会被编码)
|
/// 分页
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="obj"></param>
|
/// <param name="query"></param>
|
||||||
/// <returns></returns>
|
/// <param name="page">页码</param>
|
||||||
public static string Json(object obj)
|
/// <param name="count">每页数量</param>
|
||||||
{
|
/// <typeparam name="T"></typeparam>
|
||||||
return JsonSerializer.Serialize(obj, JsonOption);
|
/// <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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+24
-30
@@ -2,40 +2,34 @@ using System;
|
|||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Logger
|
namespace SimApi.Logger;
|
||||||
|
|
||||||
|
public class SimApiLogger(string name) : ILogger
|
||||||
{
|
{
|
||||||
public class SimApiLogger : ILogger
|
public IDisposable BeginScope<TState>(TState state) => default!;
|
||||||
|
|
||||||
|
public bool IsEnabled(LogLevel logLevel) => true;
|
||||||
|
|
||||||
|
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception,
|
||||||
|
Func<TState, Exception, string> formatter)
|
||||||
{
|
{
|
||||||
private string Name { get; }
|
Console.ForegroundColor = logLevel switch
|
||||||
|
|
||||||
public SimApiLogger(string name)
|
|
||||||
{
|
{
|
||||||
Name = name;
|
LogLevel.Debug => ConsoleColor.DarkMagenta,
|
||||||
|
LogLevel.Information => ConsoleColor.DarkCyan,
|
||||||
|
LogLevel.Warning => ConsoleColor.Yellow,
|
||||||
|
LogLevel.Error => ConsoleColor.Red,
|
||||||
|
LogLevel.Critical => ConsoleColor.DarkRed,
|
||||||
|
_ => ConsoleColor.White
|
||||||
|
};
|
||||||
|
var message =
|
||||||
|
$"[ {name} ][ {DateTime.Now:yyyy-MM-dd HH:mm:ss:ffff} ][ {logLevel.ToString()} ]\n{state}\n";
|
||||||
|
if (exception != null)
|
||||||
|
{
|
||||||
|
message += $"{exception}\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
public IDisposable BeginScope<TState>(TState state) => default!;
|
Console.WriteLine(message);
|
||||||
|
Console.ResetColor();
|
||||||
public bool IsEnabled(LogLevel logLevel) => true;
|
|
||||||
|
|
||||||
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception,
|
|
||||||
Func<TState, Exception, string> formatter)
|
|
||||||
{
|
|
||||||
Console.ForegroundColor = logLevel switch
|
|
||||||
{
|
|
||||||
LogLevel.Debug => ConsoleColor.DarkMagenta,
|
|
||||||
LogLevel.Information => ConsoleColor.DarkCyan,
|
|
||||||
LogLevel.Warning => ConsoleColor.Yellow,
|
|
||||||
LogLevel.Error => ConsoleColor.Red,
|
|
||||||
LogLevel.Critical => ConsoleColor.DarkRed,
|
|
||||||
_ => ConsoleColor.White
|
|
||||||
};
|
|
||||||
var message =
|
|
||||||
$"[ {Name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]\n{state}\n";
|
|
||||||
if (exception != null)
|
|
||||||
{
|
|
||||||
message += $"{exception}\n";
|
|
||||||
}
|
|
||||||
Console.WriteLine(message);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,22 +1,20 @@
|
|||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace SimApi.Logger
|
namespace SimApi.Logger;
|
||||||
|
|
||||||
|
public class SimApiLoggerProvider : ILoggerProvider
|
||||||
{
|
{
|
||||||
public class SimApiLoggerProvider : ILoggerProvider
|
private readonly ConcurrentDictionary<string, SimApiLogger> _loggers = new();
|
||||||
|
|
||||||
|
|
||||||
|
public ILogger CreateLogger(string categoryName)
|
||||||
{
|
{
|
||||||
private readonly ConcurrentDictionary<string, SimApiLogger> _loggers =
|
return _loggers.GetOrAdd(categoryName, name => new SimApiLogger(name));
|
||||||
new ConcurrentDictionary<string, SimApiLogger>();
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
public ILogger CreateLogger(string categoryName)
|
{
|
||||||
{
|
_loggers.Clear();
|
||||||
return _loggers.GetOrAdd(categoryName, name => new SimApiLogger(name));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
_loggers.Clear();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,39 +3,29 @@ using System.Threading.Tasks;
|
|||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.Extensions.Caching.Distributed;
|
using Microsoft.Extensions.Caching.Distributed;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Middlewares
|
namespace SimApi.Middlewares;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 认证信息获取中间件
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiAuthMiddleware(RequestDelegate next)
|
||||||
{
|
{
|
||||||
/// <summary>
|
public Task Invoke(HttpContext httpContext, IDistributedCache cache, SimApiAuth auth)
|
||||||
/// 认证信息获取中间件
|
|
||||||
/// </summary>
|
|
||||||
public class SimApiAuthMiddleware
|
|
||||||
{
|
{
|
||||||
private RequestDelegate Next { get; }
|
string? token = null;
|
||||||
|
if (httpContext.Request.Headers.TryGetValue("Token", out var header))
|
||||||
public SimApiAuthMiddleware(RequestDelegate next)
|
|
||||||
{
|
{
|
||||||
Next = next;
|
token = header;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task Invoke(HttpContext httpContext, IDistributedCache cache)
|
if (string.IsNullOrEmpty(token)) return next(httpContext);
|
||||||
|
var login = auth.GetLogin(token);
|
||||||
|
if (login != null)
|
||||||
{
|
{
|
||||||
string token = null;
|
httpContext.Items.Add("LoginInfo", login);
|
||||||
if (httpContext.Request.Headers.ContainsKey("Token"))
|
|
||||||
{
|
|
||||||
token = httpContext.Request.Headers["Token"];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(token))
|
|
||||||
{
|
|
||||||
var login = cache.GetString(token);
|
|
||||||
if (login != null)
|
|
||||||
{
|
|
||||||
httpContext.Items.Add("LoginInfo", JsonSerializer.Deserialize<SimApiLoginItem>(login));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Next(httpContext);
|
|
||||||
}
|
}
|
||||||
|
return next(httpContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,75 +6,64 @@ using SimApi.Communications;
|
|||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using SimApi.Exceptions;
|
using SimApi.Exceptions;
|
||||||
|
|
||||||
namespace SimApi.Middlewares
|
namespace SimApi.Middlewares;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 异常处理中间件
|
||||||
|
/// </summary>
|
||||||
|
public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExceptionMiddleware> log)
|
||||||
{
|
{
|
||||||
/// <summary>
|
public async Task InvokeAsync(HttpContext context)
|
||||||
/// 异常处理中间件
|
|
||||||
/// </summary>
|
|
||||||
public class SimApiExceptionMiddleware
|
|
||||||
{
|
{
|
||||||
private RequestDelegate Next { get; }
|
if (context.Request.Headers.TryGetValue("Query-Id", out var header))
|
||||||
|
|
||||||
private ILogger<SimApiExceptionMiddleware> Log { get; }
|
|
||||||
|
|
||||||
public SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExceptionMiddleware> log)
|
|
||||||
{
|
{
|
||||||
Log = log;
|
context.Response.Headers["Query-Id"] = header;
|
||||||
Next = next;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task InvokeAsync(HttpContext context)
|
SimApiBaseResponse response;
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (context.Request.Headers.ContainsKey("Query-Id"))
|
await next(context);
|
||||||
|
switch (context.Response.StatusCode)
|
||||||
{
|
{
|
||||||
context.Response.Headers["Query-Id"] = context.Request.Headers["Query-Id"];
|
case 200:
|
||||||
}
|
break;
|
||||||
|
case 404:
|
||||||
var response = new SimApiBaseResponse();
|
throw new SimApiException(context.Response.StatusCode, "请求的接口不存在");
|
||||||
try
|
case 301:
|
||||||
{
|
case 302:
|
||||||
await Next(context);
|
break;
|
||||||
if (context.Response.StatusCode != 200)
|
default:
|
||||||
{
|
throw new SimApiException(context.Response.StatusCode);
|
||||||
if (!new[]
|
|
||||||
{
|
|
||||||
301, 302
|
|
||||||
}.Contains(context.Response.StatusCode))
|
|
||||||
{
|
|
||||||
throw new SimApiException(context.Response.StatusCode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (SimApiException ex)
|
|
||||||
{
|
|
||||||
response = string.IsNullOrEmpty(ex.Message)
|
|
||||||
? new SimApiBaseResponse(ex.Code)
|
|
||||||
: new SimApiBaseResponse(ex.Code, ex.Message);
|
|
||||||
|
|
||||||
ErrorResponse(context, response);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Log.LogError(ex.Message);
|
|
||||||
Log.LogError(ex.StackTrace);
|
|
||||||
response = new SimApiBaseResponse(500, ex.Message);
|
|
||||||
ErrorResponse(context, response);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (SimApiException ex)
|
||||||
/// <summary>
|
|
||||||
/// 异常抛出错误
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="context"></param>
|
|
||||||
/// <param name="response"></param>
|
|
||||||
private void ErrorResponse(HttpContext context, SimApiBaseResponse response)
|
|
||||||
{
|
{
|
||||||
if (!context.Response.HasStarted)
|
response = string.IsNullOrEmpty(ex.Message)
|
||||||
{
|
? new SimApiBaseResponse(ex.Code)
|
||||||
context.Response.StatusCode = 200;
|
: new SimApiBaseResponse(ex.Code, ex.Message);
|
||||||
context.Response.Headers.Add("Content-Type", "application/json");
|
|
||||||
context.Response.WriteAsync(response.ToString());
|
ErrorResponse(context, response);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
log.LogError("{Msg}", ex.Message);
|
||||||
|
log.LogError("{Msg}", ex.StackTrace);
|
||||||
|
response = new SimApiBaseResponse(500, ex.Message);
|
||||||
|
ErrorResponse(context, response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 异常抛出错误
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="context"></param>
|
||||||
|
/// <param name="response"></param>
|
||||||
|
private static void ErrorResponse(HttpContext context, SimApiBaseResponse response)
|
||||||
|
{
|
||||||
|
if (context.Response.HasStarted) return;
|
||||||
|
context.Response.StatusCode = 200;
|
||||||
|
context.Response.Headers.Append("Content-Type", "application/json");
|
||||||
|
context.Response.WriteAsync(response.ToString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+73
-71
@@ -1,84 +1,86 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.Json;
|
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Models
|
namespace SimApi.Models;
|
||||||
|
|
||||||
|
public class SimApiBaseModel
|
||||||
{
|
{
|
||||||
public class SimApiBaseModel
|
[Column(Order = 1)] public string Id { get; set; } = Guid.NewGuid().ToString();
|
||||||
|
|
||||||
|
[Column(Order = 9998)] public DateTime UpdatedAt { get; set; } = DateTime.Now;
|
||||||
|
|
||||||
|
[Column(Order = 9999)] public DateTime CreatedAt { get; set; } = DateTime.Now;
|
||||||
|
|
||||||
|
protected virtual string[] MapperIgnoreField { get; set; } = { "Id", "CreatedAt", "UpdatedAt" };
|
||||||
|
|
||||||
|
protected virtual string UpdatedTimeField { get; set; } = "UpdatedAt";
|
||||||
|
|
||||||
|
public void MapData<TS>(TS source, bool mapAll = false)
|
||||||
{
|
{
|
||||||
protected virtual string[] MapperIgnoreField { get; set; } =
|
//获取要赋值的源数据不为null的项目
|
||||||
{
|
var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||||
"Id", "CreatedAt", "UpdatedAt"
|
.Select(x => new
|
||||||
};
|
|
||||||
|
|
||||||
protected virtual string UpdatedTimeField { get; set; } = "UpdatedAt";
|
|
||||||
|
|
||||||
public void MapData<TS>(TS source, bool mapAll = false)
|
|
||||||
{
|
|
||||||
//获取要赋值的源数据不为null的项目
|
|
||||||
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
|
||||||
.Select(x => new
|
|
||||||
{
|
|
||||||
x.Name,
|
|
||||||
x.PropertyType
|
|
||||||
})
|
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
|
||||||
|
|
||||||
//获取目标对象的属性信息
|
|
||||||
var targetProps = GetType().GetProperties().Select(x => new
|
|
||||||
{
|
|
||||||
x.Name,
|
|
||||||
x.PropertyType
|
|
||||||
})
|
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
|
||||||
foreach (var sp in sourceProps.Where(sp =>
|
|
||||||
targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
|
|
||||||
(!MapperIgnoreField.Contains(sp.Key) || mapAll)))
|
|
||||||
{
|
{
|
||||||
GetType().GetProperty(sp.Key)?
|
x.Name,
|
||||||
.SetValue(this, source.GetType().GetProperty(sp.Key)?.GetValue(source));
|
x.PropertyType
|
||||||
}
|
})
|
||||||
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
|
|
||||||
UpdateTime();
|
//获取目标对象的属性信息
|
||||||
}
|
var targetProps = GetType().GetProperties().Select(x => new
|
||||||
|
|
||||||
public void MapData<TS>(TS source, string[] mapFields)
|
|
||||||
{
|
|
||||||
//获取要赋值的源数据不为null的项目
|
|
||||||
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
|
||||||
.Select(x => new
|
|
||||||
{
|
|
||||||
x.Name,
|
|
||||||
x.PropertyType
|
|
||||||
})
|
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
|
||||||
|
|
||||||
//获取目标对象的属性信息
|
|
||||||
var targetProps = GetType().GetProperties().Select(x => new
|
|
||||||
{
|
|
||||||
x.Name,
|
|
||||||
x.PropertyType
|
|
||||||
})
|
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
|
||||||
foreach (var sp in sourceProps.Where(sp =>
|
|
||||||
targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
|
|
||||||
mapFields.Contains(sp.Key)))
|
|
||||||
{
|
{
|
||||||
GetType().GetProperty(sp.Key)?
|
x.Name,
|
||||||
.SetValue(this, source.GetType().GetProperty(sp.Key)?.GetValue(source));
|
x.PropertyType
|
||||||
}
|
})
|
||||||
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
UpdateTime();
|
foreach (var sp in sourceProps.Where(sp =>
|
||||||
}
|
targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
|
||||||
|
(!MapperIgnoreField.Contains(sp.Key) || mapAll)))
|
||||||
/// <summary>
|
|
||||||
/// 更新update时间
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
public void UpdateTime()
|
|
||||||
{
|
{
|
||||||
GetType().GetProperty(UpdatedTimeField)?.SetValue(this, SimApiUtil.CstNow);
|
GetType().GetProperty(sp.Key)?
|
||||||
|
.SetValue(this, source.GetType().GetProperty(sp.Key)?.GetValue(source));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UpdateTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void MapData<TS>(TS source, string[] mapFields)
|
||||||
|
{
|
||||||
|
//获取要赋值的源数据不为null的项目
|
||||||
|
var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||||
|
.Select(x => new
|
||||||
|
{
|
||||||
|
x.Name,
|
||||||
|
x.PropertyType
|
||||||
|
})
|
||||||
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
|
|
||||||
|
//获取目标对象的属性信息
|
||||||
|
var targetProps = GetType().GetProperties().Select(x => new
|
||||||
|
{
|
||||||
|
x.Name,
|
||||||
|
x.PropertyType
|
||||||
|
})
|
||||||
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
|
foreach (var sp in sourceProps.Where(sp =>
|
||||||
|
targetProps.ContainsKey(sp.Key) && sp.Value == targetProps[sp.Key] &&
|
||||||
|
mapFields.Contains(sp.Key)))
|
||||||
|
{
|
||||||
|
GetType().GetProperty(sp.Key)?
|
||||||
|
.SetValue(this, source.GetType().GetProperty(sp.Key)?.GetValue(source));
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新update时间
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public void UpdateTime()
|
||||||
|
{
|
||||||
|
GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# YYApi 基于Asp.net Core 3/5的一个基础辅助包
|
# SimApi 基于.Net的一个基础辅助包
|
||||||
|
|
||||||
[](https://github.com/simcu/simapi-net/actions/workflows/nuget-publish.yml)
|
[](https://github.com/simcu/simapi-net/actions/workflows/nuget-publish.yml)
|
||||||
### 包含了以下组件:
|
### 包含了以下组件:
|
||||||
@@ -52,3 +52,4 @@ services.AddSimApi(options =>
|
|||||||
options.SimApiStorageOptions = Configuration.GetSection("S3").Get<SimApiStorageOptions>();
|
options.SimApiStorageOptions = Configuration.GetSection("S3").Get<SimApiStorageOptions>();
|
||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
基于S3的存储,基于RabbitMq的事件RPC调用,自定义Logger格式,自定义响应格式
|
||||||
|
|||||||
+39
-38
@@ -1,42 +1,43 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Library</OutputType>
|
<OutputType>Library</OutputType>
|
||||||
<PackOnBuild>true</PackOnBuild>
|
<PackOnBuild>true</PackOnBuild>
|
||||||
<Version>0.2.3</Version>
|
<Version>0.2.3</Version>
|
||||||
<Authors>xRain@SimcuTeam</Authors>
|
<Authors>xRain@SimcuTeam</Authors>
|
||||||
<Description>AspNetCore一个方便的API文档,捕获异常,统一输入输出的API类库</Description>
|
<Description>AspNetCore一个方便的API文档,捕获异常,统一输入输出的API类库</Description>
|
||||||
<PackageId>Simcu.SimApi</PackageId>
|
<PackageId>Simcu.SimApi</PackageId>
|
||||||
<IsPackable>true</IsPackable>
|
<IsPackable>true</IsPackable>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<IncludeSymbols>true</IncludeSymbols>
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
<ReleaseVersion>5.0.0</ReleaseVersion>
|
<ReleaseVersion>5.0.0</ReleaseVersion>
|
||||||
<SynchReleaseVersion>false</SynchReleaseVersion>
|
<SynchReleaseVersion>false</SynchReleaseVersion>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<PackageVersion>5.0.2</PackageVersion>
|
<PackageVersion>5.0.2</PackageVersion>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
</PropertyGroup>
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="Helpers\" />
|
<Folder Include="Helpers\"/>
|
||||||
<Folder Include="Communications\" />
|
<Folder Include="Communications\"/>
|
||||||
<Folder Include="Controllers\" />
|
<Folder Include="Controllers\"/>
|
||||||
<Folder Include="Middlewares\" />
|
<Folder Include="Middlewares\"/>
|
||||||
<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>
|
||||||
<Properties>
|
<Properties>
|
||||||
<Policies>
|
<Policies>
|
||||||
<DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="PrefixedHierarchical" />
|
<DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="PrefixedHierarchical"/>
|
||||||
</Policies>
|
</Policies>
|
||||||
</Properties>
|
</Properties>
|
||||||
</MonoDevelop>
|
</MonoDevelop>
|
||||||
</ProjectExtensions>
|
</ProjectExtensions>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+261
-230
@@ -5,261 +5,292 @@ 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;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 加入系统的扩展信息
|
||||||
|
/// </summary>
|
||||||
|
public static class SimApiExtensions
|
||||||
{
|
{
|
||||||
/// <summary>
|
//**********快捷添加**************
|
||||||
/// 加入系统的扩展信息
|
public static IServiceCollection AddSimApi(this IServiceCollection builder,
|
||||||
/// </summary>
|
Action<SimApiOptions> options = null)
|
||||||
public static class SimApiExtensions
|
|
||||||
{
|
{
|
||||||
//**********快捷添加**************
|
var simApiOptions = new SimApiOptions();
|
||||||
public static IServiceCollection AddSimApi(this IServiceCollection builder,
|
options?.Invoke(simApiOptions);
|
||||||
Action<SimApiOptions> options = null)
|
if (simApiOptions.EnableLogger)
|
||||||
{
|
{
|
||||||
var simApiOptions = new SimApiOptions();
|
builder.AddLogging(logger =>
|
||||||
options?.Invoke(simApiOptions);
|
|
||||||
if (simApiOptions.EnableLogger)
|
|
||||||
{
|
{
|
||||||
builder.AddLogging(logger =>
|
logger.ClearProviders();
|
||||||
|
logger.AddProvider(new SimApiLoggerProvider());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 是否使用 AUTH
|
||||||
|
if (simApiOptions.EnableSimApiAuth)
|
||||||
|
{
|
||||||
|
builder.AddSingleton<SimApiAuth>();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (simApiOptions.EnableCors)
|
||||||
|
{
|
||||||
|
builder.AddCors(cors => cors.AddPolicy("any",
|
||||||
|
policy => { policy.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin(); }));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (simApiOptions.EnableSynapse)
|
||||||
|
{
|
||||||
|
builder.AddSingleton<Synapse>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用SimApiDoc
|
||||||
|
if (simApiOptions.EnableSimApiDoc)
|
||||||
|
{
|
||||||
|
var docOptions = simApiOptions.SimApiDocOptions;
|
||||||
|
builder.AddSwaggerGen(x =>
|
||||||
|
{
|
||||||
|
foreach (var group in docOptions.ApiGroups)
|
||||||
{
|
{
|
||||||
logger.ClearProviders();
|
x.SwaggerDoc(group.Id, new OpenApiInfo
|
||||||
logger.AddProvider(new SimApiLoggerProvider());
|
{
|
||||||
});
|
Title = group.Name,
|
||||||
}
|
Description = group.Description
|
||||||
// 是否使用 AUTH
|
});
|
||||||
if (simApiOptions.EnableSimApiAuth)
|
}
|
||||||
{
|
|
||||||
builder.AddScoped<SimApiAuth>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (simApiOptions.EnableCors)
|
x.EnableAnnotations();
|
||||||
{
|
var haveOauth = false;
|
||||||
builder.AddCors(cors => cors.AddPolicy("any",
|
var haveSimApiAuth = false;
|
||||||
policy => { policy.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin(); }));
|
var oauthFlows = new OpenApiOAuthFlows();
|
||||||
}
|
foreach (var auth in docOptions.ApiAuth.Type)
|
||||||
|
|
||||||
if (simApiOptions.EnableSynapse)
|
|
||||||
{
|
|
||||||
builder.AddSingleton<Synapse>();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 使用SimApiDoc
|
|
||||||
if (simApiOptions.EnableSimApiDoc)
|
|
||||||
{
|
|
||||||
var docOptions = simApiOptions.SimApiDocOptions;
|
|
||||||
builder.AddSwaggerGen(x =>
|
|
||||||
{
|
{
|
||||||
foreach (var group in docOptions.ApiGroups)
|
switch (auth)
|
||||||
{
|
{
|
||||||
x.SwaggerDoc(group.Id, new OpenApiInfo
|
case "SimApiAuth":
|
||||||
{
|
x.AddSecurityRequirement(new OpenApiSecurityRequirement
|
||||||
Title = group.Name,
|
|
||||||
Description = group.Description
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
x.EnableAnnotations();
|
|
||||||
var haveOauth = false;
|
|
||||||
var haveSimApiAuth = false;
|
|
||||||
var oauthFlows = new OpenApiOAuthFlows();
|
|
||||||
foreach (var auth in docOptions.ApiAuth.Type)
|
|
||||||
{
|
|
||||||
switch (auth)
|
|
||||||
{
|
|
||||||
case "SimApiAuth":
|
|
||||||
x.AddSecurityRequirement(new OpenApiSecurityRequirement
|
|
||||||
{
|
|
||||||
{
|
|
||||||
new OpenApiSecurityScheme
|
|
||||||
{
|
|
||||||
Reference = new OpenApiReference
|
|
||||||
{
|
|
||||||
Type = ReferenceType.SecurityScheme,
|
|
||||||
Id = "HeaderToken"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new[] { "readAccess", "writeAccess" }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
haveSimApiAuth = true;
|
|
||||||
break;
|
|
||||||
case "ClientCredentials":
|
|
||||||
oauthFlows.ClientCredentials = new OpenApiOAuthFlow
|
|
||||||
{
|
|
||||||
TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
|
|
||||||
Scopes = docOptions.ApiAuth.Scopes
|
|
||||||
};
|
|
||||||
haveOauth = true;
|
|
||||||
break;
|
|
||||||
case "Implicit":
|
|
||||||
oauthFlows.Implicit = new OpenApiOAuthFlow
|
|
||||||
{
|
|
||||||
AuthorizationUrl = new Uri(docOptions.ApiAuth.AuthorizationUrl,
|
|
||||||
UriKind.RelativeOrAbsolute),
|
|
||||||
Scopes = docOptions.ApiAuth.Scopes
|
|
||||||
};
|
|
||||||
haveOauth = true;
|
|
||||||
break;
|
|
||||||
case "AuthorizationCode":
|
|
||||||
oauthFlows.AuthorizationCode = new OpenApiOAuthFlow
|
|
||||||
{
|
|
||||||
TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
|
|
||||||
AuthorizationUrl = new Uri(docOptions.ApiAuth.AuthorizationUrl,
|
|
||||||
UriKind.RelativeOrAbsolute),
|
|
||||||
Scopes = docOptions.ApiAuth.Scopes
|
|
||||||
};
|
|
||||||
haveOauth = true;
|
|
||||||
break;
|
|
||||||
case "Password":
|
|
||||||
oauthFlows.Password = new OpenApiOAuthFlow
|
|
||||||
{
|
|
||||||
TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
|
|
||||||
Scopes = docOptions.ApiAuth.Scopes
|
|
||||||
};
|
|
||||||
haveOauth = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (haveOauth)
|
|
||||||
{
|
|
||||||
x.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
|
|
||||||
{
|
|
||||||
Type = SecuritySchemeType.OAuth2,
|
|
||||||
Flows = oauthFlows,
|
|
||||||
Description = docOptions.ApiAuth.Description,
|
|
||||||
In = ParameterLocation.Header
|
|
||||||
});
|
|
||||||
x.AddSecurityRequirement(new OpenApiSecurityRequirement
|
|
||||||
{
|
|
||||||
{
|
{
|
||||||
new OpenApiSecurityScheme
|
|
||||||
{
|
{
|
||||||
Reference = new OpenApiReference
|
new OpenApiSecurityScheme
|
||||||
{
|
{
|
||||||
Type = ReferenceType.SecurityScheme,
|
Reference = new OpenApiReference
|
||||||
Id = "oauth2"
|
{
|
||||||
}
|
Type = ReferenceType.SecurityScheme,
|
||||||
},
|
Id = "HeaderToken"
|
||||||
new[] { "SimApiAuth" }
|
}
|
||||||
}
|
},
|
||||||
});
|
new[] { "readAccess", "writeAccess" }
|
||||||
|
}
|
||||||
|
});
|
||||||
|
haveSimApiAuth = true;
|
||||||
|
break;
|
||||||
|
case "ClientCredentials":
|
||||||
|
oauthFlows.ClientCredentials = new OpenApiOAuthFlow
|
||||||
|
{
|
||||||
|
TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
|
||||||
|
Scopes = docOptions.ApiAuth.Scopes
|
||||||
|
};
|
||||||
|
haveOauth = true;
|
||||||
|
break;
|
||||||
|
case "Implicit":
|
||||||
|
oauthFlows.Implicit = new OpenApiOAuthFlow
|
||||||
|
{
|
||||||
|
AuthorizationUrl = new Uri(docOptions.ApiAuth.AuthorizationUrl,
|
||||||
|
UriKind.RelativeOrAbsolute),
|
||||||
|
Scopes = docOptions.ApiAuth.Scopes
|
||||||
|
};
|
||||||
|
haveOauth = true;
|
||||||
|
break;
|
||||||
|
case "AuthorizationCode":
|
||||||
|
oauthFlows.AuthorizationCode = new OpenApiOAuthFlow
|
||||||
|
{
|
||||||
|
TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
|
||||||
|
AuthorizationUrl = new Uri(docOptions.ApiAuth.AuthorizationUrl,
|
||||||
|
UriKind.RelativeOrAbsolute),
|
||||||
|
Scopes = docOptions.ApiAuth.Scopes
|
||||||
|
};
|
||||||
|
haveOauth = true;
|
||||||
|
break;
|
||||||
|
case "Password":
|
||||||
|
oauthFlows.Password = new OpenApiOAuthFlow
|
||||||
|
{
|
||||||
|
TokenUrl = new Uri(docOptions.ApiAuth.TokenUrl, UriKind.RelativeOrAbsolute),
|
||||||
|
Scopes = docOptions.ApiAuth.Scopes
|
||||||
|
};
|
||||||
|
haveOauth = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (haveSimApiAuth)
|
if (haveOauth)
|
||||||
|
{
|
||||||
|
x.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
|
||||||
{
|
{
|
||||||
x.AddSecurityDefinition("HeaderToken",
|
Type = SecuritySchemeType.OAuth2,
|
||||||
|
Flows = oauthFlows,
|
||||||
|
Description = docOptions.ApiAuth.Description,
|
||||||
|
In = ParameterLocation.Header
|
||||||
|
});
|
||||||
|
x.AddSecurityRequirement(new OpenApiSecurityRequirement
|
||||||
|
{
|
||||||
|
{
|
||||||
new OpenApiSecurityScheme
|
new OpenApiSecurityScheme
|
||||||
{
|
{
|
||||||
Name = "Token",
|
Reference = new OpenApiReference
|
||||||
In = ParameterLocation.Header
|
{
|
||||||
});
|
Type = ReferenceType.SecurityScheme,
|
||||||
}
|
Id = "oauth2"
|
||||||
});
|
}
|
||||||
}
|
},
|
||||||
|
new[] { "SimApiAuth" }
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// 使用Header转发,应对代理后获取真实ip
|
if (haveSimApiAuth)
|
||||||
if (simApiOptions.EnableForwardHeaders)
|
|
||||||
{
|
|
||||||
builder.Configure<ForwardedHeadersOptions>(fwOptions =>
|
|
||||||
{
|
{
|
||||||
fwOptions.ForwardedHeaders = ForwardedHeaders.All;
|
x.AddSecurityDefinition("HeaderToken",
|
||||||
fwOptions.KnownNetworks.Clear();
|
new OpenApiSecurityScheme
|
||||||
fwOptions.KnownProxies.Clear();
|
{
|
||||||
});
|
Name = "Token",
|
||||||
}
|
In = ParameterLocation.Header
|
||||||
|
});
|
||||||
if (simApiOptions.EnableLowerUrl)
|
}
|
||||||
{
|
});
|
||||||
builder.AddRouting(rOptions => rOptions.LowercaseUrls = true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (simApiOptions.EnableSimApiStorage)
|
|
||||||
{
|
|
||||||
builder.AddHttpContextAccessor();
|
|
||||||
builder.AddSingleton<SimApiStorage>();
|
|
||||||
}
|
|
||||||
|
|
||||||
builder.AddSingleton(simApiOptions);
|
|
||||||
return builder;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
// 使用Header转发,应对代理后获取真实ip
|
||||||
/// 使用所有SimApi自定义中间件
|
if (simApiOptions.EnableForwardHeaders)
|
||||||
/// </summary>
|
|
||||||
/// <param name="builder"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder)
|
|
||||||
{
|
{
|
||||||
var options = builder.ApplicationServices.GetRequiredService<SimApiOptions>();
|
builder.Configure<ForwardedHeadersOptions>(fwOptions =>
|
||||||
|
|
||||||
var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>();
|
|
||||||
|
|
||||||
if (options.EnableForwardHeaders)
|
|
||||||
{
|
{
|
||||||
logger.LogInformation("开始配置ForwardedHeaders...");
|
fwOptions.ForwardedHeaders = ForwardedHeaders.All;
|
||||||
builder.UseForwardedHeaders();
|
fwOptions.KnownNetworks.Clear();
|
||||||
}
|
fwOptions.KnownProxies.Clear();
|
||||||
|
});
|
||||||
if (options.EnableCors)
|
|
||||||
{
|
|
||||||
logger.LogInformation("开始配置Cors全部允许...");
|
|
||||||
builder.UseCors("any");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.EnableSimApiAuth)
|
|
||||||
{
|
|
||||||
logger.LogInformation("开始配置SimApiAuth...");
|
|
||||||
builder.UseMiddleware<SimApiAuthMiddleware>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.EnableSimApiDoc)
|
|
||||||
{
|
|
||||||
logger.LogInformation("开始配置SimApiDoc...");
|
|
||||||
var docOptions = options.SimApiDocOptions;
|
|
||||||
builder.UseSwagger(x => x.RouteTemplate = "/swagger/{documentName}.json").UseSwaggerUI(x =>
|
|
||||||
{
|
|
||||||
x.DocumentTitle = docOptions.DocumentTitle;
|
|
||||||
foreach (var group in docOptions.ApiGroups)
|
|
||||||
{
|
|
||||||
x.SwaggerEndpoint($"/swagger/{group.Id}.json", name: group.Name);
|
|
||||||
}
|
|
||||||
|
|
||||||
x.EnableValidator();
|
|
||||||
x.SupportedSubmitMethods(docOptions.SupportedMethod);
|
|
||||||
x.DisplayRequestDuration();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.EnableSimApiException)
|
|
||||||
{
|
|
||||||
logger.LogInformation("开始配置SimApiException...");
|
|
||||||
builder.UseMiddleware<SimApiExceptionMiddleware>();
|
|
||||||
}
|
|
||||||
|
|
||||||
//请求一下检测存储错误
|
|
||||||
if (options.EnableSimApiStorage)
|
|
||||||
{
|
|
||||||
logger.LogInformation("开始配置SimApiStorage...");
|
|
||||||
builder.ApplicationServices.GetService<SimApiStorage>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.EnableLowerUrl)
|
|
||||||
{
|
|
||||||
logger.LogInformation("开始配置使用URL小写...");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.EnableSynapse)
|
|
||||||
{
|
|
||||||
var synapse = builder.ApplicationServices.GetRequiredService<Synapse>();
|
|
||||||
synapse.Init();
|
|
||||||
}
|
|
||||||
|
|
||||||
return builder;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (simApiOptions.EnableLowerUrl)
|
||||||
|
{
|
||||||
|
builder.AddRouting(rOptions => rOptions.LowercaseUrls = true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (simApiOptions.EnableSimApiStorage)
|
||||||
|
{
|
||||||
|
builder.AddHttpContextAccessor();
|
||||||
|
builder.AddSingleton<SimApiStorage>();
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.AddSingleton(simApiOptions);
|
||||||
|
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>
|
||||||
|
/// 使用所有SimApi自定义中间件
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="builder"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static WebApplication UseSimApi(this WebApplication builder)
|
||||||
|
{
|
||||||
|
var options = builder.Services.GetRequiredService<SimApiOptions>();
|
||||||
|
|
||||||
|
var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
|
||||||
|
|
||||||
|
logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
|
||||||
|
if (options.EnableForwardHeaders)
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始配置ForwardedHeaders...");
|
||||||
|
builder.UseForwardedHeaders();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options.EnableCors)
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始配置Cors全部允许...");
|
||||||
|
builder.UseCors("any");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options.EnableSimApiAuth)
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始配置SimApiAuth...");
|
||||||
|
builder.UseMiddleware<SimApiAuthMiddleware>();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options.EnableSimApiDoc)
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始配置SimApiDoc...");
|
||||||
|
var docOptions = options.SimApiDocOptions;
|
||||||
|
builder.UseSwagger(x => x.RouteTemplate = "/swagger/{documentName}.json").UseSwaggerUI(x =>
|
||||||
|
{
|
||||||
|
x.DocumentTitle = docOptions.DocumentTitle;
|
||||||
|
foreach (var group in docOptions.ApiGroups)
|
||||||
|
{
|
||||||
|
x.SwaggerEndpoint($"/swagger/{group.Id}.json", name: group.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
x.EnableValidator();
|
||||||
|
x.SupportedSubmitMethods(docOptions.SupportedMethod);
|
||||||
|
x.DisplayRequestDuration();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options.EnableSimApiException)
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始配置SimApiException...");
|
||||||
|
builder.UseMiddleware<SimApiExceptionMiddleware>();
|
||||||
|
}
|
||||||
|
|
||||||
|
//请求一下检测存储错误
|
||||||
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
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 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()
|
||||||
|
{
|
||||||
|
var csTopicPrefix = $"{Options.SysName}/synapse-config-store/";
|
||||||
|
var eventSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
|
||||||
|
.WithTopicFilter(o =>
|
||||||
|
o.WithTopic($"{csTopicPrefix}#").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
|
||||||
|
.Build();
|
||||||
|
Client!.ApplicationMessageReceivedAsync += e =>
|
||||||
|
{
|
||||||
|
if (!e.ApplicationMessage.Topic.StartsWith(csTopicPrefix)) return Task.CompletedTask;
|
||||||
|
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||||
|
var eventName = e.ApplicationMessage.Topic.Replace(csTopicPrefix, string.Empty);
|
||||||
|
CurrentConfig[eventName] = reqBody;
|
||||||
|
OnConfigChanged?.Invoke(this, new ConfigStoreItem(eventName, reqBody));
|
||||||
|
logger.LogDebug("Synapse Config Changed: {Config} => {Data}", eventName, reqBody);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
};
|
||||||
|
Client.SubscribeAsync(eventSubOpts).Wait();
|
||||||
|
}
|
||||||
|
|
||||||
|
public record ConfigStoreItem(string Key, string Value);
|
||||||
|
}
|
||||||
+22
-20
@@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+50
-32
@@ -1,10 +1,11 @@
|
|||||||
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;
|
||||||
@@ -13,38 +14,55 @@ public partial class Synapse
|
|||||||
{
|
{
|
||||||
private void RunEventServer()
|
private void RunEventServer()
|
||||||
{
|
{
|
||||||
EventServerChannel = CreateChannel(Options.EventProcessorNum, "EventServer");
|
var esTopicPrefix = $"{Options.SysName}/event/";
|
||||||
var queue = $"{Options.SysName}_{Options.AppName}_event";
|
Client!.ApplicationMessageReceivedAsync += e =>
|
||||||
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(esTopicPrefix)) return Task.CompletedTask;
|
||||||
}
|
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||||
var consumer = new EventingBasicConsumer(EventServerChannel);
|
var eventName = e.ApplicationMessage.Topic.Replace(esTopicPrefix, 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 callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
|
||||||
|
var mt = callClass.GetType().GetMethod(method.Method!);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (mt!.GetParameters().Length == 2)
|
||||||
|
{
|
||||||
|
var pt = mt.GetParameters()[1].ParameterType;
|
||||||
|
mt.Invoke(callClass, pt == typeof(string)
|
||||||
|
? [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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var key = ea.RoutingKey.Replace("event.", string.Empty);
|
return Task.CompletedTask;
|
||||||
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)
|
|
||||||
? new object[] { reqBody }
|
|
||||||
: new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) });
|
|
||||||
EventServerChannel.BasicAck(ea.DeliveryTag, false);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Logger.LogError("Event Processor Error: {Err}", e.InnerException);
|
|
||||||
EventServerChannel.BasicNack(ea.DeliveryTag, false, false);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
EventServerChannel.BasicConsume(queue, false, "", false, false, null, consumer);
|
foreach (var ev in EventRegistry)
|
||||||
|
{
|
||||||
|
|
||||||
|
var topic = $"{esTopicPrefix}{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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+59
-43
@@ -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,58 +12,76 @@ 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 void RunRpcClient()
|
private void RunRpcClient()
|
||||||
{
|
{
|
||||||
RpcClientChannel = CreateChannel(0, "RpcClient");
|
var rcTopic = $"{Options.SysName}/{Options.AppName}/rpc/client/{Options.AppId}/";
|
||||||
var queue = $"{Options.SysName}_{Options.AppName}_client_{Options.AppId}";
|
var rcSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
|
||||||
var router = $"client.{Options.AppName}.{Options.AppId}";
|
.WithTopicFilter(o => o.WithTopic($"{rcTopic}+")).Build();
|
||||||
RpcClientChannel.QueueDeclare(queue, true, false, true, null);
|
Client!.ApplicationMessageReceivedAsync += e =>
|
||||||
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(rcTopic)) return Task.CompletedTask;
|
||||||
RpcClientChannel.BasicAck(ea.DeliveryTag, false);
|
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||||
Logger.LogDebug(
|
var messageId = e.ApplicationMessage.Topic.Replace(rcTopic, 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);
|
Client.SubscribeAsync(rcSubOpts).Wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
private object FireRpc(string app, string action, object param)
|
private string? FireRpc(string app, string action, object? param)
|
||||||
{
|
{
|
||||||
var paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
|
string paramJson;
|
||||||
var router = $"server.{app}";
|
if (param is string strParam)
|
||||||
SimApiBaseResponse response;
|
|
||||||
var props = RpcClientChannel.CreateBasicProperties();
|
|
||||||
props.AppId = Options.AppId;
|
|
||||||
props.MessageId = Guid.NewGuid().ToString();
|
|
||||||
props.Type = action;
|
|
||||||
props.ReplyTo = Options.AppName;
|
|
||||||
RpcClientChannel.BasicPublish(Options.SysName, router, false, props, Encoding.UTF8.GetBytes(paramJson));
|
|
||||||
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 = new SimApiBaseResponse(502, "timeout");
|
response = tcs.Task.Result;
|
||||||
break;
|
logger.LogDebug(
|
||||||
|
"Synapse RPC Client Response: ({BasicPropertiesCorrelationId}) {BasicPropertiesType}@{BasicPropertiesReplyTo} -> {OptionsAppName}\n{S}",
|
||||||
|
messageId, action, app, Options.AppName, response);
|
||||||
}
|
}
|
||||||
if (ResponseCache.TryGetValue(props.MessageId, out var value))
|
else
|
||||||
{
|
{
|
||||||
response = JsonSerializer.Deserialize<SimApiBaseResponse<object>>(
|
response = JsonSerializer.Serialize(new SimApiBaseResponse(502, "timeout"), SimApiUtil.JsonOption);
|
||||||
Encoding.UTF8.GetString(value), SimApiUtil.JsonOption);
|
|
||||||
ResponseCache.Remove(props.MessageId);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
response = JsonSerializer.Serialize(new SimApiBaseResponse(500, "Synapse RPC Client Error"),
|
||||||
|
SimApiUtil.JsonOption);
|
||||||
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+67
-62
@@ -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;
|
||||||
@@ -20,74 +18,81 @@ public partial class Synapse
|
|||||||
{
|
{
|
||||||
private void RunRpcServer()
|
private void RunRpcServer()
|
||||||
{
|
{
|
||||||
RpcServerChannel = CreateChannel(Options.RpcProcessorNum, "RpcServer");
|
var rsTopicPrefix = $"{Options.SysName}/{Options.AppName}/rpc/server/";
|
||||||
var queue = $"{Options.SysName}_{Options.AppName}_server";
|
var rsSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
|
||||||
var router = $"server.{Options.AppName}";
|
.WithTopicFilter(o =>
|
||||||
RpcServerChannel.QueueDeclare(queue, true, false, true, null);
|
o.WithTopic($"$queue/{rsTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
|
||||||
RpcServerChannel.QueueBind(queue, Options.SysName, router, null);
|
.Build();
|
||||||
var consumer = new EventingBasicConsumer(RpcServerChannel);
|
Client!.ApplicationMessageReceivedAsync += e =>
|
||||||
consumer.Received += (ch, ea) =>
|
|
||||||
{
|
{
|
||||||
var reqBody = Encoding.UTF8.GetString(ea.Body.ToArray());
|
if (!e.ApplicationMessage.Topic.StartsWith(rsTopicPrefix)) return Task.CompletedTask;
|
||||||
Logger.LogDebug(
|
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||||
"RPC Receive: ({BasicPropertiesMessageId}) {BasicPropertiesReplyTo} -> {BasicPropertiesType}@{OptionsAppName}\n{S}",
|
var action = e.ApplicationMessage.Topic.Replace(rsTopicPrefix, 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);
|
Client.SubscribeAsync(rsSubOpts).Wait();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+173
-129
@@ -3,187 +3,193 @@ 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
|
||||||
{
|
{
|
||||||
res = FireRpc(appName, method, param);
|
var data = FireRpc(appName, method, param);
|
||||||
|
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,
|
return Task.CompletedTask;
|
||||||
VirtualHost = Options.MqVHost,
|
|
||||||
UserName = Options.MqUser,
|
|
||||||
Password = Options.MqPass
|
|
||||||
};
|
};
|
||||||
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(); // 获取类型中的所有方法
|
||||||
@@ -192,46 +198,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; }
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user