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

Merge pull request #3049 from dataease/pr@dev@fix_dingtalk_login

Browse Source 
fix(登录): 钉钉扫码登录失败
This commit is contained in:
fit2cloud-chenyw 2022-09-06 18:12:27 +08:00 committed by GitHub
commit d4b2ac94a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ public class XDingtalkServer {
DEException.throwException("未开启钉钉"); DEException.throwException("未开启钉钉");
} }
DingUserEntity dingUserEntity = dingtalkXpackService.userInfo(code); DingUserEntity dingUserEntity = dingtalkXpackService.userInfo(code);
String username = dingUserEntity.getUserId(); String username = dingUserEntity.getUserid();
String unionid = dingUserEntity.getUnionid(); String unionid = dingUserEntity.getUnionid();
SysUserEntity sysUserEntity = authUserService.getUserBySub(unionid, 5); SysUserEntity sysUserEntity = authUserService.getUserBySub(unionid, 5);
if (null == sysUserEntity) { if (null == sysUserEntity) {

17
backend/src/main/java/io/dataease/service/sys/SysUserService.java
View File

@ -147,13 +147,7 @@ public class SysUserService {
sysUser.setIsAdmin(false); sysUser.setIsAdmin(false);
sysUser.setSub(userId); sysUser.setSub(userId);
sysUserMapper.insert(sysUser); sysUserMapper.insert(sysUser);
SysUser dbUser = findOne(sysUser);
if (null != dbUser && null != dbUser.getUserId()) {
// 默认角色是普通员工
List<Long> roleIds = new ArrayList<Long>();
roleIds.add(2L);
saveUserRoles( dbUser.getUserId(), roleIds);
}
} }
@Transactional @Transactional
@ -161,7 +155,7 @@ public class SysUserService {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setUsername(dingUserEntity.getUserId()); sysUser.setUsername(dingUserEntity.getUserid());
sysUser.setNickName(dingUserEntity.getName()); sysUser.setNickName(dingUserEntity.getName());
sysUser.setEmail(email); sysUser.setEmail(email);
sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD)); sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD));
@ -175,12 +169,7 @@ public class SysUserService {
sysUser.setSub(dingUserEntity.getUnionid()); sysUser.setSub(dingUserEntity.getUnionid());
sysUser.setPhone(dingUserEntity.getMobile()); sysUser.setPhone(dingUserEntity.getMobile());
sysUserMapper.insert(sysUser); sysUserMapper.insert(sysUser);
SysUser dbUser = findOne(sysUser);
/*if (null != dbUser && null != dbUser.getUserId()) {
List<Long> roleIds = new ArrayList<Long>();
roleIds.add(2L);
saveUserRoles( dbUser.getUserId(), roleIds);
}*/
} }
@Transactional @Transactional