陈威 / MarketBasedPricingProgram

Download as
Browse Code »

Commit d2195b3399cb1b03278918762b9d4a8a76c1b9ac

Authored by 陈威
1 parent 9d2266cb
Exists in dev

钉钉消息通知修改，jar引入本地mavne库，判断未配置钉钉情况

Showing 3 changed files with 19 additions and 15 deletions   Show diff stats
zr-cloud/zr-modules/zr-schsf/pom.xml
  Diff comments   View file @d2195b3
... ... @@ -168,45 +168,31 @@
168 168 <groupId>com.laiwang.lippi</groupId>
169 169 <artifactId>lippi.oapi.encryt</artifactId>
170 170 <version>1.0.3-SNAPSHOT</version>
171   - <scope>system</scope>
172   - <systemPath>${project.basedir}/lib/lippi-oapi-encrpt.jar</systemPath>
173 171 </dependency>
174   -
175   -
176 172 <dependency>
177 173 <groupId>com.dingtalk.open</groupId>
178 174 <artifactId>client-sdk.api</artifactId>
179 175 <version>1.0.2</version>
180   - <scope>system</scope>
181   - <systemPath>${project.basedir}/lib/client-sdk.api-1.0.2.jar</systemPath>
182 176 </dependency>
183 177 <dependency>
184 178 <groupId>com.dingtalk.open</groupId>
185 179 <artifactId>client-sdk.common</artifactId>
186 180 <version>1.0.0-SNAPSHOT</version>
187   - <scope>system</scope>
188   - <systemPath>${project.basedir}/lib/client-sdk.common-1.0.0-SNAPSHOT.jar</systemPath>
189 181 </dependency>
190 182 <dependency>
191 183 <groupId>com.dingtalk.open</groupId>
192 184 <artifactId>client-sdk.core</artifactId>
193 185 <version>1.0.0-SNAPSHOT</version>
194   - <scope>system</scope>
195   - <systemPath>${project.basedir}/lib/client-sdk.core-1.0.0-SNAPSHOT.jar</systemPath>
196 186 </dependency>
197 187 <dependency>
198 188 <groupId>com.dingtalk.open</groupId>
199 189 <artifactId>client-sdk.spring</artifactId>
200 190 <version>1.0.0-SNAPSHOT</version>
201   - <scope>system</scope>
202   - <systemPath>${project.basedir}/lib/client-sdk.spring-1.0.0-SNAPSHOT.jar</systemPath>
203 191 </dependency>
204 192 <dependency>
205 193 <groupId>com.dingtalk.open</groupId>
206 194 <artifactId>taobao-sdk-java</artifactId>
207 195 <version>1.0.0-SNAPSHOT</version>
208   - <scope>system</scope>
209   - <systemPath>${project.basedir}/lib/taobao-sdk-java-auto_1479188381469-20190325.jar</systemPath>
210 196 </dependency>
211 197  
212 198 <dependency>
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/DingtalkController.java
  Diff comments   View file @d2195b3
... ... @@ -34,7 +34,7 @@ public class DingtalkController {
34 34 String agentId = dingtalkConstant.getAgentId();
35 35 String corpId = dingtalkConstant.getCorpId();
36 36 if (StringUtils.isEmpty(appKey) || StringUtils.isEmpty(agentId) || StringUtils.isEmpty(corpId)){
37   - log.warn("钉钉相关信息为配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，", appKey,agentId,corpId);
  37 + log.warn("钉钉相关信息未配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，", appKey,agentId,corpId);
38 38 return AjaxResult.success(null);
39 39 }
40 40  
... ...
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/DingtalkServiceImpl.java
  Diff comments   View file @d2195b3
1 1 package com.chinagas.modules.schsf.service.impl;
2 2  
3 3 import com.alibaba.fastjson.JSONObject;
  4 +import com.chinagas.common.core.domain.AjaxResult;
4 5 import com.chinagas.common.core.exceptions.ServiceException;
5 6 import com.chinagas.common.core.utils.StringUtils;
6 7 import com.chinagas.modules.schsf.constant.DingtalkConstant;
... ... @@ -32,6 +33,13 @@ public class DingtalkServiceImpl implements DingtalkService {
32 33  
33 34 @Override
34 35 public String getAccessToken() {
  36 + if (StringUtils.isEmpty(dingtalkConstant.getCorpId())
  37 + || StringUtils.isEmpty(dingtalkConstant.getAgentId())
  38 + || StringUtils.isEmpty(dingtalkConstant.getAppKey())
  39 + || StringUtils.isEmpty(dingtalkConstant.getAppSecret())) {
  40 + log.warn("钉钉相关信息未配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，appSecret:{}", dingtalkConstant.getAppKey(), dingtalkConstant.getAgentId(), dingtalkConstant.getCorpId(), dingtalkConstant.getAppSecret());
  41 + throw new ServiceException("钉钉相关信息未配置，请在nacos中进行配置");
  42 + }
35 43 String accToken = "";
36 44 JSONObject jsontemp = new JSONObject();
37 45 try {
... ... @@ -73,6 +81,16 @@ public class DingtalkServiceImpl implements DingtalkService {
73 81 log.info("钉钉通知，通知标题:{}", title);
74 82 log.info("钉钉通知，通知内容:{}", markdown);
75 83 log.info("钉钉通知，通知用户id:{},通知用户数量:{}", userIds, userIds.size());
  84 + if (userIds==null || userIds.size()==0){
  85 + return;
  86 + }
  87 + if (StringUtils.isEmpty(dingtalkConstant.getCorpId())
  88 + || StringUtils.isEmpty(dingtalkConstant.getAgentId())
  89 + || StringUtils.isEmpty(dingtalkConstant.getAppKey())
  90 + || StringUtils.isEmpty(dingtalkConstant.getAppSecret())) {
  91 + log.warn("钉钉通知，钉钉相关信息未配置，请在nacos中进行配置，appKey:{}，agentId:{}，corpId:{}，appSecret:{}", dingtalkConstant.getAppKey(), dingtalkConstant.getAgentId(), dingtalkConstant.getCorpId(), dingtalkConstant.getAppSecret());
  92 + return;
  93 + }
76 94 // 分割用户ID列表为多个不超过100的子列表
77 95 List<String> userIdSubList = new ArrayList<>();
78 96 List<List<String>> splitUserIds = new ArrayList<>();
... ...