center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #3244 from dataease/pr@dev@fix_lark_qr_login

Browse Source 
fix(登录): 飞书扫码登录
This commit is contained in:
xuwei-fit2cloud 2022-09-28 18:30:22 +08:00 committed by GitHub
commit 482b0971bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/plugins/server/XLarkServer.java
View File

@ -94,15 +94,14 @@ public class XLarkServer {
if (!isOpen) { if (!isOpen) {
DEException.throwException("未开启飞书"); DEException.throwException("未开启飞书");
} }
LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state); LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state, false);
String username = larkUserInfo.getUser_id(); String username = larkUserInfo.getUser_id();
String sub = larkUserInfo.getSub(); SysUserEntity sysUserEntity = authUserService.getUserByLarkId(username);
SysUserEntity sysUserEntity = authUserService.getUserByLarkId(sub);
if (null == sysUserEntity) { if (null == sysUserEntity) {
String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@lark.work"); String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@lark.work");
sysUserService.validateExistUser(username, larkUserInfo.getName(), email); sysUserService.validateExistUser(username, larkUserInfo.getName(), email);
sysUserService.saveLarkCUser(larkUserInfo, email); sysUserService.saveLarkCUser(larkUserInfo, email);
sysUserEntity = authUserService.getUserByLarkId(sub); sysUserEntity = authUserService.getUserByLarkId(username);
} }
TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build(); TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build();
String realPwd = sysUserEntity.getPassword(); String realPwd = sysUserEntity.getPassword();
@ -171,7 +170,7 @@ public class XLarkServer {
DEException.throwException("未开启飞书"); DEException.throwException("未开启飞书");
} }
larkXpackService = SpringContextUtil.getBean(LarkXpackService.class); larkXpackService = SpringContextUtil.getBean(LarkXpackService.class);
LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state); LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state, true);
String userId = larkUserInfo.getUser_id(); String userId = larkUserInfo.getUser_id();