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

统一IP相关命名，升级依赖并优化接口实现

本次提交主要内容如下： - 全面统一与“IP地址”相关的类、属性、方法、服务等命名（如 IpAddress → IPAddress，IpBanner → IPBanner 等），包括 JSON 字段、请求名、参数名等，提升代码一致性。 - 同步调整所有接口、抽象类、实现类及配置项的相关属性和委托名，保持命名规范统一。 - 适配业务逻辑，确保 IP 判断、存储、序列化、权限校验等环节与新命名一致，用户登录相关 LastIpAddress 也统一为 LastIPAddress。 - 客户端与服务端的请求注册、服务注册等同步为新命名，保证前后端一致。 - 升级部分依赖包版本，项目自身版本号提升至 2.0.1。 - 优化控制台输出及调试信息，保持接口和方法兼容性，便于后续维护和扩展。

6e0c4a5
XFE工作室室长 <mail@xfegzs.com>
提交于
父提交 0586209

代码差异

22 个文件 +74 -66
Modified XFEExtension.NetCore.ServerInteractive/Implements/CoreService/XFEServerCoreServiceBase.cs +1 -1
@@ -14,7 +14,7 @@ public abstract class XFEServerCoreServiceBase : IXFEServerCoreServiceBase
14 14 /// <inheritdoc/>
15 15 public bool Handled { get => ReturnArgs.Handled; set => ReturnArgs.Handled = value; }
16 16 /// <inheritdoc/>
17 public string ClientIp { get => ReturnArgs.ClientIp; set => ReturnArgs.ClientIp = value; }
17 public string ClientIP { get => ReturnArgs.ClientIP; set => ReturnArgs.ClientIP = value; }
18 18 /// <inheritdoc/>
19 19 public bool IsStandardError { get => ReturnArgs.IsStandardError; set => ReturnArgs.IsStandardError = value; }
20 20 /// <inheritdoc/>
Modified XFEExtension.NetCore.ServerInteractive/Implements/ServerService/ServerCoreServiceBase.cs +1 -1
@@ -13,7 +13,7 @@ public abstract class ServerCoreServiceBase : IServerCoreService
13 13 /// <inheritdoc/>
14 14 public string ServerCoreName { get; set; } = string.Empty;
15 15 /// <inheritdoc/>
16 public string BindingIpAddress { get; set; } = string.Empty;
16 public string BindingIPAddress { get; set; } = string.Empty;
17 17
18 18 /// <inheritdoc/>
19 19 public abstract Task StartServerCore();
Modified XFEExtension.NetCore.ServerInteractive/Interfaces/CoreService/IXFEServerCoreServiceBase.cs +1 -1
@@ -18,7 +18,7 @@ public interface IXFEServerCoreServiceBase
18 18 /// <summary>
19 19 /// 客户端IP地址
20 20 /// </summary>
21 string ClientIp { get; set; }
21 string ClientIP { get; set; }
22 22
23 23 /// <summary>
24 24 /// 是否是标准错误（如果是标准错误，服务器将自动处理并返回给客户端；如果不是，服务器将输出报错及堆栈信息）
Modified XFEExtension.NetCore.ServerInteractive/Interfaces/ServerService/IServerCoreService.cs +1 -1
@@ -8,7 +8,7 @@ public interface IServerCoreService : IXFEServerServiceBase
8 8 /// <summary>
9 9 /// 绑定的IP地址（服务初始化执行完成后才会刷新）
10 10 /// </summary>
11 string BindingIpAddress { get; set; }
11 string BindingIPAddress { get; set; }
12 12 /// <summary>
13 13 /// 核心服务器名称
14 14 /// </summary>
Modified XFEExtension.NetCore.ServerInteractive/Models/IPAddressInfo.cs +2 -2
@@ -3,12 +3,12 @@
3 3 /// <summary>
4 4 /// IP地址信息
5 5 /// </summary>
6 public class IpAddressInfo
6 public class IPAddressInfo
7 7 {
8 8 /// <summary>
9 9 /// IP地址
10 10 /// </summary>
11 public required string IpAddress { get; set; }
11 public required string IPAddress { get; set; }
12 12 /// <summary>
13 13 /// IP地址备注
14 14 /// </summary>
Modified XFEExtension.NetCore.ServerInteractive/Models/ServerModels/ServerCoreReturnArgs.cs +1 -1
@@ -20,7 +20,7 @@ public class ServerCoreReturnArgs : Exception
20 20 /// <summary>
21 21 /// 客户端IP地址
22 22 /// </summary>
23 public string ClientIp { get; set; } = string.Empty;
23 public string ClientIP { get; set; } = string.Empty;
24 24 /// <summary>
25 25 /// 是否已经处理完成
26 26 /// </summary>
Modified XFEExtension.NetCore.ServerInteractive/Models/UserModels/UserLoginModel.cs +1 -1
@@ -12,7 +12,7 @@ public class UserLoginModel
12 12 /// <summary>
13 13 /// 上一次登录IP
14 14 /// </summary>
15 public string LastIpAddress { get; set; } = string.Empty;
15 public string LastIPAddress { get; set; } = string.Empty;
16 16 /// <summary>
17 17 /// 电脑配置信息
18 18 /// </summary>
Modified XFEExtension.NetCore.ServerInteractive/Options/XFEServerCoreOptions.cs +2 -2
@@ -10,7 +10,7 @@ public class XFEServerCoreOptions
10 10 /// <summary>
11 11 /// 绑定的IP地址（服务初始化执行完成后才会刷新）
12 12 /// </summary>
13 public string BindingIpAddress { get; set; } = string.Empty;
13 public string BindingIPAddress { get; set; } = string.Empty;
14 14 /// <summary>
15 15 /// 核心服务器名称
16 16 /// </summary>
@@ -26,5 +26,5 @@ public class XFEServerCoreOptions
26 26 /// <summary>
27 27 /// 获取IP地址的函数，默认为从请求事件参数中获取客户端IP地址
28 28 /// </summary>
29 public Func<CyberCommRequestEventArgs, string> GetIpFunction { get; set; } = args => args.ClientIP;
29 public Func<CyberCommRequestEventArgs, string> GetIPFunction { get; set; } = args => args.ClientIP;
30 30 }
Modified XFEExtension.NetCore.ServerInteractive/Profiles/ServerBaseProfile.cs +3 -3
@@ -14,9 +14,9 @@ public partial class ServerBaseProfile : XFEProfile
14 14 /// 封禁的IP地址列表
15 15 /// </summary>
16 16 [ProfileProperty]
17 [ProfilePropertyAddGet("Current._bannedIpAddressList.CurrentProfile = Current")]
18 [ProfilePropertyAddGet("return Current._bannedIpAddressList")]
19 private ProfileList<IpAddressInfo> _bannedIpAddressList = [];
17 [ProfilePropertyAddGet("Current._bannedIPAddressList.CurrentProfile = Current")]
18 [ProfilePropertyAddGet("return Current._bannedIPAddressList")]
19 private ProfileList<IPAddressInfo> _bannedIPAddressList = [];
20 20 /// <summary>
21 21 /// 服务器上次绑定的IP地址字典
22 22 /// </summary>
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Extensions/XFEClientRequesterBuilderExtensions.cs +9 -9
@@ -50,24 +50,24 @@ public static class XFEClientRequesterBuilderExtensions
50 50 /// 添加IP封禁请求
51 51 /// </summary>
52 52 /// <returns></returns>
53 public XFEClientRequesterBuilder AddBannedIpRequest() => xFEClientRequesterBuilder.AddRequest("get_bannedIpList", static (session, computerInfo, _) => new
53 public XFEClientRequesterBuilder AddBannedIPRequest() => xFEClientRequesterBuilder.AddRequest("get_bannedIPList", static (session, computerInfo, _) => new
54 54 {
55 execute = "get_bannedIpList",
55 execute = "get_bannedIPList",
56 56 session,
57 57 computerInfo
58 }, static response => JsonSerializer.Deserialize<List<IpAddressInfo>>(response, JsonSerializerOptions)!).AddRequest("add_bannedIp", static (session, computerInfo, parameters) => new
58 }, static response => JsonSerializer.Deserialize<List<IPAddressInfo>>(response, JsonSerializerOptions)!).AddRequest("add_bannedIP", static (session, computerInfo, parameters) => new
59 59 {
60 execute = "add_bannedIp",
60 execute = "add_bannedIP",
61 61 session,
62 62 computerInfo,
63 bannedIp = parameters[0],
63 bannedIP = parameters[0],
64 64 notes = parameters[1]
65 }, static response => response).AddRequest("remove_bannedIp", static (session, computerInfo, parameters) => new
65 }, static response => response).AddRequest("remove_bannedIP", static (session, computerInfo, parameters) => new
66 66 {
67 execute = "remove_bannedIp",
67 execute = "remove_bannedIP",
68 68 session,
69 69 computerInfo,
70 bannedIp = parameters[0]
70 bannedIP = parameters[0]
71 71 }, static response => bool.Parse(response));
72 72
73 73 /// <summary>
@@ -83,7 +83,7 @@ public static class XFEClientRequesterBuilderExtensions
83 83 /// <typeparam name="T">登录返回用户接口类型</typeparam>
84 84 /// <returns></returns>
85 85 public XFEClientRequesterBuilder UseXFEStandardRequest<T>() where T : IUserFaceInfo => xFEClientRequesterBuilder.AddLoginRequest<T>()
86 .AddBannedIpRequest()
86 .AddBannedIPRequest()
87 87 .AddLogRequest()
88 88 .AddCheckConnectRequest();
89 89 }
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Extensions/XFEServerBuilderExtensions.cs +2 -2
@@ -17,7 +17,7 @@ public static class XFEServerBuilderExtensions
17 17 /// <returns></returns>
18 18 public XFEServerBuilder UseXFEServer() => xFEServerBuilder.UseXFELog()
19 19 .AddXFEExceptionProcess()
20 .AddXFEIpInitializer()
20 .AddXFEIPInitializer()
21 21 .AddXFECoreProcessor();
22 22
23 23 /// <summary>
@@ -42,6 +42,6 @@ public static class XFEServerBuilderExtensions
42 42 /// 使用XFEIP初始化器
43 43 /// </summary>
44 44 /// <returns></returns>
45 public XFEServerBuilder AddXFEIpInitializer() => xFEServerBuilder.AddInitializer<ServerIpInitializer>();
45 public XFEServerBuilder AddXFEIPInitializer() => xFEServerBuilder.AddInitializer<ServerIPInitializer>();
46 46 }
47 47 }
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Extensions/XFEServerCoreBuilderExtensions.cs +3 -3
@@ -54,7 +54,7 @@ public static class XFEServerCoreBuilderExtensions
54 54 /// 添加IP封禁服务
55 55 /// </summary>
56 56 /// <returns></returns>
57 public XFEServerCoreBuilder AddIpBannerService() => xFEServerCoreBuilder.AddStandardService<IpBannerService>(["get_bannedIpList", "add_bannedIp", "remove_bannedIp"]);
57 public XFEServerCoreBuilder AddIPBannerService() => xFEServerCoreBuilder.AddStandardService<IPBannerService>(["get_bannedIPList", "add_bannedIP", "remove_bannedIP"]);
58 58
59 59 /// <summary>
60 60 /// 添加日期统计服务
@@ -106,7 +106,7 @@ public static class XFEServerCoreBuilderExtensions
106 106 .AddConnectService()
107 107 .AddStandardLoginService<T>()
108 108 .AddServerLogService()
109 .AddIpBannerService();
109 .AddIPBannerService();
110 110
111 111 /// <summary>
112 112 /// 使用XFE标准服务器核心（Options）
@@ -141,7 +141,7 @@ public static class XFEServerCoreBuilderExtensions
141 141 // Add services that depend on user functions if available
142 142 if (hasUserFunctions)
143 143 {
144 builder = builder.AddStandardLoginService<T>().AddServerLogService().AddIpBannerService();
144 builder = builder.AddStandardLoginService<T>().AddServerLogService().AddIPBannerService();
145 145 }
146 146
147 147 return builder;
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Helpers/UserHelper.cs +1 -1
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/Services/CoreService/EntryPointVerifyServer.cs +2 -2
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/Services/CoreService/IpBannerService.cs +12 -12
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/Services/CoreService/UserLoginService.cs +2 -2
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/Services/CoreService/UserReloginService.cs +1 -1
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/Services/ServerService/ServerIpInitializer.cs +4 -4
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/Services/ServerService/XFECoreServerProcessService.cs +1 -1
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/XFEServerCore.cs +6 -6
Modified XFEExtension.NetCore.ServerInteractive/Utilities/Server/XFEServerCoreBuilder.cs +5 -5
Modified XFEExtension.NetCore.ServerInteractive/XFEExtension.NetCore.ServerInteractive.csproj +13 -5