From ff226c65141a9de6f8428ee241a8b6d9f3bf0527 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 28 Sep 2022 18:25:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E9=A3=9E=E4=B9=A6?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/plugins/server/XLarkServer.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java index 77553bbb4d..9f51798be4 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java @@ -94,15 +94,14 @@ public class XLarkServer { if (!isOpen) { DEException.throwException("未开启飞书"); } - LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state); + LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state, false); String username = larkUserInfo.getUser_id(); - String sub = larkUserInfo.getSub(); - SysUserEntity sysUserEntity = authUserService.getUserByLarkId(sub); + SysUserEntity sysUserEntity = authUserService.getUserByLarkId(username); if (null == sysUserEntity) { String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@lark.work"); sysUserService.validateExistUser(username, larkUserInfo.getName(), email); sysUserService.saveLarkCUser(larkUserInfo, email); - sysUserEntity = authUserService.getUserByLarkId(sub); + sysUserEntity = authUserService.getUserByLarkId(username); } TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build(); String realPwd = sysUserEntity.getPassword(); @@ -171,7 +170,7 @@ public class XLarkServer { DEException.throwException("未开启飞书"); } larkXpackService = SpringContextUtil.getBean(LarkXpackService.class); - LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state); + LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state, true); String userId = larkUserInfo.getUser_id();