From e25d37f0a5c775c5f5250a34c1e702cdd4bd53af Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Mon, 22 Apr 2024 20:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/kqapi/security/password/UsernamePasswordAuthFilter.java | 1 +
 .../src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java | 2 ++
 .../java/com/ningdatech/kqapi/user/model/vo/LoginUserDetailVO.java     | 3 +++
 .../src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java   | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/security/password/UsernamePasswordAuthFilter.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/security/password/UsernamePasswordAuthFilter.java
index 05ca02d..2a7f2a4 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/security/password/UsernamePasswordAuthFilter.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/security/password/UsernamePasswordAuthFilter.java
@@ -49,6 +49,7 @@ public class UsernamePasswordAuthFilter extends AbstractAuthenticationProcessing
         } catch (BadCredentialsException | UsernameNotFoundException e) {
             throw e;
         } catch (Exception e) {
+            logger.error("登录失败：", e);
             throw BizException.wrap("登录失败，请联系管理员！");
         }
     }
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java
index e56d14f..a212e98 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java
@@ -165,6 +165,7 @@ public class UserInfoManage {
             UserListVO res = new UserListVO();
             res.setUserId(r.getId());
             res.setRealName(r.getRealName());
+            res.setUserName(r.getUsername());
             res.setCreateTime(r.getCreateOn());
             res.setPhoneNo(r.getMobile());
             res.setAccountStatus(r.getAccountStatus());
@@ -178,6 +179,7 @@ public class UserInfoManage {
         LoginUserDetailVO result = new LoginUserDetailVO();
         result.setUserId(details.getUserId());
         result.setRealName(details.getRealName());
+        result.setUserName(details.getIdentifier());
         return result;
     }
 
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/LoginUserDetailVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/LoginUserDetailVO.java
index f914631..733524a 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/LoginUserDetailVO.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/LoginUserDetailVO.java
@@ -19,6 +19,9 @@ public class LoginUserDetailVO {
     @ApiModelProperty("用户id")
     private Long userId;
 
+    @ApiModelProperty("用户名")
+    private String userName;
+
     @ApiModelProperty("用户真实姓名")
     private String realName;
 
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java
index 19cbcee..fde7081 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java
@@ -23,6 +23,9 @@ public class UserListVO {
     @ApiModelProperty("用户id")
     private Long userId;
 
+    @ApiModelProperty("用户名")
+    private String userName;
+
     @ApiModelProperty("用户姓名")
     private String realName;