From 992735bec7850f61bd04fbf27c530eaee905620a Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Thu, 19 Oct 2023 17:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E5=90=8D=E4=BC=98?=
 =?UTF-8?q?=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/api/model/LoginUser.java     | 15 ++++++++++++++-
 .../system/service/impl/WxLoginServiceImpl.java   |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
index 2f00e102..352db32d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
@@ -1,8 +1,9 @@
 package com.ruoyi.system.api.model;
 
+import com.ruoyi.system.api.domain.SysUser;
+
 import java.io.Serializable;
 import java.util.Set;
-import com.ruoyi.system.api.domain.SysUser;
 
 /**
  * 用户信息
@@ -27,6 +28,10 @@ public class LoginUser implements Serializable
      * 用户名
      */
     private String username;
+    /**
+     * 微信用户名
+     */
+    private String nickname;
 
     /**
      * 登录时间
@@ -53,6 +58,14 @@ public class LoginUser implements Serializable
      */
     private Set<String> roles;
 
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
     /**
      * 用户信息
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java
index feaff89a..849db740 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java
@@ -289,7 +289,8 @@ public class WxLoginServiceImpl  implements WxLoginService {
         //如果为空，则表示是新用户登录，将该用户写入信息
         if(login==null){
             login=new WxUser();
-            login.setUserName(entity.getUsername());
+            login.setUserName(entity.getNickname());
+            login.setLoginName(entity.getUsername());
 /*            if(StringUtils.isEmpty(entity.getTelephone())){
                 login.setLoginName(entity.getLoginName());
             }else {