diff --git a/daxpay-payment/daxpay-payment-admin/pom.xml b/daxpay-payment/daxpay-payment-admin/pom.xml new file mode 100644 index 000000000..2d200b0e9 --- /dev/null +++ b/daxpay-payment/daxpay-payment-admin/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + cn.daxpay.open + daxpay-payment + 4.0.0-SNAPSHOT + ../pom.xml + + + daxpay-payment-admin + jar + 运营管理端（控制器 + 管理服务），依赖支付公共底座 + + + + + org.projectlombok + lombok + provided + + + + + cn.daxpay.open + daxpay-payment-common + ${project.version} + + + + diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayAdminApp.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayAdminApp.java new file mode 100644 index 000000000..67bd8d8b6 --- /dev/null +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayAdminApp.java @@ -0,0 +1,13 @@ +package cn.daxpay.open.payment.admin; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.ComponentScan; + +/// # 运营管理端装配入口 +/// +/// 扫描 `cn.daxpay.open.payment.admin` 及其子包，注册管理端控制器与服务。 +/// 本模块依赖 `daxpay-payment-common` 公共底座，不反向被公共层依赖。 +@AutoConfiguration +@ComponentScan +public class DaxpayAdminApp { +} diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/appinfo/controller/MchAppInfoAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/appinfo/controller/MchAppInfoAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/appinfo/controller/MchAppInfoAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/appinfo/controller/MchAppInfoAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/capability/controller/PayCapabilityController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/capability/controller/PayCapabilityController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/capability/controller/PayCapabilityController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/capability/controller/PayCapabilityController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/capability/service/PayCapabilityService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/capability/service/PayCapabilityService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/capability/service/PayCapabilityService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/capability/service/PayCapabilityService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/channel/controller/ChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/channel/controller/ChannelMerchantAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/channel/controller/ChannelMerchantAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/channel/controller/ChannelMerchantAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/channel/controller/MerchantChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/channel/controller/MerchantChannelMerchantAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/channel/controller/MerchantChannelMerchantAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/channel/controller/MerchantChannelMerchantAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/config/controller/MchAppNotifyConfigAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/config/controller/MchAppNotifyConfigAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/config/controller/MchAppNotifyConfigAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/config/controller/MchAppNotifyConfigAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/config/controller/MerchantCredentialAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/config/controller/MerchantCredentialAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/config/controller/MerchantCredentialAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/config/controller/MerchantCredentialAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/config/service/MchAppNotifyConfigService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/config/service/MchAppNotifyConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/config/service/MchAppNotifyConfigService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/config/service/MchAppNotifyConfigService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/controller/DeviceQrCodeAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/controller/DeviceQrCodeAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/controller/DeviceQrCodeAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/controller/DeviceQrCodeAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/service/DeviceQrCodeAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/service/DeviceQrCodeAdminService.java similarity index 99% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/service/DeviceQrCodeAdminService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/service/DeviceQrCodeAdminService.java index 87b4bbe0d..5e64dde8f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/service/DeviceQrCodeAdminService.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/service/DeviceQrCodeAdminService.java @@ -10,7 +10,7 @@ import cn.daxpay.open.payment.device.qrcode.param.DeviceQrCodeBindMerchantParam; import cn.daxpay.open.payment.device.qrcode.param.DeviceQrCodeParam; import cn.daxpay.open.payment.device.qrcode.param.DeviceQrCodeQuery; import cn.daxpay.open.payment.device.qrcode.result.DeviceQrCodeResult; -import cn.daxpay.open.payment.merchant.dto.MchAppInfoAccessInfo; +import cn.daxpay.open.payment.common.dto.MchAppInfoAccessInfo; import cn.daxpay.open.platform.common.mybatisplus.util.MpUtil; import cn.daxpay.open.platform.common.translate.service.TransService; import cn.daxpay.open.platform.core.code.CommonCode; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayAggregateConfigAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayAggregateConfigAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayAggregateConfigAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayAggregateConfigAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayCashierConfigAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayCashierConfigAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayCashierConfigAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/gateway/controller/GatewayCashierConfigAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/gateway/service/GatewayCashierConfigService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/gateway/service/GatewayCashierConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/gateway/service/GatewayCashierConfigService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/gateway/service/GatewayCashierConfigService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/info/controller/MerchantAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/info/controller/MerchantAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/info/controller/MerchantAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/info/controller/MerchantAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/info/service/MerchantAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/info/service/MerchantAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/info/service/MerchantAdminService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/info/service/MerchantAdminService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/paychannel/controller/PayChannelController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/paychannel/controller/PayChannelController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/paychannel/controller/PayChannelController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/paychannel/controller/PayChannelController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayEnvConfigController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayEnvConfigController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayEnvConfigController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayEnvConfigController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductConfigController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductConfigController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductConfigController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductConfigController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/controller/PayProductController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/service/PayProductConfigService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/service/PayProductConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/product/service/PayProductConfigService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/product/service/PayProductConfigService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/provider/controller/PayProviderController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/provider/controller/PayProviderController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/provider/controller/PayProviderController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/provider/controller/PayProviderController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/provider/service/PayProviderService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/provider/service/PayProviderService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/provider/service/PayProviderService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/provider/service/PayProviderService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/route/controller/PayRouteAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/route/controller/PayRouteAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/route/controller/PayRouteAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/route/controller/PayRouteAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/route/service/PayRouteConfigService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/route/service/PayRouteConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/route/service/PayRouteConfigService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/route/service/PayRouteConfigService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/store/controller/MchStoreInfoAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/store/controller/MchStoreInfoAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/store/controller/MchStoreInfoAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/store/controller/MchStoreInfoAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/GatewayPayOrderAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/GatewayPayOrderAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/GatewayPayOrderAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/GatewayPayOrderAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/NormalPayOrderAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/NormalPayOrderAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/NormalPayOrderAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/NormalPayOrderAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayRefundOrderAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayRefundOrderAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayRefundOrderAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayRefundOrderAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayTradeAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayTradeAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayTradeAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/controller/PayTradeAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/GatewayPayOrderAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/GatewayPayOrderAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/GatewayPayOrderAdminService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/GatewayPayOrderAdminService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/NormalPayOrderAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/NormalPayOrderAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/NormalPayOrderAdminService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/NormalPayOrderAdminService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayRefundOrderAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayRefundOrderAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayRefundOrderAdminService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayRefundOrderAdminService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayTradeAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayTradeAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayTradeAdminService.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/trade/service/PayTradeAdminService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/PlatformWxDomainVerifyAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/PlatformWxDomainVerifyAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/PlatformWxDomainVerifyAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/PlatformWxDomainVerifyAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/WxDomainVerifyAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/WxDomainVerifyAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/WxDomainVerifyAdminController.java rename to daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/wxverify/controller/WxDomainVerifyAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..469fcae68 --- /dev/null +++ b/daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.daxpay.open.payment.admin.DaxpayAdminApp diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dto/MchAppInfoAccessInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/dto/MchAppInfoAccessInfo.java similarity index 87% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dto/MchAppInfoAccessInfo.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/dto/MchAppInfoAccessInfo.java index 682243d02..2a0749648 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dto/MchAppInfoAccessInfo.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/dto/MchAppInfoAccessInfo.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.merchant.dto; +package cn.daxpay.open.payment.common.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dto/MerchantAccessInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/dto/MerchantAccessInfo.java similarity index 84% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dto/MerchantAccessInfo.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/dto/MerchantAccessInfo.java index ad0428872..572fd5294 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dto/MerchantAccessInfo.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/dto/MerchantAccessInfo.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.merchant.dto; +package cn.daxpay.open.payment.common.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/DaxUserInfoStatusCheck.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/DaxUserInfoStatusCheck.java index 897eead24..2507e21b3 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/DaxUserInfoStatusCheck.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/DaxUserInfoStatusCheck.java @@ -7,7 +7,7 @@ import cn.daxpay.open.platform.capability.auth.entity.AuthInfoResult; import cn.daxpay.open.platform.capability.auth.entity.LoginAuthContext; import cn.daxpay.open.platform.capability.auth.exception.LoginFailureException; import cn.daxpay.open.platform.core.code.CommonCode; -import cn.daxpay.open.payment.merchant.service.query.MerchantAccessQueryService; +import cn.daxpay.open.payment.common.service.query.MerchantAccessQueryService; import cn.daxpay.open.payment.merchant.service.user.MerchantUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/MerchantContextLoader.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/MerchantContextLoader.java index 91f60c747..f2a0288a4 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/MerchantContextLoader.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/MerchantContextLoader.java @@ -9,9 +9,9 @@ import cn.daxpay.open.platform.core.exception.BizInfoException; import cn.daxpay.open.platform.core.exception.config.ConfigNotEnableException; import cn.daxpay.open.platform.iam.service.client.ClientCodeService; import cn.daxpay.open.payment.common.runtime.PaymentContext; -import cn.daxpay.open.payment.merchant.dto.MchAppInfoAccessInfo; -import cn.daxpay.open.payment.merchant.dto.MerchantAccessInfo; -import cn.daxpay.open.payment.merchant.service.query.MerchantAccessQueryService; +import cn.daxpay.open.payment.common.dto.MchAppInfoAccessInfo; +import cn.daxpay.open.payment.common.dto.MerchantAccessInfo; +import cn.daxpay.open.payment.common.service.query.MerchantAccessQueryService; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/PaySignService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/PaySignService.java index a8bb1e365..d08c1da4e 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/PaySignService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/PaySignService.java @@ -7,7 +7,7 @@ import cn.daxpay.open.platform.core.exception.business.VerifySignFailedException import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.common.runtime.PaymentContext; import cn.daxpay.open.payment.common.util.PaySignUtil; -import cn.daxpay.open.payment.merchant.service.query.MerchantAccessQueryService; +import cn.daxpay.open.payment.common.service.query.MerchantAccessQueryService; import cn.daxpay.open.payment.unipay.param.PaymentCommonParam; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantAccessQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/query/MerchantAccessQueryService.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantAccessQueryService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/query/MerchantAccessQueryService.java index 2a9b9e536..2fa032fee 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantAccessQueryService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/service/query/MerchantAccessQueryService.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.merchant.service.query; +package cn.daxpay.open.payment.common.service.query; -import cn.daxpay.open.payment.merchant.dto.MchAppInfoAccessInfo; -import cn.daxpay.open.payment.merchant.dto.MerchantAccessInfo; +import cn.daxpay.open.payment.common.dto.MchAppInfoAccessInfo; +import cn.daxpay.open.payment.common.dto.MerchantAccessInfo; import cn.daxpay.open.payment.merchant.dao.appinfo.MchAppInfoManager; import cn.daxpay.open.payment.merchant.dao.config.MerchantCredentialManager; import cn.daxpay.open.payment.merchant.dao.info.MerchantInfoManager; @@ -21,7 +21,9 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class MerchantAccessQueryService { private final MerchantInfoManager merchantInfoManager; + private final MchAppInfoManager mchAppInfoManager; + private final MerchantCredentialManager merchantCredentialManager; /// 根据商户号查询商户接入信息（引导用，忽略租户） diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/qrcode/service/CodePayAssistService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/qrcode/service/CodePayAssistService.java index 8a89e856e..fc69b452e 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/qrcode/service/CodePayAssistService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/qrcode/service/CodePayAssistService.java @@ -4,8 +4,8 @@ import cn.daxpay.open.payment.device.enums.QrCodeStatusEnum; import cn.daxpay.open.payment.device.qrcode.dao.DeviceQrCodeManager; import cn.daxpay.open.payment.device.qrcode.entity.DeviceQrCode; import cn.daxpay.open.payment.device.qrcode.result.CodePayInfoResult; -import cn.daxpay.open.payment.merchant.dto.MerchantAccessInfo; -import cn.daxpay.open.payment.merchant.service.query.MerchantAccessQueryService; +import cn.daxpay.open.payment.common.dto.MerchantAccessInfo; +import cn.daxpay.open.payment.common.service.query.MerchantAccessQueryService; import cn.daxpay.open.platform.core.exception.DataNotExistException; import cn.daxpay.open.platform.core.exception.operation.OperationFailException; import cn.daxpay.open.platform.core.code.CommonCode; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java index d963166b4..0fc3648a7 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; /// # 商户API配置服务（配置态） /// /// 管理端/商户端凭证查询与更新。须在已有租户上下文（登录 Filter / 运营端 ignoreTable）下调用。 -/// 网关验签取公钥请走 [cn.daxpay.open.payment.merchant.service.query.MerchantAccessQueryService]。 +/// 网关验签取公钥请走 [cn.daxpay.open.payment.common.service.query.MerchantAccessQueryService]。 @Slf4j @Service @RequiredArgsConstructor diff --git a/daxpay-payment/daxpay-payment-gateway/pom.xml b/daxpay-payment/daxpay-payment-gateway/pom.xml new file mode 100644 index 000000000..728fe6531 --- /dev/null +++ b/daxpay-payment/daxpay-payment-gateway/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + cn.daxpay.open + daxpay-payment + 4.0.0-SNAPSHOT + ../pom.xml + + + daxpay-payment-gateway + jar + 支付网关端（下单/退款/转账/查询/聚合支付的控制器与编排服务），依赖支付公共底座 + + + + + org.projectlombok + lombok + provided + + + + + cn.daxpay.open + daxpay-payment-common + ${project.version} + + + + diff --git a/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/DaxpayGatewayApp.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/DaxpayGatewayApp.java new file mode 100644 index 000000000..b320e7189 --- /dev/null +++ b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/DaxpayGatewayApp.java @@ -0,0 +1,13 @@ +package cn.daxpay.open.payment.gateway; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.ComponentScan; + +/// # 支付网关端装配入口 +/// +/// 扫描 `cn.daxpay.open.payment.gateway` 及其子包，注册网关端控制器与编排服务。 +/// 本模块依赖 `daxpay-payment-common` 公共底座，不反向被公共层依赖。 +@AutoConfiguration +@ComponentScan +public class DaxpayGatewayApp { +} diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/controller/GatewayClientController.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/controller/GatewayClientController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/controller/GatewayClientController.java rename to daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/controller/GatewayClientController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/controller/UniGatewayPayController.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/controller/UniGatewayPayController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/controller/UniGatewayPayController.java rename to daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/controller/UniGatewayPayController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/gateway/WxVerifyGatewayController.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/controller/WxVerifyGatewayController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/gateway/WxVerifyGatewayController.java rename to daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/controller/WxVerifyGatewayController.java index ea4890347..50f18797f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/gateway/WxVerifyGatewayController.java +++ b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/controller/WxVerifyGatewayController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.merchant.controller.gateway; +package cn.daxpay.open.payment.gateway.controller; import cn.daxpay.open.payment.merchant.service.wxverify.WxDomainVerifyService; import cn.daxpay.open.platform.core.annotation.IgnoreAuth; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayAggregatePayService.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayAggregatePayService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayAggregatePayService.java rename to daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayAggregatePayService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayOrderQueryService.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayOrderQueryService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayOrderQueryService.java rename to daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayOrderQueryService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayAssistService.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayAssistService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayAssistService.java rename to daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayAssistService.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayHandleService.java b/daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayHandleService.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayHandleService.java rename to daxpay-payment/daxpay-payment-gateway/src/main/java/cn/daxpay/open/payment/gateway/service/GatewayPayHandleService.java diff --git a/daxpay-payment/daxpay-payment-gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-payment/daxpay-payment-gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..afd8ad823 --- /dev/null +++ b/daxpay-payment/daxpay-payment-gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.daxpay.open.payment.gateway.DaxpayGatewayApp diff --git a/daxpay-payment/daxpay-payment-merchant/pom.xml b/daxpay-payment/daxpay-payment-merchant/pom.xml new file mode 100644 index 000000000..120fd3ec2 --- /dev/null +++ b/daxpay-payment/daxpay-payment-merchant/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + cn.daxpay.open + daxpay-payment + 4.0.0-SNAPSHOT + ../pom.xml + + + daxpay-payment-merchant + jar + 商户自助端（商户管理自己资源/订单的控制器），依赖支付公共底座 + + + + + org.projectlombok + lombok + provided + + + + + cn.daxpay.open + daxpay-payment-common + ${project.version} + + + + 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 new file mode 100644 index 000000000..018381c52 --- /dev/null +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayMerchantApp.java @@ -0,0 +1,14 @@ +package cn.daxpay.open.payment.merchant; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.ComponentScan; + +/// # 商户自助端装配入口 +/// +/// 扫描 `cn.daxpay.open.payment.merchant` 及其子包，注册商户自助控制器（controller/mch）。 +/// 本模块依赖 `daxpay-payment-common` 公共底座；商户领域 entity/dao/service 留公共层共享， +/// 此处仅负责商户端 HTTP 接口的装配。 +@AutoConfiguration +@ComponentScan +public class DaxpayMerchantApp { +} diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/ChannelConfigController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/ChannelConfigController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/ChannelConfigController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/ChannelConfigController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/MerchantCredentialController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/MerchantCredentialController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/MerchantCredentialController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/MerchantCredentialController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchAppInfoController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchAppInfoController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchAppInfoController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchAppInfoController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchUserAdminController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchUserAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchUserAdminController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchUserAdminController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantUserController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantUserController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantUserController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantUserController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchBasicController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchBasicController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchBasicController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchBasicController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderQueryController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderQueryController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderQueryController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderQueryController.java diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/store/MchStoreInfoController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/store/MchStoreInfoController.java similarity index 100% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/store/MchStoreInfoController.java rename to daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/store/MchStoreInfoController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..128ec25b1 --- /dev/null +++ b/daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.daxpay.open.payment.merchant.DaxpayMerchantApp diff --git a/daxpay-payment/pom.xml b/daxpay-payment/pom.xml index c49434551..adacdc3d6 100644 --- a/daxpay-payment/pom.xml +++ b/daxpay-payment/pom.xml @@ -16,6 +16,9 @@ daxpay-payment-common + daxpay-payment-admin + daxpay-payment-gateway + daxpay-payment-merchant diff --git a/daxpay-start/pom.xml b/daxpay-start/pom.xml index c4278aea0..64c36afe7 100644 --- a/daxpay-start/pom.xml +++ b/daxpay-start/pom.xml @@ -37,13 +37,34 @@ provided - + cn.daxpay.open daxpay-payment-common ${project.version} + + + cn.daxpay.open + daxpay-payment-admin + ${project.version} + + + + + cn.daxpay.open + daxpay-payment-gateway + ${project.version} + + + + + cn.daxpay.open + daxpay-payment-merchant + ${project.version} + + cn.daxpay.open