From: Tang Cheng Date: Wed, 10 Jul 2019 01:38:32 +0000 (+0800) Subject: 将 common 改为 payapi-common X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=e4bf7625846932962a28191785e9a1deef415417;p=epayment%2Ffood_payapi.git 将 common 改为 payapi-common --- diff --git a/common/build.gradle b/payapi-common/build.gradle similarity index 100% rename from common/build.gradle rename to payapi-common/build.gradle diff --git a/common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/IntegerList.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IntegerList.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/IntegerList.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IntegerList.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/MobileNumber.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/MobileNumber.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/MobileNumber.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/MobileNumber.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/Sign.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sign.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/Sign.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sign.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/StringList.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/StringList.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/StringList.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/StringList.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/annotation/UserStatus.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/UserStatus.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/annotation/UserStatus.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/UserStatus.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginInitResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginInitResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginInitResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginInitResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiLoginResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ApiResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ApiResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ApiVersionResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiVersionResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ApiVersionResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ApiVersionResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayfinishParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayfinishParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayfinishParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayfinishParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenPayResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenPayResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenPayResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenPayResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/CommonQueryRechargeResultParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonQueryRechargeResultParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/CommonQueryRechargeResultParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonQueryRechargeResultParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeConfirmParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeConfirmParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeConfirmParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeConfirmParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeInitParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeInitParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeInitParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CommonRechargeInitParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumeFeetype.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumeFeetype.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumeFeetype.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumeFeetype.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayCancelParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayCancelParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayCancelParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayCancelParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayRefundParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayRefundParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayRefundParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ConsumePayRefundParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ModifyUserParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ModifyUserParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ModifyUserParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ModifyUserParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/NewUserCheck.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/NewUserCheck.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/NewUserCheck.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/NewUserCheck.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/PayReverseResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/PayReverseResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/PayReverseResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/PayReverseResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/QueryDtlResultParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryDtlResultParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/QueryDtlResultParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryDtlResultParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/QueryShopParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryShopParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/QueryShopParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryShopParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/QueryTransDtlResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryTransDtlResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/QueryTransDtlResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryTransDtlResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/QueryUserParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryUserParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/QueryUserParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryUserParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/ShopResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ShopResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/ShopResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/ShopResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/UserResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/UserResponse.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/UserResponse.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/UserResponse.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/bean/YktCardPayinitParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/YktCardPayinitParam.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/bean/YktCardPayinitParam.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/YktCardPayinitParam.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/exception/RequestParamCheckException.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/exception/RequestParamCheckException.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/exception/RequestParamCheckException.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/exception/RequestParamCheckException.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/util/Constants.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/Constants.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/util/Constants.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/util/Constants.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/util/DateUtil.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/DateUtil.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/util/DateUtil.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/util/DateUtil.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/util/IDTypes.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/IDTypes.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/util/IDTypes.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/util/IDTypes.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/util/MobileNumberCheck.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/MobileNumberCheck.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/util/MobileNumberCheck.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/util/MobileNumberCheck.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/util/SexTypes.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/SexTypes.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/util/SexTypes.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/util/SexTypes.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/validator/IntegerListValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IntegerListValidator.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/validator/IntegerListValidator.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IntegerListValidator.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/validator/MobileNumberValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/MobileNumberValidator.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/validator/MobileNumberValidator.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/MobileNumberValidator.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/validator/StringListValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/StringListValidator.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/validator/StringListValidator.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/StringListValidator.java diff --git a/common/src/main/java/com/supwisdom/dlpay/api/validator/UserStatusValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/UserStatusValidator.java similarity index 100% rename from common/src/main/java/com/supwisdom/dlpay/api/validator/UserStatusValidator.java rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/UserStatusValidator.java diff --git a/common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java b/payapi-common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java similarity index 100% rename from common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java rename to payapi-common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java diff --git a/payapi-sdk/build.gradle b/payapi-sdk/build.gradle index 7f5aafa8..173368c9 100644 --- a/payapi-sdk/build.gradle +++ b/payapi-sdk/build.gradle @@ -43,7 +43,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-data-redis' - implementation project(':common') + implementation project(':payapi-common') implementation 'org.springframework.cloud:spring-cloud-dependencies:Finchley.SR3' implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:2.1.2.RELEASE' @@ -59,7 +59,7 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok:1.18.8' testCompileOnly 'org.projectlombok:lombok:1.18.8' testImplementation 'org.hamcrest:hamcrest:2.1' - testImplementation project(':common') + testImplementation project(':payapi-common') } @@ -70,11 +70,11 @@ jar { manifest { attributes('Payapi-SDK-Version': sdkVersion) } - from project(':common').configurations.archives.allArtifacts.files.collect { zipTree(it) } + from project(':payapi-common').configurations.archives.allArtifacts.files.collect { zipTree(it) } } -task fullJar(type: Jar, dependsOn: ':common:jar') { +task fullJar(type: Jar, dependsOn: ':payapi-common:jar') { } jar.dependsOn(fullJar) diff --git a/payapi/build.gradle b/payapi/build.gradle index ac7c8cd1..e62b4712 100644 --- a/payapi/build.gradle +++ b/payapi/build.gradle @@ -79,7 +79,7 @@ dependencies { implementation files('libs/ojdbc6.jar') implementation 'commons-dbcp:commons-dbcp:1.4' - implementation project(':common') + implementation project(':payapi-common') annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" annotationProcessor 'org.projectlombok:lombok:1.18.8' diff --git a/settings.gradle b/settings.gradle index 4a2e5839..00adefdd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'payapi' -include 'payapi', 'payapi-sdk', 'common' +include 'payapi', 'payapi-sdk', 'payapi-common'