From 3fdeef031212105937bfadb922f6021f2749b273 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 24 Oct 2022 13:22:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=B9=B3=E5=8F=B0=E5=AF=B9=E6=8E=A5):=20?= =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E5=9B=BD=E9=99=85=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/auth/api/AuthApi.java | 4 + .../io/dataease/auth/server/AuthServer.java | 8 + .../auth/service/AuthUserService.java | 4 + .../service/impl/AuthUserServiceImpl.java | 15 ++ .../auth/service/impl/ShiroServiceImpl.java | 4 + .../controller/sys/SysUserController.java | 16 +- .../controller/sys/response/AuthBindDTO.java | 2 + .../main/java/io/dataease/ext/AuthMapper.java | 1 + .../main/java/io/dataease/ext/AuthMapper.xml | 10 + .../plugins/server/XDingtalkServer.java | 2 +- .../dataease/plugins/server/XLarkServer.java | 2 +- .../plugins/server/XLarksuiteServer.java | 206 ++++++++++++++++++ .../dataease/plugins/server/XWecomServer.java | 2 +- .../dataease/service/sys/SysUserService.java | 37 +++- .../main/resources/db/migration/V42__1.16.sql | 3 + frontend/src/api/user.js | 7 + frontend/src/lang/en.js | 4 +- frontend/src/lang/tw.js | 4 +- frontend/src/lang/zh.js | 4 +- frontend/src/views/login/index.vue | 31 ++- 20 files changed, 346 insertions(+), 20 deletions(-) create mode 100644 backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java diff --git a/backend/src/main/java/io/dataease/auth/api/AuthApi.java b/backend/src/main/java/io/dataease/auth/api/AuthApi.java index e4b2df95b5..aeaee10e13 100644 --- a/backend/src/main/java/io/dataease/auth/api/AuthApi.java +++ b/backend/src/main/java/io/dataease/auth/api/AuthApi.java @@ -75,6 +75,10 @@ public interface AuthApi { @PostMapping("/isOpenLark") boolean isOpenLark(); + @ApiOperation("是否开启国际飞书") + @PostMapping("/isOpenLarksuite") + boolean isOpenLarksuite(); + @ApiIgnore @PostMapping("/isPluginLoaded") boolean isPluginLoaded(); diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index e4282473a2..ac43dc69ce 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -337,6 +337,14 @@ public class AuthServer implements AuthApi { return authUserService.supportLark(); } + @Override + public boolean isOpenLarksuite() { + Boolean licValid = PluginUtils.licValid(); + if (!licValid) + return false; + return authUserService.supportLarksuite(); + } + @Override public boolean isPluginLoaded() { Boolean licValid = PluginUtils.licValid(); diff --git a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java index a9df96a6e8..ba9d201031 100644 --- a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java +++ b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java @@ -23,6 +23,8 @@ public interface AuthUserService { SysUserEntity getUserByDingtalkId(String dingtalkId); SysUserEntity getUserByLarkId(String larkId); + SysUserEntity getUserByLarksuiteId(String larksuiteId); + List roles(Long userId); List permissions(Long userId); @@ -43,6 +45,8 @@ public interface AuthUserService { Boolean supportLark(); + Boolean supportLarksuite(); + Boolean supportLoginLimit(); Boolean pluginLoaded(); diff --git a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java index f862f84273..a148882cf5 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java @@ -21,6 +21,7 @@ import io.dataease.plugins.util.PluginUtils; import io.dataease.plugins.xpack.cas.service.CasXpackService; import io.dataease.plugins.xpack.dingtalk.service.DingtalkXpackService; import io.dataease.plugins.xpack.lark.service.LarkXpackService; +import io.dataease.plugins.xpack.larksuite.service.LarksuiteXpackService; import io.dataease.plugins.xpack.ldap.service.LdapXpackService; import io.dataease.plugins.xpack.loginlimit.dto.response.LoginLimitInfo; import io.dataease.plugins.xpack.loginlimit.service.LoginLimitXpackService; @@ -108,6 +109,11 @@ public class AuthUserServiceImpl implements AuthUserService { return authMapper.findLarkUser(larkId); } + @Override + public SysUserEntity getUserByLarksuiteId(String larksuiteId) { + return authMapper.findLarksuiteUser(larksuiteId); + } + @Override public List roles(Long userId) { return authMapper.roleCodes(userId); @@ -221,6 +227,15 @@ public class AuthUserServiceImpl implements AuthUserService { return larkXpackService.isOpen(); } + @Override + public Boolean supportLarksuite() { + Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((LarksuiteXpackService.class)); + if (beansOfType.keySet().size() == 0) return false; + LarksuiteXpackService larkXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + if (ObjectUtils.isEmpty(larkXpackService)) return false; + return larkXpackService.isOpen(); + } + @Override public Boolean supportLoginLimit() { Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((LoginLimitXpackService.class)); diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index a1a55baffa..b92517f050 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -86,6 +86,7 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/api/auth/isOpenWecom", ANON); filterChainDefinitionMap.put("/api/auth/isOpenDingtalk", ANON); filterChainDefinitionMap.put("/api/auth/isOpenLark", ANON); + filterChainDefinitionMap.put("/api/auth/isOpenLarksuite", ANON); filterChainDefinitionMap.put("/api/auth/getPublicKey", ANON); filterChainDefinitionMap.put("/api/pluginCommon/component/*", ANON); filterChainDefinitionMap.put("/api/pluginCommon/staticInfo/**", ANON); @@ -101,6 +102,9 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/plugin/lark/callBack*", ANON); filterChainDefinitionMap.put("/plugin/lark/bind*", ANON); filterChainDefinitionMap.put("/plugin/lark/getQrParam", ANON); + filterChainDefinitionMap.put("/plugin/larksuite/callBack*", ANON); + filterChainDefinitionMap.put("/plugin/larksuite/bind*", ANON); + filterChainDefinitionMap.put("/plugin/larksuite/getQrParam", ANON); filterChainDefinitionMap.put("/cas/reset/**", ANON); filterChainDefinitionMap.put("/unauth", ANON); diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java index 8c8f4d0f87..7d4a68bca3 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -56,6 +56,8 @@ public class SysUserController { private static final String DINGTALK = "dingtalk"; private static final String LARK = "lark"; + private static final String LARKSUITE = "larksuite"; + @Resource private SysUserService sysUserService; @@ -254,15 +256,18 @@ public class SysUserController { if (authUserService.supportLark() && StringUtils.isNotBlank(sysUserAssist.getLarkId())) { dto.setLarkBinded(true); } + if (authUserService.supportLarksuite() && StringUtils.isNotBlank(sysUserAssist.getLarksuiteId())) { + dto.setLarksuiteBinded(true); + } return dto; } @PostMapping("/unbindAssist/{type}") public void unbindAssist(@PathVariable("type") String type) { - Boolean valid = StringUtils.equals(WECOM, type) || StringUtils.equals(DINGTALK, type) || StringUtils.equals(LARK, type); + Boolean valid = StringUtils.equals(WECOM, type) || StringUtils.equals(DINGTALK, type) || StringUtils.equals(LARK, type) || StringUtils.equals(LARKSUITE, type); if (!valid) { - DEException.throwException("only [wecom, dingtalk, lark] is valid"); + DEException.throwException("only [wecom, dingtalk, lark, larksuite] is valid"); } Long userId = AuthUtils.getUser().getUserId(); SysUserAssist sysUserAssist = sysUserService.assistInfo(userId); @@ -275,10 +280,13 @@ public class SysUserController { if (StringUtils.equals(LARK, type)) { sysUserAssist.setLarkId(null); } - if (StringUtils.isBlank(sysUserAssist.getWecomId()) && StringUtils.isBlank(sysUserAssist.getDingtalkId()) && StringUtils.isBlank(sysUserAssist.getLarkId())) { + if (StringUtils.equals(LARKSUITE, type)) { + sysUserAssist.setLarksuiteId(null); + } + if (StringUtils.isBlank(sysUserAssist.getWecomId()) && StringUtils.isBlank(sysUserAssist.getDingtalkId()) && StringUtils.isBlank(sysUserAssist.getLarkId()) && StringUtils.isBlank(sysUserAssist.getLarksuiteId())) { sysUserService.changeUserFrom(userId, 0); } - sysUserService.saveAssist(userId, sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId()); + sysUserService.saveAssist(userId, sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId(), sysUserAssist.getLarksuiteId()); } diff --git a/backend/src/main/java/io/dataease/controller/sys/response/AuthBindDTO.java b/backend/src/main/java/io/dataease/controller/sys/response/AuthBindDTO.java index 0394961fe3..dcb2afcd1a 100644 --- a/backend/src/main/java/io/dataease/controller/sys/response/AuthBindDTO.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/AuthBindDTO.java @@ -12,4 +12,6 @@ public class AuthBindDTO implements Serializable { private Boolean dingtalkBinded = false; private Boolean larkBinded = false; + + private Boolean larksuiteBinded = false; } diff --git a/backend/src/main/java/io/dataease/ext/AuthMapper.java b/backend/src/main/java/io/dataease/ext/AuthMapper.java index 763d41f414..5ddb83f600 100644 --- a/backend/src/main/java/io/dataease/ext/AuthMapper.java +++ b/backend/src/main/java/io/dataease/ext/AuthMapper.java @@ -37,5 +37,6 @@ public interface AuthMapper { SysUserEntity findWecomUser(@Param("wecomId") String wecomId); SysUserEntity findDingtalkUser(@Param("dingtalkId") String dingtalkId); SysUserEntity findLarkUser(@Param("larkId") String larkId); + SysUserEntity findLarksuiteUser(@Param("larksuiteId") String larksuiteId); } diff --git a/backend/src/main/java/io/dataease/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/ext/AuthMapper.xml index ac07e54e79..dda18002af 100644 --- a/backend/src/main/java/io/dataease/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/ext/AuthMapper.xml @@ -137,4 +137,14 @@ where a.lark_id = #{larkId} + + 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 27414e6836..9554458b8d 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java @@ -185,7 +185,7 @@ public class XDingtalkServer { sysUserAssist.setUserId(Long.parseLong(state)); } sysUserAssist.setDingtalkId(userId); - sysUserService.saveAssist(sysUserAssist.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId()); + sysUserService.saveAssist(sysUserAssist.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId(), sysUserAssist.getLarksuiteId()); response.sendRedirect(url); } catch (Exception e) { 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 9f51798be4..f473c6eed8 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XLarkServer.java @@ -185,7 +185,7 @@ public class XLarkServer { sysUserAssist.setUserId(Long.parseLong(state)); } sysUserAssist.setLarkId(userId); - sysUserService.saveAssist(sysUserAssist.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId()); + sysUserService.saveAssist(sysUserAssist.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId(), sysUserAssist.getLarksuiteId()); response.sendRedirect(url); } catch (Exception e) { diff --git a/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java b/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java new file mode 100644 index 0000000000..52223daff3 --- /dev/null +++ b/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java @@ -0,0 +1,206 @@ +package io.dataease.plugins.server; + +import io.dataease.auth.entity.SysUserEntity; +import io.dataease.auth.entity.TokenInfo; +import io.dataease.auth.service.AuthUserService; +import io.dataease.auth.util.JWTUtils; +import io.dataease.commons.constants.SysLogConstants; +import io.dataease.commons.exception.DEException; +import io.dataease.commons.utils.DeLogUtils; +import io.dataease.commons.utils.LogUtil; +import io.dataease.commons.utils.ServletUtils; +import io.dataease.plugins.common.base.domain.SysUserAssist; +import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.display.dto.response.SysSettingDto; +import io.dataease.plugins.xpack.lark.dto.entity.LarkQrResult; +import io.dataease.plugins.xpack.lark.dto.response.LarkInfo; +import io.dataease.plugins.xpack.larksuite.dto.entity.UserData; +import io.dataease.plugins.xpack.larksuite.dto.response.LarksuiteUserResult; +import io.dataease.plugins.xpack.larksuite.service.LarksuiteXpackService; +import io.dataease.service.sys.SysUserService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import springfox.documentation.annotations.ApiIgnore; + +import javax.annotation.Resource; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.List; +import java.util.Map; + +@ApiIgnore +@RequestMapping("/plugin/larksuite") +@Controller +public class XLarksuiteServer { + + @Resource + private AuthUserService authUserService; + @Resource + private SysUserService sysUserService; + + @ResponseBody + @GetMapping("/info") + public LarkInfo getLarkInfo() { + LarksuiteXpackService larkXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + return larkXpackService.info(); + } + + @ResponseBody + @RequiresPermissions("sysparam:read") + @PostMapping("/save") + public void save(@RequestBody List settings) { + LarksuiteXpackService larkXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + larkXpackService.save(settings); + } + + @ResponseBody + @PostMapping("/testConn") + public void testConn(@RequestBody LarkInfo larkInfo) { + LarksuiteXpackService larkXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + try { + larkXpackService.testConn(larkInfo); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @ResponseBody + @PostMapping("/getQrParam") + public LarkQrResult getQrParam() { + LarksuiteXpackService larkXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + return larkXpackService.getQrParam(); + } + + @GetMapping("/callBack") + public ModelAndView callBack(@RequestParam("code") String code, @RequestParam("state") String state) { + ModelAndView modelAndView = new ModelAndView("redirect:/"); + HttpServletResponse response = ServletUtils.response(); + LarksuiteXpackService larksuiteXpackService = null; + try { + Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((LarksuiteXpackService.class)); + if (beansOfType.keySet().size() == 0) { + DEException.throwException("缺少国际飞书插件"); + } + larksuiteXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + Boolean isOpen = larksuiteXpackService.isOpen(); + if (!isOpen) { + DEException.throwException("未开启国际飞书"); + } + LarksuiteUserResult larksuiteUserResult = larksuiteXpackService.userInfo(code, state, false); + UserData larkUserInfo = larksuiteUserResult.getData(); + String username = larkUserInfo.getUser_id(); + SysUserEntity sysUserEntity = authUserService.getUserByLarksuiteId(username); + if (null == sysUserEntity) { + String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@larksuite.work"); + sysUserService.validateExistUser(username, larkUserInfo.getName(), email); + sysUserService.saveLarksuiteCUser(larkUserInfo, email); + sysUserEntity = authUserService.getUserByLarkId(username); + } + TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build(); + String realPwd = sysUserEntity.getPassword(); + String token = JWTUtils.sign(tokenInfo, realPwd); + ServletUtils.setToken(token); + + DeLogUtils.save(SysLogConstants.OPERATE_TYPE.LOGIN, SysLogConstants.SOURCE_TYPE.USER, sysUserEntity.getUserId(), null, null, null); + + Cookie cookie_token = new Cookie("Authorization", token); + cookie_token.setPath("/"); + + response.addCookie(cookie_token); + } catch (Exception e) { + + String msg = e.getMessage(); + if (null != e.getCause()) { + msg = e.getCause().getMessage(); + } + try { + msg = URLEncoder.encode(msg, "UTF-8"); + LogUtil.error(e); + Cookie cookie_error = new Cookie("LarksuiteError", msg); + cookie_error.setPath("/"); + response.addCookie(cookie_error); + return modelAndView; + } catch (UnsupportedEncodingException e1) { + e.printStackTrace(); + } + } + return modelAndView; + } + + private void bindError(HttpServletResponse response, String url, String errorMsg) { + Cookie cookie_error = new Cookie("LarksuiteError", errorMsg); + cookie_error.setPath("/"); + response.addCookie(cookie_error); + try { + response.sendRedirect(url); + } catch (IOException e) { + LogUtil.error(e.getMessage(), e); + DEException.throwException(e); + } + } + + @GetMapping("/bind") + public void bind(@RequestParam("code") String code, @RequestParam("state") String state) { + + HttpServletResponse response = ServletUtils.response(); + String url = "/#person-info/index"; + + LarksuiteXpackService larksuiteXpackService = null; + try { + SysUserEntity userEntity = authUserService.getUserById(Long.parseLong(state)); + if (ObjectUtils.isEmpty(userEntity)) { + bindError(response, url, "绑定用户不存在"); + return; + } + SysUserAssist sysUserAssist = sysUserService.assistInfo(Long.parseLong(state)); + if (ObjectUtils.isNotEmpty(sysUserAssist) && StringUtils.isNotBlank(sysUserAssist.getLarksuiteId())) { + bindError(response, url, "目标用户已绑定其他国际飞书账号"); + return; + } + + Boolean isOpen = authUserService.supportLarksuite(); + if (!isOpen) { + DEException.throwException("未开启国际飞书"); + } + larksuiteXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + LarksuiteUserResult larksuiteUserResult = larksuiteXpackService.userInfo(code, state, true); + UserData larkUserInfo = larksuiteUserResult.getData(); + String userId = larkUserInfo.getUser_id(); + + + SysUserEntity sysUserEntity = authUserService.getUserByLarksuiteId(userId); + if (null != sysUserEntity) { + bindError(response, url, "当前国际飞书账号已绑定其他DE用户"); + return; + } + + if (ObjectUtils.isEmpty(sysUserAssist)) { + sysUserAssist = new SysUserAssist(); + sysUserAssist.setUserId(Long.parseLong(state)); + } + sysUserAssist.setLarksuiteId(userId); + sysUserService.saveAssist(sysUserAssist.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId(), sysUserAssist.getLarksuiteId()); + response.sendRedirect(url); + } catch (Exception e) { + + String msg = e.getMessage(); + if (null != e.getCause()) { + msg = e.getCause().getMessage(); + } + try { + msg = URLEncoder.encode(msg, "UTF-8"); + LogUtil.error(e); + bindError(response, url, msg); + } catch (UnsupportedEncodingException e1) { + e.printStackTrace(); + } + } + } +} 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 7ff7678cdb..738f4f73bc 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java @@ -193,7 +193,7 @@ public class XWecomServer { sysUserAssist.setUserId(Long.parseLong(state)); } sysUserAssist.setWecomId(userId); - sysUserService.saveAssist(sysUserAssist.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId()); + sysUserService.saveAssist(sysUserAssist.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId(), sysUserAssist.getLarksuiteId()); response.sendRedirect(url); } catch (Exception e) { diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java index bc929fb6d1..466153a885 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -21,6 +21,7 @@ import io.dataease.plugins.common.base.mapper.SysUsersRolesMapper; import io.dataease.plugins.common.entity.XpackLdapUserEntity; import io.dataease.plugins.xpack.dingtalk.dto.response.DingUserEntity; import io.dataease.plugins.xpack.lark.dto.entity.LarkUserInfo; +import io.dataease.plugins.xpack.larksuite.dto.entity.UserData; import io.dataease.plugins.xpack.oidc.dto.SSOUserInfo; import org.apache.commons.collections4.CollectionUtils; @@ -107,7 +108,7 @@ public class SysUserService { SysUserAssist sysUserAssist = request.getSysUserAssist(); if (ObjectUtils.isNotEmpty(sysUserAssist) && (StringUtils.isNotBlank(sysUserAssist.getWecomId()) || StringUtils.isNotBlank(sysUserAssist.getDingtalkId()) || StringUtils.isNotBlank(sysUserAssist.getLarkId()))) { - saveAssist(userId, sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId()); + saveAssist(userId, sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId(), sysUserAssist.getLarksuiteId()); } return insert; @@ -157,7 +158,7 @@ public class SysUserService { sysUser.setIsAdmin(false); sysUser.setSub(userId); sysUserMapper.insert(sysUser); - Optional.ofNullable(findOne(sysUser)).ifPresent(u -> saveAssist(u.getUserId(), u.getUsername(), null, null)); + Optional.ofNullable(findOne(sysUser)).ifPresent(u -> saveAssist(u.getUserId(), u.getUsername(), null, null, null)); } @@ -180,7 +181,7 @@ public class SysUserService { sysUser.setSub(dingUserEntity.getUnionid()); sysUser.setPhone(dingUserEntity.getMobile()); sysUserMapper.insert(sysUser); - Optional.ofNullable(findOne(sysUser)).ifPresent(u -> saveAssist(u.getUserId(), null, u.getUsername(), null)); + Optional.ofNullable(findOne(sysUser)).ifPresent(u -> saveAssist(u.getUserId(), null, u.getUsername(), null, null)); } @Transactional @@ -202,7 +203,29 @@ public class SysUserService { sysUser.setSub(larkUserInfo.getSub()); sysUser.setPhone(larkUserInfo.getMobile()); sysUserMapper.insert(sysUser); - Optional.ofNullable(findOne(sysUser)).ifPresent(u -> saveAssist(u.getUserId(), null, null, u.getUsername())); + Optional.ofNullable(findOne(sysUser)).ifPresent(u -> saveAssist(u.getUserId(), null, null, u.getUsername(), null)); + } + + @Transactional + public void saveLarksuiteCUser(UserData larkUserInfo, String email) { + long now = System.currentTimeMillis(); + SysUser sysUser = new SysUser(); + + sysUser.setUsername(larkUserInfo.getUser_id()); + sysUser.setNickName(larkUserInfo.getName()); + sysUser.setEmail(email); + sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD)); + sysUser.setCreateTime(now); + sysUser.setUpdateTime(now); + + sysUser.setEnabled(1L); + sysUser.setLanguage("zh_CN"); + sysUser.setFrom(7); + sysUser.setIsAdmin(false); + sysUser.setSub(larkUserInfo.getUnion_id()); + sysUser.setPhone(larkUserInfo.getMobile()); + sysUserMapper.insert(sysUser); + Optional.ofNullable(findOne(sysUser)).ifPresent(u -> saveAssist(u.getUserId(), null, null, null, u.getUsername())); } @Transactional @@ -299,7 +322,7 @@ public class SysUserService { SysUserAssist sysUserAssist = request.getSysUserAssist(); if (ObjectUtils.isNotEmpty(sysUserAssist) && (StringUtils.isNotBlank(sysUserAssist.getWecomId()) || StringUtils.isNotBlank(sysUserAssist.getDingtalkId()) || StringUtils.isNotBlank(sysUserAssist.getLarkId()))) { - saveAssist(user.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId()); + saveAssist(user.getUserId(), sysUserAssist.getWecomId(), sysUserAssist.getDingtalkId(), sysUserAssist.getLarkId(), sysUserAssist.getLarksuiteId()); } return result; } @@ -550,12 +573,13 @@ public class SysUserService { sysUserAssistMapper.insertSelective(sysUserAssist); } - public void saveAssist(Long userId, String wecomId, String dingtlkId, String larkId) { + public void saveAssist(Long userId, String wecomId, String dingtlkId, String larkId, String larksuiteId) { SysUserAssist existAssist = sysUserAssistMapper.selectByPrimaryKey(userId); if (ObjectUtils.isNotEmpty(existAssist)) { existAssist.setWecomId(wecomId); existAssist.setDingtalkId(dingtlkId); existAssist.setLarkId(larkId); + existAssist.setLarksuiteId(larksuiteId); sysUserAssistMapper.updateByPrimaryKey(existAssist); return; } @@ -564,6 +588,7 @@ public class SysUserService { sysUserAssist.setWecomId(wecomId); sysUserAssist.setDingtalkId(dingtlkId); sysUserAssist.setLarkId(larkId); + sysUserAssist.setLarksuiteId(larksuiteId); sysUserAssistMapper.insert(sysUserAssist); } diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql index 2423350791..75d3e058f8 100644 --- a/backend/src/main/resources/db/migration/V42__1.16.sql +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -14,3 +14,6 @@ ALTER TABLE `sys_task_email` ADD COLUMN `view_data_range` VARCHAR(255) NULL DEFA UPDATE `sys_msg_type` set `type_name` = 'i18n_msg_type_dataset_sync_failed' WHERE (`msg_type_id` = 6); + +ALTER TABLE `sys_user_assist` +ADD COLUMN `larksuite_id` VARCHAR(255) NULL DEFAULT NULL AFTER `lark_id`; diff --git a/frontend/src/api/user.js b/frontend/src/api/user.js index 6899c6726d..32d2067307 100644 --- a/frontend/src/api/user.js +++ b/frontend/src/api/user.js @@ -121,6 +121,13 @@ export function larkStatus() { }) } +export function larksuiteStatus() { + return request({ + url: '/api/auth/isOpenLarksuite', + method: 'post' + }) +} + export function pluginLoaded() { return request({ url: '/api/auth/isPluginLoaded', diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 804ddce80d..191845c079 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2361,7 +2361,8 @@ export default { channel_email_msg: 'Email', channel_wecom_msg: 'Wecom', channel_dingtalk_msg: 'Dingtalk', - channel_lark_msg: 'Lark' + channel_lark_msg: 'Lark', + channel_larksuite_msg: 'Larksuite' }, denumberrange: { label: 'Number range', @@ -2477,6 +2478,7 @@ export default { wecom: 'Wecom', dingtalk: 'Dingtalk', lark: 'Lark', + larksuite: 'Larksuite', pixel: 'Pixel', default: 'Default', custom: 'Custom', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 6f69214e79..c0e2870d0c 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2362,7 +2362,8 @@ export default { channel_email_msg: '郵件提醒', channel_wecom_msg: '企業微信', channel_dingtalk_msg: '釘釘提醒', - channel_lark_msg: '飛書提醒' + channel_lark_msg: '飛書提醒', + channel_larksuite_msg: '國際飛書' }, denumberrange: { label: '數值區間', @@ -2478,6 +2479,7 @@ export default { wecom: '企業微信', dingtalk: '釘釘', lark: '飛書', + larksuite: '國際飛書', pixel: '分辨率', default: '默認', custom: '自定義', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 73d7733c38..d4bf01b025 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2362,7 +2362,8 @@ export default { channel_email_msg: '邮件提醒', channel_wecom_msg: '企业微信', channel_dingtalk_msg: '钉钉提醒', - channel_lark_msg: '飞书提醒' + channel_lark_msg: '飞书提醒', + channel_larksuite_msg: '国际飞书' }, denumberrange: { label: '数值区间', @@ -2478,6 +2479,7 @@ export default { wecom: '企业微信', dingtalk: '钉钉', lark: '飞书', + larksuite: '国际飞书', pixel: '分辨率', default: '默认', custom: '自定义', diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index bac3dee230..56e1e88565 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -75,6 +75,11 @@ :label="2" size="mini" >OIDC + Larksuite @@ -187,6 +192,12 @@ component-name="SSOComponent" /> + +
import { encrypt } from '@/utils/rsaEncrypt' -import { ldapStatus, oidcStatus, getPublicKey, pluginLoaded, defaultLoginType, wecomStatus, dingtalkStatus, larkStatus } from '@/api/user' +import { ldapStatus, oidcStatus, getPublicKey, pluginLoaded, defaultLoginType, wecomStatus, dingtalkStatus, larkStatus, larksuiteStatus } from '@/api/user' import { getSysUI } from '@/utils/auth' import { changeFavicon } from '@/utils/index' import { initTheme } from '@/utils/ThemeUtil' @@ -248,10 +259,10 @@ export default { return this.$store.state.user.loginMsg }, qrTypes() { - return this.loginTypes && this.loginTypes.filter(item => item > 3) || [] + return this.loginTypes && this.loginTypes.filter(item => item > 3 && item < 7) || [] }, radioTypes() { - return this.loginTypes && this.loginTypes.filter(item => item < 4) || [] + return this.loginTypes && this.loginTypes.filter(item => item < 4 || item > 6) || [] } }, watch: { @@ -312,6 +323,13 @@ export default { this.setDefaultType() }) + larksuiteStatus().then(res => { + if (res.success && res.data) { + this.loginTypes.push(7) + } + this.setDefaultType() + }) + getPublicKey().then(res => { if (res.success && res.data) { // 保存公钥 @@ -391,6 +409,9 @@ export default { clearLarkMsg() { Cookies.remove('LarkError') }, + clearLarksuiteMsg() { + Cookies.remove('LarksuiteError') + }, showLoginImage(uiInfo) { this.uiInfo = getSysUI() if (!this.uiInfo || Object.keys(this.uiInfo).length === 0) { @@ -427,6 +448,7 @@ export default { this.clearWecomMsg() this.clearDingtalkMsg() this.clearLarkMsg() + this.clearLarksuiteMsg() this.$refs.loginForm.validate(valid => { if (valid) { this.loading = true @@ -447,8 +469,9 @@ export default { }) }, changeLoginType(val) { - if (val !== 2) return + if (val !== 2 && val !== 7) return this.clearOidcMsg() + this.clearLarksuiteMsg() this.$nextTick(() => { })