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

fix(系统管理-系统参数): 第三方登录平台默认邮箱设置为常量导致报错

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-09-19 16:30:28 +08:00
parent 633f04e604
commit 51539ada88
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ public class XDingtalkServer {
DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class); DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class);
return dingtalkXpackService.info(); return dingtalkXpackService.info();
} }
@ResponseBody @ResponseBody
@RequiresPermissions("sysparam:read") @RequiresPermissions("sysparam:read")
@PostMapping("/save") @PostMapping("/save")
@ -55,16 +56,18 @@ public class XDingtalkServer {
DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class); DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class);
dingtalkXpackService.save(settings); dingtalkXpackService.save(settings);
} }
@ResponseBody @ResponseBody
@PostMapping("/testConn") @PostMapping("/testConn")
public void testConn(@RequestBody DingtalkInfo dingtalkInfo) { public void testConn(@RequestBody DingtalkInfo dingtalkInfo) {
DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class); DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class);
try { try {
dingtalkXpackService.testConn(dingtalkInfo); dingtalkXpackService.testConn(dingtalkInfo);
}catch(Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ResponseBody @ResponseBody
@PostMapping("/getQrParam") @PostMapping("/getQrParam")
public DingQrResult getQrParam() { public DingQrResult getQrParam() {
@ -92,7 +95,7 @@ public class XDingtalkServer {
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) {
String email = StringUtils.isNotBlank(dingUserEntity.getOrg_email()) ? dingUserEntity.getOrg_email() : StringUtils.isNotBlank(dingUserEntity.getEmail()) ? dingUserEntity.getEmail() : "demo@dingtalk.work"; String email = StringUtils.isNotBlank(dingUserEntity.getOrg_email()) ? dingUserEntity.getOrg_email() : StringUtils.isNotBlank(dingUserEntity.getEmail()) ? dingUserEntity.getEmail() : (username + "@dingtalk.work");
sysUserService.validateExistUser(username, dingUserEntity.getName(), email); sysUserService.validateExistUser(username, dingUserEntity.getName(), email);
sysUserService.saveDingtalkCUser(dingUserEntity, email); sysUserService.saveDingtalkCUser(dingUserEntity, email);
sysUserEntity = authUserService.getUserBySub(unionid, 5); sysUserEntity = authUserService.getUserBySub(unionid, 5);

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

@ -96,7 +96,7 @@ public class XLarkServer {
String sub = larkUserInfo.getSub(); String sub = larkUserInfo.getSub();
SysUserEntity sysUserEntity = authUserService.getUserBySub(sub, 6); SysUserEntity sysUserEntity = authUserService.getUserBySub(sub, 6);
if (null == sysUserEntity) { if (null == sysUserEntity) {
String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : "demo@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.getUserBySub(sub, 6); sysUserEntity = authUserService.getUserBySub(sub, 6);

7
backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
View File

@ -49,6 +49,7 @@ public class XWecomServer {
WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class); WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class);
return wecomXpackService.info(); return wecomXpackService.info();
} }
@ResponseBody @ResponseBody
@RequiresPermissions("sysparam:read") @RequiresPermissions("sysparam:read")
@PostMapping("/save") @PostMapping("/save")
@ -56,16 +57,18 @@ public class XWecomServer {
WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class); WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class);
wecomXpackService.save(settings); wecomXpackService.save(settings);
} }
@ResponseBody @ResponseBody
@PostMapping("/testConn") @PostMapping("/testConn")
public void testConn(@RequestBody WecomInfo wecomInfo) { public void testConn(@RequestBody WecomInfo wecomInfo) {
WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class); WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class);
try { try {
wecomXpackService.testConn(wecomInfo); wecomXpackService.testConn(wecomInfo);
}catch(Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ResponseBody @ResponseBody
@PostMapping("/getQrParam") @PostMapping("/getQrParam")
public BaseQrResult getQrParam() { public BaseQrResult getQrParam() {
@ -96,7 +99,7 @@ public class XWecomServer {
SysUserEntity sysUserEntity = authUserService.getUserBySub(userId, 4); SysUserEntity sysUserEntity = authUserService.getUserBySub(userId, 4);
if (null == sysUserEntity) { if (null == sysUserEntity) {
Object emailObj = ObjectUtils.isEmpty(userMap.get("biz_mail")) ? userMap.get("email") : userMap.get("biz_mail"); Object emailObj = ObjectUtils.isEmpty(userMap.get("biz_mail")) ? userMap.get("email") : userMap.get("biz_mail");
String email = ObjectUtils.isEmpty(emailObj) ? "demo@wecom.work" : emailObj.toString(); String email = ObjectUtils.isEmpty(emailObj) ? (userId + "@wecom.work") : emailObj.toString();
sysUserService.validateExistUser(userId, userMap.get("name").toString(), email); sysUserService.validateExistUser(userId, userMap.get("name").toString(), email);
sysUserService.saveWecomCUser(userMap, userId, email); sysUserService.saveWecomCUser(userMap, userId, email);
sysUserEntity = authUserService.getUserBySub(userId, 4); sysUserEntity = authUserService.getUserBySub(userId, 4);