Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/Controllers/UserController.cs

@@ -102,7 +102,7 @@ public class UserController : BaseController
     {
         var (total, items) = await _userRepository.Queryable(includeDeleted: true)
              .Includes(d => d.Account)
-             .Includes(d=>d.Roles)
+             .Includes(d => d.Roles)
              .Includes(d => d.Organization)
              .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                  d => d.Name.Contains(dto.Keyword!) || d.PhoneNo.Contains(dto.Keyword!))
@@ -286,7 +286,7 @@ public class UserController : BaseController
         var result = await _accountDomainService.ResetPasswordAsync(account, dto.CurrentPassword, dto.NewPassword,
              HttpContext.RequestAborted);
         if (!result.Succeeded)
-            throw new UserFriendlyException(string.Join(',', result.Errors.Select(d => d.Description).ToList()));
+            throw UserFriendlyException.SameMessage(string.Join(',', result.Errors.Select(d => d.Description).ToList()));
         account.PasswordChanged = true;
         await _accountRepository.UpdateAsync(account, HttpContext.RequestAborted);
     }
@@ -298,7 +298,7 @@ public class UserController : BaseController
     [HttpPost("initial-pwd/{userId}")]
     public async Task InitialPassword(string userId)
     {
-        var account = await _accountRepository.GetAsync(_sessionContext.RequiredUserId, HttpContext.RequestAborted);
+        var account = await _accountRepository.GetAsync(userId, HttpContext.RequestAborted);
         if (account == null)
             throw UserFriendlyException.SameMessage("无效账号编号");
         await _accountDomainService.InitialPasswordAsync(account, HttpContext.RequestAborted);

src/Hotline.Api/appsettings.Development.json

@@ -54,7 +54,7 @@
     "Expired": 86300 //认证过期时间（秒）
   },
   "ConnectionStrings": {
-    "Hotline": " PORT=5432;DATABASE=hotline;HOST=192.168.100.121;PASSWORD=fengwo11!!;USER ID=dev;",
+    "Hotline": "PORT=5432;DATABASE=hotline;HOST=192.168.100.121;PASSWORD=fengwo11!!;USER ID=dev;",
     "Redis": "192.168.100.223:6379",
     "MongoDB": "mongodb://192.168.100.121:27017"
   },