Commit c057fbcd0d1ee957073b140933b40e6d0fab6e4a

Authored by zhangdaiscott
1 parent 2263ccf7

增加统一推送消息接口(支持企业微信、邮件、系统消息、钉钉等)

jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -536,4 +536,17 @@ public interface ISysBaseAPI extends CommonAPI { @@ -536,4 +536,17 @@ public interface ISysBaseAPI extends CommonAPI {
536 @GetMapping("/sys/api/translateDictFromTableByKeys") 536 @GetMapping("/sys/api/translateDictFromTableByKeys")
537 List<DictModel> translateDictFromTableByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keys") String keys); 537 List<DictModel> translateDictFromTableByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keys") String keys);
538 538
  539 + /**
  540 + * 发送模板消息
  541 + */
  542 + @PostMapping("/sys/api/sendTemplateMessage")
  543 + void sendTemplateMessage(@RequestBody MessageDTO message);
  544 +
  545 + /**
  546 + * 获取模板内容
  547 + * @param code
  548 + * @return
  549 + */
  550 + @GetMapping("/sys/api/getTemplateContent")
  551 + String getTemplateContent(@RequestParam("code") String code);
539 } 552 }
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
@@ -279,6 +279,15 @@ public class SysBaseAPIFallback implements ISysBaseAPI { @@ -279,6 +279,15 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
279 } 279 }
280 280
281 @Override 281 @Override
  282 + public void sendTemplateMessage(MessageDTO message) {
  283 + }
  284 +
  285 + @Override
  286 + public String getTemplateContent(String code) {
  287 + return null;
  288 + }
  289 +
  290 + @Override
282 public void sendEmailMsg(String email,String title,String content) { 291 public void sendEmailMsg(String email,String title,String content) {
283 292
284 } 293 }
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 // log.info(" Feign request params sign: {}",sign); 101 // log.info(" Feign request params sign: {}",sign);
102 // log.info("============================ [end] fegin api url ============================"); 102 // log.info("============================ [end] fegin api url ============================");
103 // requestTemplate.header(CommonConstant.X_SIGN, sign); 103 // requestTemplate.header(CommonConstant.X_SIGN, sign);
104 -// requestTemplate.header(CommonConstant.X_TIMESTAMP, DateUtils.getCurrentTimestamp().toString()); 104 +// requestTemplate.header(CommonConstant.X_TIMESTAMP, String.valueOf(System.currentTimeMillis()));
105 // } catch (IOException e) { 105 // } catch (IOException e) {
106 // e.printStackTrace(); 106 // e.printStackTrace();
107 // } 107 // }
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 // return new SpringEncoder(feignHttpMessageConverter()); 146 // return new SpringEncoder(feignHttpMessageConverter());
147 // } 147 // }
148 // 148 //
149 -// @Bean 149 +// @Bean("apiFeignDecoder")
150 // public Decoder feignDecoder() { 150 // public Decoder feignDecoder() {
151 // return new SpringDecoder(feignHttpMessageConverter()); 151 // return new SpringDecoder(feignHttpMessageConverter());
152 // } 152 // }
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -338,4 +338,17 @@ public interface ISysBaseAPI extends CommonAPI { @@ -338,4 +338,17 @@ public interface ISysBaseAPI extends CommonAPI {
338 */ 338 */
339 List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize); 339 List<DictModel> loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize);
340 340
  341 + /**
  342 + * 发送模板消息
  343 + * @param message
  344 + */
  345 + void sendTemplateMessage(MessageDTO message);
  346 +
  347 + /**
  348 + * 根据模板编码获取模板内容
  349 + * @param templateCode
  350 + * @return
  351 + */
  352 + String getTemplateContent(String templateCode);
  353 +
341 } 354 }