Merge tag '1.0.12' into develop

农商行接口修改，消费接口新加支付场景

diff --cc build.gradle
index 83b1ec8,0b1c3c0..fe5a7de
--- 1/build.gradle
--- 2/build.gradle
+++ b/build.gradle
@@@ -15,133 -13,15 +15,132 @@@ allprojects 
          jcenter()
          mavenCentral()
      }
 -    
 +    ext {
 +        set('junit_jupiter_version', "5.5.2")
 +        set("junit_platform_version", "1.5.2")
 +        set("mockitoVersion", "3.1.0")
 +    }
 +
 +    apply plugin: 'java'
 +    apply plugin: 'io.spring.dependency-management'
 +
 +    sourceCompatibility = JavaVersion.VERSION_1_8
 +    targetCompatibility = JavaVersion.VERSION_1_8
 +
 +    compileKotlin {
 +        kotlinOptions {
 +            freeCompilerArgs = ['-Xjsr305=strict']
 +            jvmTarget = jdkVersion
 +        }
 +    }
 +
 +    compileTestKotlin {
 +        kotlinOptions {
 +            freeCompilerArgs = ['-Xjsr305=strict']
 +            jvmTarget = jdkVersion
 +        }
 +    }
 +
 +    version = gitVersion()
 +    ext {
 +        details = versionDetails()
 +    }
  }
  
 +
  subprojects {
 -    version = '1.0'
 -}
  
 -bootJar {
 -    enabled = false
 +    ext {
 +        set('springCloudVersion', "Hoxton.RELEASE")
 +    }
 +
 +    dependencies {
 +        ext {
 +            slf4jVersion = '1.7.26'
 +            beanutilsVersion = '1.9.3'
 +            codecVersion = '1.13'
 +            lang3Version = '3.9'
 +            commonCodecVersion = '1.12'
 +            lombokVersion = '1.18.8'
 +            javaELVersion = '3.0.0'
 +            shedlockVersion = '2.5.0'
 +            jose4jVersion = '0.6.5'
 +            jcabiManifestsVersion = '1.1'
 +            kotlnLogVersion = '1.6.26'
 +            slf4jVersion = '1.7.26'
 +            gsonVersion = '2.8.5'
 +            dbcpVersion = '1.4'
 +            log4jVersion = '1.2.17'
 +            alibabFastjsonVerison = '1.2.60'
 +            beanutilsVersion = '1.9.3'
 +            alipaySDKVersion = '3.7.110.ALL'
 +            lombokVersion = '1.18.8'
 +            resetAssuredVersion = '3.3.0'
 +            hamcrestVersion = '2.1'
 +            mockkVersion = '1.9.3'
 +            commonNetVersion = '3.6'
 +            kaptchaVersion = '2.3.2'
 +            jerseyClientVersion = '1.19'
 +            javaxWSRSVersion = '2.1.1'
 +            dom4jVersion = '2.1.1'
 +            springSocialVersion = '1.1.6.RELEASE'
 +            springKafkaVersion = '2.3.4.RELEASE'
 +            postgresVersion = '42.2.5'
 +        }
 +        implementation "org.jetbrains.kotlin:kotlin-reflect"
 +        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 +
 +        implementation "org.springframework.boot:spring-boot-starter"
 +        implementation "org.springframework.boot:spring-boot-starter-data-jpa"
 +        implementation "org.springframework.boot:spring-boot-starter-data-redis"
 +        implementation "org.springframework.boot:spring-boot-starter-validation"
 +
 +        implementation "javax.validation:validation-api"
 +        implementation "com.jcabi:jcabi-manifests:${jcabiManifestsVersion}"
 +        implementation "org.slf4j:slf4j-parent:${slf4jVersion}"
 +        implementation "org.slf4j:slf4j-api:${slf4jVersion}"
 +        implementation "org.postgresql:postgresql:${postgresVersion}"
 +        implementation "io.github.microutils:kotlin-logging:${kotlnLogVersion}"
-         implementation "org.slf4j:slf4j-parent:${slf4jVersion}"
 +        implementation "com.google.code.gson:gson:${gsonVersion}"
 +        implementation "commons-dbcp:commons-dbcp:${dbcpVersion}"
 +        implementation "commons-codec:commons-codec:${commonCodecVersion}"
 +        implementation "log4j:log4j:${log4jVersion}"
 +        implementation "com.alibaba:fastjson:${alibabFastjsonVerison}"
 +        implementation "com.fasterxml.jackson.module:jackson-module-kotlin"
 +
 +
 +        annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 +        annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 +        compileOnly "org.projectlombok:lombok:${lombokVersion}"
 +
 +        //    implementation "javax.el:javax.el-api:${javaELVersion}"
 +        //    implementation "javax.servlet:javax.servlet-api:4.0.1"
 +//        testImplementation 'org.springframework:spring-test'
 +//        testImplementation 'org.springframework.boot:spring-boot-test'
 +//    implementation "javax.servlet:jstl:1.2"
 +//    implementation "taglibs:standard:1.1.2"
 +        testImplementation "org.springframework.boot:spring-boot-starter-test"
 +        testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
 +        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
 +        testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
 +        testImplementation "io.mockk:mockk:${mockkVersion}"
 +        testImplementation "org.hamcrest:hamcrest:${hamcrestVersion}"
 +        testImplementation "io.rest-assured:rest-assured:${resetAssuredVersion}"
 +        testImplementation "io.rest-assured:spring-mock-mvc:${resetAssuredVersion}"
 +    }
 +
 +    test {
 +        useJUnitPlatform()
 +        testLogging {
 +            events "passed", "skipped", "failed"
 +        }
 +    }
 +
 +    dependencyManagement {
 +        imports {
 +            mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
 +        }
 +    }
  }
  
 -group = 'com.supwisdom'
 +

