From aa1ef61e6e5ac715139ea2d5649df44229aa1f54 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 16 Mar 2022 17:38:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEtoken=E6=9F=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/ptos_tall/bean/vo/UserVo.java    |  9 +++++++++
 .../com/ccsens/ptos_tall/service/UserService.java    | 12 +++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/UserVo.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/UserVo.java
index 320b38f..f1bbd6a 100644
--- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/UserVo.java
+++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/UserVo.java
@@ -81,8 +81,17 @@ public class UserVo {
         private String token;
         @ApiModelProperty("刷新token")
         private String refreshToken;
+        @ApiModelProperty("性别 偶数--女 奇数--男")
+        private byte gender;
+        @ApiModelProperty("国家")
+        private String country;
+        @ApiModelProperty("省份")
+        private String province;
+        @ApiModelProperty("城市")
+        private String city;
     }
 
+
     @Data
     @ApiModel("生成关注公众号二维码")
     public static class AttentionOfficial{
diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java
index 6d5f4fc..fa0e5d2 100644
--- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java
+++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java
@@ -1,5 +1,6 @@
 package com.ccsens.ptos_tall.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
@@ -440,12 +441,10 @@ public class UserService implements IUserService {
         if(ObjectUtil.isNull(sysUser)){
             throw new BaseException(CodeEnum.NOT_LOGIN);
         }
-        userInfo.setId(sysUser.getId());
+
         //获取用户信息
-        userInfo.setAvatarUrl(sysUser.getAvatarUrl());
+        BeanUtil.copyProperties(sysUser,userInfo);
         userInfo.setUserName(sysUser.getName());
-        userInfo.setAuthType(sysUser.getAuthType());
-
         //查找手机号
         userInfo.setPhone(sysAuthDao.getPhoneByUserId(Long.valueOf(claims.getSubject())));
 
@@ -467,8 +466,7 @@ public class UserService implements IUserService {
             SysUser sysUser = sysUserDao.getVisitorUser(params.getDeviceId());
             log.info("查找deviceId用户：{}" ,sysUser);
             if(ObjectUtil.isNotNull(sysUser)){
-                userInfo.setId(sysUser.getId());
-                userInfo.setAvatarUrl(sysUser.getAvatarUrl());
+                BeanUtil.copyProperties(sysUser,userInfo);
                 userInfo.setUserName(sysUser.getName());
             }else {
                 //以前没有关联用户则新建一个
@@ -479,7 +477,7 @@ public class UserService implements IUserService {
                 sysUserDao.insertSelective(sysUser);
                 userInfo.setId(sysUser.getId());
             }
-            userInfo.setAuthType(sysUser.getAuthType());
+//            userInfo.setAuthType(sysUser.getAuthType());
             //添加登录记录
             saveSigninLog(sysUser.getId(), 0L,params.getDeviceId(), params.getClientType(),params.getClientIp());
             //重新生成token