modify(login): 修改登录返回对象，新增返回用户信息

backend/IM_API/Controllers/AuthController.cs

@@ -1,4 +1,5 @@
-using IM_API.Dtos;
+using AutoMapper;
+using IM_API.Dtos;
 using IM_API.Interface.Services;
 using IM_API.Tools;
 using Microsoft.AspNetCore.Http;
@@ -17,7 +18,12 @@ namespace IM_API.Controllers
         private readonly IJWTService _jwtService;
         private readonly IRefreshTokenService _refreshTokenService;
         private readonly IConfiguration _configuration;
-        public AuthController(ILogger<AuthController> logger, IAuthService authService, IJWTService jwtService, IRefreshTokenService refreshTokenService, IConfiguration configuration,IUserService userService)
+        private IMapper _mapper;
+        public AuthController(ILogger<AuthController> logger, IAuthService authService, 
+            IJWTService jwtService, IRefreshTokenService refreshTokenService, 
+            IConfiguration configuration,IUserService userService,
+            IMapper mapper
+            )
         {
             _logger = logger;
             _authService = authService;
@@ -25,16 +31,18 @@ namespace IM_API.Controllers
             _refreshTokenService = refreshTokenService;
             _configuration = configuration;
             _userService = userService;
+            _mapper = mapper;
         }
         [HttpPost]
         public async Task<IActionResult> Login(LoginRequestDto dto)
         {
             var user = await _authService.LoginAsync(dto);
+            var userInfo = _mapper.Map<UserInfoDto>(user);
             //生成凭证
             (string token,DateTime expiresAt) = _jwtService.CreateAccessTokenForUser(user.Id,user.Username,"user");
             //生成刷新凭证
             string refreshToken = await _refreshTokenService.CreateRefreshTokenAsync(user.Id);
-            var res = new BaseResponse<LoginDto>(new LoginDto(user.Id,token,refreshToken,expiresAt));
+            var res = new BaseResponse<LoginDto>(new LoginDto(userInfo,token,refreshToken, expiresAt));
             return Ok(res);
         }
         [HttpPost]
@@ -55,7 +63,7 @@ namespace IM_API.Controllers
             }
             var userinfo = await _userService.GetUserInfoAsync(userId);
             (string token,DateTime expiresAt) = _jwtService.CreateAccessTokenForUser(userinfo.Id,userinfo.Username,"user");
-            var res = new BaseResponse<LoginDto>(new LoginDto(userinfo.Id,token,dto.refreshToken,expiresAt));
+            var res = new BaseResponse<LoginDto>(new LoginDto(userinfo,token, dto.refreshToken, expiresAt));
             return Ok(res);
         }
     }

backend/IM_API/Dtos/LoginDto.cs

@@ -2,12 +2,12 @@
 {
     public class LoginDto
     {
-        public int Id { get; set; }
+        public UserInfoDto userInfo { get; set; }
         public string Token { get; set; }
         public string RefreshToken { get; set; }
         public DateTime ExpireAt { get; set; }
-        public LoginDto(int id,string token,string refreshToken,DateTime expireAt) { 
-            this.Id = id;
+        public LoginDto(UserInfoDto userInfo,string token, string refreshToken, DateTime expireAt) { 
+            this.userInfo = userInfo;
             this.Token = token;
             this.RefreshToken = refreshToken;
             this.ExpireAt = expireAt;

backend/IM_API/Filters/GlobalExceptionFilter.cs

@@ -0,0 +1,38 @@
+using IM_API.Dtos;
+using IM_API.Exceptions;
+using IM_API.Tools;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace IM_API.Filters
+{
+    public class GlobalExceptionFilter : IExceptionFilter
+    {
+        private readonly ILogger<GlobalExceptionFilter> _logger;
+        public GlobalExceptionFilter(ILogger<GlobalExceptionFilter> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnException(ExceptionContext context)
+        {
+            if(context.Exception is BaseException)
+            {
+                var exception = (BaseException)context.Exception;
+                BaseResponse<object?> res = new BaseResponse<object?>(
+                        code:exception.Code,
+                        message: exception.Message,
+                        data:null
+                    );
+                context.Result = new JsonResult(res);
+            }
+            else
+            {
+                _logger.LogError(context.Exception,context.Exception.Message);
+                BaseResponse<object?> res = new BaseResponse<object?>(CodeDefine.SYSTEM_ERROR);
+                context.Result = new JsonResult(res);
+            }
+                context.ExceptionHandled = true;
+        }
+    }
+}

backend/IM_API/Program.cs

@@ -1,5 +1,6 @@
 
 using IM_API.Configs;
+using IM_API.Filters;
 using IM_API.Hubs;
 using IM_API.Models;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
@@ -97,7 +98,10 @@ namespace IM_API
                         }
                     };
                 });
-            builder.Services.AddControllers();
+            builder.Services.AddControllers(options =>
+            {
+                options.Filters.Add<GlobalExceptionFilter>();
+            });
             // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
             builder.Services.AddEndpointsApiExplorer();
             builder.Services.AddSwaggerGen();