Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3fc7db01c | ||
|
|
894d6930f7 | ||
|
|
106d3eec19 | ||
|
|
a8c7a20a64 | ||
|
|
b6dbcd6cee | ||
|
|
b7775cbe6c | ||
|
|
28c6d53f38 | ||
|
|
ebceb0a260 | ||
|
|
162b92a415 | ||
|
|
a859986a93 | ||
|
|
e1c6694e18 | ||
|
|
566b1d190b | ||
|
|
eb8c9732bd | ||
|
|
c8b78ce86d | ||
|
|
b2ec94e957 | ||
|
|
a8439c174c | ||
|
|
81e166ad45 | ||
|
|
d50d32f032 |
@@ -9,16 +9,21 @@ jobs:
|
|||||||
publish:
|
publish:
|
||||||
name: Publish Project to Nuget
|
name: Publish Project to Nuget
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v5
|
uses: actions/setup-dotnet@v5
|
||||||
with:
|
with:
|
||||||
dotnet-version: "10.x.x"
|
dotnet-version: "10.x.x"
|
||||||
|
- name: NuGet login (OIDC → temp API key)
|
||||||
|
uses: NuGet/login@v1
|
||||||
|
id: login
|
||||||
|
with:
|
||||||
|
user: ${{ secrets.NUGET_USER }}
|
||||||
- name: Publish
|
- name: Publish
|
||||||
run: |
|
run: |
|
||||||
version=`git describe --tags`
|
version=`git describe --tags`
|
||||||
dotnet build --configuration release -p:Version=$version
|
dotnet build --configuration release -p:Version=$version
|
||||||
dotnet nuget push bin/release/Simcu.SimApi.$version.nupkg -k ${NUGET_APIKEY} -s https://www.nuget.org/api/v2/package
|
dotnet nuget push bin/release/Simcu.SimApi.$version.nupkg -k ${{steps.login.outputs.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json
|
||||||
env:
|
|
||||||
NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
|
|
||||||
@@ -13,13 +13,13 @@ namespace SimApi.Attributes;
|
|||||||
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
|
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
|
||||||
public class SimApiAuthAttribute : ActionFilterAttribute
|
public class SimApiAuthAttribute : ActionFilterAttribute
|
||||||
{
|
{
|
||||||
private string[] Types { get; }
|
private string[]? Types { get; }
|
||||||
|
|
||||||
|
|
||||||
//默认是user登录类型
|
//默认是user登录类型
|
||||||
public SimApiAuthAttribute()
|
public SimApiAuthAttribute()
|
||||||
{
|
{
|
||||||
Types = new[] { "user" };
|
Types = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
//只检测一种用户类型的快捷方式
|
//只检测一种用户类型的快捷方式
|
||||||
@@ -34,13 +34,6 @@ public class SimApiAuthAttribute : ActionFilterAttribute
|
|||||||
Types = types;
|
Types = types;
|
||||||
}
|
}
|
||||||
|
|
||||||
//只检测一种用户类型的快捷方式
|
|
||||||
public SimApiAuthAttribute(string type, string url)
|
|
||||||
{
|
|
||||||
Types = new[] { type };
|
|
||||||
new HttpPostAttribute(url);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void OnActionExecuting(ActionExecutingContext context)
|
public override void OnActionExecuting(ActionExecutingContext context)
|
||||||
{
|
{
|
||||||
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
|
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
|
||||||
@@ -49,6 +42,8 @@ public class SimApiAuthAttribute : ActionFilterAttribute
|
|||||||
{
|
{
|
||||||
throw new SimApiException(401);
|
throw new SimApiException(401);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Types == null) return;
|
||||||
//检测用户类型
|
//检测用户类型
|
||||||
if (!Types.Intersect(loginInfo.Type).Any())
|
if (!Types.Intersect(loginInfo.Type).Any())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -12,13 +12,28 @@ public class SimApiDocAttribute : SwaggerOperationAttribute
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 定义接口说明
|
/// 定义接口说明
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="tag">接口分组</param>
|
/// <param name="tags">接口分组列表</param>
|
||||||
/// <param name="name">接口名称</param>
|
/// <param name="name">接口名称</param>
|
||||||
public SimApiDocAttribute(string tag, string name)
|
/// <param name="description">接口描述</param>
|
||||||
|
public SimApiDocAttribute(string[] tags, string name, string? description = null)
|
||||||
{
|
{
|
||||||
Tags = [tag];
|
Tags = tags;
|
||||||
Summary = name;
|
Summary = name;
|
||||||
|
if (description != null)
|
||||||
|
{
|
||||||
|
Description = description;
|
||||||
|
}
|
||||||
// Consumes = new[] {"application/json"};
|
// Consumes = new[] {"application/json"};
|
||||||
// Produces = new[] {"application/json"};
|
// Produces = new[] {"application/json"};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 定义接口说明
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="tag">接口分组</param>
|
||||||
|
/// <param name="name">接口名称</param>
|
||||||
|
/// <param name="description">接口描述</param>
|
||||||
|
public SimApiDocAttribute(string tag, string name, string? description = null) : this([tag], name, description)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+4
-5
@@ -14,7 +14,6 @@ namespace SimApi.CoceSdk;
|
|||||||
|
|
||||||
public class CoceApp(SimApiOptions simApiOptions, ILogger<CoceApp> logger, IDistributedCache cache)
|
public class CoceApp(SimApiOptions simApiOptions, ILogger<CoceApp> logger, IDistributedCache cache)
|
||||||
{
|
{
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取Level Token
|
/// 获取Level Token
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -164,7 +163,7 @@ public class CoceApp(SimApiOptions simApiOptions, ILogger<CoceApp> logger, IDist
|
|||||||
var sign = SimApiUtil.Md5(signStr + simApiOptions.CoceSdkOptions.AppKey);
|
var sign = SimApiUtil.Md5(signStr + simApiOptions.CoceSdkOptions.AppKey);
|
||||||
logger.LogDebug("签名: {Sign}", sign);
|
logger.LogDebug("签名: {Sign}", sign);
|
||||||
request.Add("sign", sign);
|
request.Add("sign", sign);
|
||||||
logger.LogDebug("请求地址: {PlatUrl} => {Data}", platUrl, JsonSerializer.Serialize(request));
|
logger.LogDebug("请求地址: {PlatUrl} => {Data}", platUrl, SimApiUtil.Json(request));
|
||||||
var http = new HttpClient();
|
var http = new HttpClient();
|
||||||
return http.PostAsJsonAsync(platUrl, request).Result;
|
return http.PostAsJsonAsync(platUrl, request).Result;
|
||||||
}
|
}
|
||||||
@@ -178,7 +177,7 @@ public class CoceApp(SimApiOptions simApiOptions, ILogger<CoceApp> logger, IDist
|
|||||||
public IEnumerable<GroupInfo>? GetUserGroups(string token)
|
public IEnumerable<GroupInfo>? GetUserGroups(string token)
|
||||||
{
|
{
|
||||||
const string uri = "/api/lv2/user/groups";
|
const string uri = "/api/lv2/user/groups";
|
||||||
var resp = ProxyQuery<GroupInfo[]>(uri, token,"{}");
|
var resp = ProxyQuery<GroupInfo[]>(uri, token, "{}");
|
||||||
return resp;
|
return resp;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,10 +206,10 @@ public class CoceApp(SimApiOptions simApiOptions, ILogger<CoceApp> logger, IDist
|
|||||||
public dynamic? ProxyQuery(string uri, string token, string json) => ProxyQuery<dynamic>(uri, token, json);
|
public dynamic? ProxyQuery(string uri, string token, string json) => ProxyQuery<dynamic>(uri, token, json);
|
||||||
|
|
||||||
public dynamic? ProxyQueue(string uri, string token, object data) =>
|
public dynamic? ProxyQueue(string uri, string token, object data) =>
|
||||||
ProxyQuery<dynamic>(uri, token, JsonSerializer.Serialize(data));
|
ProxyQuery<dynamic>(uri, token, SimApiUtil.Json(data));
|
||||||
|
|
||||||
public T? ProxyQueue<T>(string uri, string token, object data) =>
|
public T? ProxyQueue<T>(string uri, string token, object data) =>
|
||||||
ProxyQuery<T>(uri, token, JsonSerializer.Serialize(data));
|
ProxyQuery<T>(uri, token, SimApiUtil.Json(data));
|
||||||
|
|
||||||
public T? ProxyQuery<T>(string uri, string token, string json = "{}")
|
public T? ProxyQuery<T>(string uri, string token, string json = "{}")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ using SimApi.Attributes;
|
|||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
using SimApi.Controllers;
|
using SimApi.Controllers;
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
using static SimApi.Helpers.SimApiError;
|
||||||
|
|
||||||
namespace SimApi.CoceSdk;
|
namespace SimApi.CoceSdk;
|
||||||
|
|
||||||
@@ -19,7 +20,7 @@ public class CoceController(CoceApp coce, SimApiAuth auth, IServiceProvider sp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public SimApiBaseResponse<string> Login([FromBody] SimApiOneFieldRequest<string> request)
|
public string Login([FromBody] SimApiOneFieldRequest<string> request)
|
||||||
{
|
{
|
||||||
var data = coce.GetLevelToken(request.Data!);
|
var data = coce.GetLevelToken(request.Data!);
|
||||||
ErrorWhenNull(data, 400);
|
ErrorWhenNull(data, 400);
|
||||||
@@ -38,14 +39,14 @@ public class CoceController(CoceApp coce, SimApiAuth auth, IServiceProvider sp)
|
|||||||
};
|
};
|
||||||
var processor = sp.GetService<ICoceLoginProcessor>();
|
var processor = sp.GetService<ICoceLoginProcessor>();
|
||||||
processor?.Process(loginItem, groups.ToArray());
|
processor?.Process(loginItem, groups.ToArray());
|
||||||
return new SimApiBaseResponse<string>(auth.Login(loginItem));
|
return auth.Login(loginItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost, SimApiAuth]
|
[HttpPost, SimApiAuth]
|
||||||
public SimApiBaseResponse<GroupInfo[]> ListGroups()
|
public GroupInfo[] ListGroups()
|
||||||
{
|
{
|
||||||
var levelToken = coce.GetToken(LoginInfo.Id!);
|
var levelToken = coce.GetToken(LoginInfo.Id!);
|
||||||
var groups = coce.GetUserGroups(levelToken!)!;
|
var groups = coce.GetUserGroups(levelToken!)!;
|
||||||
return new SimApiBaseResponse<GroupInfo[]>(groups.ToArray());
|
return groups.ToArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,5 +10,5 @@ public class SimApiLoginItem
|
|||||||
public required string Id { get; set; }
|
public required string Id { get; set; }
|
||||||
public string[] Type { get; set; } = ["user"];
|
public string[] Type { get; set; } = ["user"];
|
||||||
public Dictionary<string, string> Meta { get; set; } = [];
|
public Dictionary<string, string> Meta { get; set; } = [];
|
||||||
public object? Extra { get; set; }
|
public Dictionary<string, object?> Extra { get; set; } = [];
|
||||||
};
|
};
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiGateAuthOptions
|
||||||
|
{
|
||||||
|
public string? AppId { get; set; }
|
||||||
|
|
||||||
|
public string? AppKey { get; set; }
|
||||||
|
}
|
||||||
@@ -29,11 +29,12 @@ public class SimApiJobOptions
|
|||||||
/// 设置为null 使用默认redis配置
|
/// 设置为null 使用默认redis配置
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? Database { get; set; } = null;
|
public int? Database { get; set; } = null;
|
||||||
|
|
||||||
public SimApiJobServerConfig[] Servers { get; set; } = [new()];
|
public SimApiJobServerConfig[] Servers { get; set; } = [new()];
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SimApiJobServerConfig()
|
public class SimApiJobServerConfig()
|
||||||
{
|
{
|
||||||
public string[] Queues { get; set; } = ["default"];
|
public string[] Queues { get; set; } = ["default"];
|
||||||
public int WorkerNum { get; set; } = 50;
|
public int WorkerNum { get; set; } = 5;
|
||||||
}
|
}
|
||||||
@@ -18,6 +18,11 @@ public class SimApiOptions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableSimApiAuth { get; set; }
|
public bool EnableSimApiAuth { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启用SimApi网关授权, 基于上层网关透传的身份令牌验证
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableSimApiGateAuth { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否使用CoceSdk
|
/// 是否使用CoceSdk
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -81,7 +86,6 @@ public class SimApiOptions
|
|||||||
public bool EnableVersionUrl { get; set; } = true;
|
public bool EnableVersionUrl { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 启用格式化的 Console Logger
|
/// 启用格式化的 Console Logger
|
||||||
/// default: false
|
/// default: false
|
||||||
@@ -106,6 +110,8 @@ public class SimApiOptions
|
|||||||
|
|
||||||
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public SimApiGateAuthOptions SimApiGateAuthOptions { get; set; } = new();
|
||||||
|
|
||||||
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions>? options = null)
|
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions>? options = null)
|
||||||
{
|
{
|
||||||
options?.Invoke(SimApiSynapseOptions);
|
options?.Invoke(SimApiSynapseOptions);
|
||||||
@@ -130,4 +136,9 @@ public class SimApiOptions
|
|||||||
{
|
{
|
||||||
options?.Invoke(SimApiJobOptions);
|
options?.Invoke(SimApiJobOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ConfigureSimApiGateAuth(Action<SimApiGateAuthOptions>? options = null)
|
||||||
|
{
|
||||||
|
options?.Invoke(SimApiGateAuthOptions);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
using System.Collections.Generic;
|
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;
|
||||||
|
|
||||||
|
using static SimApiError;
|
||||||
|
|
||||||
public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -13,13 +14,10 @@ public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost, SimApiDoc("认证", "检测登陆")]
|
[HttpPost, SimApiDoc("认证", "检测登陆")]
|
||||||
public SimApiBaseResponse<string> CheckLogin()
|
public string CheckLogin()
|
||||||
{
|
{
|
||||||
ErrorWhenNull(LoginInfo, 401, "未登录");
|
ErrorWhenNull(LoginInfo, 401, "未登录");
|
||||||
return new SimApiBaseResponse<string>
|
return LoginInfo.Id;
|
||||||
{
|
|
||||||
Data = LoginInfo.Id
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -27,23 +25,15 @@ public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost, SimApiDoc("认证", "退出登陆")]
|
[HttpPost, SimApiDoc("认证", "退出登陆")]
|
||||||
public SimApiBaseResponse Logout()
|
public void Logout()
|
||||||
{
|
{
|
||||||
string? token = null;
|
|
||||||
|
|
||||||
if (Request.Headers.TryGetValue("Token", out var value))
|
if (Request.Headers.TryGetValue("Token", out var value))
|
||||||
{
|
{
|
||||||
token = value;
|
auth.Logout(value!);
|
||||||
}
|
}
|
||||||
|
|
||||||
auth.Logout(token!);
|
|
||||||
return new SimApiBaseResponse();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[HttpPost, SimApiAuth]
|
[HttpPost, SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
|
||||||
public SimApiBaseResponse<SimApiLoginItem> UserInfo()
|
public SimApiLoginItem UserInfo() => LoginInfo;
|
||||||
{
|
|
||||||
return new SimApiBaseResponse<SimApiLoginItem>(LoginInfo);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
using System.Diagnostics.CodeAnalysis;
|
using SimApi.Communications;
|
||||||
using SimApi.Communications;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.AspNetCore.Mvc.Filters;
|
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 static SimApi.Helpers.SimApiError;
|
||||||
|
|
||||||
namespace SimApi.Controllers;
|
namespace SimApi.Controllers;
|
||||||
|
|
||||||
@@ -24,6 +23,8 @@ public class SimApiBaseController : Controller
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"]!;
|
protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"]!;
|
||||||
|
|
||||||
|
protected SimApiLoginItem LoginToken => (SimApiLoginItem)HttpContext.Items["LoginToken"]!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 验证请求参数
|
/// 验证请求参数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -38,74 +39,4 @@ public class SimApiBaseController : Controller
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 错误返回
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="code">错误代码</param>
|
|
||||||
/// <param name="message">错误描述(若是常规错误,代码可自动带取描述)</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
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([DoesNotReturnIf(true)] bool condition, int code = 400, string message = "")
|
|
||||||
{
|
|
||||||
if (condition)
|
|
||||||
{
|
|
||||||
Error(code, message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 检测条件,根据条件返回报错 如果condition是ture报错
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="condition">检测条件</param>
|
|
||||||
/// <param name="code">错误代码</param>
|
|
||||||
/// <param name="message">错误描述</param>
|
|
||||||
protected static void ErrorWhenTrue([DoesNotReturnIf(true)] bool condition, int code = 400, string message = "")
|
|
||||||
{
|
|
||||||
ErrorWhen(condition, code, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 如果condition是false 报错
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="condition"></param>
|
|
||||||
/// <param name="code"></param>
|
|
||||||
/// <param name="message"></param>
|
|
||||||
protected static void ErrorWhenFalse([DoesNotReturnIf(false)] bool condition, int code = 400, string message = "")
|
|
||||||
{
|
|
||||||
ErrorWhen(!condition, code, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 检测给定的变量是否为NUll
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="condition">检测条件</param>
|
|
||||||
/// <param name="code">错误代码</param>
|
|
||||||
/// <param name="message">错误描述</param>
|
|
||||||
protected static void ErrorWhenNull([NotNull] object? condition, int code = 404, string message = "请求的资源不存在")
|
|
||||||
{
|
|
||||||
ErrorWhen(condition == null, code, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 上传文件
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected SimApiBaseResponse<string> UploadFile()
|
|
||||||
{
|
|
||||||
return new SimApiBaseResponse<string>();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using SimApi.Communications;
|
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Controllers;
|
namespace SimApi.Controllers;
|
||||||
@@ -14,22 +13,19 @@ public class SimApiCommonController : SimApiBaseController
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("exception/{code:int}")]
|
[HttpGet("exception/{code:int}")]
|
||||||
[ApiExplorerSettings(IgnoreApi = true)]
|
[ApiExplorerSettings(IgnoreApi = true)]
|
||||||
public SimApiBaseResponse ExceptionHandler(int code)
|
public void ExceptionHandler(int code)
|
||||||
{
|
{
|
||||||
return new SimApiBaseResponse(code);
|
SimApiError.Error(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[HttpPost, HttpGet]
|
[HttpPost, HttpGet]
|
||||||
public SimApiBaseResponse<Dictionary<string, string>> Versions()
|
public Dictionary<string, string> Versions()
|
||||||
{
|
{
|
||||||
return new SimApiBaseResponse<Dictionary<string, string>>()
|
return new Dictionary<string, string>
|
||||||
{
|
|
||||||
Data = new Dictionary<string, string>
|
|
||||||
{
|
{
|
||||||
{ "SimApi", SimApiUtil.SimApiVersion },
|
{ "SimApi", SimApiUtil.SimApiVersion },
|
||||||
{ "App", SimApiUtil.AppVersion }
|
{ "App", SimApiUtil.AppVersion }
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+94
-10
@@ -1,25 +1,42 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using Microsoft.Extensions.Caching.Distributed;
|
using Microsoft.Extensions.Caching.Distributed;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
|
using StackExchange.Redis;
|
||||||
|
|
||||||
namespace SimApi.Helpers;
|
namespace SimApi.Helpers;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 认证助手
|
/// 认证助手
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SimApiAuth(IDistributedCache cache)
|
public class SimApiAuth(IDistributedCache cache, IConnectionMultiplexer redis)
|
||||||
{
|
{
|
||||||
|
private const string TokenCacheKey = "SimApi:Auth:Token:{token}";
|
||||||
|
private const string TokenSetCacheKey = "SimApi:Auth:User:{userId}";
|
||||||
|
private readonly IDatabase _redisDb = redis.GetDatabase();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 登录信息
|
/// 登录信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="loginItem"></param>
|
/// <param name="loginItem"></param>
|
||||||
|
/// <param name="expireTime"></param>
|
||||||
/// <param name="token"></param>
|
/// <param name="token"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public string Login(SimApiLoginItem loginItem, string? token = null)
|
public string Login(SimApiLoginItem loginItem, TimeSpan? expireTime = null, string? token = null)
|
||||||
{
|
{
|
||||||
|
expireTime ??= TimeSpan.FromDays(7);
|
||||||
token ??= Guid.NewGuid().ToString();
|
token ??= Guid.NewGuid().ToString();
|
||||||
cache.SetString(token, JsonSerializer.Serialize(loginItem));
|
var cacheKey = TokenCacheKey.Replace("{token}", token);
|
||||||
|
var setCacheKey = TokenSetCacheKey.Replace("{userId}", loginItem.Id);
|
||||||
|
_redisDb.SetAdd(setCacheKey, token);
|
||||||
|
cache.SetString(cacheKey, SimApiUtil.Json(loginItem),
|
||||||
|
new DistributedCacheEntryOptions
|
||||||
|
{
|
||||||
|
SlidingExpiration = expireTime
|
||||||
|
});
|
||||||
|
_redisDb.KeyExpire(setCacheKey, expireTime.Value);
|
||||||
|
|
||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,10 +48,15 @@ public class SimApiAuth(IDistributedCache cache)
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public string Update(SimApiLoginItem loginItem, string token)
|
public string Update(SimApiLoginItem loginItem, string token)
|
||||||
{
|
{
|
||||||
cache.SetString(token, JsonSerializer.Serialize(loginItem));
|
var cacheKey = TokenCacheKey.Replace("{token}", token);
|
||||||
|
cache.SetString(cacheKey, SimApiUtil.Json(loginItem));
|
||||||
|
var ttl = _redisDb.KeyTimeToLive(cacheKey);
|
||||||
|
var setCacheKey = TokenSetCacheKey.Replace("{userId}", loginItem.Id);
|
||||||
|
_redisDb.KeyExpire(setCacheKey, ttl);
|
||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取登陆信息
|
/// 获取登陆信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -42,19 +64,81 @@ public class SimApiAuth(IDistributedCache cache)
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public SimApiLoginItem? GetLogin(string token)
|
public SimApiLoginItem? GetLogin(string token)
|
||||||
{
|
{
|
||||||
var login = cache.GetString(token);
|
var cacheKey = TokenCacheKey.Replace("{token}", token);
|
||||||
return login != null ? JsonSerializer.Deserialize<SimApiLoginItem>(login) : null;
|
var login = cache.GetString(cacheKey);
|
||||||
|
var resp = login != null ? SimApiUtil.FromJson<SimApiLoginItem>(login) : null;
|
||||||
|
if (resp != null)
|
||||||
|
{
|
||||||
|
var ttl = _redisDb.KeyTimeToLive(cacheKey);
|
||||||
|
var setCacheKey = TokenSetCacheKey.Replace("{userId}", resp.Id);
|
||||||
|
_redisDb.KeyExpire(setCacheKey, ttl);
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有的登录token
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiLoginItem[] GetAllLogins(string userId)
|
||||||
|
{
|
||||||
|
var setCacheKey = TokenSetCacheKey.Replace("{userId}", userId);
|
||||||
|
var allLogins = _redisDb.SetMembers(setCacheKey).ToStringArray();
|
||||||
|
var resp = new List<SimApiLoginItem>();
|
||||||
|
foreach (var login in allLogins)
|
||||||
|
{
|
||||||
|
if (login != null)
|
||||||
|
{
|
||||||
|
var item = GetLogin(login);
|
||||||
|
if (item != null)
|
||||||
|
{
|
||||||
|
resp.Add(item);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_redisDb.SetRemove(setCacheKey, login);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 退出所有登录
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
public void LogoutAll(string userId)
|
||||||
|
{
|
||||||
|
var setCacheKey = TokenSetCacheKey.Replace("{userId}", userId);
|
||||||
|
var allLogins = _redisDb.SetMembers(setCacheKey).ToStringArray();
|
||||||
|
foreach (var login in allLogins)
|
||||||
|
{
|
||||||
|
if (login != null)
|
||||||
|
{
|
||||||
|
var cacheKey = TokenCacheKey.Replace("{token}", login);
|
||||||
|
cache.Remove(cacheKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_redisDb.KeyDelete(setCacheKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 退出登陆
|
/// 退出登陆
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="uuid">登陆标识</param>
|
/// <param name="token">登陆标识</param>
|
||||||
public void Logout(string uuid)
|
public void Logout(string token)
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(uuid))
|
var item = GetLogin(token);
|
||||||
|
if (item != null)
|
||||||
{
|
{
|
||||||
cache.Remove(uuid);
|
var setCacheKey = TokenSetCacheKey.Replace("{userId}", item.Id);
|
||||||
|
_redisDb.SetRemove(setCacheKey, token);
|
||||||
|
var cacheKey = TokenCacheKey.Replace("{token}", token);
|
||||||
|
cache.Remove(cacheKey);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+40
-3
@@ -7,8 +7,15 @@ public class SimApiCache(IDistributedCache cache)
|
|||||||
{
|
{
|
||||||
private const string Prefix = "SimApi:Cache:";
|
private const string Prefix = "SimApi:Cache:";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置缓存 (值不能为null)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
/// <param name="value"></param>
|
||||||
|
/// <param name="options"></param>
|
||||||
public void Set(string key, object value, DistributedCacheEntryOptions? options = null)
|
public void Set(string key, object value, DistributedCacheEntryOptions? options = null)
|
||||||
{
|
{
|
||||||
|
SimApiError.ErrorWhenNull(value, 400, "缓存值不能为null");
|
||||||
if (options is not null)
|
if (options is not null)
|
||||||
{
|
{
|
||||||
cache.SetString(Prefix + key, SimApiUtil.Json(value), options);
|
cache.SetString(Prefix + key, SimApiUtil.Json(value), options);
|
||||||
@@ -19,14 +26,44 @@ public class SimApiCache(IDistributedCache cache)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string? Get(string key)
|
/// <summary>
|
||||||
|
/// 移除缓存
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
public void Remove(string key)
|
||||||
{
|
{
|
||||||
return cache.GetString(Prefix + key);
|
cache.Remove(Prefix + key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 缓存Key是否存在
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public bool HasKey(string key)
|
||||||
|
{
|
||||||
|
return Get<string>(key) != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取string类型缓存
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string? Get(string key)
|
||||||
|
{
|
||||||
|
return Get<string>(Prefix + key);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取特定类型缓存
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
public T? Get<T>(string key)
|
public T? Get<T>(string key)
|
||||||
{
|
{
|
||||||
var data = cache.GetString(Prefix + key);
|
var data = cache.GetString(Prefix + key);
|
||||||
return data == null ? default : JsonSerializer.Deserialize<T>(data);
|
return data == null ? default : SimApiUtil.FromJson<T>(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
using SimApi.Exceptions;
|
||||||
|
|
||||||
|
namespace SimApi.Helpers;
|
||||||
|
|
||||||
|
public static class SimApiError
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 错误返回
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="code">错误代码</param>
|
||||||
|
/// <param name="message">错误描述(若是常规错误,代码可自动带取描述)</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[DoesNotReturn]
|
||||||
|
public 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>
|
||||||
|
public static void ErrorWhen([DoesNotReturnIf(true)] bool condition, int code = 400,
|
||||||
|
string message = "")
|
||||||
|
{
|
||||||
|
if (condition)
|
||||||
|
{
|
||||||
|
Error(code, message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检测条件,根据条件返回报错 如果condition是ture报错
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="condition">检测条件</param>
|
||||||
|
/// <param name="code">错误代码</param>
|
||||||
|
/// <param name="message">错误描述</param>
|
||||||
|
public static void ErrorWhenTrue([DoesNotReturnIf(true)] bool condition, int code = 400,
|
||||||
|
string message = "")
|
||||||
|
{
|
||||||
|
ErrorWhen(condition, code, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 如果condition是false 报错
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="condition"></param>
|
||||||
|
/// <param name="code"></param>
|
||||||
|
/// <param name="message"></param>
|
||||||
|
public static void ErrorWhenFalse([DoesNotReturnIf(false)] bool condition, int code = 400,
|
||||||
|
string message = "")
|
||||||
|
{
|
||||||
|
ErrorWhen(!condition, code, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检测给定的变量是否为NUll
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="condition">检测条件</param>
|
||||||
|
/// <param name="code">错误代码</param>
|
||||||
|
/// <param name="message">错误描述</param>
|
||||||
|
public static void ErrorWhenNull([NotNull] object? condition, int code = 404,
|
||||||
|
string message = "请求的资源不存在")
|
||||||
|
{
|
||||||
|
ErrorWhen(condition == null, code, message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,14 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
public string? AppIdName { get; init; } = "appId";
|
public string? AppIdName { get; init; } = "appId";
|
||||||
public string[] SignFields { get; init; } = [];
|
public string[] SignFields { get; init; } = [];
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 发起签名请求
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="url"></param>
|
||||||
|
/// <param name="body"></param>
|
||||||
|
/// <param name="queries"></param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
public T? SignQuery<T>(string url, object? body = null, Dictionary<string, string>? queries = null)
|
public T? SignQuery<T>(string url, object? body = null, Dictionary<string, string>? queries = null)
|
||||||
{
|
{
|
||||||
url = Server + url;
|
url = Server + url;
|
||||||
@@ -40,6 +48,13 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
return Query<T>(path, body);
|
return Query<T>(path, body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 发起AES加密请求
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="url"></param>
|
||||||
|
/// <param name="body"></param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
public T? AesQuery<T>(string url, object body)
|
public T? AesQuery<T>(string url, object body)
|
||||||
{
|
{
|
||||||
url = Server + url;
|
url = Server + url;
|
||||||
@@ -55,6 +70,14 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
return Query<T>(url, req);
|
return Query<T>(url, req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 发起AES加密以及签名请求
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="url"></param>
|
||||||
|
/// <param name="body"></param>
|
||||||
|
/// <param name="queries"></param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
public T? AesSignQuery<T>(string url, object body, Dictionary<string, string>? queries = null)
|
public T? AesSignQuery<T>(string url, object body, Dictionary<string, string>? queries = null)
|
||||||
{
|
{
|
||||||
var req = new SimApiOneFieldRequest<string>
|
var req = new SimApiOneFieldRequest<string>
|
||||||
@@ -64,6 +87,14 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
return SignQuery<T>(url, req, queries);
|
return SignQuery<T>(url, req, queries);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 发起请求
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="url"></param>
|
||||||
|
/// <param name="req"></param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="SimApiException"></exception>
|
||||||
private T? Query<T>(string url, object? req)
|
private T? Query<T>(string url, object? req)
|
||||||
{
|
{
|
||||||
var http = new HttpClient();
|
var http = new HttpClient();
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Net.Mail;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -94,6 +95,25 @@ public static class SimApiUtil
|
|||||||
return regex.IsMatch(cell);
|
return regex.IsMatch(cell);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 判断是否是Email地址
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="email"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static bool CheckEmail(string email)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var m = new MailAddress(email);
|
||||||
|
return m.Address == email;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// MD5加密字符串
|
/// MD5加密字符串
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -131,6 +151,51 @@ public static class SimApiUtil
|
|||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 字符串Base64编码
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="str"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string Base64Encode(string str)
|
||||||
|
{
|
||||||
|
var bytes = Encoding.UTF8.GetBytes(str);
|
||||||
|
return Convert.ToBase64String(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 从Base64中解码字符串
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="base64Str"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string Base64Decode(string base64Str)
|
||||||
|
{
|
||||||
|
var bytes = Convert.FromBase64String(base64Str);
|
||||||
|
return Encoding.UTF8.GetString(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 把对象Base64编码
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="obj"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string Base64Encode(object obj)
|
||||||
|
{
|
||||||
|
var json = Json(obj);
|
||||||
|
return Base64Encode(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 从Base64中解析对象
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="base64Str"></param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static T? Base64Decode<T>(string base64Str)
|
||||||
|
{
|
||||||
|
var json = Base64Decode(base64Str);
|
||||||
|
return FromJson<T>(json);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 将XML字符串序列化为对象
|
/// 将XML字符串序列化为对象
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -154,6 +219,17 @@ public static class SimApiUtil
|
|||||||
return JsonSerializer.Serialize(obj, JsonOption);
|
return JsonSerializer.Serialize(obj, JsonOption);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 将JSON解析为对象(控制台输出中文不会被编码)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="jsonString"></param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static T? FromJson<T>(string jsonString)
|
||||||
|
{
|
||||||
|
return JsonSerializer.Deserialize<T>(jsonString, JsonOption);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 分页
|
/// 分页
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
using System.Text.Json;
|
using System.Threading.Tasks;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.Extensions.Caching.Distributed;
|
|
||||||
using SimApi.Communications;
|
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Middlewares;
|
namespace SimApi.Middlewares;
|
||||||
@@ -12,7 +9,7 @@ namespace SimApi.Middlewares;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class SimApiAuthMiddleware(RequestDelegate next)
|
public class SimApiAuthMiddleware(RequestDelegate next)
|
||||||
{
|
{
|
||||||
public Task Invoke(HttpContext httpContext, IDistributedCache cache, SimApiAuth auth)
|
public Task Invoke(HttpContext httpContext, SimApiAuth auth)
|
||||||
{
|
{
|
||||||
string? token = null;
|
string? token = null;
|
||||||
if (httpContext.Request.Headers.TryGetValue("Token", out var header))
|
if (httpContext.Request.Headers.TryGetValue("Token", out var header))
|
||||||
@@ -24,8 +21,10 @@ public class SimApiAuthMiddleware(RequestDelegate next)
|
|||||||
var login = auth.GetLogin(token);
|
var login = auth.GetLogin(token);
|
||||||
if (login != null)
|
if (login != null)
|
||||||
{
|
{
|
||||||
|
httpContext.Items.Add("LoginToken", token);
|
||||||
httpContext.Items.Add("LoginInfo", login);
|
httpContext.Items.Add("LoginInfo", login);
|
||||||
}
|
}
|
||||||
|
|
||||||
return next(httpContext);
|
return next(httpContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
@@ -20,7 +19,6 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
|
|||||||
context.Response.Headers["Query-Id"] = header;
|
context.Response.Headers["Query-Id"] = header;
|
||||||
}
|
}
|
||||||
|
|
||||||
SimApiBaseResponse response;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await next(context);
|
await next(context);
|
||||||
@@ -31,39 +29,58 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
|
|||||||
case 200:
|
case 200:
|
||||||
case 301:
|
case 301:
|
||||||
case 302:
|
case 302:
|
||||||
break;
|
|
||||||
case 404:
|
case 404:
|
||||||
throw new SimApiException(context.Response.StatusCode, "请求的接口不存在");
|
break;
|
||||||
|
// case 404:
|
||||||
|
// throw new SimApiException(context.Response.StatusCode, "请求的接口不存在");
|
||||||
default:
|
default:
|
||||||
throw new SimApiException(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)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
log.LogError("{Msg}", ex.Message);
|
// 解包异步异常
|
||||||
log.LogError("{Msg}", ex.StackTrace);
|
ex = UnwrapAggregateException(ex);
|
||||||
response = new SimApiBaseResponse(500, ex.Message);
|
SimApiBaseResponse response;
|
||||||
ErrorResponse(context, response);
|
if (ex is SimApiException simEx)
|
||||||
|
{
|
||||||
|
response = string.IsNullOrEmpty(simEx.Message)
|
||||||
|
? new SimApiBaseResponse(simEx.Code)
|
||||||
|
: new SimApiBaseResponse(simEx.Code, simEx.Message);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
log.LogError(ex, "服务器异常");
|
||||||
|
response = new SimApiBaseResponse(500, "服务器错误");
|
||||||
|
}
|
||||||
|
|
||||||
|
await ErrorResponseAsync(context, response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
private static Exception UnwrapAggregateException(Exception ex)
|
||||||
/// 异常抛出错误
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="context"></param>
|
|
||||||
/// <param name="response"></param>
|
|
||||||
private static void ErrorResponse(HttpContext context, SimApiBaseResponse response)
|
|
||||||
{
|
{
|
||||||
|
while (ex is AggregateException aggEx && aggEx.InnerException != null)
|
||||||
|
{
|
||||||
|
ex = aggEx.InnerException;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ex;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 异步输出错误响应(修复异步异常捕获核心)
|
||||||
|
/// </summary>
|
||||||
|
private static async Task ErrorResponseAsync(HttpContext context, SimApiBaseResponse response)
|
||||||
|
{
|
||||||
|
// 响应已开始则直接返回,不修改
|
||||||
|
if (context.Response.HasStarted)
|
||||||
|
return;
|
||||||
|
|
||||||
context.Response.StatusCode = 200;
|
context.Response.StatusCode = 200;
|
||||||
context.Response.Headers.Append("Content-Type", "application/json");
|
context.Response.ContentType = "application/json";
|
||||||
context.Response.WriteAsync(response.ToString()).Wait();
|
context.Response.ContentLength = null; // 清除可能已设置的 Content-Length
|
||||||
|
await context.Response.WriteAsync(response.ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using SimApi.Communications;
|
||||||
|
using SimApi.Configurations;
|
||||||
|
using SimApi.Helpers;
|
||||||
|
|
||||||
|
namespace SimApi.Middlewares;
|
||||||
|
|
||||||
|
public class SimApiGateAuthMiddleware(RequestDelegate next, ILogger<SimApiGateAuthMiddleware> logger)
|
||||||
|
{
|
||||||
|
public Task Invoke(HttpContext httpContext, SimApiOptions simApiOptions)
|
||||||
|
{
|
||||||
|
if (httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Auth", out var auth) &&
|
||||||
|
httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Time", out var time) &&
|
||||||
|
httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Sign", out var sign))
|
||||||
|
{
|
||||||
|
var signStr =
|
||||||
|
$"appId={simApiOptions.SimApiGateAuthOptions.AppId}&auth={auth}&time={time}&appKey={simApiOptions.SimApiGateAuthOptions.AppKey}";
|
||||||
|
logger.LogDebug($"签名字符串 => {signStr}");
|
||||||
|
if (SimApiUtil.Md5(signStr) == sign && !string.IsNullOrEmpty(auth))
|
||||||
|
{
|
||||||
|
var login = SimApiUtil.Base64Decode<SimApiLoginItem>(auth!);
|
||||||
|
httpContext.Items.Add("LoginInfo", login);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.LogDebug("签名不匹配");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return next(httpContext);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,7 +30,7 @@ public class AesBodyModelBinder : IModelBinder
|
|||||||
SimApiOneFieldRequest<string>? aesRequest;
|
SimApiOneFieldRequest<string>? aesRequest;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
aesRequest = JsonSerializer.Deserialize<SimApiOneFieldRequest<string>>(requestBody, SimApiUtil.JsonOption);
|
aesRequest = SimApiUtil.FromJson<SimApiOneFieldRequest<string>>(requestBody);
|
||||||
}
|
}
|
||||||
catch (JsonException ex)
|
catch (JsonException ex)
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-16
@@ -1,5 +1,4 @@
|
|||||||
<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>
|
||||||
@@ -12,10 +11,6 @@
|
|||||||
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
|
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
|
||||||
<Folder Include="Communications\"/>
|
|
||||||
<Folder Include="Exceptions\"/>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.22" />
|
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.22" />
|
||||||
<PackageReference Include="Hangfire.Console" Version="1.4.3"/>
|
<PackageReference Include="Hangfire.Console" Version="1.4.3"/>
|
||||||
@@ -23,16 +18,7 @@
|
|||||||
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.1" />
|
||||||
<PackageReference Include="Minio" Version="7.0.0" />
|
<PackageReference Include="Minio" Version="7.0.0" />
|
||||||
<PackageReference Include="MQTTnet" Version="5.0.1.1416"/>
|
<PackageReference Include="MQTTnet" Version="5.0.1.1416"/>
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.0.1" />
|
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.0" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.0.1" />
|
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ProjectExtensions>
|
|
||||||
<MonoDevelop>
|
|
||||||
<Properties>
|
|
||||||
<Policies>
|
|
||||||
<DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="PrefixedHierarchical"/>
|
|
||||||
</Policies>
|
|
||||||
</Properties>
|
|
||||||
</MonoDevelop>
|
|
||||||
</ProjectExtensions>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+87
-15
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
@@ -21,6 +20,7 @@ using SimApi.CoceSdk;
|
|||||||
using SimApi.Configurations;
|
using SimApi.Configurations;
|
||||||
using SimApi.Logger;
|
using SimApi.Logger;
|
||||||
using SimApi.SwaggerFilters;
|
using SimApi.SwaggerFilters;
|
||||||
|
using StackExchange.Redis;
|
||||||
|
|
||||||
namespace SimApi;
|
namespace SimApi;
|
||||||
|
|
||||||
@@ -38,6 +38,8 @@ public static class SimApiExtensions
|
|||||||
if (simApiOptions.RedisConfiguration != null)
|
if (simApiOptions.RedisConfiguration != null)
|
||||||
{
|
{
|
||||||
builder.AddStackExchangeRedisCache(x => x.Configuration = simApiOptions.RedisConfiguration);
|
builder.AddStackExchangeRedisCache(x => x.Configuration = simApiOptions.RedisConfiguration);
|
||||||
|
builder.AddSingleton<IConnectionMultiplexer>(_ =>
|
||||||
|
ConnectionMultiplexer.Connect(simApiOptions.RedisConfiguration));
|
||||||
builder.AddSingleton<SimApiCache>();
|
builder.AddSingleton<SimApiCache>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,7 +126,75 @@ public static class SimApiExtensions
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
x.CustomSchemaIds(type => type.FullName?.Replace("+", "."));
|
x.CustomSchemaIds(type =>
|
||||||
|
{
|
||||||
|
// 递归解析类型名称(处理嵌套泛型/数组/可空 + 保证唯一性)
|
||||||
|
string GetSimpleTypeName(Type t, int depth = 0)
|
||||||
|
{
|
||||||
|
// 防止无限递归
|
||||||
|
if (depth > 5) return t.Name.Split('`')[0];
|
||||||
|
|
||||||
|
// 处理数组类型
|
||||||
|
if (t.IsArray)
|
||||||
|
{
|
||||||
|
var elementType = t.GetElementType();
|
||||||
|
return $"{GetSimpleTypeName(elementType!, depth + 1)}[]";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理可空类型
|
||||||
|
if (Nullable.GetUnderlyingType(t) != null)
|
||||||
|
{
|
||||||
|
var underlyingType = Nullable.GetUnderlyingType(t);
|
||||||
|
return GetSimpleTypeName(underlyingType!, depth + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理泛型类型(递归解析嵌套泛型)
|
||||||
|
if (t.IsGenericType)
|
||||||
|
{
|
||||||
|
var genericBaseName = t.GetGenericTypeDefinition().Name.Split('`')[0];
|
||||||
|
var genericArgs = t.GetGenericArguments()
|
||||||
|
.Select(arg => GetSimpleTypeName(arg, depth + 1))
|
||||||
|
.Where(arg => !string.IsNullOrEmpty(arg))
|
||||||
|
.ToArray();
|
||||||
|
return $"{genericBaseName}<{string.Join(",", genericArgs)}>";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理基础类型(小写)
|
||||||
|
if (t.IsPrimitive || t == typeof(string) || t == typeof(DateTime) || t == typeof(Guid))
|
||||||
|
{
|
||||||
|
return t.Name switch
|
||||||
|
{
|
||||||
|
"String" => "string",
|
||||||
|
"Int32" => "int",
|
||||||
|
"Int64" => "long",
|
||||||
|
"Boolean" => "boolean",
|
||||||
|
"DateTime" => "datetime",
|
||||||
|
"Guid" => "guid",
|
||||||
|
_ => t.Name.ToLower()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 核心修复:生成唯一名称(处理嵌套类/同名不同类)
|
||||||
|
var typeName = t.Name;
|
||||||
|
|
||||||
|
// 步骤1:处理嵌套类(如 ApplicationDto+ApplicationEditRequest → ApplicationDto_ApplicationEditRequest)
|
||||||
|
if (t.DeclaringType != null)
|
||||||
|
{
|
||||||
|
typeName = $"{GetSimpleTypeName(t.DeclaringType)}.{typeName}";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 步骤2:(可选)处理同命名空间下的同名类(拼接命名空间前缀,避免全局重复)
|
||||||
|
// 如需更严格的唯一性,取消注释下面这行
|
||||||
|
// typeName = $"{t.Namespace?.Replace(".", "_")}_{typeName}";
|
||||||
|
|
||||||
|
return typeName;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根调用:解析当前类型
|
||||||
|
var uniqueSchemaId = GetSimpleTypeName(type);
|
||||||
|
// 可选:移除特殊字符(如 $、+),避免 Swagger 解析问题
|
||||||
|
return uniqueSchemaId.Replace("$", "").Replace("+", "_");
|
||||||
|
});
|
||||||
x.OperationFilter<SimApiResponseOperationFilter>();
|
x.OperationFilter<SimApiResponseOperationFilter>();
|
||||||
x.OperationFilter<SimApiSignOperationFilter>();
|
x.OperationFilter<SimApiSignOperationFilter>();
|
||||||
x.OperationFilter<AesBodyOperationFilter>();
|
x.OperationFilter<AesBodyOperationFilter>();
|
||||||
@@ -159,19 +229,13 @@ public static class SimApiExtensions
|
|||||||
switch (auth)
|
switch (auth)
|
||||||
{
|
{
|
||||||
case "SimApiAuth":
|
case "SimApiAuth":
|
||||||
x.AddSecurityDefinition("HeaderToken",
|
x.AddSecurityDefinition("SimApiAuth",
|
||||||
new OpenApiSecurityScheme
|
new OpenApiSecurityScheme
|
||||||
{
|
{
|
||||||
Name = "Token",
|
Name = "Token",
|
||||||
In = ParameterLocation.Header,
|
In = ParameterLocation.Header,
|
||||||
Type = SecuritySchemeType.ApiKey
|
Type = SecuritySchemeType.ApiKey
|
||||||
});
|
});
|
||||||
x.AddSecurityRequirement(docs => new OpenApiSecurityRequirement
|
|
||||||
{
|
|
||||||
{
|
|
||||||
new OpenApiSecuritySchemeReference("HeaderToken"), new List<string>()
|
|
||||||
}
|
|
||||||
});
|
|
||||||
break;
|
break;
|
||||||
case "ClientCredentials":
|
case "ClientCredentials":
|
||||||
oauthFlows.ClientCredentials = new OpenApiOAuthFlow
|
oauthFlows.ClientCredentials = new OpenApiOAuthFlow
|
||||||
@@ -220,12 +284,6 @@ public static class SimApiExtensions
|
|||||||
Description = docOptions.ApiAuth.Description,
|
Description = docOptions.ApiAuth.Description,
|
||||||
In = ParameterLocation.Header
|
In = ParameterLocation.Header
|
||||||
});
|
});
|
||||||
x.AddSecurityRequirement(docs => new OpenApiSecurityRequirement
|
|
||||||
{
|
|
||||||
{
|
|
||||||
new OpenApiSecuritySchemeReference("oauth2"), new List<string>()
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -336,6 +394,20 @@ public static class SimApiExtensions
|
|||||||
builder.MapControllers();
|
builder.MapControllers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (options.EnableSimApiGateAuth)
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始配置SimApiGateAuth...");
|
||||||
|
if (string.IsNullOrEmpty(options.SimApiGateAuthOptions.AppId) ||
|
||||||
|
string.IsNullOrEmpty(options.SimApiGateAuthOptions.AppKey))
|
||||||
|
{
|
||||||
|
logger.LogCritical("必须配置Gate的AppId和AppKey才能启用SimApiGateAuth");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
builder.UseMiddleware<SimApiGateAuthMiddleware>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (options.EnableSimApiAuth)
|
if (options.EnableSimApiAuth)
|
||||||
{
|
{
|
||||||
logger.LogInformation("开始配置SimApiAuth...");
|
logger.LogInformation("开始配置SimApiAuth...");
|
||||||
|
|||||||
@@ -22,11 +22,11 @@ public class AesBodyOperationFilter : IOperationFilter
|
|||||||
.GetCustomAttribute<AesBodyAttribute>() != null;
|
.GetCustomAttribute<AesBodyAttribute>() != null;
|
||||||
if (!hasAesBodyAttr) continue;
|
if (!hasAesBodyAttr) continue;
|
||||||
// 1. 移除默认的 Query 参数描述(如果存在)
|
// 1. 移除默认的 Query 参数描述(如果存在)
|
||||||
var queryParam = operation.Parameters
|
var queryParam = operation.Parameters!
|
||||||
.FirstOrDefault(p => p.Name == parameter.Name);
|
.FirstOrDefault(p => p.Name == parameter.Name);
|
||||||
if (queryParam != null)
|
if (queryParam != null)
|
||||||
{
|
{
|
||||||
operation.Parameters.Remove(queryParam);
|
operation.Parameters!.Remove(queryParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. 添加 Body 参数描述
|
// 2. 添加 Body 参数描述
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ public class GlobalDynamicObjectSchemaFilter : ISchemaFilter
|
|||||||
{
|
{
|
||||||
if (!IsDynamicObjectType(context.Type)) return;
|
if (!IsDynamicObjectType(context.Type)) return;
|
||||||
var oaSchema = schema as OpenApiSchema;
|
var oaSchema = schema as OpenApiSchema;
|
||||||
oaSchema.AdditionalPropertiesAllowed = true;
|
oaSchema!.AdditionalPropertiesAllowed = true;
|
||||||
oaSchema.AdditionalProperties = new OpenApiSchema
|
oaSchema.AdditionalProperties = new OpenApiSchema
|
||||||
{
|
{
|
||||||
Type = JsonSchemaType.Object, // 表示 value 可以是任意类型(兼容所有类型)
|
Type = JsonSchemaType.Object, // 表示 value 可以是任意类型(兼容所有类型)
|
||||||
|
|||||||
@@ -10,16 +10,16 @@ public class RemoveEmptyTagsFilter : IDocumentFilter
|
|||||||
{
|
{
|
||||||
// 步骤1:收集所有有接口的 Tag 名称
|
// 步骤1:收集所有有接口的 Tag 名称
|
||||||
var tagsWithOperations = swaggerDoc.Paths.Values
|
var tagsWithOperations = swaggerDoc.Paths.Values
|
||||||
.SelectMany(path => path.Operations.Values)
|
.SelectMany(path => path.Operations!.Values)
|
||||||
.SelectMany(op => op.Tags.Select(t => t.Name))
|
.SelectMany(op => op.Tags!.Select(t => t.Name))
|
||||||
.Distinct()
|
.Distinct()
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
// 步骤2:移除无接口的空 Tag
|
// 步骤2:移除无接口的空 Tag
|
||||||
var emptyTags = swaggerDoc.Tags.Where(t => !tagsWithOperations.Contains(t.Name)).ToList();
|
var emptyTags = swaggerDoc.Tags!.Where(t => !tagsWithOperations.Contains(t.Name)).ToList();
|
||||||
foreach (var tag in emptyTags)
|
foreach (var tag in emptyTags)
|
||||||
{
|
{
|
||||||
swaggerDoc.Tags.Remove(tag);
|
swaggerDoc.Tags!.Remove(tag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -19,22 +19,10 @@ namespace SimApi.SwaggerFilters
|
|||||||
// 控制器上有 [SimApiAuth](继承到所有方法)
|
// 控制器上有 [SimApiAuth](继承到所有方法)
|
||||||
context.MethodInfo.DeclaringType?.GetCustomAttributes<SimApiAuthAttribute>(true).Any() == true;
|
context.MethodInfo.DeclaringType?.GetCustomAttributes<SimApiAuthAttribute>(true).Any() == true;
|
||||||
if (!requiresAuth) return;
|
if (!requiresAuth) return;
|
||||||
|
|
||||||
// 关键修复:正确构造 OpenApiSecuritySchemeReference(匹配键类型要求)
|
|
||||||
var securitySchemeRef = new OpenApiSecuritySchemeReference(
|
|
||||||
referenceId: "SimApiAuth", // 必须与 AddSecurityDefinition 的 ID 一致
|
|
||||||
hostDocument: null,
|
|
||||||
externalResource: null
|
|
||||||
);
|
|
||||||
|
|
||||||
// 给 Security 赋值(确保键类型是 OpenApiSecuritySchemeReference)
|
|
||||||
operation.Security ??= new List<OpenApiSecurityRequirement>();
|
operation.Security ??= new List<OpenApiSecurityRequirement>();
|
||||||
operation.Security.Add(new OpenApiSecurityRequirement
|
operation.Security.Add(new OpenApiSecurityRequirement()
|
||||||
{
|
{
|
||||||
{
|
{ new OpenApiSecuritySchemeReference("SimApiAuth", context.Document), [] }
|
||||||
securitySchemeRef,
|
|
||||||
[]
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public class SimApiResponseOperationFilter : IOperationFilter
|
|||||||
var schema = context.SchemaGenerator.GenerateSchema(wrappedType, context.SchemaRepository);
|
var schema = context.SchemaGenerator.GenerateSchema(wrappedType, context.SchemaRepository);
|
||||||
|
|
||||||
// 5. 替换 Swagger 文档中的响应类型(只保留 200 OK 的响应,匹配过滤器逻辑)
|
// 5. 替换 Swagger 文档中的响应类型(只保留 200 OK 的响应,匹配过滤器逻辑)
|
||||||
operation.Responses.Clear(); // 清除默认响应(如 200 返回原始类型)
|
operation.Responses!.Clear(); // 清除默认响应(如 200 返回原始类型)
|
||||||
operation.Responses.Add("200", new OpenApiResponse
|
operation.Responses.Add("200", new OpenApiResponse
|
||||||
{
|
{
|
||||||
Description = "请求成功",
|
Description = "请求成功",
|
||||||
|
|||||||
@@ -17,8 +17,9 @@ public partial class Synapse
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
|
paramJson = SimApiUtil.Json(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
var topic = $"{Options.SysName}/event/{Options.AppName}/{eventName}";
|
var topic = $"{Options.SysName}/event/{Options.AppName}/{eventName}";
|
||||||
var message = new MqttApplicationMessageBuilder()
|
var message = new MqttApplicationMessageBuilder()
|
||||||
.WithTopic(topic)
|
.WithTopic(topic)
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ public partial class Synapse
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
|
paramJson = SimApiUtil.Json(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
var topic = $"{Options.SysName}/{app}/rpc/server/{action}";
|
var topic = $"{Options.SysName}/{app}/rpc/server/{action}";
|
||||||
@@ -73,7 +73,7 @@ public partial class Synapse
|
|||||||
Client.PublishAsync(message, CancellationToken.None).Wait();
|
Client.PublishAsync(message, CancellationToken.None).Wait();
|
||||||
logger.LogDebug(
|
logger.LogDebug(
|
||||||
"Synapse RPC Client Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}\nHeaders: {Headers}",
|
"Synapse RPC Client Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}\nHeaders: {Headers}",
|
||||||
messageId, Options.AppName, action, app, paramJson, JsonSerializer.Serialize(headers));
|
messageId, Options.AppName, action, app, paramJson, SimApiUtil.Json(headers));
|
||||||
|
|
||||||
string response;
|
string response;
|
||||||
try
|
try
|
||||||
@@ -88,13 +88,12 @@ public partial class Synapse
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
response = JsonSerializer.Serialize(new SimApiBaseResponse(502, "timeout"), SimApiUtil.JsonOption);
|
response = SimApiUtil.Json(new SimApiBaseResponse(502, "timeout"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
response = JsonSerializer.Serialize(new SimApiBaseResponse(500, "Synapse RPC Client Error"),
|
response = SimApiUtil.Json(new SimApiBaseResponse(500, "Synapse RPC Client Error"));
|
||||||
SimApiUtil.JsonOption);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ using MQTTnet.Protocol;
|
|||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
using SimApi.Exceptions;
|
using SimApi.Exceptions;
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
using JsonSerializer = System.Text.Json.JsonSerializer;
|
using System.Text.Json;
|
||||||
|
|
||||||
namespace SimApi;
|
namespace SimApi;
|
||||||
|
|
||||||
@@ -96,7 +96,7 @@ public partial class Synapse
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
|
var returnJson = SimApiUtil.Json(res);
|
||||||
var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{appInfo[2]}";
|
var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{appInfo[2]}";
|
||||||
var message = new MqttApplicationMessageBuilder()
|
var message = new MqttApplicationMessageBuilder()
|
||||||
.WithTopic(reply)
|
.WithTopic(reply)
|
||||||
|
|||||||
+1
-1
@@ -101,7 +101,7 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
var data = FireRpc(appName, method, param, headers, timeout);
|
var data = FireRpc(appName, method, param, headers, timeout);
|
||||||
res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption);
|
res = SimApiUtil.FromJson<SimApiBaseResponse<T>>(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (res as SimApiBaseResponse<T>)!;
|
return (res as SimApiBaseResponse<T>)!;
|
||||||
|
|||||||
Reference in New Issue
Block a user