From 438a5aa051d4103ff04344fc7c73038bb5f48efd Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 6 Jul 2026 18:58:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor(lakala):=20=E6=8B=89=E5=8D=A1=E6=8B=89?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=B7=AF=E7=94=B1=E7=94=B1=20channel-one=20?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=87=B3=20channel-two?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/channel/lakala/client/LakalaChannelClient.java | 2 +- .../channel/lakala/client/credential/LakalaSdkCredential.java | 2 +- .../daxpay/open/channel/lakala/config/LakalaClientConfig.java | 4 ++-- .../channel/lakala/service/isv/LakalaIsvConfigAssembler.java | 2 +- .../lakala/service/payment/isv/LakalaIsvPayService.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/LakalaChannelClient.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/LakalaChannelClient.java index bb0ce0d08..788f61148 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/LakalaChannelClient.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/LakalaChannelClient.java @@ -18,7 +18,7 @@ import org.springframework.web.service.annotation.PostExchange; /// # 拉卡拉通道客户端 /// -/// 声明式 HTTP 接口, 调用子应用 dax-pay-channel-one 的拉卡拉通道接口。 +/// 声明式 HTTP 接口, 调用子应用 dax-pay-channel-two 的拉卡拉通道接口。 /// 拉卡拉为聚合服务商模式, 不区分直连/服务商, 路径前缀 `/channel/lakala`。 @HttpExchange(accept = MediaType.APPLICATION_JSON_VALUE, contentType = MediaType.APPLICATION_JSON_VALUE) public interface LakalaChannelClient { diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java index 69a32630e..37baccc35 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java @@ -4,7 +4,7 @@ import lombok.Data; /// # 拉卡拉 SDK 凭证(主应用侧) /// -/// 与子应用 dax-pay-channel-one 的 `LakalaSdkCredential` 镜像, 跨 HTTP 传输时字段对齐。 +/// 与子应用 dax-pay-channel-two 的 `LakalaSdkCredential` 镜像, 跨 HTTP 传输时字段对齐。 /// 主应用从服务商密钥配置(LakalaIsvKeyConfig) + 通道商户绑定(LakalaIsvChannelMerchant) 组装, /// 下发给子应用发起拉卡拉 API 调用。 @Data diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/config/LakalaClientConfig.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/config/LakalaClientConfig.java index a04fd45f4..99fee1974 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/config/LakalaClientConfig.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/config/LakalaClientConfig.java @@ -12,7 +12,7 @@ import org.springframework.web.service.invoker.HttpServiceProxyFactory; /// /// 复用全局 [RestClient](由 common-spring 的 RestClientConfiguration 提供, 已预装: /// OTel traceparent 透传 / BusinessContextInterceptor 业务上下文透传 / Apache HttpClient5 连接池), -/// 经 `mutate()` 派生出绑定 channel-one baseUrl 的实例。 +/// 经 `mutate()` 派生出绑定 channel-two baseUrl 的实例。 /// /// baseUrl 从 [DaxpayChannelProperties] 统一读取。 @Configuration @@ -25,7 +25,7 @@ public class LakalaClientConfig { // mutate 派生: 继承全局 RestClient 的拦截器 / observation / requestFactory, 仅覆盖 baseUrl RestClient channelClient = restClient .mutate() - .baseUrl(channelProperties.getOne().getBaseUrl()) + .baseUrl(channelProperties.getTwo().getBaseUrl()) .build(); return HttpServiceProxyFactory .builderFor(RestClientAdapter.create(channelClient)) diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java index 091d5630d..3fc756180 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; /// # 拉卡拉服务商通道凭证组装器 /// /// 从服务商密钥配置([LakalaIsvKeyConfig]) + 通道商户绑定([LakalaIsvChannelMerchant]) 组装通道调用凭证, -/// 下发给子应用 dax-pay-channel-one 发起拉卡拉 API 调用。 +/// 下发给子应用 dax-pay-channel-two 发起拉卡拉 API 调用。 /// /// 字段映射(对齐拉卡拉 V3 接口): /// - lkl_app_id ← [LakalaIsvKeyConfig.lklAppId] (拉卡拉应用编号, 全局唯一) diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/payment/isv/LakalaIsvPayService.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/payment/isv/LakalaIsvPayService.java index 97ded9be9..2609d408a 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/payment/isv/LakalaIsvPayService.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/payment/isv/LakalaIsvPayService.java @@ -23,7 +23,7 @@ import org.springframework.stereotype.Service; /// # 拉卡拉服务商支付执行业务服务 /// -/// 通过 [LakalaChannelClient] 调用子应用 dax-pay-channel-one 完成拉卡拉支付下单。 +/// 通过 [LakalaChannelClient] 调用子应用 dax-pay-channel-two 完成拉卡拉支付下单。 /// 请求构建、响应解析全部在本类中完成。 /// /// 拉卡拉聚合通道: 一个接口承载微信/支付宝/银联三种底层渠道, 由 accountType + transType 决定路由。