feat: 新增服务号注册授权页面并优化注册提示信息

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/FuwuhaoService.cs

@@ -179,6 +179,7 @@ public class FuwuhaoService : ApplicationService
                 {
                     throw new ApplicationException("获取用户id异常，请重试");
                 }
+
                 var loginInfo = await _accountService.PostLoginAsync(cache.UserId!.Value);
                 output.Token = loginInfo.Token;
                 output.RefreshToken = loginInfo.RefreshToken;
@@ -194,19 +195,35 @@ public class FuwuhaoService : ApplicationService
     /// <param name="code"></param>
     /// <returns></returns>
     [HttpGet("fuwuhao/register")]
-    public async Task<string> RegisterByCodeAsync([FromQuery] string code)
+    public async Task<IActionResult> RegisterByCodeAsync([FromQuery] string code)
+    {
+        var message = await RegisterByCodeForMessageAsync(code);
+        //var message = "恭喜注册";
+        var filePath = Path.Combine("wwwroot", "aihub", "auth.html");
+        var html = await File.ReadAllTextAsync(filePath);
+        var result = new ContentResult
+        {
+            Content = html.Replace("{{message}}", message),
+            ContentType = "text/html",
+            StatusCode = 200
+        };
+        return result;
+    }
+
+
+    private async Task<string> RegisterByCodeForMessageAsync(string code)
     {
         //根据code获取到openid、微信用户昵称、头像
         var userInfo = await _fuwuhaoManager.GetUserInfoByCodeAsync(code);
         if (userInfo is null)
         {
-            return "当前注册已经失效，请重新扫码注册";
+            return "当前注册已经失效，请重新扫码注册！";
         }
 
         var scene = await _openIdToSceneCache.GetAsync($"{FuwuhaoConst.OpenIdToSceneCacheKey}{userInfo.OpenId}");
         if (scene is null)
         {
-            return "当前注册已经过期，请重新扫码注册";
+            return "当前注册已经过期，请重新扫码注册！";
         }
 
         var files = new FormFileCollection();
@@ -230,23 +247,32 @@ public class FuwuhaoService : ApplicationService
         var result = await _fileService.Post(files);
 
         //由于存在查询/编辑在同一个事务操作，上锁防止并发
-        await using (await DistributedLock.AcquireLockAsync($"fuwuhao:RegisterLock:{userInfo.OpenId}", TimeSpan.FromMinutes(1)))
+        await using (await DistributedLock.AcquireLockAsync($"fuwuhao:RegisterLock:{userInfo.OpenId}",
+                         TimeSpan.FromMinutes(1)))
         {
             if (await _userRepository.IsAnyAsync(x => x.FuwuhaoOpenId == userInfo.OpenId))
             {
-                throw new UserFriendlyException("你已注册过意社区账号");
+                return "你已注册过意社区账号！";
             }
 
-
-            var userId = await _accountService.PostSystemRegisterAsync(new RegisterDto
+            Guid userId;
+            try
             {
-                UserName = $"wx{Random.Shared.Next(100000, 999999)}",
-                Password = Guid.NewGuid().ToString("N"),
-                Phone = null,
-                Email = null,
-                Nick = userInfo.Nickname,
-                Icon = result.FirstOrDefault()?.Id.ToString()
-            });
+                userId = await _accountService.PostSystemRegisterAsync(new RegisterDto
+                {
+                    UserName = $"wx{Random.Shared.Next(100000, 999999)}",
+                    Password = Guid.NewGuid().ToString("N"),
+                    Phone = null,
+                    Email = null,
+                    Nick = userInfo.Nickname,
+                    Icon = result.FirstOrDefault()?.Id.ToString()
+                });
+            }
+            catch (UserFriendlyException e)
+            {
+                return e.Message;
+            }
+
 
             await _userRepository.InsertAsync(new AiUserExtraInfoEntity(userId, userInfo.OpenId));
             await _sceneCache.SetAsync($"{FuwuhaoConst.SceneCacheKey}{scene}", new SceneCacheDto
@@ -257,7 +283,7 @@ public class FuwuhaoService : ApplicationService
                 new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(120) });
         }
 
-        return "恭喜你已注册成功意社区账号！";
+        return "恭喜你成功注册意社区账号！";
     }
 }
 

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs

@@ -313,7 +313,7 @@ namespace Yi.Framework.Rbac.Domain.Managers
             {
                 if (handle is null)
                 {
-                    throw new UserFriendlyException($"{userName}用户正在注册中，请稍等");
+                    throw new UserFriendlyException($"{userName}用户正在注册中，请稍等。。。");
                 }
 
                 var userUpName = userName.ToUpper();