From ac2c42dbc8bd72ae8131bdf6e757eaf8a21692a6 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 7 Jul 2026 18:10:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9E=81=E5=85=89=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BA=BF=E4=B8=8A=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bsd/pjcloud/hard/WechatPayTest.java | 41 ------------------- .../pjcloud/thirdparty/config/JgConfig.java | 5 +++ .../thirdparty/job/ThirdAppJgPushJob.java | 12 +++--- .../impl/jg/ThirdThirdJgPushServiceImpl.java | 2 +- .../src/main/resources/application.yml | 3 +- 5 files changed, 14 insertions(+), 49 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/hard/com/bsd/pjcloud/hard/WechatPayTest.java b/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/hard/com/bsd/pjcloud/hard/WechatPayTest.java index bb5bfe763..e055efbdc 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/hard/com/bsd/pjcloud/hard/WechatPayTest.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/hard/com/bsd/pjcloud/hard/WechatPayTest.java @@ -1,17 +1,7 @@ package hard.com.bsd.pjcloud.hard; -import cn.hutool.json.JSONUtil; import com.bsd.pjcloud.hard.HardApp; -import com.bsd.pjcloud.hard.api.dto.wechat.WechatMicropayDto; -import com.bsd.pjcloud.hard.api.dto.wechat.WechatQueryDto; -import com.bsd.pjcloud.hard.api.dto.wechat.WechatRefundDto; -import com.bsd.pjcloud.hard.api.vo.wechat.WechatMicropayVo; -import com.bsd.pjcloud.hard.api.vo.wechat.WechatQueryVo; -import com.bsd.pjcloud.hard.api.vo.wechat.WechatRefundVo; -import com.bsd.pjcloud.hard.service.WechatPayService; -import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; /** @@ -21,36 +11,5 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest(classes = HardApp.class) public class WechatPayTest { - @Resource - private WechatPayService wechatPayService; - - @Test - public void micropay() throws Exception { - long currentTimeMillis = System.currentTimeMillis(); - - WechatMicropayDto dto = new WechatMicropayDto(); - dto.setMerId(currentTimeMillis); - dto.setOrderId(currentTimeMillis); - dto.setPrice(1); - dto.setWechatQrCode("132796932599913148"); - - WechatMicropayVo micropay = wechatPayService.micropay(dto); - if (micropay.isAllSuccess()) { - log.info("支付成功json:{}", JSONUtil.toJsonStr(micropay)); - } - } - - @Test - public void query() throws Exception { - WechatQueryDto dto = new WechatQueryDto(); - dto.setWechantOrderId("4200002719202506059568204561"); - - WechatQueryVo micropay = wechatPayService.query(dto); - } - - @Test - public void rerfund() throws Exception { - String currentOrderId = "4200002648202506062041165177"; - } } diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/config/JgConfig.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/config/JgConfig.java index 1d1af1486..e92793fac 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/config/JgConfig.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/config/JgConfig.java @@ -21,6 +21,11 @@ public class JgConfig { */ private String appKey; + /** + * 是否生产模式 + */ + private Boolean isProd; + /** * 极光推送secret */ diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/job/ThirdAppJgPushJob.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/job/ThirdAppJgPushJob.java index 453f93762..2978926e3 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/job/ThirdAppJgPushJob.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/job/ThirdAppJgPushJob.java @@ -23,12 +23,12 @@ public class ThirdAppJgPushJob { private final List testUserIdList = List.of(2029755089492066305L, 2034824566572941314L); - @PostConstruct - public void test() { - pushToAllUsers("早餐提醒", "早餐时间就要到了,请尽快预约哦!!"); -// pushToAllUsers("午餐提醒", "午餐间就要到了,请尽快预约哦!!"); -// pushToAllUsers("晚餐提醒", "晚餐时间就要到了,请尽快预约哦!!"); - } +// @PostConstruct +// public void test() { +//// pushToAllUsers("早餐提醒", "早餐时间就要到了,请尽快预约哦!!"); +//// pushToAllUsers("午餐提醒", "午餐间就要到了,请尽快预约哦!!"); +//// pushToAllUsers("晚餐提醒", "晚餐时间就要到了,请尽快预约哦!!"); +// } private void pushToAllUsers(String title, String subtitle) { JgPusDto jgPusDto = new JgPusDto(); diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/jg/ThirdThirdJgPushServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/jg/ThirdThirdJgPushServiceImpl.java index 07a9f7764..b150e4027 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/jg/ThirdThirdJgPushServiceImpl.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/jg/ThirdThirdJgPushServiceImpl.java @@ -75,7 +75,7 @@ public class ThirdThirdJgPushServiceImpl implements ThirdJgPushService { // start 通知options ios start Options options = new Options(); // true:表示推送生产环境,false:表示推送开发环境 - options.setApnsProduction(false); + options.setApnsProduction(jgPush.getIsProd()); param.setOptions(options); // end 通知options ios end diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml index 5b64ea08f..c274ac545 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml @@ -219,4 +219,5 @@ jg: app-key: 3877351c5811a35093f04476 master-secret: 2a253b41ac1eaa96558c56ef large-icon: https://public-com.zianxin.com/logo/60x60.png - small-icon-uri: https://public-com.zianxin.com/logo/320x320.png \ No newline at end of file + small-icon-uri: https://public-com.zianxin.com/logo/320x320.png + is-prod: true \ No newline at end of file