diff --cc payapi/build.gradle
index 184dbb5,0a7d16c..2938317
--- 1/payapi/build.gradle
--- 2/payapi/build.gradle
+++ b/payapi/build.gradle
@@@ -57,44 -53,89 +57,53 @@@ docker 
  docker.dependsOn(jar)
  
  dependencies {
 -    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 -    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 -    implementation 'org.springframework.boot:spring-boot-starter-web'
 -    implementation 'org.springframework.boot:spring-boot-starter-security'
 -    implementation 'org.springframework.boot:spring-boot-starter-cache'
 -    implementation 'org.springframework.boot:spring-boot-autoconfigure'
 -    implementation 'org.springframework.security:spring-security-oauth2-jose'
 -    implementation 'org.springframework.security:spring-security-oauth2-client'
 -    implementation 'org.springframework.security:spring-security-oauth2-jose'
 -    implementation 'org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.5.RELEASE'
 -    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 -    implementation 'org.springframework.session:spring-session-data-redis'
 -    implementation 'org.springframework.boot:spring-boot-starter-cache'
 -    implementation 'org.springframework.kafka:spring-kafka'
 -    implementation 'org.springframework.social:spring-social-web:1.1.6.RELEASE'
 -    implementation 'org.springframework.kafka:spring-kafka:2.2.8.RELEASE'
 -    implementation 'org.jetbrains.kotlin:kotlin-reflect'
 -    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 -    implementation 'commons-codec:commons-codec:1.12'
 -    implementation 'org.apache.commons:commons-lang3:3.9'
 -    implementation 'net.javacrumbs.shedlock:shedlock-spring:2.5.0'
 -    implementation 'net.javacrumbs.shedlock:shedlock-provider-redis-spring:2.5.0'
 -
 -    implementation 'org.springframework.cloud:spring-cloud-starter'
 -    implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
 -    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-hystrix'
 -    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-hystrix-dashboard'
 -
 -    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
 +    implementation project(":payapi-common")
 +
 +    implementation "org.springframework.boot:spring-boot-starter-web"
 +    implementation "org.springframework.boot:spring-boot-starter-security"
 +    implementation "org.springframework.boot:spring-boot-starter-cache"
 +    implementation "org.springframework.boot:spring-boot-autoconfigure"
 +    implementation "org.springframework.security:spring-security-oauth2-jose"
 +    implementation "org.springframework.security:spring-security-oauth2-client"
 +    implementation "org.springframework.security:spring-security-oauth2-jose"
 +    implementation "org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure"
 +    implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
 +    implementation "org.springframework.session:spring-session-data-redis"
 +    implementation "org.springframework.boot:spring-boot-starter-cache"
 +    implementation "org.springframework.kafka:spring-kafka"
 +    implementation "org.springframework.social:spring-social-web:${springSocialVersion}"
 +    implementation "org.springframework.kafka:spring-kafka:${springKafkaVersion}"
 +
 +    implementation "org.springframework.cloud:spring-cloud-starter"
 +    implementation "org.springframework.cloud:spring-cloud-starter-consul-discovery"
 +    implementation "org.springframework.cloud:spring-cloud-starter-netflix-hystrix"
 +    implementation "org.springframework.cloud:spring-cloud-starter-netflix-hystrix-dashboard"
 +
      runtime("org.springframework.boot:spring-boot-devtools")
  
 -    implementation 'org.postgresql:postgresql:42.2.5'
 -    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
 -    implementation 'com.jcabi:jcabi-manifests:1.1'
 +    implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5"
+     implementation 'org.bitbucket.b_c:jose4j:0.6.5'
 -    implementation 'io.github.microutils:kotlin-logging:1.6.26'
 -    implementation 'org.slf4j:slf4j-parent:1.7.26'
+     implementation 'com.github.penggle:kaptcha:2.3.2'
 -    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+     implementation group: 'com.sun.jersey', name: 'jersey-client', version: '1.19'
+     implementation group: 'javax.servlet', name: 'jstl', version: '1.2'
+     implementation group: 'taglibs', name: 'standard', version: '1.1.2'
 -    implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
+     implementation files('libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar')
 -//    implementation files('libs/ojdbc6.jar')
 -    implementation 'commons-dbcp:commons-dbcp:1.4'
+     implementation 'commons-beanutils:commons-beanutils:1.9.3'
 -
 -    implementation 'log4j:log4j:1.2.17'
 -    implementation 'com.alibaba:fastjson:1.2.60'
 -
+     implementation 'com.eatthepath:java-otp:0.1.0'
+     implementation project(':payapi-common')
 -    /*支付宝SDK*/
 -    implementation group: 'com.alipay.sdk', name: 'alipay-sdk-java', version: '3.7.110.ALL'
  
 -    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 -    annotationProcessor 'org.projectlombok:lombok:1.18.8'
 -    compileOnly 'org.projectlombok:lombok:1.18.8'
 +    implementation "org.apache.commons:commons-lang3:${lang3Version}"
 +    implementation "net.javacrumbs.shedlock:shedlock-spring:${shedlockVersion}"
 +    implementation "net.javacrumbs.shedlock:shedlock-provider-redis-spring:${shedlockVersion}"
  
 -//    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 -    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 -    testImplementation 'io.rest-assured:rest-assured:3.3.0'
 -    testImplementation 'io.rest-assured:spring-mock-mvc:3.3.0'
 -    testImplementation 'org.hamcrest:hamcrest:2.1'
 -}
 +    implementation "org.bitbucket.b_c:jose4j:${jose4jVersion}"
 +    implementation files("libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar")
 +    implementation "commons-beanutils:commons-beanutils:${beanutilsVersion}"
 +    /*支付宝SDK*/
 +    implementation "com.alipay.sdk:alipay-sdk-java:${alipaySDKVersion}"
  
 -dependencyManagement {
 -    imports {
 -        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
 -    }
 -}
 +    implementation "com.github.penggle:kaptcha:${kaptchaVersion}"
 +    implementation "com.sun.jersey:jersey-client:${jerseyClientVersion}"
  
 -compileKotlin {
 -    kotlinOptions {
 -        freeCompilerArgs = ['-Xjsr305=strict']
 -        jvmTarget = jdkVersion
 -    }
  }
  
 -compileTestKotlin {
 -    kotlinOptions {
 -        freeCompilerArgs = ['-Xjsr305=strict']
 -        jvmTarget = jdkVersion
 -    }
 -}

diff --cc payapi/src/main/resources/data.sql
Simple merge