From d2195b3399cb1b03278918762b9d4a8a76c1b9ac Mon Sep 17 00:00:00 2001 From: chenweiwei Date: Tue, 2 Jul 2024 13:19:19 +0800 Subject: [PATCH] 钉钉消息通知修改，jar引入本地mavne库，判断未配置钉钉情况 --- zr-cloud/zr-modules/zr-schsf/pom.xml | 14 -------------- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/DingtalkController.java | 2 +- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/DingtalkServiceImpl.java | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/zr-cloud/zr-modules/zr-schsf/pom.xml b/zr-cloud/zr-modules/zr-schsf/pom.xml index 622b569..7dcc384 100644 --- a/zr-cloud/zr-modules/zr-schsf/pom.xml +++ b/zr-cloud/zr-modules/zr-schsf/pom.xml @@ -168,45 +168,31 @@ com.laiwang.lippi lippi.oapi.encryt 1.0.3-SNAPSHOT - system - ${project.basedir}/lib/lippi-oapi-encrpt.jar - - com.dingtalk.open client-sdk.api 1.0.2 - system - ${project.basedir}/lib/client-sdk.api-1.0.2.jar com.dingtalk.open client-sdk.common 1.0.0-SNAPSHOT - system - ${project.basedir}/lib/client-sdk.common-1.0.0-SNAPSHOT.jar com.dingtalk.open client-sdk.core 1.0.0-SNAPSHOT - system - ${project.basedir}/lib/client-sdk.core-1.0.0-SNAPSHOT.jar com.dingtalk.open client-sdk.spring 1.0.0-SNAPSHOT - system - ${project.basedir}/lib/client-sdk.spring-1.0.0-SNAPSHOT.jar com.dingtalk.open taobao-sdk-java 1.0.0-SNAPSHOT - system - ${project.basedir}/lib/taobao-sdk-java-auto_1479188381469-20190325.jar diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/DingtalkController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/DingtalkController.java index 5fcf759..d474122 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/DingtalkController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/DingtalkController.java @@ -34,7 +34,7 @@ public class DingtalkController { String agentId = dingtalkConstant.getAgentId(); String corpId = dingtalkConstant.getCorpId(); if (StringUtils.isEmpty(appKey) || StringUtils.isEmpty(agentId) || StringUtils.isEmpty(corpId)){ - log.warn("钉钉相关信息为配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，", appKey,agentId,corpId); + log.warn("钉钉相关信息未配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，", appKey,agentId,corpId); return AjaxResult.success(null); } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/DingtalkServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/DingtalkServiceImpl.java index 2e4e79a..d94967e 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/DingtalkServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/DingtalkServiceImpl.java @@ -1,6 +1,7 @@ package com.chinagas.modules.schsf.service.impl; import com.alibaba.fastjson.JSONObject; +import com.chinagas.common.core.domain.AjaxResult; import com.chinagas.common.core.exceptions.ServiceException; import com.chinagas.common.core.utils.StringUtils; import com.chinagas.modules.schsf.constant.DingtalkConstant; @@ -32,6 +33,13 @@ public class DingtalkServiceImpl implements DingtalkService { @Override public String getAccessToken() { + if (StringUtils.isEmpty(dingtalkConstant.getCorpId()) + || StringUtils.isEmpty(dingtalkConstant.getAgentId()) + || StringUtils.isEmpty(dingtalkConstant.getAppKey()) + || StringUtils.isEmpty(dingtalkConstant.getAppSecret())) { + log.warn("钉钉相关信息未配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，appSecret:{}", dingtalkConstant.getAppKey(), dingtalkConstant.getAgentId(), dingtalkConstant.getCorpId(), dingtalkConstant.getAppSecret()); + throw new ServiceException("钉钉相关信息未配置，请在nacos中进行配置"); + } String accToken = ""; JSONObject jsontemp = new JSONObject(); try { @@ -73,6 +81,16 @@ public class DingtalkServiceImpl implements DingtalkService { log.info("钉钉通知，通知标题:{}", title); log.info("钉钉通知，通知内容:{}", markdown); log.info("钉钉通知，通知用户id:{},通知用户数量:{}", userIds, userIds.size()); + if (userIds==null || userIds.size()==0){ + return; + } + if (StringUtils.isEmpty(dingtalkConstant.getCorpId()) + || StringUtils.isEmpty(dingtalkConstant.getAgentId()) + || StringUtils.isEmpty(dingtalkConstant.getAppKey()) + || StringUtils.isEmpty(dingtalkConstant.getAppSecret())) { + log.warn("钉钉通知，钉钉相关信息未配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，appSecret:{}", dingtalkConstant.getAppKey(), dingtalkConstant.getAgentId(), dingtalkConstant.getCorpId(), dingtalkConstant.getAppSecret()); + return; + } // 分割用户ID列表为多个不超过100的子列表 List userIdSubList = new ArrayList<>(); List> splitUserIds = new ArrayList<>(); -- libgit2 0.21.2