From 30f14e0dbf0c13f9a4d930b51de9b9504ac4c3d1 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Fri, 30 May 2025 09:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A8=E9=80=81=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3=E7=BB=99=E5=89=8D=E7=AB=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E9=80=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/controller/LoginController.java | 27 ++++++++++++++++++- .../mall/common/service/GeTuiPushService.java | 4 +-- .../service/impl/GeTuiPushServiceImpl.java | 11 ++++---- .../src/main/resources/application.yml | 1 + 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java index 217ca92c..df097d8b 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java @@ -11,6 +11,7 @@ import com.suisung.mall.common.constant.AuthConstant; import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.constant.RedisConstant; import com.suisung.mall.common.pojo.req.WxUserInfoReq; +import com.suisung.mall.common.service.GeTuiPushService; import com.suisung.mall.common.service.impl.BaseControllerImpl; import com.suisung.mall.common.utils.I18nUtil; import com.suisung.mall.common.utils.UserInfoService; @@ -47,9 +48,33 @@ public class LoginController extends BaseControllerImpl { @Autowired private UserInfoService userInfoService; + @Autowired + private GeTuiPushService geTuiPushService; + /** - * 移动端登录 + * 推送测试 */ + @PostMapping(value = "/push/testcase") + public Object testcase(@RequestBody JSONObject paramsJSON) { + + String title = paramsJSON.getStr("title"); + if (StrUtil.isBlank(title)) { + title = "小发同城"; + } + + String clickType = paramsJSON.getStr("clickType"); + if (StrUtil.isBlank(clickType)) { + clickType = "none"; + } + + String clinkContent = paramsJSON.getStr("clickContent"); + if (StrUtil.isBlank(clinkContent)) { + clinkContent = ""; + } + + return geTuiPushService.pushMessageToSingleByCid(paramsJSON.getStr("cid"), title, paramsJSON.getStr("message"), clickType, clinkContent); + } + @RequestMapping(value = "/testcase", method = RequestMethod.GET) public Object testcase() { Map arg = new HashMap(); diff --git a/mall-common/src/main/java/com/suisung/mall/common/service/GeTuiPushService.java b/mall-common/src/main/java/com/suisung/mall/common/service/GeTuiPushService.java index 389048be..1c21533d 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/service/GeTuiPushService.java +++ b/mall-common/src/main/java/com/suisung/mall/common/service/GeTuiPushService.java @@ -19,7 +19,7 @@ public interface GeTuiPushService { * @param transmission 透传消息 txt json 格式 * @return */ - Pair pushTransmissionToSingleByCid(String cid, String transmission); + Pair pushTransmissionToSingleByCid(String cid, String transmission); /** * 单个用户推送消息(支持H5、安卓、苹果系统) @@ -40,5 +40,5 @@ public interface GeTuiPushService { * @param clickContent * @return */ - Pair pushMessageToSingleByCid(String cid, String title, String content, String clickType, String clickContent); + Pair pushMessageToSingleByCid(String cid, String title, String content, String clickType, String clickContent); } diff --git a/mall-common/src/main/java/com/suisung/mall/common/service/impl/GeTuiPushServiceImpl.java b/mall-common/src/main/java/com/suisung/mall/common/service/impl/GeTuiPushServiceImpl.java index 9dd4eeac..219b917c 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/service/impl/GeTuiPushServiceImpl.java +++ b/mall-common/src/main/java/com/suisung/mall/common/service/impl/GeTuiPushServiceImpl.java @@ -10,6 +10,7 @@ package com.suisung.mall.common.service.impl; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.getui.push.v2.sdk.ApiHelper; import com.getui.push.v2.sdk.GtApiConfiguration; import com.getui.push.v2.sdk.api.PushApi; @@ -69,7 +70,7 @@ public class GeTuiPushServiceImpl implements GeTuiPushService { * @return */ @Override - public Pair pushTransmissionToSingleByCid(String cid, String transmission) { + public Pair pushTransmissionToSingleByCid(String cid, String transmission) { PushDTO pushDTO = new PushDTO(); // 设置推送参数 pushDTO.setRequestId(System.currentTimeMillis() + ""); @@ -142,7 +143,7 @@ public class GeTuiPushServiceImpl implements GeTuiPushService { * @return */ @Override - public Pair pushMessageToSingleByCid(String cid, String title, String content, String clickType, String clickContent) { + public Pair pushMessageToSingleByCid(String cid, String title, String content, String clickType, String clickContent) { //根据cid进行单推 PushDTO pushDTO = new PushDTO(); // 设置推送参数 @@ -239,11 +240,11 @@ public class GeTuiPushServiceImpl implements GeTuiPushService { ApiResult apiResult = creatPushApi().pushToSingleByCid(pushDTO); if (!apiResult.isSuccess()) { log.error("个推推送失败：{}", apiResult); - return Pair.of(false, "个推推送失败：" + apiResult.getMsg()); + return Pair.of(false, "个推推送失败：" + JSONUtil.toJsonStr(apiResult)); } log.debug("推送返回数据：{}", apiResult); - - return Pair.of(true, "推送成功"); + + return Pair.of(true, "推送成功，返回数据：" + JSONUtil.toJsonStr(apiResult)); } } diff --git a/mall-gateway/src/main/resources/application.yml b/mall-gateway/src/main/resources/application.yml index f9e85cd1..1a7e1bd9 100644 --- a/mall-gateway/src/main/resources/application.yml +++ b/mall-gateway/src/main/resources/application.yml @@ -92,6 +92,7 @@ secure: - "/esProduct/**" - "/admin/oss/upload/**" - "/mobile/**/**/test/case" + - "/**/**/testcase" universal: urls: - "/admin/account/account-user-base/info"