Merge branch 'Test_IRC_Net8' into Uat_IRC_Net8

修改发放token
修改邮件多了IR
2025-01-20 11:12:09 +08:00 · 2025-01-20 11:09:55 +08:00 · 2025-01-20 10:44:27 +08:00 · 2025-01-18 22:55:22 +08:00
4 changed files with 4 additions and 3 deletions
--- a/IRaCIS.Core.API/Controllers/ExtraController.cs
+++ b/IRaCIS.Core.API/Controllers/ExtraController.cs
@ -122,7 +122,7 @@ namespace IRaCIS.Api.Controllers
        {
            var token = _tokenService.GetToken(new UserTokenInfo()
            {
-                UserRoleId = Guid.NewGuid(),
+                IdentityUserId = Guid.NewGuid(),
                UserName = "Share001",
                UserTypeEnum = UserTypeEnum.ShareImage,

--- a/IRaCIS.Core.Application/Service/Common/MailService.cs
+++ b/IRaCIS.Core.Application/Service/Common/MailService.cs
@ -660,7 +660,7 @@ namespace IRaCIS.Core.Application.Service
                    trialInfo.ResearchProgramNo,
                    trialInfo.TrialCode,
                    sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName,
-                    $"{userType.UserTypeShortName} ({userType.UserTypeName})",
+                    userType.UserTypeName,
                    sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                    );

--- a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs
@ -104,7 +104,7 @@ namespace IRaCIS.Core.Application.Services
                StudyId = imageShare.StudyId,
                Token = _tokenService.GetToken(new UserTokenInfo()
                {
-                    UserRoleId = Guid.NewGuid(),
+                    IdentityUserId = Guid.NewGuid(),
                    FullName = "Share001",
                    UserName = "Share001",
                    UserTypeEnum = UserTypeEnum.ShareImage,
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@ -672,6 +672,7 @@ namespace IRaCIS.Core.Application.Contracts
                TrialSiteSurveyId = currentEntity!.Id,
                Token = _tokenService.GetToken(new UserTokenInfo()
                {
+                    IdentityUserId=Guid.NewGuid(),
                    UserRoleId = Guid.NewGuid(),
                    UserName = "SiteSurvey",
                    UserTypeEnum = UserTypeEnum.Undefined,
Author	SHA1	Message	Date
hang	036565ec81	Merge branch 'Test_IRC_Net8' into Uat_IRC_Net8 continuous-integration/drone/push Build is passing Details	2025-01-20 11:12:09 +08:00
hang	a2225d7cba	修改发放token continuous-integration/drone/push Build is passing Details	2025-01-20 11:09:55 +08:00
hang	3463b69b78	修改邮件多了IR continuous-integration/drone/push Build is passing Details	2025-01-20 10:44:27 +08:00
he	d930d51d0d	修改查询问题 continuous-integration/drone/push Build is passing Details	2025-01-18 22:55:22 +08:00