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

Merge pull request #3428 from dataease/pr@dev@perf_larksuite

Browse Source 
perf(平台对接): 优化飞书国际版
This commit is contained in:
dataeaseShu 2022-10-24 17:35:25 +08:00 committed by GitHub
commit 70aba6070e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java
View File

@ -101,7 +101,7 @@ public class XLarksuiteServer {
String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@larksuite.work"); String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@larksuite.work");
sysUserService.validateExistUser(username, larkUserInfo.getName(), email); sysUserService.validateExistUser(username, larkUserInfo.getName(), email);
sysUserService.saveLarksuiteCUser(larkUserInfo, email); sysUserService.saveLarksuiteCUser(larkUserInfo, email);
sysUserEntity = authUserService.getUserByLarkId(username); sysUserEntity = authUserService.getUserByLarksuiteId(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();

5
frontend/src/views/login/index.vue
View File

@ -379,6 +379,11 @@ export default {
this.switchCodeIndex(6) this.switchCodeIndex(6)
} }
this.clearLarkMsg() this.clearLarkMsg()
if (Cookies.get('LarksuiteError')) {
this.$error(Cookies.get('LarksuiteError'))
}
this.clearLarksuiteMsg()
}, },
methods: { methods: {