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..b528f45bb3 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; @@ -246,13 +248,16 @@ public class SysUserController { AuthBindDTO dto = new AuthBindDTO(); if (ObjectUtils.isEmpty(sysUserAssist)) return dto; if (authUserService.supportWecom() && StringUtils.isNotBlank(sysUserAssist.getWecomId())) { - dto.setWecomBinded(true); + dto.setWecomBound(true); } if (authUserService.supportDingtalk() && StringUtils.isNotBlank(sysUserAssist.getDingtalkId())) { - dto.setDingtalkBinded(true); + dto.setDingtalkBound(true); } if (authUserService.supportLark() && StringUtils.isNotBlank(sysUserAssist.getLarkId())) { - dto.setLarkBinded(true); + dto.setLarkBound(true); + } + if (authUserService.supportLarksuite() && StringUtils.isNotBlank(sysUserAssist.getLarksuiteId())) { + dto.setLarksuiteBound(true); } return dto; } @@ -260,9 +265,9 @@ public class SysUserController { @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..b01f031a67 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 @@ -7,9 +7,11 @@ import java.io.Serializable; @Data public class AuthBindDTO implements Serializable { - private Boolean wecomBinded = false; + private Boolean wecomBound = false; - private Boolean dingtalkBinded = false; + private Boolean dingtalkBound = false; - private Boolean larkBinded = false; + private Boolean larkBound = false; + + private Boolean larksuiteBound = 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..9710597aa6 100644 --- a/backend/src/main/java/io/dataease/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/ext/AuthMapper.xml @@ -23,8 +23,7 @@ + + diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 4f9d1bced1..d293f49dca 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -25,6 +25,8 @@ import io.dataease.plugins.xpack.email.dto.response.XpackEmailTemplateDTO; import io.dataease.plugins.xpack.email.service.EmailXpackService; import io.dataease.plugins.xpack.lark.dto.entity.LarkMsgResult; import io.dataease.plugins.xpack.lark.service.LarkXpackService; +import io.dataease.plugins.xpack.larksuite.dto.response.LarksuiteMsgResult; +import io.dataease.plugins.xpack.larksuite.service.LarksuiteXpackService; import io.dataease.plugins.xpack.wecom.dto.entity.WecomMsgResult; import io.dataease.plugins.xpack.wecom.service.WecomXpackService; import io.dataease.service.chart.ViewExportExcel; @@ -297,6 +299,30 @@ public class EmailTaskHandler extends TaskHandler implements Job { } } + } + break; + case "larksuite": + if (SpringContextUtil.getBean(AuthUserService.class).supportLarksuite()) { + List larksuiteUsers = new ArrayList<>(); + for (int j = 0; j < reciLists.size(); j++) { + String reci = reciLists.get(j); + SysUserEntity userBySub = userService.getUserByName(reci); + if (ObjectUtils.isEmpty(userBySub)) continue; + Long userId = userBySub.getUserId(); + SysUserAssist sysUserAssist = sysUserService.assistInfo(userId); + if (ObjectUtils.isEmpty(sysUserAssist) || StringUtils.isBlank(sysUserAssist.getLarksuiteId())) + continue; + larksuiteUsers.add(sysUserAssist.getLarksuiteId()); + } + + if (CollectionUtils.isNotEmpty(larksuiteUsers)) { + LarksuiteXpackService larksuiteXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + LarksuiteMsgResult larksuiteMsgResult = larksuiteXpackService.pushOaMsg(larksuiteUsers, emailTemplateDTO.getTitle(), contentStr, bytes, files); + if (larksuiteMsgResult.getCode() != 0) { + errorMsgs.add("larksuite: " + larksuiteMsgResult.getMsg()); + } + } + } break; default: 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..64d9506cfb --- /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.getUserByLarksuiteId(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/message/service/strategy/SendLarksuite.java b/backend/src/main/java/io/dataease/service/message/service/strategy/SendLarksuite.java new file mode 100644 index 0000000000..d5f49cfc77 --- /dev/null +++ b/backend/src/main/java/io/dataease/service/message/service/strategy/SendLarksuite.java @@ -0,0 +1,39 @@ +package io.dataease.service.message.service.strategy; + + +import io.dataease.auth.service.AuthUserService; +import io.dataease.plugins.common.base.domain.SysUserAssist; +import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.larksuite.service.LarksuiteXpackService; +import io.dataease.service.message.service.SendService; +import io.dataease.service.sys.SysUserService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Service("sendLarksuite") +public class SendLarksuite implements SendService { + + @Autowired + private AuthUserService authUserService; + + @Resource + private SysUserService sysUserService; + + @Override + public void sendMsg(Long userId, Long typeId, String content, String param) { + SysUserAssist sysUserAssist = sysUserService.assistInfo(userId); + if (ObjectUtils.isNotEmpty(sysUserAssist) && StringUtils.isNotBlank(sysUserAssist.getLarksuiteId()) && authUserService.supportLarksuite()) { + String username = sysUserAssist.getLarksuiteId(); + LarksuiteXpackService larksuiteXpackService = SpringContextUtil.getBean(LarksuiteXpackService.class); + List userIds = new ArrayList<>(); + userIds.add(username); + larksuiteXpackService.pushMsg(userIds, content); + } + } +} \ No newline at end of file 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..6a02f442ad 100644 --- a/backend/src/main/resources/db/migration/V42__1.16.sql +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -1,16 +1,44 @@ -UPDATE `sys_menu` set `component` = REPLACE(`component`, 'SysParam', 'sysParam') where (`component` like '%SysParam%'); +UPDATE `sys_menu` +set `component` = REPLACE(`component`, 'SysParam', 'sysParam') +where (`component` like '%SysParam%'); -UPDATE `sys_menu` set `component` = REPLACE(`component`, 'privateForm', 'PrivateForm') where (`component` like '%privateForm%'); +UPDATE `sys_menu` +set `component` = REPLACE(`component`, 'privateForm', 'PrivateForm') +where (`component` like '%privateForm%'); -UPDATE `sys_menu` set `component` = REPLACE(`component`, 'personPwd', 'PersonPwd') where (`component` like '%personPwd%'); +UPDATE `sys_menu` +set `component` = REPLACE(`component`, 'personPwd', 'PersonPwd') +where (`component` like '%personPwd%'); -UPDATE `sys_menu` set `component` = REPLACE(`component`, 'dataset', 'Dataset') where (`component` = 'system/task/dataset'); +UPDATE `sys_menu` +set `component` = REPLACE(`component`, 'dataset', 'Dataset') +where (`component` = 'system/task/dataset'); -UPDATE `sys_menu` set `component` = REPLACE(`component`, 'form', 'Form') where (`component` = 'system/task/form'); +UPDATE `sys_menu` +set `component` = REPLACE(`component`, 'form', 'Form') +where (`component` = 'system/task/form'); -ALTER TABLE `dataset_table_field` ADD COLUMN `date_format` VARCHAR(255) NULL AFTER `accuracy`; +ALTER TABLE `dataset_table_field` + ADD COLUMN `date_format` VARCHAR(255) NULL AFTER `accuracy`; -ALTER TABLE `sys_task_email` ADD COLUMN `view_data_range` VARCHAR(255) NULL DEFAULT 'view' AFTER `reci_users`; +ALTER TABLE `sys_task_email` + ADD COLUMN `view_data_range` VARCHAR(255) NULL DEFAULT 'view' AFTER `reci_users`; -UPDATE `sys_msg_type` set `type_name` = 'i18n_msg_type_dataset_sync_failed' WHERE (`msg_type_id` = 6); +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`; + +ALTER TABLE `dataset_table_field` CHANGE COLUMN `type` `type` VARCHAR(255) NOT NULL COMMENT '原始字段类型' ; + +INSERT INTO `my_plugin` (`name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `creator`, `load_mybatis`, + `install_time`, `module_name`, `ds_type`) +VALUES ('Apache Kylin 数据源插件', 'default', '0', '0', 'datasource', 'Apache Kylin 数据源插件', '1.0-SNAPSHOT', 'DATAEASE', '0', + '1650765903630', 'kylin-backend', 'kylin'); + + + +INSERT INTO `sys_msg_channel` (`msg_channel_id`, `channel_name`, `service_name`) VALUES ('6', 'webmsg.channel_larksuite_msg', 'sendLarksuite'); 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/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 3da2dd20e8..ba4a5e3c35 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -677,7 +677,9 @@ export default { 'tabMoveInActiveId', 'tabActiveTabNameMap', 'mousePointShadowMap', - 'tabMoveOutComponentId' + 'tabMoveOutComponentId', + 'tabCollisionActiveId', + 'tabMoveInActiveId' ]) }, watch: { @@ -1920,8 +1922,8 @@ export default { const left = this.left const width = this.width const height = this.height - // tab 移入检测开启 - if (this.isTabMoveCheck) { + // tab 移入检测开启 tab组件不能相互移入另一个tab组件 + if (this.isTabMoveCheck && this.element.type !== 'de-tabs') { const nodes = this.$el.parentNode.childNodes // 获取当前父节点下所有子节点 for (const item of nodes) { if ( @@ -1951,7 +1953,7 @@ export default { const brAndBr = (collisionT + collisionH) >= (top + height) && (collisionL + collisionW) >= (left + width) if (tfAndTf && bfAndBf && trAndTr && brAndBr) { this.$store.commit('setTabCollisionActiveId', item.getAttribute('component-id')) - } else { + } else if (this.tabCollisionActiveId === item.getAttribute('component-id')) { this.$store.commit('setTabCollisionActiveId', null) } @@ -1972,7 +1974,7 @@ export default { const activeBrAndBr = (activeT + activeH) >= (top + height) && (activeL + activeW) >= (left + width) if (activeTfAndTf && activeBfAndBf && activeTrAndTr && activeBrAndBr) { this.$store.commit('setTabMoveInActiveId', item.getAttribute('component-id')) - } else { + } else if (this.tabMoveInActiveId === item.getAttribute('component-id')) { this.$store.commit('setTabMoveInActiveId', null) } } diff --git a/frontend/src/components/GradientColorSelector/base.js b/frontend/src/components/GradientColorSelector/base.js index 557047a9a5..bf88a65f75 100644 --- a/frontend/src/components/GradientColorSelector/base.js +++ b/frontend/src/components/GradientColorSelector/base.js @@ -86,7 +86,7 @@ export const colorCases = [ export const gradientColorCases = [ { name: '渐变色1', - value: 'gradient1', + value: 'gradient1_continuous_gradient', colors: [ ['rgba(144,202,249,0.5)', 'rgba(1,87,155,0.9)'], ['rgba(127,222,234,1)', 'rgba(0,77,65,1)'], @@ -101,3 +101,72 @@ export const gradientColorCases = [ export const isGradientValue = value => { return value && gradientColorCases.some(item => item.value === value) } + +export const getColorType = value => { + if (value.endsWith('_split_gradient')) { + return 'split_gradient' + } + const cloneColorCases = JSON.parse(JSON.stringify(colorCases)) + if (cloneColorCases.some(item => item.value === value)) { + return 'simple' + } + return 'gradient' +} + +export const getMapColorCases = () => { + const cloneColorCases = JSON.parse(JSON.stringify(colorCases)) + return cloneColorCases.map(colorItem => { + const curColors = colorItem.colors + const len = curColors.length + const start = curColors[0] + const end = curColors[len - 1] + const itemResult = { + name: colorItem.name, + value: colorItem.value + '_split_gradient', + baseColors: [start, end], + colors: stepsColor(start, end, 9, 1) + } + return itemResult + }) +} + +export function stepsColor(start, end, steps, gamma) { + var i; var j; var ms; var me; var output = []; var so = [] + gamma = gamma || 1 + var normalize = function(channel) { + return Math.pow(channel / 255, gamma) + } + start = parseColor(start).map(normalize) + end = parseColor(end).map(normalize) + for (i = 0; i < steps; i++) { + ms = (steps - 1) === 0 ? 0 : (i / (steps - 1)) + me = 1 - ms + for (j = 0; j < 3; j++) { + so[j] = pad( + Math.round( + Math.pow(start[j] * me + end[j] * ms, 1 / gamma) * 255 + ).toString(16) + ) + } + output.push('#' + so.join('')) + } + function parseColor(hexStr) { + return hexStr.length === 4 + ? hexStr + .substr(1) + .split('') + .map(function(s) { + return 0x11 * parseInt(s, 16) + }) + : [hexStr.substr(1, 2), hexStr.substr(3, 2), hexStr.substr(5, 2)].map( + function(s) { + return parseInt(s, 16) + } + ) + } + function pad(s) { + return s.length === 1 ? '0' + s : s + } + return output +} + diff --git a/frontend/src/components/GradientColorSelector/index.vue b/frontend/src/components/GradientColorSelector/index.vue index 48da711b0d..6acae31b81 100644 --- a/frontend/src/components/GradientColorSelector/index.vue +++ b/frontend/src/components/GradientColorSelector/index.vue @@ -20,7 +20,7 @@ @@ -38,7 +38,7 @@
@@ -47,7 +47,7 @@ @tab-click="handleClick" > - + + @@ -132,7 +139,7 @@