diff --git a/src/main/java/cn/van333/wxsend/business/controller/WXController.java b/src/main/java/cn/van333/wxsend/business/controller/WXController.java index 7925702..f7823dc 100644 --- a/src/main/java/cn/van333/wxsend/business/controller/WXController.java +++ b/src/main/java/cn/van333/wxsend/business/controller/WXController.java @@ -154,12 +154,66 @@ public class WXController { return R.ok(result); } - //@RequestMapping(value = "/send/test") - //@ResponseBody - //@RateLimiter(time = 1, count = 5) - //public R test() { - // return R.ok(IpUtils.getIpAddr()); - // - //} + @RequestMapping(value = "/send/LF") + @ResponseBody + @RateLimiter(time = 5, count = 60) + public R sendToLF(HttpServletRequest request, @RequestBody MessageRequest message) throws Exception { + logger.info("message 打印---{}",JSON.toJSONString(message)); + String vanToken = request.getHeader("vanToken"); + if (StrUtil.isEmpty(vanToken)) { + return R.error("vanToken为空"); + } + if (!TokenUtil.checkToken(vanToken)) { + return R.error("vanToken无效"); + } + String source = request.getHeader("source"); + if (StrUtil.isEmpty(source)) { + return R.error("来源为空"); + } + if (!StrUtil.isAllNotEmpty(message.getTitle(), message.getText())) { + return R.error("缺少标题和内容"); + } + logger.info("vanToken 打印---{}",vanToken); + logger.info("source 打印---{}",source); + String sourceForQL = SourceForQLUtil.transferSource(source); + if (!StrUtil.isAllNotEmpty(message.getTitle(), message.getText())) { + return R.error("缺少标题和内容"); + } + String result = WxSendUtil.sendNotify("("+sourceForQL+") "+message.getTitle(), message.getText(), message.getTouser(), WXMessageType.LF); + logger.info("result 打印---{}",result); + return R.ok(result); + + } + + @RequestMapping(value = "/send/JD") + @ResponseBody + @RateLimiter(time = 5, count = 60) + public R sendToJD(HttpServletRequest request, @RequestBody MessageRequest message) throws Exception { + logger.info("message 打印---{}",JSON.toJSONString(message)); + String vanToken = request.getHeader("vanToken"); + if (StrUtil.isEmpty(vanToken)) { + return R.error("vanToken为空"); + } + if (!TokenUtil.checkToken(vanToken)) { + return R.error("vanToken无效"); + } + String source = request.getHeader("source"); + if (StrUtil.isEmpty(source)) { + return R.error("来源为空"); + } + if (!StrUtil.isAllNotEmpty(message.getTitle(), message.getText())) { + return R.error("缺少标题和内容"); + } + logger.info("vanToken 打印---{}",vanToken); + logger.info("source 打印---{}",source); + String sourceForQL = SourceForQLUtil.transferSource(source); + if (!StrUtil.isAllNotEmpty(message.getTitle(), message.getText())) { + return R.error("缺少标题和内容"); + } + String result = WxSendUtil.sendNotify("("+sourceForQL+") "+message.getTitle(), message.getText(), message.getTouser(), WXMessageType.JD); + logger.info("result 打印---{}",result); + return R.ok(result); + + } } diff --git a/src/main/java/cn/van333/wxsend/enums/WXMessageType.java b/src/main/java/cn/van333/wxsend/enums/WXMessageType.java index 577ab70..c4df263 100644 --- a/src/main/java/cn/van333/wxsend/enums/WXMessageType.java +++ b/src/main/java/cn/van333/wxsend/enums/WXMessageType.java @@ -17,7 +17,10 @@ public enum WXMessageType { // 爱茅台 IMT("IMT","1000005","ww929e7d6493c6336e","SpYfWAA4lougQECoQ3WNvZnJ31Po77NU-XSnuC8syGs"), // TY - TY("TY","1000006","ww929e7d6493c6336e","sGrNc8uBd_Wp6hmme2oP_Rh37scmgGulPuCHiQ9PYcc"); + TY("TY","1000006","ww929e7d6493c6336e","sGrNc8uBd_Wp6hmme2oP_Rh37scmgGulPuCHiQ9PYcc"), + JD("JD","1000008","ww929e7d6493c6336e","neXT6KJ8FYVLR-LN455MAcFaeUYkVaTsAkIOqXx3wLA"), + LF("LF","1000009","ww929e7d6493c6336e","msWg3ugSSRFIXeWZuoGKN2MI2Kg9AJVAG6pCWFEeH5E"),; + private String type;