From 4ea7c856ecebb3b5ebf7cf52d65c69eced595bc0 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Wed, 1 Jul 2026 10:54:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E5=90=88=E5=B9=B6=20admin?= =?UTF-8?q?/merchant=20=E6=A8=A1=E5=9D=97=E8=87=B3=20payment-common,=20?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=B8=BA=E5=8D=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 daxpay-payment-admin/merchant 源码并入 daxpay-payment-common (包路径不变) - 删除冗余的 DaxpayPaymentMerchantApp/DaxpayPaymentAdminApp, 保留 DaxpayPaymentApp - admin 的额外依赖 (common-translate/service-baseapi/service-notify/common-artemis) 并入 common pom - 父 pom modules 与 daxpay-start pom 同步收敛 --- daxpay-payment/daxpay-payment-admin/pom.xml | 122 ------------------ .../payment/admin/DaxpayPaymentAdminApp.java | 16 --- ...ot.autoconfigure.AutoConfiguration.imports | 1 - daxpay-payment/daxpay-payment-common/pom.xml | 26 +++- .../info/ChannelMerchantAdminController.java | 0 .../develop/DevelopSignController.java | 0 .../develop/DevelopTradeController.java | 0 .../capability/PayCapabilityController.java | 0 .../channel/PayChannelController.java | 0 .../product/PayProductConfigController.java | 0 .../product/PayProductController.java | 0 .../provider/PayProviderController.java | 0 .../appinfo/MchAppInfoAdminController.java | 0 ...erchantChannelMerchantAdminController.java | 0 .../MerchantCredentialAdminController.java | 0 .../info/MerchantAdminController.java | 0 .../route/PayRouteAdminController.java | 0 .../store/MchStoreInfoAdminController.java | 0 .../DevicePrinterAdminController.java | 0 .../service/DevicePrinterAdminService.java | 0 .../DeviceSpeakerAdminController.java | 0 .../service/DeviceSpeakerAdminService.java | 0 .../DeviceVendorConfigAdminController.java | 0 .../DeviceVendorConfigAdminService.java | 0 .../admin/param/develop/DevelopParam.java | 0 .../admin/param/develop/DevelopSignParam.java | 0 .../param/develop/DevelopVerifyParam.java | 0 .../result/develop/DevelopPayResult.java | 0 .../result/develop/DevelopSignResult.java | 0 .../service/develop/DevelopSignService.java | 0 .../service/develop/DevelopTradeService.java | 0 .../merchant/info/MerchantAdminService.java | 0 .../auth/MchPasswordLoginHandler.java | 0 .../merchant/config/DaxPayProperties.java | 0 .../config/MerchantAuthConfiguration.java | 0 .../config/ChannelConfigController.java | 0 .../config/MerchantCredentialController.java | 0 .../controller/info/MchAppInfoController.java | 0 .../info/MchUserAdminController.java | 0 .../controller/info/MerchantController.java | 0 .../info/MerchantUserController.java | 0 .../miniapp/MiniMchBasicController.java | 0 .../miniapp/MiniMchOrderController.java | 0 .../miniapp/MiniMchOrderQueryController.java | 0 .../store/MchStoreInfoController.java | 0 .../convert/appinfo/MchAppInfoConvert.java | 0 .../convert/config/ChannelConfigConvert.java | 0 .../config/MerchantCredentialConvert.java | 0 .../convert/info/MerchantInfoConvert.java | 0 .../convert/info/MerchantUserConvert.java | 0 .../basic/PayRouteBasicConfigConvert.java | 0 .../scene/PayRouteSceneConfigConvert.java | 0 .../strategy/PayRouteStrategyConvert.java | 0 .../convert/store/MchStoreInfoConvert.java | 0 .../dao/appinfo/MchAppInfoManager.java | 0 .../dao/appinfo/MchAppInfoMapper.java | 0 .../dao/config/ChannelConfigManager.java | 0 .../dao/config/ChannelConfigMapper.java | 0 .../dao/config/MerchantCredentialManager.java | 0 .../dao/config/MerchantCredentialMapper.java | 0 .../dao/info/MerchantInfoManager.java | 0 .../merchant/dao/info/MerchantInfoMapper.java | 0 .../dao/info/MerchantUserManager.java | 0 .../merchant/dao/info/MerchantUserMapper.java | 0 .../basic/PayRouteBasicConfigManager.java | 0 .../basic/PayRouteBasicConfigMapper.java | 0 .../scene/PayRouteSceneConfigManager.java | 0 .../scene/PayRouteSceneConfigMapper.java | 0 .../strategy/PayRouteStrategyManager.java | 0 .../strategy/PayRouteStrategyMapper.java | 0 .../dao/store/MchStoreInfoManager.java | 0 .../dao/store/MchStoreInfoMapper.java | 0 .../merchant/entity/appinfo/MchAppInfo.java | 0 .../entity/config/MerchantCredential.java | 0 .../merchant/entity/info/MerchantInfo.java | 0 .../merchant/entity/info/MerchantUser.java | 0 .../route/basic/PayRouteBasicConfig.java | 0 .../route/scene/PayRouteSceneConfig.java | 0 .../route/strategy/PayRouteStrategy.java | 0 .../merchant/entity/store/MchStoreInfo.java | 0 .../filter/MchContextLocalFilter.java | 0 .../param/appinfo/MchAppInfoParam.java | 0 .../param/appinfo/MchAppInfoQuery.java | 0 .../param/config/MerchantCredentialParam.java | 0 .../param/config/NotifySubscribeParam.java | 0 .../param/info/MerchantForgotParam.java | 0 .../param/info/MerchantInfoParam.java | 0 .../param/info/MerchantInfoQuery.java | 0 .../param/info/MerchantRegisterParam.java | 0 .../param/info/MerchantUserBatchParam.java | 0 .../param/info/MerchantUserParam.java | 0 .../param/info/MerchantUserQuery.java | 0 .../info/MerchantUserResetPwdBatchParam.java | 0 .../param/info/MerchantUserResetPwdParam.java | 0 .../miniapp/order/MiniPayOrderQuery.java | 0 .../miniapp/quickly/QuicklyBarPayParam.java | 0 .../miniapp/quickly/QuicklyQrPayParam.java | 0 .../basic/PayRouteBasicConfigBatchParam.java | 0 .../route/basic/PayRouteBasicConfigItem.java | 0 .../PayRouteSceneCapabilityBatchItem.java | 0 .../PayRouteSceneCapabilityBatchParam.java | 0 .../scene/PayRouteSceneConfigBatchParam.java | 0 .../route/scene/PayRouteSceneConfigItem.java | 0 .../route/strategy/PayRouteStrategyParam.java | 0 .../param/store/MchStoreInfoParam.java | 0 .../param/store/MchStoreInfoQuery.java | 0 .../result/appinfo/MchAppInfoResult.java | 0 .../result/config/ChannelConfigResult.java | 0 .../config/MerchantCredentialResult.java | 0 .../merchant/result/info/MchResult.java | 0 .../result/info/MerchantInfoResult.java | 0 .../result/info/MerchantUserDetailResult.java | 0 .../result/info/MerchantUserResult.java | 0 .../basic/PayRouteBasicConfigResult.java | 0 .../scene/PayRouteSceneConfigResult.java | 0 .../strategy/PayRouteStrategyResult.java | 0 .../result/store/MchStoreInfoResult.java | 0 .../service/appinfo/MchAppInfoService.java | 0 .../service/config/ChannelConfigService.java | 0 .../config/MerchantCredentialService.java | 0 .../service/info/MerchantInfoService.java | 0 .../service/miniapp/MiniMchBasicService.java | 0 .../miniapp/MiniMchOrderQueryService.java | 0 .../MerchantPermissionServiceImpl.java | 0 .../query/MerchantQueryFacadeService.java | 0 .../query/MerchantUserQueryFacadeService.java | 0 .../query/MerchantUserQueryService.java | 0 .../basic/PayRouteBasicConfigService.java | 0 .../route/basic/PayRouteBasicMatcher.java | 0 .../route/facade/PayRouteConfigService.java | 0 .../service/route/model/PayRouteBundle.java | 0 .../service/route/model/RouteHit.java | 0 .../runtime/PayRouteProductResolver.java | 0 .../route/runtime/PayRouteService.java | 0 .../route/scene/PayRouteMethodValidator.java | 0 .../scene/PayRouteSceneConfigService.java | 0 .../route/scene/PayRouteSceneMatcher.java | 0 .../support/PayRouteConfigProviders.java | 0 .../route/support/PayRouteI18nHelper.java | 0 .../PayRouteStrategyCapabilitySupport.java | 0 .../service/store/MchStoreInfoService.java | 0 .../user/MerchantUserAdminService.java | 0 .../service/user/MerchantUserService.java | 0 .../daxpay-payment-merchant/pom.xml | 97 -------------- .../merchant/DaxpayPaymentMerchantApp.java | 16 --- ...ot.autoconfigure.AutoConfiguration.imports | 1 - daxpay-payment/pom.xml | 4 +- daxpay-start/pom.xml | 12 +- 148 files changed, 27 insertions(+), 268 deletions(-) delete mode 100644 daxpay-payment/daxpay-payment-admin/pom.xml delete mode 100644 daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayPaymentAdminApp.java delete mode 100644 daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java (100%) rename daxpay-payment/{daxpay-payment-admin => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java (100%) rename daxpay-payment/{daxpay-payment-merchant => daxpay-payment-common}/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java (100%) delete mode 100644 daxpay-payment/daxpay-payment-merchant/pom.xml delete mode 100644 daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayPaymentMerchantApp.java delete mode 100644 daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/daxpay-payment/daxpay-payment-admin/pom.xml b/daxpay-payment/daxpay-payment-admin/pom.xml deleted file mode 100644 index 55122ded5..000000000 --- a/daxpay-payment/daxpay-payment-admin/pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - 4.0.0 - - cn.daxpay.open - daxpay-payment - 4.0.0-SNAPSHOT - - - daxpay-payment-admin - jar - 多商户支付运营端功能实现 - - - - - org.projectlombok - lombok - provided - - - - - org.mapstruct - mapstruct-processor - provided - ${mapstruct.version} - - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - cn.daxpay.open - daxpay-payment-common - ${project.version} - - - - cn.daxpay.open - daxpay-payment-merchant - ${project.version} - - - - - cn.daxpay.open - common-translate - ${project.version} - - - - cn.daxpay.open - service-baseapi - ${project.version} - - - - cn.daxpay.open - service-notify - ${project.version} - - - - cn.daxpay.open - common-artemis - ${project.version} - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - UTF-8 - - xlsx - xls - docx - doc - - - - - - - src/main/resources - - **/* - - - - src/main/java - - **/*.xml - **/*.sql - **/*.flt - **/*.xlsx - **/*.xls - **/*.docx - **/*.doc - - - - - diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayPaymentAdminApp.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayPaymentAdminApp.java deleted file mode 100644 index 9ff346274..000000000 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayPaymentAdminApp.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.daxpay.open.payment.admin; - -import org.apache.ibatis.annotations.Mapper; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; - -/// # 支付运营端装配入口 -/// -@AutoConfiguration -@ConfigurationPropertiesScan -@MapperScan(annotationClass = Mapper.class) -@ComponentScan -public class DaxpayPaymentAdminApp { -} 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 deleted file mode 100644 index cb617d980..000000000 --- a/daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.daxpay.open.payment.admin.DaxpayPaymentAdminApp diff --git a/daxpay-payment/daxpay-payment-common/pom.xml b/daxpay-payment/daxpay-payment-common/pom.xml index 29393d010..050394b72 100644 --- a/daxpay-payment/daxpay-payment-common/pom.xml +++ b/daxpay-payment/daxpay-payment-common/pom.xml @@ -11,7 +11,7 @@ daxpay-payment-common jar - 多商户支付核心业务实现 + 多商户支付功能实现（含核心底座、运营端、商户端） @@ -104,6 +104,30 @@ capability-wechat ${project.version} + + + cn.daxpay.open + common-translate + ${project.version} + + + + cn.daxpay.open + service-baseapi + ${project.version} + + + + cn.daxpay.open + service-notify + ${project.version} + + + + cn.daxpay.open + common-artemis + ${project.version} + diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java diff --git a/daxpay-payment/daxpay-payment-merchant/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 similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java similarity index 100% rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java diff --git a/daxpay-payment/daxpay-payment-merchant/pom.xml b/daxpay-payment/daxpay-payment-merchant/pom.xml deleted file mode 100644 index 01dc01206..000000000 --- a/daxpay-payment/daxpay-payment-merchant/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - 4.0.0 - - cn.daxpay.open - daxpay-payment - 4.0.0-SNAPSHOT - - - daxpay-payment-merchant - jar - 多商户支付商户端功能实现 - - - - - org.projectlombok - lombok - provided - - - - - org.mapstruct - mapstruct-processor - provided - ${mapstruct.version} - - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - cn.daxpay.open - daxpay-payment-common - ${project.version} - - - - org.junit.jupiter - junit-jupiter - test - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - UTF-8 - - xlsx - xls - docx - doc - - - - - - - src/main/resources - - **/* - - - - src/main/java - - **/*.xml - **/*.sql - **/*.flt - **/*.xlsx - **/*.xls - **/*.docx - **/*.doc - - - - - diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayPaymentMerchantApp.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayPaymentMerchantApp.java deleted file mode 100644 index f13401d30..000000000 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayPaymentMerchantApp.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.daxpay.open.payment.merchant; - -import org.apache.ibatis.annotations.Mapper; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; - -/// # 支付商户端装配入口 -/// -@AutoConfiguration -@ConfigurationPropertiesScan -@MapperScan(annotationClass = Mapper.class) -@ComponentScan -public class DaxpayPaymentMerchantApp { -} 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 deleted file mode 100644 index 4f6639bcb..000000000 --- a/daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.daxpay.open.payment.merchant.DaxpayPaymentMerchantApp diff --git a/daxpay-payment/pom.xml b/daxpay-payment/pom.xml index 5b3dc32fa..c49434551 100644 --- a/daxpay-payment/pom.xml +++ b/daxpay-payment/pom.xml @@ -12,12 +12,10 @@ daxpay-payment pom - 多商户支付核心功能实现 + 多商户支付功能实现（核心底座 + 运营端 + 商户端，单模块） daxpay-payment-common - daxpay-payment-merchant - daxpay-payment-admin diff --git a/daxpay-start/pom.xml b/daxpay-start/pom.xml index b462cadd1..63a36cb21 100644 --- a/daxpay-start/pom.xml +++ b/daxpay-start/pom.xml @@ -37,22 +37,12 @@ provided - + cn.daxpay.open daxpay-payment-common ${project.version} - - cn.daxpay.open - daxpay-payment-merchant - ${project.version} - - - cn.daxpay.open - daxpay-payment-admin - ${project.version} -