XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet

XFEExtension.NetCore.ServerInteractive

[DLL] Server interaction extension, including user identity verification and querying in conjunction with AutoConfig

公开
关注 0 Fork 0 Star 0
返回提交历史

XFEstudio/XFEExtension.NetCore.ServerInteractive

Consolidate request services: merge Login+Relogin into UserRequestService, GetLog+ClearLog into LogRequestService

Agent-Logs-Url: https://github.com/XFEstudio/XFEExtension.NetCore.ServerInteractive/sessions/7a7b7fef-e309-432d-a43f-54a12776f5fe Co-authored-by: XFEstudio <132526994+XFEstudio@users.noreply.github.com>

9c71d48
copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
提交于
父提交 ae6d1e8

代码差异

5 个文件 +40 -82
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Extensions/XFEClientRequesterBuilderExtensions.cs +2 -14
@@ -32,19 +32,7 @@ public static class XFEClientRequesterBuilderExtensions
32 32 /// 添加日志请求
33 33 /// </summary>
34 34 /// <returns></returns>
35 public XFEClientRequesterBuilder AddLogRequest() => xFEClientRequesterBuilder.AddRequest("get_log", static (session, deviceInfo, parameters) => new
36 {
37 execute = "get_log",
38 session,
39 deviceInfo,
40 startDateTime = parameters[0],
41 endDateTime = parameters[1]
42 }, static response => response).AddRequest("clear_log", static (session, deviceInfo, _) => new
43 {
44 execute = "clear_log",
45 session,
46 deviceInfo
47 }, static response => response);
35 public XFEClientRequesterBuilder AddLogRequest() => xFEClientRequesterBuilder.AddRequest<LogRequestService>();
48 36
49 37 /// <summary>
50 38 /// 添加IP封禁请求
@@ -75,7 +63,7 @@ public static class XFEClientRequesterBuilderExtensions
75 63 /// </summary>
76 64 /// <typeparam name="T">登录返回用户接口类型</typeparam>
77 65 /// <returns></returns>
78 public XFEClientRequesterBuilder AddLoginRequest<T>() where T : IUserFaceInfo => xFEClientRequesterBuilder.AddRequest<LoginRequestService<T>>().AddRequest<ReloginRequestService<T>>();
66 public XFEClientRequesterBuilder AddLoginRequest<T>() where T : IUserFaceInfo => xFEClientRequesterBuilder.AddRequest<UserRequestService<T>>();
79 67
80 68 /// <summary>
81 69 /// 使用XFE标准服务器服务请求
Deleted XFEExtension.NetCore.ServerInteractive/Utilities/Requester/Services/ClearLogRequestService.cs +0 -26
@@ -1,26 +0,0 @@
1 using XFEExtension.NetCore.ServerInteractive.Attributes;
2 using XFEExtension.NetCore.ServerInteractive.Implements.Requester;
3
4 namespace XFEExtension.NetCore.ServerInteractive.Utilities.Requester.Services;
5
6 /// <summary>
7 /// 清除日志请求服务
8 /// </summary>
9 public partial class ClearLogRequestService : StandardRequestServiceBase
10 {
11 /// <summary>
12 /// 解析清除日志响应
13 /// </summary>
14 [Response("log/clear")]
15 public object AnalyzeClearLogResponse() => true;
16
17 /// <summary>
18 /// 构造清除日志请求体
19 /// </summary>
20 [Request("log/clear")]
21 public object PostClearLogRequest() => new
22 {
23 session = Session,
24 deviceInfo = DeviceInfo
25 };
26 }
Renamed XFEExtension.NetCore.ServerInteractive/Utilities/Requester/Services/LogRequestService.cs +18 -2
@@ -4,9 +4,9 @@ using XFEExtension.NetCore.ServerInteractive.Implements.Requester;
4 4 namespace XFEExtension.NetCore.ServerInteractive.Utilities.Requester.Services;
5 5
6 6 /// <summary>
7 /// 获取日志请求服务
7 /// 日志请求服务（包含获取日志与清除日志）
8 8 /// </summary>
9 public partial class GetLogRequestService : StandardRequestServiceBase
9 public partial class LogRequestService : StandardRequestServiceBase
10 10 {
11 11 /// <summary>
12 12 /// 解析获取日志响应
@@ -25,4 +25,20 @@ public partial class GetLogRequestService : StandardRequestServiceBase
25 25 startDateTime = Parameters[0],
26 26 endDateTime = Parameters[1],
27 27 };
28
29 /// <summary>
30 /// 解析清除日志响应
31 /// </summary>
32 [Response("log/clear")]
33 public object AnalyzeClearLogResponse() => true;
34
35 /// <summary>
36 /// 构造清除日志请求体
37 /// </summary>
38 [Request("log/clear")]
39 public object PostClearLogRequest() => new
40 {
41 session = Session,
42 deviceInfo = DeviceInfo
43 };
28 44 }
Deleted XFEExtension.NetCore.ServerInteractive/Utilities/Requester/Services/ReloginRequestService.cs +0 -36
@@ -1,36 +0,0 @@
1 using System.Text.Json;
2 using XFEExtension.NetCore.ServerInteractive.Attributes;
3 using XFEExtension.NetCore.ServerInteractive.Implements.Requester;
4 using XFEExtension.NetCore.ServerInteractive.Interfaces;
5 using XFEExtension.NetCore.ServerInteractive.Utilities.JsonConverter;
6
7 namespace XFEExtension.NetCore.ServerInteractive.Utilities.Requester.Services;
8
9 /// <summary>
10 /// 登录校验请求服务
11 /// </summary>
12 public partial class ReloginRequestService<T> : StandardRequestServiceBase where T : IUserFaceInfo
13 {
14 private readonly JsonSerializerOptions _jsonSerializerOptions = new();
15
16 /// <summary>
17 /// 登录校验请求服务
18 /// </summary>
19 public ReloginRequestService() => _jsonSerializerOptions.Converters.Add(new JsonDateTimeConverter());
20
21 /// <summary>
22 /// 解析登录校验响应
23 /// </summary>
24 [Response("user/relogin")]
25 public object AnalyzeReloginResponse() => JsonSerializer.Deserialize<T>(Response, _jsonSerializerOptions)!;
26
27 /// <summary>
28 /// 构造登录校验请求体
29 /// </summary>
30 [Request("user/relogin")]
31 public object PostReloginRequest() => new
32 {
33 session = Session,
34 deviceInfo = DeviceInfo,
35 };
36 }
Renamed XFEExtension.NetCore.ServerInteractive/Utilities/Requester/Services/UserRequestService.cs +20 -4
@@ -8,16 +8,16 @@ using XFEExtension.NetCore.ServerInteractive.Utilities.JsonConverter;
8 8 namespace XFEExtension.NetCore.ServerInteractive.Utilities.Requester.Services;
9 9
10 10 /// <summary>
11 /// 登录请求服务
11 /// 用户请求服务（包含登录与登录校验）
12 12 /// </summary>
13 public partial class LoginRequestService<T> : StandardRequestServiceBase where T : IUserFaceInfo
13 public partial class UserRequestService<T> : StandardRequestServiceBase where T : IUserFaceInfo
14 14 {
15 15 private readonly JsonSerializerOptions _jsonSerializerOptions = new();
16 16
17 17 /// <summary>
18 /// 登录请求服务
18 /// 用户请求服务
19 19 /// </summary>
20 public LoginRequestService() => _jsonSerializerOptions.Converters.Add(new JsonDateTimeConverter());
20 public UserRequestService() => _jsonSerializerOptions.Converters.Add(new JsonDateTimeConverter());
21 21
22 22 /// <summary>
23 23 /// 解析登录响应
@@ -40,4 +40,20 @@ public partial class LoginRequestService<T> : StandardRequestServiceBase where T
40 40 account = Parameters[0],
41 41 password = Parameters[1]
42 42 };
43
44 /// <summary>
45 /// 解析登录校验响应
46 /// </summary>
47 [Response("user/relogin")]
48 public object AnalyzeReloginResponse() => JsonSerializer.Deserialize<T>(Response, _jsonSerializerOptions)!;
49
50 /// <summary>
51 /// 构造登录校验请求体
52 /// </summary>
53 [Request("user/relogin")]
54 public object PostReloginRequest() => new
55 {
56 session = Session,
57 deviceInfo = DeviceInfo,
58 };
43 59 }