dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-10-13 21:30:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref 升级脚手架依赖

Browse Source
This commit is contained in:
bootx
2025-08-21 12:48:17 +08:00
parent 1a3abea1e1
commit 6df7782ed2
107 changed files with 1419 additions and 6524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daxpay-open/daxpay-open-controller/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.daxpay</groupId>
<artifactId>daxpay-open</artifactId>
<version>3.0.0.beta5</version>
<version>3.0.0</version>
</parent>
<artifactId>daxpay-open-controller</artifactId>

2
daxpay-open/daxpay-open-core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.daxpay</groupId>
<artifactId>daxpay-open</artifactId>
<version>3.0.0.beta5</version>
<version>3.0.0</version>
</parent>
<artifactId>daxpay-open-core</artifactId>

2
daxpay-open/daxpay-open-service/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.daxpay</groupId>
<artifactId>daxpay-open</artifactId>
<version>3.0.0.beta5</version>
<version>3.0.0</version>
</parent>
<artifactId>daxpay-open-service</artifactId>

3
daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackSendService.java
View File

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.http.ContentType;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.daxpay.core.result.DaxNoticeResult;
@@ -62,7 +63,7 @@ public class MerchantCallbackSendService {
String body = null;
try {
// 构造通知消息并签名
var daxResult = new DaxNoticeResult<Map<String, Object>>(SUCCESS_CODE, JsonUtil.parseObj(task.getContent()), SUCCESS_MSG)
var daxResult = new DaxNoticeResult<Map<String, Object>>(SUCCESS_CODE, JSONUtil.parseObj(task.getContent()), SUCCESS_MSG)
.setAppId(task.getAppId());
daxResult.setTraceId(MDC.get(CommonCode.TRACE_ID));
daxResult.setResTime(LocalDateTime.now());

3
daxpay-open/daxpay-open-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifySendService.java
View File

@@ -3,6 +3,7 @@ package org.dromara.daxpay.service.service.notice.notify;
import cn.bootx.platform.core.code.CommonCode;
import cn.bootx.platform.core.util.JsonUtil;
import cn.bootx.platform.starter.redis.delay.service.DelayJobService;
import cn.hutool.json.JSONUtil;
import org.dromara.daxpay.core.enums.MerchantNotifyTypeEnum;
import org.dromara.daxpay.core.result.DaxNoticeResult;
import org.dromara.daxpay.service.code.DaxPayCode;
@@ -69,7 +70,7 @@ public class MerchantNotifySendService {
String body = null;
try {
// 构造通知消息并签名
var daxResult = new DaxNoticeResult<Map<String, Object>>(SUCCESS_CODE, JsonUtil.parseObj(task.getContent()), SUCCESS_MSG)
var daxResult = new DaxNoticeResult<Map<String, Object>>(SUCCESS_CODE, JSONUtil.parseObj(task.getContent()), SUCCESS_MSG)
.setAppId(task.getAppId())
.setNoticeType(task.getNotifyType());
daxResult.setTraceId(MDC.get(CommonCode.TRACE_ID));

8
daxpay-open/pom.xml
View File

@@ -6,13 +6,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.3</version>
<version>3.5.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.dromara.daxpay</groupId>
<artifactId>daxpay-open</artifactId>
<version>3.0.0.beta5</version>
<version>3.0.0</version>
<packaging>pom</packaging>
<description>开源版支付核心功能实现</description>
@@ -34,8 +34,8 @@
<easytrans.version>3.0.5</easytrans.version>
<wxjava.version>4.7.4.B</wxjava.version>
<bootx-platform.version>3.0.0.beta5</bootx-platform.version>
<daxpay.version>3.0.0.beta5</daxpay.version>
<bootx-platform.version>3.0.0</bootx-platform.version>
<daxpay.version>3.0.0</daxpay.version>
</properties>
<dependencies>