diff --git a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java index d6ed61d1f0..fa187f5ed2 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java @@ -48,6 +48,7 @@ public class XDingtalkServer { DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class); return dingtalkXpackService.info(); } + @ResponseBody @RequiresPermissions("sysparam:read") @PostMapping("/save") @@ -55,16 +56,18 @@ public class XDingtalkServer { DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class); dingtalkXpackService.save(settings); } + @ResponseBody @PostMapping("/testConn") public void testConn(@RequestBody DingtalkInfo dingtalkInfo) { DingtalkXpackService dingtalkXpackService = SpringContextUtil.getBean(DingtalkXpackService.class); try { dingtalkXpackService.testConn(dingtalkInfo); - }catch(Exception e) { + } catch (Exception e) { throw new RuntimeException(e); } } + @ResponseBody @PostMapping("/getQrParam") public DingQrResult getQrParam() { @@ -92,7 +95,7 @@ public class XDingtalkServer { String unionid = dingUserEntity.getUnionid(); SysUserEntity sysUserEntity = authUserService.getUserBySub(unionid, 5); 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.saveDingtalkCUser(dingUserEntity, email); sysUserEntity = authUserService.getUserBySub(unionid, 5); 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 16c3d6a687..5021f746c4 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java @@ -96,7 +96,7 @@ public class XLarkServer { String sub = larkUserInfo.getSub(); SysUserEntity sysUserEntity = authUserService.getUserBySub(sub, 6); 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.saveLarkCUser(larkUserInfo, email); sysUserEntity = authUserService.getUserBySub(sub, 6); diff --git a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java index b50ee487e8..98e6ad8ce2 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java @@ -49,6 +49,7 @@ public class XWecomServer { WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class); return wecomXpackService.info(); } + @ResponseBody @RequiresPermissions("sysparam:read") @PostMapping("/save") @@ -56,16 +57,18 @@ public class XWecomServer { WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class); wecomXpackService.save(settings); } + @ResponseBody @PostMapping("/testConn") public void testConn(@RequestBody WecomInfo wecomInfo) { WecomXpackService wecomXpackService = SpringContextUtil.getBean(WecomXpackService.class); try { wecomXpackService.testConn(wecomInfo); - }catch(Exception e) { + } catch (Exception e) { throw new RuntimeException(e); } } + @ResponseBody @PostMapping("/getQrParam") public BaseQrResult getQrParam() { @@ -96,7 +99,7 @@ public class XWecomServer { SysUserEntity sysUserEntity = authUserService.getUserBySub(userId, 4); if (null == sysUserEntity) { 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.saveWecomCUser(userMap, userId, email); sysUserEntity = authUserService.getUserBySub(userId, 4);