XFEExtension.NetCore.ServerInteractive
[DLL] Server interaction extension, including user identity verification and querying in conjunction with AutoConfig
关注
0
Fork
0
Star
0
返回提交历史
Modified
XFEExtension.NetCore.ServerInteractive.TServer/Program.cs
+1
-1
Modified
XFEExtension.NetCore.ServerInteractive.Test/Program.cs
+1
-1
Added
XFEExtension.NetCore.ServerInteractive/Options/XFEServerCoreOptions.cs
+6
-0
Renamed
XFEExtension.NetCore.ServerInteractive/Options/XFEStandardServerCoreOptions.cs
+1
-1
Renamed
XFEExtension.NetCore.ServerInteractive/Utilities/Extensions/XFEClientRequesterBuilderExtensions.cs
+1
-1
Renamed
XFEExtension.NetCore.ServerInteractive/Utilities/Extensions/XFEServerBuilderExtensions.cs
+1
-1
Renamed
XFEExtension.NetCore.ServerInteractive/Utilities/Extensions/XFEServerCoreBuilderExtensions.cs
+2
-1
Modified
XFEExtension.NetCore.ServerInteractive/Utilities/Server/Services/CoreService/UserLoginService.cs
+4
-4
Modified
XFEExtension.NetCore.ServerInteractive/Utilities/Server/XFEServerCoreBuilder.cs
+0
-11
XFEstudio/XFEExtension.NetCore.ServerInteractive
扩展方法与Options类命名空间重构及优化
将扩展方法类迁移至Utilities.Extensions命名空间，并恢复实现；Options相关类迁移至Options命名空间；同步调整Program.cs引用；UserLoginService<T>增加Json空值安全；移除XFEServerCoreBuilder的UseCustomIPGetFunction方法，提升结构清晰度与可维护性。
8eaa052
代码差异
9 个文件
+17
-21
@@ -4,8 +4,8 @@ using XFEExtension.NetCore.ServerInteractive.TServer;
4
4
using XFEExtension.NetCore.ServerInteractive.TServer.Models;
5
5
using XFEExtension.NetCore.ServerInteractive.TServer.Profiles;
6
6
using XFEExtension.NetCore.ServerInteractive.TServer.Services;
7
using XFEExtension.NetCore.ServerInteractive.Utilities;
8
7
using XFEExtension.NetCore.ServerInteractive.Utilities.DataTable;
8
using XFEExtension.NetCore.ServerInteractive.Utilities.Extensions;
9
9
using XFEExtension.NetCore.ServerInteractive.Utilities.Server;
10
10
11
11
var server = XFEServerBuilder.CreateBuilder() // 创建服务器构建器
@@ -2,7 +2,7 @@
2
2
using XFEExtension.NetCore.ServerInteractive.Models;
3
3
using XFEExtension.NetCore.ServerInteractive.Models.RequesterModels;
4
4
using XFEExtension.NetCore.ServerInteractive.TServer.Models;
5
using XFEExtension.NetCore.ServerInteractive.Utilities;
5
using XFEExtension.NetCore.ServerInteractive.Utilities.Extensions;
6
6
using XFEExtension.NetCore.ServerInteractive.Utilities.Requester;
7
7
8
8
internal class Program
@@ -0,0 +1,6 @@
1
namespace XFEExtension.NetCore.ServerInteractive.Options;
2
3
public class XFEServerCoreOptions
4
{
5
6
}
@@ -1,7 +1,7 @@
1
1
using XFEExtension.NetCore.ServerInteractive.Models.UserModels;
2
2
using XFEExtension.NetCore.ServerInteractive.Utilities.DataTable;
3
3
4
namespace XFEExtension.NetCore.ServerInteractive.Utilities;
4
namespace XFEExtension.NetCore.ServerInteractive.Options;
5
5
6
6
/// <summary>
7
7
/// XFE服务器核心服务选项
@@ -5,7 +5,7 @@ using XFEExtension.NetCore.ServerInteractive.Utilities.JsonConverter;
5
5
using XFEExtension.NetCore.ServerInteractive.Utilities.Requester;
6
6
using XFEExtension.NetCore.ServerInteractive.Utilities.Requester.Serviecs;
7
7
8
namespace XFEExtension.NetCore.ServerInteractive.Utilities;
8
namespace XFEExtension.NetCore.ServerInteractive.Utilities.Extensions;
9
9
10
10
/// <summary>
11
11
/// XFE客户端请求器构建器扩展
@@ -1,7 +1,7 @@
1
1
using XFEExtension.NetCore.ServerInteractive.Utilities.Server;
2
2
using XFEExtension.NetCore.ServerInteractive.Utilities.Server.Services.ServerService;
3
3
4
namespace XFEExtension.NetCore.ServerInteractive.Utilities;
4
namespace XFEExtension.NetCore.ServerInteractive.Utilities.Extensions;
5
5
6
6
/// <summary>
7
7
/// XFE服务器构建器扩展
@@ -1,9 +1,10 @@
1
1
using XFEExtension.NetCore.ServerInteractive.Models.UserModels;
2
using XFEExtension.NetCore.ServerInteractive.Options;
2
3
using XFEExtension.NetCore.ServerInteractive.Utilities.DataTable;
3
4
using XFEExtension.NetCore.ServerInteractive.Utilities.Server;
4
5
using XFEExtension.NetCore.ServerInteractive.Utilities.Server.Services.CoreService;
5
6
6
namespace XFEExtension.NetCore.ServerInteractive.Utilities;
7
namespace XFEExtension.NetCore.ServerInteractive.Utilities.Extensions;
7
8
8
9
/// <summary>
9
10
/// XFE服务器核心构建器扩展
@@ -14,13 +14,13 @@ public class UserLoginService<T> : ServerCoreUserLoginServiceBase<T> where T : c
14
14
public override async Task RequestReceiveAsync()
15
15
{
16
16
Console.Write("登录请求");
17
var account = Json["account"].ToString();
18
var password = Json["password"].ToString();
19
var computerInfo = Json["computerInfo"].ToString();
17
var account = Json["account"]?.ToString();
18
var password = Json["password"]?.ToString();
19
var computerInfo = Json["computerInfo"]?.ToString();
20
20
if (account.IsNullOrWhiteSpace()) throw Error("账户名不能为空");
21
21
if (password.IsNullOrWhiteSpace()) throw Error("登录密码不能为空");
22
22
if (computerInfo.IsNullOrWhiteSpace()) throw Error("电脑信息不能为空");
23
var user = UserHelper.GetUser(Json["account"], Json["password"], GetUserFunction(), ReturnArgs!);
23
var user = UserHelper.GetUser(account, password, GetUserFunction(), ReturnArgs!);
24
24
Console.Write($"{account}（{computerInfo[..10]}...）");
25
25
var userLoginList = GetEncryptedUserLoginModelFunction().Where(userLogin => userLogin.UserLoginModel.ComputerInfo == computerInfo);
26
26
var userLogin = GetEncryptedUserLoginModelFunction().FirstOrDefault(userLogin => userLogin.UserLoginModel.UID == user.ID);
@@ -49,17 +49,6 @@ public abstract class XFEServerCoreBuilder : XFEBuilderBase<XFEServerCoreBuilder
49
49
/// <returns>XFE服务器核心构建器</returns>
50
50
public XFEServerCoreBuilder AddService<T>() where T : IServerCoreOriginalService, new() => AddService(new T());
51
51
52
/// <summary>
53
/// 使用自定义IP获取函数
54
/// </summary>
55
/// <param name="getIpFunction">自定义IP获取函数</param>
56
/// <returns>XFE服务器核心构建器</returns>
57
public XFEServerCoreBuilder UseCustomIPGetFunction(Func<CyberCommRequestEventArgs, string> getIpFunction)
58
{
59
xFEServerCore.GetIpFunction = getIpFunction;
60
return this;
61
}
62
63
52
/// <summary>
64
53
/// 添加校验服务
65
54
/// </summary>