Merge branch 'master' of https://github.com/Qtoss-AI/BotSharp

Author: Oceania2018

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs

@@ -173,12 +173,14 @@ public async Task<Conversation> GetConversationRecordOrCreateNew(string agentId)
             var state = _services.GetRequiredService<IConversationStateService>();
             var channel = state.GetState("channel");
             var channelId = state.GetState("channel_id");
+            var userId = state.GetState("current_user_id");
             var sess = new Conversation
             {
                 Id = _conversationId,
                 Channel = channel,
                 ChannelId = channelId,
-                AgentId = agentId
+                AgentId = agentId,
+                UserId = userId,
             };
             converation = await NewConversation(sess);
         }

src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs

@@ -570,7 +570,7 @@ public async Task<bool> SendVerificationCodeResetPasswordNoLogin(User user)
 
         if (!string.IsNullOrEmpty(user.Phone))
         {
-            record = db.GetUserByPhone(user.Phone);
+            record = db.GetUserByPhone(user.Phone, regionCode: user.RegionCode);
         }
 
         if (!string.IsNullOrEmpty(user.Email))
@@ -745,7 +745,7 @@ public async Task<bool> AddDashboardConversation(string userId, string conversat
         await Task.CompletedTask;
         return true;
     }
-    
+
     public async Task<bool> RemoveDashboardConversation(string userId, string conversationId)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();