From 2a2419af900d280f102f6dd05d38ef0529b5d04e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 10 Oct 2025 14:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8C=BF=E5=90=8D=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=EF=BC=8C=E9=80=80=E5=87=BA=E8=B4=A6=E5=8F=B7=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRC.Core.SCP/IRC.Core.SCP.csproj | 6 +++---
IRaCIS.Core.API/Controllers/ExtraController.cs | 2 +-
.../Service/Management/UserService.cs | 14 ++++++++++++--
.../Service/SiteSurvey/TrialSiteSurveyService.cs | 5 +++--
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/IRC.Core.SCP/IRC.Core.SCP.csproj b/IRC.Core.SCP/IRC.Core.SCP.csproj
index 999a17361..ca9724a3b 100644
--- a/IRC.Core.SCP/IRC.Core.SCP.csproj
+++ b/IRC.Core.SCP/IRC.Core.SCP.csproj
@@ -14,9 +14,9 @@
-
-
-
+
+
+
diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs
index d072ef029..5859710db 100644
--- a/IRaCIS.Core.API/Controllers/ExtraController.cs
+++ b/IRaCIS.Core.API/Controllers/ExtraController.cs
@@ -126,7 +126,7 @@ namespace IRaCIS.Api.Controllers
var token = _tokenService.GetToken(new UserTokenInfo()
{
IdentityUserId = Guid.NewGuid(),
- UserName = "Share001",
+ UserName = "ImageShare",
UserTypeEnum = UserTypeEnum.ShareImage,
});
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index f602ec53e..971eefe6b 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -917,9 +917,19 @@ namespace IRaCIS.Core.Application.Service
{
await _fusionCache.RemoveAsync(CacheKeys.UserToken(identityUserId));
- var userName = await _userRoleRepository.Where(t => t.Id == userRoleId).Select(t => t.IdentityUser.UserName).FirstOrDefaultAsync();
+ if (_identityUserRepository.Any(t => t.Id == identityUserId))
+ {
+
+ var userName = await _userRoleRepository.Where(t => t.Id == userRoleId).Select(t => t.IdentityUser.UserName).FirstOrDefaultAsync();
+
+ await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = identityUserId, ActionUserName = userName, OptType = UserOptType.LoginOut }, true);
+ }
+ else
+ {
+ await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = null, ActionUserName = _userInfo.UserName, OptType = UserOptType.LoginOut }, true);
+ }
+
- await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = identityUserId, ActionUserName = userName, OptType = UserOptType.LoginOut }, true);
return ResponseOutput.Ok();
}
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index c2a4bf479..81b3e9ca6 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -257,7 +257,7 @@ namespace IRaCIS.Core.Application.Contracts
result.ReviewStatus = info.ReviewStatus;
}
- result.Token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = Guid.NewGuid() });
+ result.Token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = Guid.NewGuid(), UserName = $"Reviewer_{inDto.EmailOrPhone}" });
}
}
@@ -678,8 +678,9 @@ namespace IRaCIS.Core.Application.Contracts
Token = _tokenService.GetToken(new UserTokenInfo()
{
IdentityUserId = Guid.NewGuid(),
+
UserRoleId = Guid.NewGuid(),
- UserName = "SiteSurvey",
+ UserName = $"SiteSurvey_{currentEntity.Email}",
UserTypeEnum = UserTypeEnum.Undefined,
})
});