修改查询语句

src/main/java/com/four/system/controller/SysUserController.java

@@ -111,10 +111,10 @@ public class SysUserController extends BaseController
      * 获取当前用户信息
      */
     @InnerAuth
-    @GetMapping("/info/{username}")
+    @GetMapping("/info/{email}")
-    public R<LoginUser> info(@PathVariable("username") String username)
+    public R<LoginUser> info(@PathVariable("email") String email)
     {
-        SysUser sysUser = userService.selectUserByUserName(username);
+        SysUser sysUser = userService.selectUserByUserName(email);
         if (StringUtils.isNull(sysUser))
         {
             return R.fail("用户名或密码错误");

src/main/java/com/four/system/domain/SysUserOnline.java

@@ -22,6 +22,8 @@ public class SysUserOnline
     /** 浏览器类型 */
     private String browser;
 
+    private String email;
+
     /** 操作系统 */
     private String os;
 
@@ -43,6 +45,15 @@ public class SysUserOnline
         return userName;
     }
 
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
     public void setUserName(String userName)
     {
         this.userName = userName;

src/main/java/com/four/system/mapper/SysUserMapper.java

@@ -38,10 +38,10 @@ public interface SysUserMapper
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param email 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName(String userName);
+    public SysUser selectUserByUserName(String email);
 
     /**
      * 通过用户ID查询用户

src/main/java/com/four/system/service/ISysUserService.java

@@ -37,10 +37,10 @@ public interface ISysUserService
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param email 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName(String userName);
+    public SysUser selectUserByUserName(String email);
 
     /**
      * 通过用户ID查询用户

src/main/java/com/four/system/service/impl/SysUserServiceImpl.java

@@ -103,13 +103,13 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param email 用户名
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserByUserName(String userName)
+    public SysUser selectUserByUserName(String email)
     {
-        return userMapper.selectUserByUserName(userName);
+        return userMapper.selectUserByUserName(email);
     }
 
     /**

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9201
+  port: 9209
 
 # Spring
 spring:
@@ -15,11 +15,14 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.252.165:8848
+        namespace: xiaoxu
       config:
         # 配置中心地址
         server-addr: 101.34.252.165:8848
+        namespace: xiaoxu
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+

src/main/resources/mapper/system/SysUserMapper.xml

@@ -48,6 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<sql id="selectUserVo">
 		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+			   u.user_sign,
+			   u.bind_wechat_status,
+			   u.real_name_authentication_status,
+			   u.bind_bank_card_status,
+			   u.user_money,
+			   u.invitation_code,
+			   u.differential_state,
 			   d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
 			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
 		from sys_user u
@@ -122,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
+		where u.email = #{email} and u.del_flag = '0'
 	</select>
 
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">