diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayMerchantApp.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayMerchantApp.java index 760c689f2..88861546e 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayMerchantApp.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayMerchantApp.java @@ -5,9 +5,13 @@ import org.springframework.context.annotation.ComponentScan; /// # 商户自助端装配入口 /// -/// 扫描 `cn.daxpay.open.payment.merchant` 及其子包(controller),注册商户自助控制器。 -/// 本模块依赖 `daxpay-payment-common` 公共底座;商户领域 entity/dao/service 留公共层共享, -/// 此处仅负责商户端 HTTP 接口的装配。 +/// 扫描 `cn.daxpay.open.payment.merchant` 及其子包,注册: +/// - 商户端 HTTP 控制器(controller) +/// - 端特有能力:登录 Handler、商户上下文 Filter、本端查询 service(如 MerchantInfo / ChannelConfig 展示) +/// - 小程序编排 service +/// +/// 本模块依赖 `daxpay-payment-common` 公共底座;商户领域 entity/dao 与多端共享 service +/// (用户/应用/凭证/路由/权限等)仍在公共层,供 admin / unipay / 交易引擎共用。 @AutoConfiguration @ComponentScan public class DaxpayMerchantApp { diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerify.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerify.java similarity index 59% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerify.java rename to daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerify.java index 244216c1a..34e7b97eb 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerify.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerify.java @@ -2,19 +2,18 @@ package cn.daxpay.open.payment.unipay.aop; import java.lang.annotation.*; -/// # 支付校验校验标识 +/// # 开放支付验签标识 /// /// 入参出参要求: /// -/// 1. 方法至少有一个参数,并且需要签名的参数放在第一位, 并为PaymentCommonParam的子类 +/// 1. 方法至少有一个参数,并且需要签名的参数放在第一位, 并为 MerchantPaymentCommonParam 的子类 /// 2. 返回对象必须为 DaxResult 格式 /// -/// 注解实现的功能(按先后顺序): +/// 注解实现的功能(按先后顺序): /// 1. 参数校验 -/// 2. 商户和应用信息初始化 -/// 3. 终端信息初始化 -/// 4. 参数签名校验 -/// 5. 参数请求时间校验 +/// 2. 商户身份初始化(mchNo 入线程上下文) +/// 3. 参数签名校验 +/// 4. 响应写入 resTime 并签名 @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java rename to daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java index 16dd96159..80c4aff57 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/aop/PaymentVerifyAspect.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; import java.time.OffsetDateTime; import java.time.ZoneOffset; -/// # 支付签名切面(common.aop.PaymentVerify) +/// # 开放支付验签切面([PaymentVerify]) /// /// 执行顺序: 过滤器 -> 拦截器 -> 切面 -> 方法。 /// 切面只负责"商户身份初始化 + 签名校验",不负责应用解析(由支付流程完成)。