From 1a0130dd1a15497acb9fb26d9858002f1422f9de Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Thu, 9 Mar 2023 11:55:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/wechat/util/WechatMessageUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java index da0dfc45..196569c0 100644 --- a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java +++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java @@ -7,7 +7,6 @@ import cn.lili.common.enums.ClientTypeEnum; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.DateUtil; -import cn.lili.common.utils.HttpUtils; import cn.lili.common.utils.StringUtils; import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.enums.ConnectEnum; @@ -111,7 +110,7 @@ public class WechatMessageUtil { map.put("data", postParams); log.info("参数内容：" + JSONUtil.toJsonStr(map)); - String content = HttpUtils.doPostWithJson(url, map); + String content = HttpUtil.post(url, JSONUtil.toJsonStr(map)); JSONObject json = new JSONObject(content); log.info("微信消息发送结果：" + content); String errorMessage = json.getStr("errmsg"); From f6030cc91826d5b36307f23fc2fc098433aaa438 Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Thu, 9 Mar 2023 16:54:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=8F=91=E9=80=81=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=E3=80=82?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=B9=8B=E5=89=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/WechatMessageServiceImpl.java | 6 +++--- .../modules/wechat/util/WechatMessageData.java | 5 ++--- .../modules/wechat/util/WechatMessageUtil.java | 14 ++++++-------- .../wechat/WechatMessageManageController.java | 2 ++ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java index 448ff57a..42c140bc 100644 --- a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java @@ -138,13 +138,13 @@ public class WechatMessageServiceImpl extends ServiceImpl msg = new ArrayList<>(); //新订单消息提示 msg.add(new WechatMessageData( - "待支付", - "您有新订单需要支付", + "订单支付成功通知", + "订单支付成功通知", "如有问题，请联系在线客服", "OPENTM207498902", WechatMessageItemEnums.MEMBER_NAME.name() + "," + WechatMessageItemEnums.ORDER_SN.name() + "," + WechatMessageItemEnums.PRICE.name() + "," + WechatMessageItemEnums.GOODS_INFO.name(), - OrderStatusEnum.UNPAID)); + OrderStatusEnum.UNDELIVERED)); //已发货 msg.add(new WechatMessageData( "订单发货", diff --git a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java index e425ab8c..8e952736 100644 --- a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java +++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java @@ -1,6 +1,5 @@ package cn.lili.modules.wechat.util; -import cn.hutool.json.JSONUtil; import lombok.Data; import java.util.HashMap; @@ -48,7 +47,7 @@ public class WechatMessageData { * * @return */ - public String createData() { + public Map> createData() { Map> dataMap = new LinkedHashMap<>(); @@ -62,7 +61,7 @@ public class WechatMessageData { //拼接备注 dataMap.put("remark", createValue(this.remark)); - return JSONUtil.toJsonStr(dataMap); + return dataMap; } diff --git a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java index 196569c0..156c9f48 100644 --- a/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java +++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java @@ -100,14 +100,13 @@ public class WechatMessageUtil { //发送url String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + token; - Map map = new HashMap<>(4); + Map map = new HashMap<>(4); //用户id map.put("touser", connect.getUnionId()); //模版id map.put("template_id", wechatMessage.getCode()); //模版中所需数据 - String postParams = createData(order, wechatMessage); - map.put("data", postParams); + map.put("data", createData(order, wechatMessage)); log.info("参数内容：" + JSONUtil.toJsonStr(map)); String content = HttpUtil.post(url, JSONUtil.toJsonStr(map)); @@ -119,7 +118,7 @@ public class WechatMessageUtil { if (!"0".equals(errcode)) { log.error("消息发送失败：" + errorMessage); log.error("消息发送请求token：" + token); - log.error("消息发送请求：" + postParams); + log.error("消息发送请求：" + map.get("data")); } } @@ -164,8 +163,7 @@ public class WechatMessageUtil { //模版id map.put("template_id", wechatMPMessage.getCode()); //模版中所需数据 - Map> postParams = createData(order, wechatMPMessage); - map.put("data", postParams); + map.put("data", createData(order, wechatMPMessage)); map.put("page", "pages/order/orderDetail?sn=" + order.getSn()); log.info("参数内容：" + JSONUtil.toJsonStr(map)); String content = null; @@ -182,7 +180,7 @@ public class WechatMessageUtil { if (!"0".equals(errcode)) { log.error("消息发送失败：" + errorMessage); log.error("消息发送请求token：" + token); - log.error("消息发送请求：" + postParams); + log.error("消息发送请求：" + map.get("data")); } } @@ -193,7 +191,7 @@ public class WechatMessageUtil { * @param wechatMessage * @return */ - private String createData(Order order, WechatMessage wechatMessage) { + private Map> createData(Order order, WechatMessage wechatMessage) { WechatMessageData wechatMessageData = new WechatMessageData(); wechatMessageData.setFirst(wechatMessage.getFirst()); wechatMessageData.setRemark(wechatMessage.getRemark()); diff --git a/manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java index 16d45c78..3bac3257 100644 --- a/manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java +++ b/manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java @@ -1,5 +1,6 @@ package cn.lili.controller.wechat; +import cn.lili.common.aop.annotation.DemoSite; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; @@ -31,6 +32,7 @@ public class WechatMessageManageController { @GetMapping(value = "/init") @ApiOperation(value = "初始化微信消息") + @DemoSite public ResultMessage init() { wechatMessageService.init(); return ResultUtil.success();