登录额外返回字段-用户名-用于右上角显示

src/main/java/com/cmeeting/ad/service/UserService.java

@@ -8,7 +8,7 @@ import com.cmeeting.util.R;
 public interface UserService {
     R login(String agentId, String data, String ip);
 
-    String auth(String userId, String nick, String role);
+    Object auth(String userId, String nick, String role);
 
 
     Object tokenAuth(ApplicationUserVO.LoginDecrypt vo);

src/main/java/com/cmeeting/ad/service/impl/UserServiceImpl.java

@@ -80,7 +80,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String auth(String userId, String nick, String role) {
+    public Object auth(String userId, String nick, String role) {
         HashMap<String, String> stringStringHashMap = new HashMap<>();
         stringStringHashMap.put("userId", userId);
         stringStringHashMap.put("tenantId", permissionTenantId);
@@ -92,11 +92,14 @@ public class UserServiceImpl implements UserService {
         SecurityContextHolder.getContext().setAuthentication(authentication);
         RobotSecurityUser userDetail = (RobotSecurityUser) authentication.getPrincipal();
         String token = jwtUtil.generateToken(userDetail);
+        JSONObject ret = new JSONObject();
+        ret.put("token", token);
+        ret.put("name", nick);
 
         redisUtils.set(token, userDetail, Long.parseLong(expireTime));
         // 记录登录日志
         iUserAccessRecordService.save(UserAccessRecord.builder().userId(userId).createTime(new Date()).build());
-        return token;
+        return ret;
     }
 
 
@@ -135,7 +138,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String emailAuth(UserVo.Auth vo) {
+    public Object emailAuth(UserVo.Auth vo) {
         String userId = vo.getId();
         String nick = vo.getNick();
         //时间戳
@@ -158,7 +161,13 @@ public class UserServiceImpl implements UserService {
         RobotSecurityUser userDetail = (RobotSecurityUser) authentication.getPrincipal();
         String token = jwtUtil.generateToken(userDetail);
         redisUtils.set(token, userDetail, expireTimeStamp);
-        return token;
+
+        JSONObject ret = new JSONObject();
+        ret.put("token", token);
+        ret.put("name", nick);
+        // 记录登录日志
+        iUserAccessRecordService.save(UserAccessRecord.builder().userId(userId).createTime(new Date()).build());
+        return ret;
     }
 
     private R loginByAD(ApplicationUserVO.Login login) {