Compare commits
14
Commits
10.5.1
..
10.26.6.11
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ceeea2c451 | ||
|
|
464878edce | ||
|
|
aaba8b8b73 | ||
|
|
6e2ae11c54 | ||
|
|
d0a5e996c9 | ||
|
|
3b405079c1 | ||
|
|
611808787e | ||
|
|
8ee297e819 | ||
|
|
bc4195e984 | ||
|
|
4a0caa1079 | ||
|
|
7a2ff896b2 | ||
|
|
aef62a3472 | ||
|
|
ec3004518f | ||
|
|
140e039d27 |
@@ -434,3 +434,6 @@ MigrationBackup/
|
|||||||
# Ionide (cross platform F# VS Code tools) working folder
|
# Ionide (cross platform F# VS Code tools) working folder
|
||||||
.ionide/
|
.ionide/
|
||||||
|
|
||||||
|
|
||||||
|
# BitFun snapshot data - auto managed
|
||||||
|
.bitfun/
|
||||||
|
|||||||
@@ -0,0 +1,226 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Net.Http.Json;
|
||||||
|
using SimApi.Communications;
|
||||||
|
using static SimApi.Helpers.SimApiError;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthCenter(SimApiAuthClient simapi)
|
||||||
|
{
|
||||||
|
public SimApiAuthClient Client { get; } = simapi;
|
||||||
|
|
||||||
|
#region 公共
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 委托AuthCenter进行应用签名验证
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="appId"></param>
|
||||||
|
/// <param name="timestamp"></param>
|
||||||
|
/// <param name="nonce"></param>
|
||||||
|
/// <param name="sign"></param>
|
||||||
|
public void VerifySign(string appId, string timestamp, string nonce, string sign)
|
||||||
|
{
|
||||||
|
var http = new HttpClient();
|
||||||
|
var url = $"{Client.Server}/api/auth/sign/verify?appId={appId}×tamp={timestamp}&nonce={nonce}&sign={sign}";
|
||||||
|
var result = http.PostAsJsonAsync(url, new { }).Result;
|
||||||
|
var resp = result.Content.ReadFromJsonAsync<SimApiBaseResponse>().Result;
|
||||||
|
ErrorWhenNull(resp, 400, "签名验证失败");
|
||||||
|
ErrorWhenFalse(resp.Code == 200, 400, "签名验证失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
#region 群组相关
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据profileId获取群组列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GroupRelatedItem[]? GroupRelated(string profileId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.GroupRelatedItem[]>("/api/auth/group/related", new { profileId });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据关键字搜索群组,输入群组ID精准搜索
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="keyword"></param>
|
||||||
|
/// <param name="skip"></param>
|
||||||
|
/// <param name="take"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? GroupSearch(string keyword, int skip = 0, int take = 20)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/group/search",
|
||||||
|
new { keyword, skip, take });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用组ID以及组内成员,管理员profile获取组的详细树结构
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GroupDetailTreeNode? GroupDetail(string groupId, string profileId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.GroupDetailTreeNode>("/api/auth/group/detail",
|
||||||
|
new { profileId, groupId });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取profile在本组的所有子组
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string[]? GroupRelatedIndex(string groupId, string profileId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<string[]>("/api/auth/internal/group/related-group-ids", new { groupId, profileId });
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Profile相关
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据关键字,搜索用户Profile,参数支持精准ID,用户手机号,用户邮箱,Profile名称模糊搜索
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="keyword"></param>
|
||||||
|
/// <param name="skip"></param>
|
||||||
|
/// <param name="take"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? ProfileSearch(string keyword, int skip = 0, int take = 20)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/profile/search",
|
||||||
|
new { keyword, skip, take });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 通过id,可以批量获取用户的基本信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ids"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? ProfileList(string[] ids)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/profile/list", new { ids });
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region AuthGate内部应用专用 - 注意: 只有内部应用可以调用
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取是否为App的拥有者
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="applicationId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public bool CheckIsAppOwner(string profileId, string applicationId)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<bool>("/api/auth/internal/app/check-owner", new
|
||||||
|
{
|
||||||
|
ProfileId = profileId,
|
||||||
|
AppId = applicationId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取应用列表,根据用户profileId 和 提供的appIds
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="appIds"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.AppAndProfileItem[]? GetAppList(string profileId, IEnumerable<string> appIds)
|
||||||
|
{
|
||||||
|
return Client.SignQuery<SimApiAuthCenterDto.AppAndProfileItem[]>("/api/auth/internal/app/related", new
|
||||||
|
{
|
||||||
|
ProfileId = profileId,
|
||||||
|
AllowedAppIds = appIds,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 系统登录
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取登录授权CODE
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <param name="data"></param>
|
||||||
|
/// <param name="backUrl"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GetCodeResponse GetLoginCode(string? scene = null,
|
||||||
|
Dictionary<string, object>? data = null,
|
||||||
|
string? backUrl = null)
|
||||||
|
{
|
||||||
|
var code = Client.SignQuery<string>("/api/auth/login/code",
|
||||||
|
new { scene, data, backUrl });
|
||||||
|
return new SimApiAuthCenterDto.GetCodeResponse()
|
||||||
|
{
|
||||||
|
Code = code!,
|
||||||
|
Server = Client.Server,
|
||||||
|
FullUrl = $"{Client.Server}/auth?code={code}"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用code获取登录信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="code"></param>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.LoginInfoResponse GetLoginInfo(string code, string? scene = null)
|
||||||
|
{
|
||||||
|
var resp = Client.SignQuery<SimApiAuthCenterDto.LoginInfoResponse>("/api/auth/login/get", new { code });
|
||||||
|
ErrorWhenNull(resp, 400232, "登录信息获取失败");
|
||||||
|
ErrorWhen(resp.Scene != scene, 403003, "登录场景不匹配");
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region 安全验证
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取安全验证代码
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <param name="data"></param>
|
||||||
|
/// <param name="backUrl"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.GetCodeResponse GetConfirmCode(string scene, string userId,
|
||||||
|
Dictionary<string, object>? data = null,
|
||||||
|
string? backUrl = null)
|
||||||
|
{
|
||||||
|
var code = Client.SignQuery<string>("/api/auth/confirm/code",
|
||||||
|
new { scene, data, backUrl, profileId = userId });
|
||||||
|
return new SimApiAuthCenterDto.GetCodeResponse()
|
||||||
|
{
|
||||||
|
Code = code!,
|
||||||
|
Server = Client.Server,
|
||||||
|
FullUrl = $"{Client.Server}/confirm?code={code}"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用安全验证code 获取验证结果
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="code"></param>
|
||||||
|
/// <param name="scene"></param>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SimApiAuthCenterDto.ConfirmResponse Confirm(string code, string scene, string? userId = null)
|
||||||
|
{
|
||||||
|
var resp = Client.SignQuery<SimApiAuthCenterDto.ConfirmResponse>("/api/auth/confirm/get", new { code });
|
||||||
|
ErrorWhenNull(resp, 403001, "安全确认码无效");
|
||||||
|
ErrorWhen(resp.ProfileId != userId, 403002, "安全确认身份不匹配");
|
||||||
|
ErrorWhen(resp.Scene != scene, 403003, "安全确认场景不匹配");
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthCenterDto
|
||||||
|
{
|
||||||
|
public class AppAndProfileItem
|
||||||
|
{
|
||||||
|
public required string Id { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ConfirmResponse
|
||||||
|
{
|
||||||
|
public required string ApplicationId { get; set; }
|
||||||
|
public required string ProfileId { get; set; }
|
||||||
|
public string? Scene { get; set; }
|
||||||
|
public Dictionary<string, object>? Data { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class LoginInfoResponse
|
||||||
|
{
|
||||||
|
public string? Scene { get; set; }
|
||||||
|
public Dictionary<string, object>? Data { get; set; }
|
||||||
|
public required string ProfileId { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GetCodeResponse
|
||||||
|
{
|
||||||
|
public required string Code { get; set; }
|
||||||
|
public required string Server { get; set; }
|
||||||
|
public required string FullUrl { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GroupRelatedItem
|
||||||
|
{
|
||||||
|
public required string Id { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
public bool IsOwner { get; set; }
|
||||||
|
public bool IsAdmin { get; set; }
|
||||||
|
public bool IsMember { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GroupDetailTreeNode
|
||||||
|
{
|
||||||
|
public required string Id { get; set; }
|
||||||
|
public required string Name { get; set; }
|
||||||
|
public string? Image { get; set; }
|
||||||
|
public string? Description { get; set; }
|
||||||
|
public int Sort { get; set; }
|
||||||
|
public List<GroupDetailTreeNode> Children { get; set; } = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
using System;
|
using System.Threading.Tasks;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
using SimApi.Configurations;
|
using SimApi.Configurations;
|
||||||
using SimApi.Helpers;
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Middlewares;
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
public class SimApiGateAuthMiddleware(RequestDelegate next, ILogger<SimApiGateAuthMiddleware> logger)
|
public class SimApiAuthCenterMiddleware(RequestDelegate next, ILogger<SimApiAuthCenterMiddleware> logger)
|
||||||
{
|
{
|
||||||
public Task Invoke(HttpContext httpContext, SimApiOptions simApiOptions)
|
public Task Invoke(HttpContext httpContext, SimApiOptions simApiOptions)
|
||||||
{
|
{
|
||||||
@@ -17,7 +16,7 @@ public class SimApiGateAuthMiddleware(RequestDelegate next, ILogger<SimApiGateAu
|
|||||||
httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Sign", out var sign))
|
httpContext.Request.Headers.TryGetValue("X-SimApi-Gate-Sign", out var sign))
|
||||||
{
|
{
|
||||||
var signStr =
|
var signStr =
|
||||||
$"appId={simApiOptions.SimApiGateAuthOptions.AppId}&auth={auth}&time={time}&appKey={simApiOptions.SimApiGateAuthOptions.AppKey}";
|
$"appId={simApiOptions.SimApiAuthCenterOptions.AppId}&auth={auth}&time={time}&appKey={simApiOptions.SimApiAuthCenterOptions.AppKey}";
|
||||||
logger.LogDebug($"签名字符串 => {signStr}");
|
logger.LogDebug($"签名字符串 => {signStr}");
|
||||||
if (SimApiUtil.Md5(signStr) == sign && !string.IsNullOrEmpty(auth))
|
if (SimApiUtil.Md5(signStr) == sign && !string.IsNullOrEmpty(auth))
|
||||||
{
|
{
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using SimApi.Configurations;
|
||||||
|
using SimApi.Helpers;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthClient(SimApiOptions apiOptions, ILogger<SimApiAuthClient> logger)
|
||||||
|
: SimApiHttpClient(apiOptions, logger)
|
||||||
|
{
|
||||||
|
public override string Server { get; init; } = apiOptions.SimApiAuthCenterOptions.Server ?? string.Empty;
|
||||||
|
public override string AppId { get; init; } = apiOptions.SimApiAuthCenterOptions.AppId ?? string.Empty;
|
||||||
|
public override string AppKey { get; init; } = apiOptions.SimApiAuthCenterOptions.AppKey ?? string.Empty;
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using static SimApi.Helpers.SimApiError;
|
||||||
|
|
||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthIam(SimApiAuthClient simapi, ILogger<SimApiAuthIam> logger)
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 向Iam注册权限
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="permissions"></param>
|
||||||
|
public void RegisterPermissions(SimApiAuthIamDto.PermissionItem[] permissions)
|
||||||
|
{
|
||||||
|
var log = $"检测到 {permissions.Length} 个权限接口,正在注册..: ";
|
||||||
|
foreach (var permission in permissions)
|
||||||
|
{
|
||||||
|
log += $"\n |- {permission.Identifier} => [{permission.Group}]{permission.Name} ({permission.Description})";
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogInformation(log);
|
||||||
|
simapi.SignQuery<string>("/api/iam/permission/register", new { permissions });
|
||||||
|
logger.LogInformation("权限注册完成");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取拥有的权限标识数组
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string[] GetPermissionOwned(string profileId, string? groupId = null)
|
||||||
|
{
|
||||||
|
return simapi.SignQuery<string[]>("/api/iam/permission/owned", new { profileId, groupId }) ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检测profileId是否有这个权限
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="profileId"></param>
|
||||||
|
/// <param name="permission"></param>
|
||||||
|
/// <param name="groupId"></param>
|
||||||
|
public void CheckPermission(string profileId, string permission, string? groupId = null)
|
||||||
|
{
|
||||||
|
var ok = simapi.SignQuery<bool>("/api/iam/permission/check", new { profileId, permission, groupId });
|
||||||
|
ErrorWhen(!ok, 403, "没有该权限");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace SimApi.AuthSDK;
|
||||||
|
|
||||||
|
public class SimApiAuthIamDto
|
||||||
|
{
|
||||||
|
public class PermissionItem
|
||||||
|
{
|
||||||
|
public required string Identifier { get; init; }
|
||||||
|
public required string Name { get; init; }
|
||||||
|
public required string Group { get; init; }
|
||||||
|
public required string Description { get; init; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,234 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net.Http;
|
|
||||||
using System.Net.Http.Json;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using Microsoft.Extensions.Caching.Distributed;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using SimApi.Communications;
|
|
||||||
using SimApi.Configurations;
|
|
||||||
using SimApi.Helpers;
|
|
||||||
|
|
||||||
namespace SimApi.CoceSdk;
|
|
||||||
|
|
||||||
public class CoceApp(SimApiOptions simApiOptions, ILogger<CoceApp> logger, IDistributedCache cache)
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 获取Level Token
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="lv1Token"></param>
|
|
||||||
/// <param name="level"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public LevelTokenResponse? GetLevelToken(string lv1Token, int level = 5)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, object>
|
|
||||||
{
|
|
||||||
{ "lv1Token", lv1Token },
|
|
||||||
{ "time", (int)SimApiUtil.TimestampNow },
|
|
||||||
{ "appId", simApiOptions.CoceSdkOptions.AppId! },
|
|
||||||
{ "level", level }
|
|
||||||
};
|
|
||||||
return QueryAppApi<LevelTokenResponse>("/api/app/token", dict);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 通过用户手机号搜索用户
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="phone"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public UserInfo? SearchUserByPhone(string phone)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, object>
|
|
||||||
{
|
|
||||||
{ "cell", phone },
|
|
||||||
{ "time", (int)SimApiUtil.TimestampNow },
|
|
||||||
{ "appId", simApiOptions.CoceSdkOptions.AppId! },
|
|
||||||
};
|
|
||||||
return QueryAppApi<UserInfo>("/api/app/user/search-by-phone", dict);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 通过给出的UserId列表获取用户信息
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="userIds"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public UserInfo[]? SearchUserByIds(IEnumerable<string> userIds)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, object>
|
|
||||||
{
|
|
||||||
{ "ids", string.Join(",", userIds) },
|
|
||||||
{ "time", (int)SimApiUtil.TimestampNow },
|
|
||||||
{ "appId", simApiOptions.CoceSdkOptions.AppId! },
|
|
||||||
};
|
|
||||||
return QueryAppApi<UserInfo[]>("/api/app/user/search-by-ids", dict);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 向用户发送消息
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="userId"></param>
|
|
||||||
/// <param name="title"></param>
|
|
||||||
/// <param name="content"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public bool SendUserMessage(string userId, string title, string content)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, object>
|
|
||||||
{
|
|
||||||
{ "time", (int)SimApiUtil.TimestampNow },
|
|
||||||
{ "appId", simApiOptions.CoceSdkOptions.AppId! },
|
|
||||||
{ "userId", userId },
|
|
||||||
{ "type", "text" },
|
|
||||||
{ "title", title },
|
|
||||||
{ "text", content }
|
|
||||||
};
|
|
||||||
return QueryAppApiNoResp("/api/app/message", dict);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 创建交易订单号
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="name"></param>
|
|
||||||
/// <param name="amount"></param>
|
|
||||||
/// <param name="ext"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public string? TradeCreate(string name, int amount, string ext)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, object>
|
|
||||||
{
|
|
||||||
{ "time", (int)SimApiUtil.TimestampNow },
|
|
||||||
{ "appId", simApiOptions.CoceSdkOptions.AppId! },
|
|
||||||
{ "amount", amount },
|
|
||||||
{ "ext", ext },
|
|
||||||
{ "name", name }
|
|
||||||
};
|
|
||||||
return QueryAppApi<string>("/api/app/trade/create", dict);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 查询订单状态
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="tradeNo"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public CheckTradeResponse? TradeCheck(string tradeNo)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, object>
|
|
||||||
{
|
|
||||||
{ "time", (int)SimApiUtil.TimestampNow },
|
|
||||||
{ "appId", simApiOptions.CoceSdkOptions.AppId! },
|
|
||||||
{ "tradeNo", tradeNo }
|
|
||||||
};
|
|
||||||
return QueryAppApi<CheckTradeResponse>("/api/app/trade/result", dict);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 对订单进行退款
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="tradeNo"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public bool TradeRefund(string tradeNo)
|
|
||||||
{
|
|
||||||
var dict = new Dictionary<string, object>
|
|
||||||
{
|
|
||||||
{ "time", (int)SimApiUtil.TimestampNow },
|
|
||||||
{ "appId", simApiOptions.CoceSdkOptions.AppId! },
|
|
||||||
{ "tradeNo", tradeNo }
|
|
||||||
};
|
|
||||||
return QueryAppApiNoResp("/api/app/trade/refund", dict);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private T? QueryAppApi<T>(string endpoint, Dictionary<string, object> request)
|
|
||||||
{
|
|
||||||
var response = QueryAppApi(endpoint, request);
|
|
||||||
var result = response.Content.ReadFromJsonAsync<SimApiBaseResponse<T>>().Result!;
|
|
||||||
if (result.Code == 200) return result.Data;
|
|
||||||
logger.LogDebug("发生错误: {Code} => {Message}", result.Code, result.Message);
|
|
||||||
return default;
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool QueryAppApiNoResp(string endpoint, Dictionary<string, object> request)
|
|
||||||
{
|
|
||||||
var response = QueryAppApi(endpoint, request);
|
|
||||||
var result = response.Content.ReadFromJsonAsync<SimApiBaseResponse>().Result!;
|
|
||||||
return result.Code == 200;
|
|
||||||
}
|
|
||||||
|
|
||||||
private HttpResponseMessage QueryAppApi(string endpoint, Dictionary<string, object> request)
|
|
||||||
{
|
|
||||||
var platUrl = simApiOptions.CoceSdkOptions.ApiEndpoint + endpoint;
|
|
||||||
var sorted = request.OrderBy(x => x.Key);
|
|
||||||
var signStr = sorted.Aggregate("", (current, item) => current + $"{item.Key}={item.Value}&").TrimEnd('&');
|
|
||||||
logger.LogDebug("签名的字符串: {SignStr}", signStr);
|
|
||||||
var sign = SimApiUtil.Md5(signStr + simApiOptions.CoceSdkOptions.AppKey);
|
|
||||||
logger.LogDebug("签名: {Sign}", sign);
|
|
||||||
request.Add("sign", sign);
|
|
||||||
logger.LogDebug("请求地址: {PlatUrl} => {Data}", platUrl, SimApiUtil.Json(request));
|
|
||||||
var http = new HttpClient();
|
|
||||||
return http.PostAsJsonAsync(platUrl, request).Result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 获取用户的群组信息
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="token">Level >=2 的Token</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public IEnumerable<GroupInfo>? GetUserGroups(string token)
|
|
||||||
{
|
|
||||||
const string uri = "/api/lv2/user/groups";
|
|
||||||
var resp = ProxyQuery<GroupInfo[]>(uri, token, "{}");
|
|
||||||
return resp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 获取用户信息
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="token"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public UserInfo? GetUserInfo(string token)
|
|
||||||
{
|
|
||||||
const string uri = "/api/lv1/user/info";
|
|
||||||
return ProxyQuery<UserInfo>(uri, token);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SaveToken(string userId, string levelToken)
|
|
||||||
{
|
|
||||||
cache.SetString($"LEVEL:TOKEN:{userId}", levelToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string? GetToken(string userId)
|
|
||||||
{
|
|
||||||
return cache.GetString($"LEVEL:TOKEN:{userId}");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public dynamic? ProxyQuery(string uri, string token, string json) => ProxyQuery<dynamic>(uri, token, json);
|
|
||||||
|
|
||||||
public dynamic? ProxyQueue(string uri, string token, object data) =>
|
|
||||||
ProxyQuery<dynamic>(uri, token, SimApiUtil.Json(data));
|
|
||||||
|
|
||||||
public T? ProxyQueue<T>(string uri, string token, object data) =>
|
|
||||||
ProxyQuery<T>(uri, token, SimApiUtil.Json(data));
|
|
||||||
|
|
||||||
public T? ProxyQuery<T>(string uri, string token, string json = "{}")
|
|
||||||
{
|
|
||||||
var http = new HttpClient();
|
|
||||||
http.DefaultRequestHeaders.Add("Token", token);
|
|
||||||
var realUrl = simApiOptions.CoceSdkOptions.ApiEndpoint + uri;
|
|
||||||
var response = http.PostAsync(realUrl, new StringContent(json, Encoding.UTF8, "application/json"))
|
|
||||||
.Result;
|
|
||||||
var resp = response.Content.ReadFromJsonAsync<SimApiBaseResponse<T>>().Result!;
|
|
||||||
if (resp.Code != 200)
|
|
||||||
{
|
|
||||||
logger.LogDebug("请求发生错误: {RespCode} => {RespMessage}", resp.Code, resp.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return resp.Code == 200 ? resp.Data : default;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ConfigResponse GetConfig()
|
|
||||||
{
|
|
||||||
return new ConfigResponse(simApiOptions.CoceSdkOptions.AppId!, simApiOptions.CoceSdkOptions.AuthEndpoint);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
namespace SimApi.CoceSdk;
|
|
||||||
|
|
||||||
public class CoceAppSdkOption
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* 中心API服务器地址
|
|
||||||
*/
|
|
||||||
public string ApiEndpoint { get; set; } = "https://api.coce.cc";
|
|
||||||
|
|
||||||
public string AuthEndpoint { get; set; } = "https://home.coce.cc";
|
|
||||||
|
|
||||||
public string? AppId { get; set; }
|
|
||||||
|
|
||||||
public string? AppKey { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using SimApi.Attributes;
|
|
||||||
using SimApi.Communications;
|
|
||||||
using SimApi.Controllers;
|
|
||||||
using SimApi.Helpers;
|
|
||||||
using static SimApi.Helpers.SimApiError;
|
|
||||||
|
|
||||||
namespace SimApi.CoceSdk;
|
|
||||||
|
|
||||||
public class CoceController(CoceApp coce, SimApiAuth auth, IServiceProvider sp) : SimApiBaseController
|
|
||||||
{
|
|
||||||
[HttpPost]
|
|
||||||
public SimApiBaseResponse<ConfigResponse> GetConfig()
|
|
||||||
{
|
|
||||||
return new SimApiBaseResponse<ConfigResponse>(coce.GetConfig());
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpPost]
|
|
||||||
public string Login([FromBody] SimApiOneFieldRequest<string> request)
|
|
||||||
{
|
|
||||||
var data = coce.GetLevelToken(request.Data!);
|
|
||||||
ErrorWhenNull(data, 400);
|
|
||||||
coce.SaveToken(data!.UserId, data.Token);
|
|
||||||
var userinfo = coce.GetUserInfo(data!.Token);
|
|
||||||
var meta = new Dictionary<string, string>
|
|
||||||
{
|
|
||||||
{ "name", userinfo!.Name },
|
|
||||||
{ "image", userinfo.Image }
|
|
||||||
};
|
|
||||||
var groups = coce.GetUserGroups(data.Token!)!;
|
|
||||||
var loginItem = new SimApiLoginItem
|
|
||||||
{
|
|
||||||
Id = data.UserId,
|
|
||||||
Meta = meta,
|
|
||||||
};
|
|
||||||
var processor = sp.GetService<ICoceLoginProcessor>();
|
|
||||||
processor?.Process(loginItem, groups.ToArray());
|
|
||||||
return auth.Login(loginItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpPost, SimApiAuth]
|
|
||||||
public GroupInfo[] ListGroups()
|
|
||||||
{
|
|
||||||
var levelToken = coce.GetToken(LoginInfo.Id!);
|
|
||||||
var groups = coce.GetUserGroups(levelToken!)!;
|
|
||||||
return groups.ToArray();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
namespace SimApi.CoceSdk;
|
|
||||||
|
|
||||||
public record ConfigResponse(string AppId, string AuthUrl);
|
|
||||||
|
|
||||||
public record LevelTokenResponse(string Token, string UserId, int TokenLevel);
|
|
||||||
|
|
||||||
public record GroupInfo(string Id, string Name, string Image, string Description, string Role);
|
|
||||||
|
|
||||||
public record UserInfo(string UserId, string Name, string Image);
|
|
||||||
|
|
||||||
public record CheckTradeResponse(
|
|
||||||
string TradeNo,
|
|
||||||
int Amount,
|
|
||||||
int Fee,
|
|
||||||
string Name,
|
|
||||||
string? Ext,
|
|
||||||
string Status,
|
|
||||||
DateTime CreatedAt,
|
|
||||||
DateTime? FinishedAt,
|
|
||||||
DateTime? RefundAt,
|
|
||||||
DateTime? CloseAt);
|
|
||||||
|
|
||||||
public class UserInfoWithGroup
|
|
||||||
{
|
|
||||||
public string? UserId { get; set; }
|
|
||||||
|
|
||||||
public string? Name { get; set; }
|
|
||||||
|
|
||||||
public string? LevelToken { get; set; }
|
|
||||||
|
|
||||||
public UserGroupItem[]? UserGroupItems { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class UserGroupItem
|
|
||||||
{
|
|
||||||
public string? GroupId { get; set; }
|
|
||||||
|
|
||||||
public string? GroupName { get; set; }
|
|
||||||
|
|
||||||
public string? GroupRole { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using SimApi.Communications;
|
|
||||||
|
|
||||||
namespace SimApi.CoceSdk;
|
|
||||||
|
|
||||||
public interface ICoceLoginProcessor
|
|
||||||
{
|
|
||||||
SimApiLoginItem Process(SimApiLoginItem loginItem, GroupInfo[] groups);
|
|
||||||
}
|
|
||||||
@@ -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, "未知错误代码"))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiAuthCenterOptions
|
||||||
|
{
|
||||||
|
public string? Server { get; set; }
|
||||||
|
public string? AppId { get; set; }
|
||||||
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 开启则使用内部网关透传的Middleware
|
||||||
|
/// 注意: 只有内部应用需要开启这个,也就是api通过内部网关代理后
|
||||||
|
/// </summary>
|
||||||
|
public bool UseMiddleware { get; set; }
|
||||||
|
public bool UseIam { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiExceptionOptions
|
||||||
|
{
|
||||||
|
public int[] SkipStatusCodes = [200, 301, 302];
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace SimApi.Configurations;
|
|
||||||
|
|
||||||
public class SimApiGateAuthOptions
|
|
||||||
{
|
|
||||||
public string? AppId { get; set; }
|
|
||||||
|
|
||||||
public string? AppKey { get; set; }
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiHttpClientOptions
|
||||||
|
{
|
||||||
|
public string Server { get; set; } = string.Empty;
|
||||||
|
public string AppId { get; set; } = string.Empty;
|
||||||
|
public string AppKey { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using SimApi.CoceSdk;
|
|
||||||
|
|
||||||
namespace SimApi.Configurations;
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
@@ -21,12 +20,7 @@ public class SimApiOptions
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 启用SimApi网关授权, 基于上层网关透传的身份令牌验证
|
/// 启用SimApi网关授权, 基于上层网关透传的身份令牌验证
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableSimApiGateAuth { get; set; }
|
public bool EnableSimApiAuthGate { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 是否使用CoceSdk
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableCoceSdk { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 开启S3兼容的存储系统。
|
/// 开启S3兼容的存储系统。
|
||||||
@@ -51,9 +45,6 @@ public class SimApiOptions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableCors { get; set; } = true;
|
public bool EnableCors { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
public CoceAppSdkOption CoceSdkOptions { get; set; } = new();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 启用异常拦截,启用后,所有的异常将被通过json反馈。
|
/// 启用异常拦截,启用后,所有的异常将被通过json反馈。
|
||||||
/// default: true
|
/// default: true
|
||||||
@@ -65,7 +56,6 @@ public class SimApiOptions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableSimApiResponseFilter { get; set; } = true;
|
public bool EnableSimApiResponseFilter { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
||||||
/// default: true
|
/// default: true
|
||||||
@@ -78,20 +68,16 @@ public class SimApiOptions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableLowerUrl { get; set; } = true;
|
public bool EnableLowerUrl { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 应用可以通过 /versions 显示出应用版本和SimApi包版本
|
|
||||||
/// default: true
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableVersionUrl { get; set; } = true;
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 启用格式化的 Console Logger
|
/// 启用格式化的 Console Logger
|
||||||
/// default: false
|
/// default: false
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool EnableLogger { get; set; } = true;
|
public bool EnableLogger { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否启用SimApiHttpClient
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableSimApiHttpClient { get; set; } = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 配置Job
|
/// 配置Job
|
||||||
@@ -110,18 +96,34 @@ public class SimApiOptions
|
|||||||
|
|
||||||
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
||||||
|
|
||||||
public SimApiGateAuthOptions SimApiGateAuthOptions { get; set; } = new();
|
public SimApiAuthCenterOptions SimApiAuthCenterOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public SimApiHttpClientOptions SimApiHttpClientOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public SimApiExceptionOptions SimApiExceptionOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public SimApiRouteOptions SimApiRouteOptions { get; set; } = new();
|
||||||
|
|
||||||
|
public void ConfigureSimApiRoute(Action<SimApiRouteOptions>? options = null)
|
||||||
|
{
|
||||||
|
options?.Invoke(SimApiRouteOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ConfigureSimApiException(Action<SimApiExceptionOptions>? options = null)
|
||||||
|
{
|
||||||
|
options?.Invoke(SimApiExceptionOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ConfigureSimApiHttpClient(Action<SimApiHttpClientOptions>? options = null)
|
||||||
|
{
|
||||||
|
options?.Invoke(SimApiHttpClientOptions);
|
||||||
|
}
|
||||||
|
|
||||||
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions>? options = null)
|
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions>? options = null)
|
||||||
{
|
{
|
||||||
options?.Invoke(SimApiSynapseOptions);
|
options?.Invoke(SimApiSynapseOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ConfigureCoceSdk(Action<CoceAppSdkOption>? options = null)
|
|
||||||
{
|
|
||||||
options?.Invoke(CoceSdkOptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ConfigureSimApiDoc(Action<SimApiDocOptions>? options = null)
|
public void ConfigureSimApiDoc(Action<SimApiDocOptions>? options = null)
|
||||||
{
|
{
|
||||||
options?.Invoke(SimApiDocOptions);
|
options?.Invoke(SimApiDocOptions);
|
||||||
@@ -137,8 +139,8 @@ public class SimApiOptions
|
|||||||
options?.Invoke(SimApiJobOptions);
|
options?.Invoke(SimApiJobOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ConfigureSimApiGateAuth(Action<SimApiGateAuthOptions>? options = null)
|
public void ConfigureSimApiAuthCenter(Action<SimApiAuthCenterOptions>? options = null)
|
||||||
{
|
{
|
||||||
options?.Invoke(SimApiGateAuthOptions);
|
options?.Invoke(SimApiAuthCenterOptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace SimApi.Configurations;
|
||||||
|
|
||||||
|
public class SimApiRouteOptions
|
||||||
|
{
|
||||||
|
public string? VersionRoute = "/versions";
|
||||||
|
public string? LogoutRoute = "/auth/logout";
|
||||||
|
public string? UserInfoRoute = "/user/info";
|
||||||
|
}
|
||||||
@@ -5,8 +5,6 @@ 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>
|
||||||
|
|||||||
@@ -31,11 +31,12 @@ public class SimApiCommonController : SimApiBaseController
|
|||||||
{ "App", SimApiUtil.AppVersion }
|
{ "App", SimApiUtil.AppVersion }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取已登录用户信息
|
/// 获取已登录用户信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost("/user/info"), SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
|
[HttpPost, SimApiAuth, SimApiDoc("认证", "获取已登录用户信息")]
|
||||||
public SimApiLoginItem UserInfo() => LoginInfo;
|
public SimApiLoginItem UserInfo() => LoginInfo;
|
||||||
}
|
}
|
||||||
@@ -65,7 +65,7 @@ public static class SimApiError
|
|||||||
/// <param name="code">错误代码</param>
|
/// <param name="code">错误代码</param>
|
||||||
/// <param name="message">错误描述</param>
|
/// <param name="message">错误描述</param>
|
||||||
public static void ErrorWhenNull([NotNull] object? condition, int code = 404,
|
public static void ErrorWhenNull([NotNull] object? condition, int code = 404,
|
||||||
string message = "请求的资源不存在")
|
string message = "")
|
||||||
{
|
{
|
||||||
ErrorWhen(condition == null, code, message);
|
ErrorWhen(condition == null, code, message);
|
||||||
}
|
}
|
||||||
|
|||||||
+29
-33
@@ -3,19 +3,24 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Net.Http.Json;
|
using System.Net.Http.Json;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
|
using SimApi.Configurations;
|
||||||
using SimApi.Exceptions;
|
using SimApi.Exceptions;
|
||||||
|
|
||||||
namespace SimApi.Helpers;
|
namespace SimApi.Helpers;
|
||||||
|
|
||||||
public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
public class SimApiHttpClient(SimApiOptions? apiOptions = null, ILogger<SimApiHttpClient>? logger = null)
|
||||||
{
|
{
|
||||||
public string Server { get; init; } = string.Empty;
|
public virtual string Server { get; init; } = apiOptions?.SimApiHttpClientOptions.Server ?? string.Empty;
|
||||||
public string SignName { get; init; } = "sign";
|
public virtual string AppId { get; init; } = apiOptions?.SimApiHttpClientOptions.AppId ?? string.Empty;
|
||||||
public string TimestampName { get; init; } = "timestamp";
|
public virtual string AppKey { get; init; } = apiOptions?.SimApiHttpClientOptions.AppKey ?? string.Empty;
|
||||||
public string NonceName { get; init; } = "nonce";
|
|
||||||
public string? AppIdName { get; init; } = "appId";
|
public virtual string SignName { get; init; } = "sign";
|
||||||
public string[] SignFields { get; init; } = [];
|
public virtual string TimestampName { get; init; } = "timestamp";
|
||||||
|
public virtual string NonceName { get; init; } = "nonce";
|
||||||
|
public virtual string? AppIdName { get; init; } = "appId";
|
||||||
|
public virtual string[] SignFields { get; init; } = [];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发起签名请求
|
/// 发起签名请求
|
||||||
@@ -25,18 +30,18 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
/// <param name="queries"></param>
|
/// <param name="queries"></param>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
/// <returns></returns>
|
/// <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;
|
||||||
var queryUrl = SignFields.Aggregate(string.Empty,
|
var queryUrl = SignFields.Aggregate(string.Empty,
|
||||||
(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)
|
||||||
@@ -55,17 +60,17 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
/// <param name="body"></param>
|
/// <param name="body"></param>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public T? AesQuery<T>(string url, object body)
|
public T AesQuery<T>(string url, object body)
|
||||||
{
|
{
|
||||||
url = Server + url;
|
url = Server + url;
|
||||||
if (!string.IsNullOrEmpty(AppIdName))
|
if (!string.IsNullOrEmpty(AppIdName))
|
||||||
{
|
{
|
||||||
url += $"?{AppIdName}={appId}";
|
url += $"?{AppIdName}={AppId}";
|
||||||
}
|
}
|
||||||
|
logger?.LogDebug($"[HTTPCLIENT请求][加密前BODY] {url}\n{SimApiUtil.Json(body)}\n");
|
||||||
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);
|
||||||
}
|
}
|
||||||
@@ -78,11 +83,12 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
/// <param name="queries"></param>
|
/// <param name="queries"></param>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
/// <returns></returns>
|
/// <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)
|
||||||
{
|
{
|
||||||
|
logger?.LogDebug($"[HTTPCLIENT请求][加密前BODY] {url}\n{SimApiUtil.Json(body)}\n");
|
||||||
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);
|
||||||
}
|
}
|
||||||
@@ -95,26 +101,16 @@ public class SimApiHttpClient(string? appId, string appKey, bool debug = false)
|
|||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <exception cref="SimApiException"></exception>
|
/// <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();
|
||||||
if (debug)
|
logger?.LogDebug($"[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)
|
logger?.LogDebug($"[HTTPCLIENT响应] {resp.Content.ReadAsStringAsync().Result}\n");
|
||||||
{
|
SimApiError.ErrorWhenFalse(resp.IsSuccessStatusCode, (int)resp.StatusCode, $"HTTP ERROR: {resp.StatusCode}");
|
||||||
Console.WriteLine($"[HTTPCLIENT响应] {resp.Content.ReadAsStringAsync().Result}\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
var res = resp.Content.ReadFromJsonAsync<SimApiBaseResponse<T>>().Result;
|
var res = resp.Content.ReadFromJsonAsync<SimApiBaseResponse<T>>().Result;
|
||||||
if (res == null)
|
SimApiError.ErrorWhenNull(res, 500, "请求发生错误");
|
||||||
{
|
SimApiError.ErrorWhen(res.Code != 200, res.Code, res.Message);
|
||||||
throw new SimApiException(500, "请求发生错误");
|
return res.Data!;
|
||||||
}
|
|
||||||
|
|
||||||
return res.Code != 200 ? throw new SimApiException(res.Code, res.Message) : res.Data;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,16 +1,22 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using SimApi.Communications;
|
using SimApi.Communications;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using SimApi.Configurations;
|
||||||
using SimApi.Exceptions;
|
using SimApi.Exceptions;
|
||||||
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Middlewares;
|
namespace SimApi.Middlewares;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 异常处理中间件
|
/// 异常处理中间件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExceptionMiddleware> log)
|
public class SimApiExceptionMiddleware(
|
||||||
|
RequestDelegate next,
|
||||||
|
ILogger<SimApiExceptionMiddleware> log,
|
||||||
|
SimApiOptions simApiOptions)
|
||||||
{
|
{
|
||||||
public async Task InvokeAsync(HttpContext context)
|
public async Task InvokeAsync(HttpContext context)
|
||||||
{
|
{
|
||||||
@@ -24,18 +30,9 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
|
|||||||
await next(context);
|
await next(context);
|
||||||
if (!context.Response.HasStarted)
|
if (!context.Response.HasStarted)
|
||||||
{
|
{
|
||||||
switch (context.Response.StatusCode)
|
SimApiError.ErrorWhenFalse(
|
||||||
{
|
simApiOptions.SimApiExceptionOptions.SkipStatusCodes.Contains(context.Response.StatusCode),
|
||||||
case 200:
|
context.Response.StatusCode);
|
||||||
case 301:
|
|
||||||
case 302:
|
|
||||||
case 404:
|
|
||||||
break;
|
|
||||||
// case 404:
|
|
||||||
// throw new SimApiException(context.Response.StatusCode, "请求的接口不存在");
|
|
||||||
default:
|
|
||||||
throw new SimApiException(context.Response.StatusCode);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -48,11 +45,15 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
|
|||||||
response = string.IsNullOrEmpty(simEx.Message)
|
response = string.IsNullOrEmpty(simEx.Message)
|
||||||
? new SimApiBaseResponse(simEx.Code)
|
? new SimApiBaseResponse(simEx.Code)
|
||||||
: new SimApiBaseResponse(simEx.Code, simEx.Message);
|
: new SimApiBaseResponse(simEx.Code, simEx.Message);
|
||||||
|
if (context.Response.StatusCode == 404)
|
||||||
|
{
|
||||||
|
response.Message = "接口不存在";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
log.LogError(ex, "服务器异常");
|
log.LogError(ex, ex.Message);
|
||||||
response = new SimApiBaseResponse(500, "服务器错误");
|
response = new SimApiBaseResponse(500);
|
||||||
}
|
}
|
||||||
|
|
||||||
await ErrorResponseAsync(context, response);
|
await ErrorResponseAsync(context, response);
|
||||||
|
|||||||
+5
-5
@@ -12,13 +12,13 @@
|
|||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.22" />
|
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.23" />
|
||||||
<PackageReference Include="Hangfire.Console" Version="1.4.3"/>
|
<PackageReference Include="Hangfire.Console" Version="1.4.3"/>
|
||||||
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.12.0"/>
|
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.12.0"/>
|
||||||
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.9" />
|
||||||
<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.1.0.1559" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.0" />
|
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.3" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.0" />
|
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.3" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+56
-49
@@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Mvc;
|
|||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using SimApi.Attributes;
|
using SimApi.Attributes;
|
||||||
using SimApi.CoceSdk;
|
using SimApi.AuthSDK;
|
||||||
using SimApi.Configurations;
|
using SimApi.Configurations;
|
||||||
using SimApi.Interfaces;
|
using SimApi.Interfaces;
|
||||||
using SimApi.Logger;
|
using SimApi.Logger;
|
||||||
@@ -59,11 +59,6 @@ public static class SimApiExtensions
|
|||||||
builder.AddSingleton<SimApiAuth>();
|
builder.AddSingleton<SimApiAuth>();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (simApiOptions.EnableCoceSdk)
|
|
||||||
{
|
|
||||||
builder.AddSingleton<CoceApp>();
|
|
||||||
}
|
|
||||||
|
|
||||||
var simApiAuthChecker = typeof(ISimApiAuthChecker);
|
var simApiAuthChecker = typeof(ISimApiAuthChecker);
|
||||||
var stackTrace = new StackTrace();
|
var stackTrace = new StackTrace();
|
||||||
var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1)?.GetMethod();
|
var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1)?.GetMethod();
|
||||||
@@ -108,6 +103,11 @@ public static class SimApiExtensions
|
|||||||
policy => { policy.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin(); }));
|
policy => { policy.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin(); }));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (simApiOptions.EnableSimApiHttpClient)
|
||||||
|
{
|
||||||
|
builder.AddSingleton<SimApiHttpClient>();
|
||||||
|
}
|
||||||
|
|
||||||
if (simApiOptions.EnableSynapse)
|
if (simApiOptions.EnableSynapse)
|
||||||
{
|
{
|
||||||
builder.AddSingleton<Synapse>();
|
builder.AddSingleton<Synapse>();
|
||||||
@@ -329,6 +329,16 @@ public static class SimApiExtensions
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (simApiOptions.EnableSimApiAuthGate)
|
||||||
|
{
|
||||||
|
builder.AddSingleton<SimApiAuthClient>();
|
||||||
|
builder.AddSingleton<SimApiAuthCenter>();
|
||||||
|
if (simApiOptions.SimApiAuthCenterOptions.UseIam)
|
||||||
|
{
|
||||||
|
builder.AddSingleton<SimApiAuthIam>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
builder.AddSingleton(simApiOptions);
|
builder.AddSingleton(simApiOptions);
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
@@ -355,11 +365,11 @@ public static class SimApiExtensions
|
|||||||
builder.Services.GetService<SimApiStorage>();
|
builder.Services.GetService<SimApiStorage>();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.EnableCoceSdk)
|
if (options.EnableSimApiHttpClient)
|
||||||
{
|
{
|
||||||
logger.LogInformation("开始配置CoceAppSdk...\nApi入口: {ApiUrl}\nAuth入口:{AuthUrl}n\nAppId: {AppId}",
|
logger.LogInformation("开始配置SimApiHttpClient...\n服务器地址: {ApiUrl}\nAppId:{AuthUrl}n\nAppkey: {AppId}",
|
||||||
options.CoceSdkOptions.ApiEndpoint, options.CoceSdkOptions.AuthEndpoint,
|
options.SimApiHttpClientOptions.Server, options.SimApiHttpClientOptions.AppId,
|
||||||
options.CoceSdkOptions.AppId);
|
!string.IsNullOrEmpty(options.SimApiHttpClientOptions.AppKey));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.EnableSynapse)
|
if (options.EnableSynapse)
|
||||||
@@ -412,17 +422,20 @@ public static class SimApiExtensions
|
|||||||
logger.LogInformation(msg);
|
logger.LogInformation(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.EnableSimApiGateAuth)
|
if (options.EnableSimApiAuthGate)
|
||||||
{
|
{
|
||||||
logger.LogInformation("开始配置SimApiGateAuth...");
|
logger.LogInformation("开始配置SimApiAuthGate...");
|
||||||
if (string.IsNullOrEmpty(options.SimApiGateAuthOptions.AppId) ||
|
if (string.IsNullOrEmpty(options.SimApiAuthCenterOptions.AppId) ||
|
||||||
string.IsNullOrEmpty(options.SimApiGateAuthOptions.AppKey))
|
string.IsNullOrEmpty(options.SimApiAuthCenterOptions.AppKey))
|
||||||
{
|
{
|
||||||
logger.LogCritical("必须配置Gate的AppId和AppKey才能启用SimApiGateAuth");
|
logger.LogCritical("必须配置AuthGate的AppId和AppKey才能启用SimApiAuthGate");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
builder.UseMiddleware<SimApiGateAuthMiddleware>();
|
if (options.SimApiAuthCenterOptions.UseMiddleware)
|
||||||
|
{
|
||||||
|
builder.UseMiddleware<SimApiAuthCenterMiddleware>();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -430,41 +443,13 @@ public static class SimApiExtensions
|
|||||||
{
|
{
|
||||||
logger.LogInformation("开始配置SimApiAuth...");
|
logger.LogInformation("开始配置SimApiAuth...");
|
||||||
builder.UseMiddleware<SimApiAuthMiddleware>();
|
builder.UseMiddleware<SimApiAuthMiddleware>();
|
||||||
builder.MapControllerRoute(name: "Logout", pattern: "/auth/logout",
|
|
||||||
defaults: new
|
|
||||||
{
|
|
||||||
controller = "SimApiAuth",
|
|
||||||
action = "Logout"
|
|
||||||
});
|
|
||||||
if (options.EnableCoceSdk)
|
|
||||||
{
|
|
||||||
logger.LogInformation("开始配置CoceAppSdk...\nApi入口: {ApiUrl}\nAuth入口:{AuthUrl}n\nAppId: {AppId}",
|
|
||||||
options.CoceSdkOptions.ApiEndpoint, options.CoceSdkOptions.AuthEndpoint,
|
|
||||||
options.CoceSdkOptions.AppId);
|
|
||||||
builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/auth/login",
|
|
||||||
defaults: new
|
|
||||||
{
|
|
||||||
controller = "Coce",
|
|
||||||
action = "Login"
|
|
||||||
});
|
|
||||||
builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/user/groups",
|
|
||||||
defaults: new
|
|
||||||
{
|
|
||||||
controller = "Coce",
|
|
||||||
action = "ListGroups"
|
|
||||||
});
|
|
||||||
builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/auth/config",
|
|
||||||
defaults: new
|
|
||||||
{
|
|
||||||
controller = "Coce",
|
|
||||||
action = "GetConfig"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.EnableVersionUrl)
|
|
||||||
|
if (options.SimApiRouteOptions.VersionRoute != null)
|
||||||
{
|
{
|
||||||
builder.MapControllerRoute(name: "Versions", pattern: "/versions",
|
logger.LogInformation("注册内置Route: Versions => {}", options.SimApiRouteOptions.LogoutRoute);
|
||||||
|
builder.MapControllerRoute(name: "Versions", pattern: options.SimApiRouteOptions.VersionRoute,
|
||||||
defaults: new
|
defaults: new
|
||||||
{
|
{
|
||||||
controller = "SimApiCommon",
|
controller = "SimApiCommon",
|
||||||
@@ -472,6 +457,28 @@ public static class SimApiExtensions
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (options.SimApiRouteOptions.UserInfoRoute != null)
|
||||||
|
{
|
||||||
|
logger.LogInformation("注册内置Route: UserInfo => {}", options.SimApiRouteOptions.UserInfoRoute);
|
||||||
|
builder.MapControllerRoute(name: "UserInfo", pattern: options.SimApiRouteOptions.UserInfoRoute,
|
||||||
|
defaults: new
|
||||||
|
{
|
||||||
|
controller = "SimApiCommon",
|
||||||
|
action = "UserInfo"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options.SimApiRouteOptions.LogoutRoute != null)
|
||||||
|
{
|
||||||
|
logger.LogInformation("注册内置Route: Logout => {}", options.SimApiRouteOptions.LogoutRoute);
|
||||||
|
builder.MapControllerRoute(name: "Logout", pattern: options.SimApiRouteOptions.LogoutRoute,
|
||||||
|
defaults: new
|
||||||
|
{
|
||||||
|
controller = "SimApiAuth",
|
||||||
|
action = "Logout"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (options.EnableSimApiDoc)
|
if (options.EnableSimApiDoc)
|
||||||
{
|
{
|
||||||
logger.LogInformation("开始配置SimApiDoc...");
|
logger.LogInformation("开始配置SimApiDoc...");
|
||||||
@@ -482,7 +489,7 @@ public static class SimApiExtensions
|
|||||||
x.DocumentTitle = docOptions.DocumentTitle;
|
x.DocumentTitle = docOptions.DocumentTitle;
|
||||||
foreach (var group in docOptions.ApiGroups)
|
foreach (var group in docOptions.ApiGroups)
|
||||||
{
|
{
|
||||||
x.SwaggerEndpoint($"/swagger/{group.Id}.json", name: group.Name);
|
x.SwaggerEndpoint($"{group.Id}.json", name: group.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
x.SupportedSubmitMethods(docOptions.SupportedMethod);
|
x.SupportedSubmitMethods(docOptions.SupportedMethod);
|
||||||
|
|||||||
Reference in New Issue
Block a user