Compare commits

..
2 Commits
Author SHA1 Message Date
xrain 140e039d27 修正了SimApiHttpClient初始化方式 2026-05-05 03:53:02 +08:00
xrain 3b263b4563 /user/info不再需要simapiauth,/auth/check去除 2026-05-04 23:23:35 +08:00
5 changed files with 21 additions and 39 deletions
+2 -2
View File
@@ -27,11 +27,11 @@ public class SimApiBaseResponse(int code = 200, string message = "成功")
{ 400, "参数错误" }, { 400, "参数错误" },
{ 401, "需要登录" }, { 401, "需要登录" },
{ 403, "无权访问" }, { 403, "无权访问" },
{ 404, "接口不存在" }, { 404, "请求资源不存在" },
{ 500, "服务器错误" } { 500, "服务器错误" }
}; };
public SimApiBaseResponse(int code) : this(code, MsgBox.GetValueOrDefault(code, "未知错误")) public SimApiBaseResponse(int code) : this(code, MsgBox.GetValueOrDefault(code, "未知错误代码"))
{ {
} }
-7
View File
@@ -9,13 +9,6 @@ using static SimApiError;
public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController public class SimApiAuthController(SimApiAuth auth) : SimApiBaseController
{ {
/// <summary>
/// 获取已登录用户信息
/// </summary>
/// <returns></returns>
[HttpPost, SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
public SimApiLoginItem UserInfo() => LoginInfo;
/// <summary> /// <summary>
/// 退出登陆 /// 退出登陆
/// </summary> /// </summary>
+5 -8
View File
@@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SimApi.Attributes; using SimApi.Attributes;
using SimApi.Communications;
using SimApi.Helpers; using SimApi.Helpers;
using static SimApi.Helpers.SimApiError; using static SimApi.Helpers.SimApiError;
@@ -17,7 +18,7 @@ public class SimApiCommonController : SimApiBaseController
[ApiExplorerSettings(IgnoreApi = true)] [ApiExplorerSettings(IgnoreApi = true)]
public void ExceptionHandler(int code) public void ExceptionHandler(int code)
{ {
SimApiError.Error(code); Error(code);
} }
@@ -32,13 +33,9 @@ public class SimApiCommonController : SimApiBaseController
} }
/// <summary> /// <summary>
/// 检测用户登陆的控制器 /// 获取已登录用户信息
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost, SimApiAuth, SimApiDoc("认证", "检测登陆")] [HttpPost("/user/info"), SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
public string CheckLogin() public SimApiLoginItem UserInfo() => LoginInfo;
{
ErrorWhenNull(LoginInfo, 401, "未登录");
return LoginInfo.Id;
}
} }
+14 -9
View File
@@ -8,9 +8,14 @@ using SimApi.Exceptions;
namespace SimApi.Helpers; namespace SimApi.Helpers;
public class SimApiHttpClient(string? appId, string appKey, bool debug = false) public class SimApiHttpClient
{ {
public string Server { get; init; } = string.Empty; public required string Server { get; init; }
public required string AppId { get; init; }
public required string AppKey { get; init; }
public bool Debug { get; init; } = false;
public string SignName { get; init; } = "sign"; public string SignName { get; init; } = "sign";
public string TimestampName { get; init; } = "timestamp"; public string TimestampName { get; init; } = "timestamp";
public string NonceName { get; init; } = "nonce"; public string NonceName { get; init; } = "nonce";
@@ -32,11 +37,11 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
(current, signField) => current + $"{signField}={queries?[signField]}&"); (current, signField) => current + $"{signField}={queries?[signField]}&");
if (!string.IsNullOrEmpty(AppIdName)) if (!string.IsNullOrEmpty(AppIdName))
{ {
queryUrl += $"{AppIdName}={appId}&"; queryUrl += $"{AppIdName}={AppId}&";
} }
queryUrl += $"{TimestampName}={(int)SimApiUtil.TimestampNow}&{NonceName}={Guid.NewGuid()}"; queryUrl += $"{TimestampName}={(int)SimApiUtil.TimestampNow}&{NonceName}={Guid.NewGuid()}";
var signStr = $"{queryUrl}&{appKey}"; var signStr = $"{queryUrl}&{AppKey}";
var path = $"{url}?{queryUrl}&{SignName}={SimApiUtil.Md5(signStr)}"; var path = $"{url}?{queryUrl}&{SignName}={SimApiUtil.Md5(signStr)}";
if (queries != null) if (queries != null)
@@ -60,12 +65,12 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
url = Server + url; url = Server + url;
if (!string.IsNullOrEmpty(AppIdName)) if (!string.IsNullOrEmpty(AppIdName))
{ {
url += $"?{AppIdName}={appId}"; url += $"?{AppIdName}={AppId}";
} }
var req = new SimApiOneFieldRequest<string> var req = new SimApiOneFieldRequest<string>
{ {
Data = SimApiAesUtil.Encrypt(SimApiUtil.Json(body), appKey) Data = SimApiAesUtil.Encrypt(SimApiUtil.Json(body), AppKey)
}; };
return Query<T>(url, req); return Query<T>(url, req);
} }
@@ -82,7 +87,7 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
{ {
var req = new SimApiOneFieldRequest<string> var req = new SimApiOneFieldRequest<string>
{ {
Data = SimApiAesUtil.Encrypt(SimApiUtil.Json(body), appKey) Data = SimApiAesUtil.Encrypt(SimApiUtil.Json(body), AppKey)
}; };
return SignQuery<T>(url, req, queries); return SignQuery<T>(url, req, queries);
} }
@@ -98,13 +103,13 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
private T? Query<T>(string url, object? req) private T? Query<T>(string url, object? req)
{ {
var http = new HttpClient(); var http = new HttpClient();
if (debug) if (Debug)
{ {
Console.WriteLine($"[HTTPCLIENT请求] {url}\n{SimApiUtil.Json(req)}\n"); Console.WriteLine($"[HTTPCLIENT请求] {url}\n{SimApiUtil.Json(req)}\n");
} }
var resp = http.PostAsJsonAsync(url, req).Result; var resp = http.PostAsJsonAsync(url, req).Result;
if (debug) if (Debug)
{ {
Console.WriteLine($"[HTTPCLIENT响应] {resp.Content.ReadAsStringAsync().Result}\n"); Console.WriteLine($"[HTTPCLIENT响应] {resp.Content.ReadAsStringAsync().Result}\n");
} }
-13
View File
@@ -426,23 +426,10 @@ public static class SimApiExtensions
} }
} }
builder.MapControllerRoute(name: "CheckLogin", pattern: "/auth/check",
defaults: new
{
controller = "SimApiCommon",
action = "CheckLogin"
});
if (options.EnableSimApiAuth) if (options.EnableSimApiAuth)
{ {
logger.LogInformation("开始配置SimApiAuth..."); logger.LogInformation("开始配置SimApiAuth...");
builder.UseMiddleware<SimApiAuthMiddleware>(); builder.UseMiddleware<SimApiAuthMiddleware>();
builder.MapControllerRoute(name: "GetUserInfo", pattern: "/user/info",
defaults: new
{
controller = "SimApiAuth",
action = "UserInfo"
});
builder.MapControllerRoute(name: "Logout", pattern: "/auth/logout", builder.MapControllerRoute(name: "Logout", pattern: "/auth/logout",
defaults: new defaults: new
{ {