链接点击一次后端跳转

2022-05-30 11:28:01 +08:00
parent 144f53e809
commit a261605bde
7 changed files with 49 additions and 37 deletions
@@ -18,7 +18,7 @@ namespace IRaCIS.Application.Services

        Task AnolymousSendEmailForResetAccount(string emailAddress, int verificationCode);

-        Task AddUserSendEmailAsync(Guid userId, string routeUrl);
+        Task AddUserSendEmailAsync(Guid userId, string baseUrl, string routeUrl);

        Task AdminResetPwdSendEmailAsync(Guid userId);

@@ -253,8 +253,9 @@ namespace IRaCIS.Application.Services


        //添加用户发送邮件
-        public async Task AddUserSendEmailAsync(Guid userId, string routeUrl)
+        public async Task AddUserSendEmailAsync(Guid userId, string baseUrl, string routeUrl)
        {
+
            var sysUserInfo = (await _userRepository.Where(t => t.Id == userId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();


@@ -281,6 +282,10 @@ namespace IRaCIS.Application.Services
            await _userRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new User() { EmailToken = token });

            routeUrl = routeUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&access_token=" + token;
+         
+            var domain=baseUrl.Substring(0,baseUrl.IndexOf("/login"));
+
+            var redirectUrl = $"{domain}/api/User/UserRedirect?url={ System.Web.HttpUtility.UrlEncode(routeUrl) }";

            using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
            {
@@ -291,7 +296,7 @@ namespace IRaCIS.Application.Services
                   sysUserInfo.FullName,
                   sysUserInfo.UserName,
                   sysUserInfo.UserTypeRole.UserTypeShortName,
-                    routeUrl
+                    redirectUrl
                    );
            }

@@ -389,6 +394,10 @@ namespace IRaCIS.Application.Services

                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&access_token=" + token;

+                var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
+
+                var redirectUrl = $"{domain}/api/User/UserRedirect?url={ System.Web.HttpUtility.UrlEncode(routeUrl) }";
+
                builder.HtmlBody = string.Format(templateInfo,
                    sysUserInfo.FullName,
                    trialInfo.ExperimentName,
@@ -396,7 +405,7 @@ namespace IRaCIS.Application.Services
                    trialInfo.TrialCode,
                    sysUserInfo.UserName,
                    sysUserInfo.UserTypeRole.UserTypeShortName,
-                    sysUserInfo.IsFirstAdd ? routeUrl : baseUrl
+                    sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                    );
            }

@@ -443,8 +452,12 @@ namespace IRaCIS.Application.Services
            {
                var templateInfo = SourceReader.ReadToEnd();

+                var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
+
                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&access_token=" + token;

+                var redirectUrl = $"{domain}/api/User/UserRedirect?url={ System.Web.HttpUtility.UrlEncode(routeUrl) }";
+
                builder.HtmlBody = string.Format(templateInfo,
                    sysUserInfo.FullName,
                    trialInfo.ExperimentName,
@@ -452,7 +465,7 @@ namespace IRaCIS.Application.Services
                    trialInfo.TrialCode,
                   sysUserInfo.UserName,
                    sysUserInfo.UserTypeRole.UserTypeShortName,
-                   sysUserInfo.IsFirstAdd ? routeUrl : baseUrl
+                   sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                    );
            }