用户角色重命名初步修改

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -130,7 +130,7 @@ namespace IRaCIS.Api.Controllers
                 //验证MFA 编码是否有问题 ,前端要拆开，自己调用验证的逻辑
                 //await _userService.VerifyMFACodeAsync(userId, loginUser.MFACode);
 
-                //var loginUser = await _userRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+                //var loginUser = await _userRoleRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
                 var basicInfo = await _userService.GetUserBasicInfo(userId, loginUser.Password);
 
@@ -375,7 +375,7 @@ namespace IRaCIS.Api.Controllers
 
         [HttpGet("User/UserRedirect")]
         [AllowAnonymous]
-        public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository, string url, [FromServices] ILogger<ExtraController> _logger)
+        public async Task<IActionResult> UserRedirect([FromServices] IRepository<UserRole> _userRoleRepository, string url, [FromServices] ILogger<ExtraController> _logger)
         {
 
             var decodeUrl = System.Web.HttpUtility.UrlDecode(url);
@@ -391,7 +391,7 @@ namespace IRaCIS.Api.Controllers
             var errorUrl = domainStrList[0] + "//" + domainStrList[2] + "/error";
 
 
-            if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
+            if (!await _userRoleRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
             {
                 decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.    Return")} ";
             }

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -370,7 +370,7 @@ namespace IRaCIS.Core.API.Controllers
                         //await _uploadHub.Clients.All.ReceivProgressAsync(archiveStudyCommand.StudyInstanceUid, receivedCount);
 
 
-                        await _uploadHub.Clients.User(_userInfo.Id.ToString()).ReceivProgressAsync(archiveStudyCommand.StudyInstanceUid, receivedCount);
+                        await _uploadHub.Clients.User(_userInfo.UserRoleId.ToString()).ReceivProgressAsync(archiveStudyCommand.StudyInstanceUid, receivedCount);
 
                         archiveResult.ReceivedFileCount = receivedCount;