Просмотр исходного кода

修复关闭全局多租户模式无法登录问题

zuohuaijun 3 лет назад
Родитель
Сommit
0e2561a482

+ 1 - 1
Admin.NET/Admin.NET.Core/Enum/ErrorCodeEnum.cs

@@ -81,7 +81,7 @@ public enum ErrorCodeEnum
     /// <summary>
     /// 非法数据
     /// </summary>
-    [ErrorCodeItemMetadata("非法数据")]
+    [ErrorCodeItemMetadata("非法操作,未登录")]
     D1011,
 
     /// <summary>

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -83,7 +83,7 @@ public class SysAuthService : IDynamicApiController, ITransient
         var accessToken = JWTEncryption.Encrypt(new Dictionary<string, object>
         {
             {ClaimConst.UserId, user.Id},
-            {ClaimConst.TenantId, input.TenantId},
+            {ClaimConst.TenantId, user.TenantId},
             {ClaimConst.Account, user.Account},
             {ClaimConst.RealName, user.RealName},
             {ClaimConst.AccountType, user.AccountType },
@@ -113,7 +113,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     [HttpGet("/userInfo")]
     public async Task<LoginUserOutput> GetUserInfo()
     {
-        var user = _sysUserRep.GetFirst(u => u.Id == _userManager.UserId);
+        var user = await _sysUserRep.GetFirstAsync(u => u.Id == _userManager.UserId);
         if (user == null)
             throw Oops.Oh(ErrorCodeEnum.D1011);