From ee1de29495fa6e3695e6ff75bf472bb7d43afb1d Mon Sep 17 00:00:00 2001 From: AnonymousDotNet <18776095145@163.com> Date: Fri, 6 Dec 2024 17:03:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=8B=E6=9C=BA/=E9=82=AE=E7=AE=B1=E5=90=8E=E6=9C=AA?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs index 9bc436a7..4cee45db 100644 --- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs +++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs @@ -127,7 +127,8 @@ public class UserService : IUserService public async Task UpdatePassword(string password, string verificationCode) { var db = _services.GetRequiredService(); - var record = db.GetUserByUserName(_user.UserName); + + var record = db.GetUserById(_user.Id); if (record == null) { From 018d7c871f375f8a86f1a93cc222e178935941c3 Mon Sep 17 00:00:00 2001 From: AnonymousDotNet <18776095145@163.com> Date: Fri, 6 Dec 2024 17:34:43 +0800 Subject: [PATCH 2/5] fix: add regionCode for ActiveUser API --- .../BotSharp.Abstraction/Users/Models/UserActivationModel.cs | 1 + src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Infrastructure/BotSharp.Abstraction/Users/Models/UserActivationModel.cs b/src/Infrastructure/BotSharp.Abstraction/Users/Models/UserActivationModel.cs index 904bd936..3ea4a915 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Users/Models/UserActivationModel.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Users/Models/UserActivationModel.cs @@ -4,4 +4,5 @@ public class UserActivationModel { public string UserName { get; set; } public string VerificationCode { get; set; } + public string RegionCode { get; set; } = "CN"; } diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs index 4cee45db..55e8c0cd 100644 --- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs +++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs @@ -474,7 +474,7 @@ public class UserService : IUserService var record = id.Contains("@") ? db.GetUserByEmail(id) : db.GetUserByUserName(id); if (record == null) { - record = db.GetUserByPhone(id); + record = db.GetUserByPhone(id, regionCode: string.IsNullOrWhiteSpace(model.RegionCode) ? "CN" : model.RegionCode); } if (record == null) From 480d6d8ed8403625de014dc1c600d0d898bb024d Mon Sep 17 00:00:00 2001 From: AnonymousDotNet <18776095145@163.com> Date: Fri, 6 Dec 2024 17:44:07 +0800 Subject: [PATCH 3/5] fix: add regionCode for updatepassword API --- .../BotSharp.Core/Users/Services/UserService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs index 55e8c0cd..468de184 100644 --- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs +++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs @@ -474,7 +474,7 @@ public class UserService : IUserService var record = id.Contains("@") ? db.GetUserByEmail(id) : db.GetUserByUserName(id); if (record == null) { - record = db.GetUserByPhone(id, regionCode: string.IsNullOrWhiteSpace(model.RegionCode) ? "CN" : model.RegionCode); + record = db.GetUserByPhone(id, regionCode: (string.IsNullOrWhiteSpace(model.RegionCode) ? "CN" : model.RegionCode)); } if (record == null) @@ -647,7 +647,7 @@ public class UserService : IUserService if (!string.IsNullOrEmpty(user.Phone)) { - record = db.GetUserByPhone(user.Phone); + record = db.GetUserByPhone(user.Phone, regionCode: (string.IsNullOrWhiteSpace(user.RegionCode) ? "CN" : user.RegionCode)); } if (record == null) From ff51e81b6d58d96a7668c1516ed4f4f83ad0a663 Mon Sep 17 00:00:00 2001 From: AnonymousDotNet <18776095145@163.com> Date: Fri, 6 Dec 2024 17:59:08 +0800 Subject: [PATCH 4/5] fix: add regionCode for ModifyUserPhone API --- src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs index 468de184..03d983ba 100644 --- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs +++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs @@ -696,7 +696,7 @@ public class UserService : IUserService var curUser = await GetMyProfile(); var db = _services.GetRequiredService(); var record = db.GetUserById(curUser.Id); - var existPhone = db.GetUserByPhone(phone); + var existPhone = db.GetUserByPhone(phone, regionCode: regionCode); if (record == null || (existPhone != null && existPhone.RegionCode == regionCode)) { From 117cbd7865d76b92b212dfb701a0a41bb8c435ce Mon Sep 17 00:00:00 2001 From: AnonymousDotNet <18776095145@163.com> Date: Fri, 6 Dec 2024 18:21:34 +0800 Subject: [PATCH 5/5] fix: add regionCode for GetUserByPhone API --- src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs index 03d983ba..cb451e26 100644 --- a/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs +++ b/src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs @@ -62,7 +62,7 @@ public class UserService : IUserService if (!string.IsNullOrWhiteSpace(user.Phone)) { - record = db.GetUserByPhone(user.Phone); + record = db.GetUserByPhone(user.Phone, regionCode: (string.IsNullOrWhiteSpace(user.RegionCode) ? "CN" : user.RegionCode)); } if (record == null && !string.IsNullOrWhiteSpace(user.Email))