From: Tang Cheng Date: Mon, 8 Jul 2019 08:27:33 +0000 (+0800) Subject: refactor: 将 payapi 移到子目录下 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=88a0f84e1ee3650fed0b1e9e93cba96f7e8f9cef;p=epayment%2Ffood_payapi.git refactor: 将 payapi 移到子目录下 --- diff --git a/build.gradle b/build.gradle index 9d339e74..d3f7c745 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,3 @@ -plugins { - id 'java' - id 'org.springframework.boot' version '2.1.6.RELEASE' - id 'org.jetbrains.kotlin.jvm' version '1.3.31' - id 'org.jetbrains.kotlin.plugin.jpa' version '1.3.31' - id 'org.jetbrains.kotlin.plugin.spring' version '1.3.31' - id "com.palantir.git-version" version "0.12.0-rc2" - id 'com.palantir.docker' version '0.22.1' -} - -apply plugin: 'java' -apply plugin: 'io.spring.dependency-management' - -payapiVersion = gitVersion() - -group = 'com.supwisdom' -version = '1' -sourceCompatibility = jdkVersion -def startClass = 'com.supwisdom.dlpay.PayApiApplicationKt' - -println("Build version: $payapiVersion") allprojects { repositories { jcenter() @@ -30,78 +9,6 @@ subprojects { version = '1.0' } -bootJar { - mainClassName = startClass - manifest { - attributes('Payapi-Version': payapiVersion) - } -} - -jar { - baseName = 'payapi' -} - -docker { - name 'harbor.supwisdom.com/dali/payapi:' + version - println(jar.archivePath) - files jar.archivePath -} - -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.social:spring-social-web:1.1.6.RELEASE' - implementation 'org.jetbrains.kotlin:kotlin-reflect' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' - implementation 'commons-codec:commons-codec:1.12' - - implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery:2.1.2.RELEASE' - - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - - 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.bitbucket.b_c:jose4j:0.6.3' - 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.6' - implementation files('libs/ojdbc6.jar') - implementation 'commons-dbcp:commons-dbcp:1.4' - - implementation project(':common') - - annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" - annotationProcessor 'org.projectlombok:lombok:1.18.8' - compileOnly 'org.projectlombok:lombok:1.18.8' - -// 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' -} - compileKotlin { kotlinOptions { freeCompilerArgs = ['-Xjsr305=strict'] diff --git a/payapi/build.gradle b/payapi/build.gradle new file mode 100644 index 00000000..9d339e74 --- /dev/null +++ b/payapi/build.gradle @@ -0,0 +1,117 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.1.6.RELEASE' + id 'org.jetbrains.kotlin.jvm' version '1.3.31' + id 'org.jetbrains.kotlin.plugin.jpa' version '1.3.31' + id 'org.jetbrains.kotlin.plugin.spring' version '1.3.31' + id "com.palantir.git-version" version "0.12.0-rc2" + id 'com.palantir.docker' version '0.22.1' +} + +apply plugin: 'java' +apply plugin: 'io.spring.dependency-management' + +payapiVersion = gitVersion() + +group = 'com.supwisdom' +version = '1' +sourceCompatibility = jdkVersion +def startClass = 'com.supwisdom.dlpay.PayApiApplicationKt' + +println("Build version: $payapiVersion") +allprojects { + repositories { + jcenter() + mavenCentral() + } +} + +subprojects { + version = '1.0' +} + +bootJar { + mainClassName = startClass + manifest { + attributes('Payapi-Version': payapiVersion) + } +} + +jar { + baseName = 'payapi' +} + +docker { + name 'harbor.supwisdom.com/dali/payapi:' + version + println(jar.archivePath) + files jar.archivePath +} + +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.social:spring-social-web:1.1.6.RELEASE' + implementation 'org.jetbrains.kotlin:kotlin-reflect' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' + implementation 'commons-codec:commons-codec:1.12' + + implementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery:2.1.2.RELEASE' + + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + + 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.bitbucket.b_c:jose4j:0.6.3' + 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.6' + implementation files('libs/ojdbc6.jar') + implementation 'commons-dbcp:commons-dbcp:1.4' + + implementation project(':common') + + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" + annotationProcessor 'org.projectlombok:lombok:1.18.8' + compileOnly 'org.projectlombok:lombok:1.18.8' + +// 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' +} + +compileKotlin { + kotlinOptions { + freeCompilerArgs = ['-Xjsr305=strict'] + jvmTarget = jdkVersion + } +} + +compileTestKotlin { + kotlinOptions { + freeCompilerArgs = ['-Xjsr305=strict'] + jvmTarget = jdkVersion + } +} diff --git a/src/main/java/com/supwisdom/dlpay/AppPreparedEvent.java b/payapi/src/main/java/com/supwisdom/dlpay/AppPreparedEvent.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/AppPreparedEvent.java rename to payapi/src/main/java/com/supwisdom/dlpay/AppPreparedEvent.java diff --git a/src/main/java/com/supwisdom/dlpay/ServletInitializer.kt b/payapi/src/main/java/com/supwisdom/dlpay/ServletInitializer.kt similarity index 100% rename from src/main/java/com/supwisdom/dlpay/ServletInitializer.kt rename to payapi/src/main/java/com/supwisdom/dlpay/ServletInitializer.kt diff --git a/src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/bean/BaseResp.java diff --git a/src/main/java/com/supwisdom/dlpay/api/bean/DlpayReq.java b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/DlpayReq.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/bean/DlpayReq.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/bean/DlpayReq.java diff --git a/src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java similarity index 95% rename from src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java index 67c9b779..dafde319 100755 --- a/src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/JsonResult.java @@ -1,78 +1,78 @@ -package com.supwisdom.dlpay.api.bean; - -import java.util.HashMap; - -public class JsonResult extends HashMap { - public JsonResult() { - } - - /** - * 返回成功 - */ - public static JsonResult ok() { - return ok("操作成功"); - } - - /** - * 返回成功 - */ - public static JsonResult ok(String message) { - return ok(200, message); - } - - /** - * 返回成功 - */ - public static JsonResult ok(int code, String message) { - JsonResult jsonResult = new JsonResult(); - jsonResult.put("code", code); - jsonResult.put("msg", message); - return jsonResult; - } - - /** - * 返回失败 - */ - public static JsonResult error() { - return error("操作失败"); - } - - /** - * 返回失败 - */ - public static JsonResult error(String messag) { - return error(500, messag); - } - - /** - * 返回失败 - */ - public static JsonResult error(int code, String message) { - return ok(code, message); - } - - /** - * 设置code - */ - public JsonResult setCode(int code) { - super.put("code", code); - return this; - } - - /** - * 设置message - */ - public JsonResult setMessage(String message) { - super.put("msg", message); - return this; - } - - /** - * 放入object - */ - @Override - public JsonResult put(String key, Object object) { - super.put(key, object); - return this; - } +package com.supwisdom.dlpay.api.bean; + +import java.util.HashMap; + +public class JsonResult extends HashMap { + public JsonResult() { + } + + /** + * 返回成功 + */ + public static JsonResult ok() { + return ok("操作成功"); + } + + /** + * 返回成功 + */ + public static JsonResult ok(String message) { + return ok(200, message); + } + + /** + * 返回成功 + */ + public static JsonResult ok(int code, String message) { + JsonResult jsonResult = new JsonResult(); + jsonResult.put("code", code); + jsonResult.put("msg", message); + return jsonResult; + } + + /** + * 返回失败 + */ + public static JsonResult error() { + return error("操作失败"); + } + + /** + * 返回失败 + */ + public static JsonResult error(String messag) { + return error(500, messag); + } + + /** + * 返回失败 + */ + public static JsonResult error(int code, String message) { + return ok(code, message); + } + + /** + * 设置code + */ + public JsonResult setCode(int code) { + super.put("code", code); + return this; + } + + /** + * 设置message + */ + public JsonResult setMessage(String message) { + super.put("msg", message); + return this; + } + + /** + * 放入object + */ + @Override + public JsonResult put(String key, Object object) { + super.put(key, object); + return this; + } } \ No newline at end of file diff --git a/src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/bean/ReqParam.java diff --git a/src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/bean/SupStatusRevResp.java diff --git a/src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/bean/SupYktResp.java diff --git a/src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java b/payapi/src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/bean/WechatReqResp.java diff --git a/src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java b/payapi/src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/controller/TestAction.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/DebitCreditDtlDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/PaytypeConfigDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/PersonDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/PersonIdentityDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PersondtlDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/PersondtlDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/PersondtlDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/PersondtlDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PointsAccountDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/PointsAccountDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/PointsAccountDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/PointsAccountDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/PointsTransdtlDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/PointsTransdtlDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/PointsTransdtlDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/PointsTransdtlDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeConfigDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeConfigDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeConfigDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeConfigDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/ShopPaytypeDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/ShopdtlDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/ShopdtlDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/ShopdtlDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/ShopdtlDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/SubjectdtlDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SubjectdtlDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/SubjectdtlDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/SubjectdtlDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/dao/TransactionMainDao.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBal.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBal.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBal.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBal.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBalPk.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBalPk.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBalPk.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TAccountDayBalPk.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtl.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TDebitCreditDtlPK.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPaytypeConfigPK.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPerson.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersonIdentity.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPointsAccount.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPointsAccount.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TPointsAccount.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPointsAccount.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TPointsTransdtl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPointsTransdtl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TPointsTransdtl.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPointsTransdtl.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytype.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytype.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytype.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytype.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypeConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypeConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypeConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypeConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypePK.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypePK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypePK.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopPaytypePK.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TShopdtl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopdtl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TShopdtl.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TShopdtl.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TSourceType.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSourceType.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TSourceType.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSourceType.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TSubjectdtl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSubjectdtl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TSubjectdtl.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSubjectdtl.java diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java diff --git a/src/main/java/com/supwisdom/dlpay/api/repositories/AccountService.java b/payapi/src/main/java/com/supwisdom/dlpay/api/repositories/AccountService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/repositories/AccountService.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/repositories/AccountService.java diff --git a/src/main/java/com/supwisdom/dlpay/api/repositories/ShopaccService.java b/payapi/src/main/java/com/supwisdom/dlpay/api/repositories/ShopaccService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/repositories/ShopaccService.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/repositories/ShopaccService.java diff --git a/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java b/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java diff --git a/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/exception/TransactionCheckException.java b/payapi/src/main/java/com/supwisdom/dlpay/exception/TransactionCheckException.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/exception/TransactionCheckException.java rename to payapi/src/main/java/com/supwisdom/dlpay/exception/TransactionCheckException.java diff --git a/src/main/java/com/supwisdom/dlpay/exception/TransactionException.java b/payapi/src/main/java/com/supwisdom/dlpay/exception/TransactionException.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/exception/TransactionException.java rename to payapi/src/main/java/com/supwisdom/dlpay/exception/TransactionException.java diff --git a/src/main/java/com/supwisdom/dlpay/exception/TransactionProcessException.java b/payapi/src/main/java/com/supwisdom/dlpay/exception/TransactionProcessException.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/exception/TransactionProcessException.java rename to payapi/src/main/java/com/supwisdom/dlpay/exception/TransactionProcessException.java diff --git a/src/main/java/com/supwisdom/dlpay/exception/ValidateCodeException.java b/payapi/src/main/java/com/supwisdom/dlpay/exception/ValidateCodeException.java similarity index 94% rename from src/main/java/com/supwisdom/dlpay/exception/ValidateCodeException.java rename to payapi/src/main/java/com/supwisdom/dlpay/exception/ValidateCodeException.java index 0a500adf..98ea42be 100755 --- a/src/main/java/com/supwisdom/dlpay/exception/ValidateCodeException.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/exception/ValidateCodeException.java @@ -1,23 +1,23 @@ -/** - * - */ -package com.supwisdom.dlpay.exception; - -import org.springframework.security.core.AuthenticationException; - -/** - * @author lenovo - * - */ -public class ValidateCodeException extends AuthenticationException { - - /** - * - */ - private static final long serialVersionUID = 1170189980006964105L; - - - public ValidateCodeException(String msg) { - super(msg); - } -} +/** + * + */ +package com.supwisdom.dlpay.exception; + +import org.springframework.security.core.AuthenticationException; + +/** + * @author lenovo + * + */ +public class ValidateCodeException extends AuthenticationException { + + /** + * + */ + private static final long serialVersionUID = 1170189980006964105L; + + + public ValidateCodeException(String msg) { + super(msg); + } +} diff --git a/src/main/java/com/supwisdom/dlpay/framework/KaptchaConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/KaptchaConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/KaptchaConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/KaptchaConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/core/DatabaseConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/DatabaseConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/core/DatabaseConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/core/DatabaseConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/core/DayendSettleTask.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/DayendSettleTask.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/core/DayendSettleTask.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/core/DayendSettleTask.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/core/JwtConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/JwtConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/core/JwtConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/core/JwtConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/core/JwtToken.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/JwtToken.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/core/JwtToken.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/core/JwtToken.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/core/JwtTokenUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/JwtTokenUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/core/JwtTokenUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/core/JwtTokenUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/core/PasswordBCryptConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/PasswordBCryptConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/core/PasswordBCryptConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/core/PasswordBCryptConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/ApiClientDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ApiClientDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/ApiClientDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ApiClientDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/BusinessparaDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/BusinessparaDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/BusinessparaDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/BusinessparaDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/DictionaryDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/DictionaryDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/DictionaryDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/DictionaryDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/FeetypeConfigDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/FeetypeConfigDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/FeetypeConfigDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/FeetypeConfigDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/FunctionDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/FunctionDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/FunctionDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/FunctionDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/OperLogDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/OperLogDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/OperLogDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/OperLogDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/OperRoleDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/OperRoleDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/OperRoleDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/OperRoleDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/OperatorDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/OperatorDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/OperatorDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/OperatorDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/PeriodDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/PeriodDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/PeriodDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/PeriodDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/PermissionDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/PermissionDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/PermissionDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/PermissionDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/ResourceDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ResourceDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/ResourceDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ResourceDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/RoleDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/RoleDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/RoleDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/RoleDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/SettleCtlDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SettleCtlDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/SettleCtlDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SettleCtlDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/SettleLogDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SettleLogDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/SettleLogDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SettleLogDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/ShopDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ShopDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/ShopDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ShopDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccdayDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccdayDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccdayDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/ShopaccdayDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/SubjectDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectbalDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectbalDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/SubjectbalDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectbalDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SubjectdayDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/SysparaDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SysparaDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/SysparaDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/SysparaDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/TaskLockDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TaskLockDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/TaskLockDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TaskLockDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/TenantConfigDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TenantConfigDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/TenantConfigDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TenantConfigDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/TranscodeDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TranscodeDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/TranscodeDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TranscodeDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/TranstypeDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TranstypeDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/TranstypeDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/TranstypeDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/VoucherDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/VoucherDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/VoucherDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/VoucherDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/VoucherEntryDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/VoucherEntryDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/VoucherEntryDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/VoucherEntryDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/VouchernoCtlDao.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/dao/VouchernoCtlDao.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/dao/VouchernoCtlDao.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/dao/VouchernoCtlDao.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/data/ExistBean.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/data/ExistBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/data/ExistBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/data/ExistBean.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/data/FSubjectInfoBean.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/data/FSubjectInfoBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/data/FSubjectInfoBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/data/FSubjectInfoBean.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/data/MerchBean.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/data/MerchBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/data/MerchBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/data/MerchBean.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/data/NodeData.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/data/NodeData.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/data/NodeData.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/data/NodeData.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/data/SubjectInfoBean.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/data/SubjectInfoBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/data/SubjectInfoBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/data/SubjectInfoBean.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/data/SystemDateTime.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/data/SystemDateTime.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/data/SystemDateTime.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/data/SystemDateTime.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/data/VoucherTemp.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/data/VoucherTemp.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/data/VoucherTemp.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/data/VoucherTemp.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/ApiClientRedis.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/ApiClientRedis.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/ApiClientRedis.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/ApiClientRedis.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/DictionaryTable.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/DictionaryTable.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/DictionaryTable.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/DictionaryTable.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/JwtRedis.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/JwtRedis.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/JwtRedis.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/JwtRedis.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/PersonRedis.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/PersonRedis.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/PersonRedis.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/PersonRedis.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TBusinesspara.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TBusinesspara.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TBusinesspara.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TBusinesspara.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TDictionary.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TDictionary.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TDictionary.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TDictionary.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TDictionaryPK.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TDictionaryPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TDictionaryPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TDictionaryPK.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfigPK.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfigPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfigPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TFeetypeConfigPK.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TFunction.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TFunction.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TFunction.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TFunction.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TOperLog.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TOperLog.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TOperLog.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TOperLog.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TOperRole.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TOperRole.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TOperRole.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TOperRole.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TOperator.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TOperator.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TOperator.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TOperator.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TPeriod.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPeriod.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TPeriod.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPeriod.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TPeriodPK.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPeriodPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TPeriodPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPeriodPK.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TPermission.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPermission.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TPermission.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPermission.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TRole.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TRoleFunction.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TRoleFunction.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TRoleFunction.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TRoleFunction.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TSettleLog.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSettleLog.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TSettleLog.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSettleLog.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TSettlectl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSettlectl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TSettlectl.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSettlectl.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TShop.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShop.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TShop.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShop.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TShopacc.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShopacc.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TShopacc.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShopacc.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccday.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccday.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccday.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccday.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccdayPK.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccdayPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccdayPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TShopaccdayPK.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TSubject.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubject.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TSubject.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubject.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectbal.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectbal.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectbal.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectbal.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectday.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectday.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectday.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectday.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectdayPK.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectdayPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectdayPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSubjectdayPK.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TSyspara.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSyspara.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TSyspara.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TSyspara.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TTaskLock.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTaskLock.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TTaskLock.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTaskLock.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TTenantConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTenantConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TTenantConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTenantConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TTranscode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTranscode.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TTranscode.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTranscode.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TTranstype.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTranstype.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TTranstype.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TTranstype.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucher.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucher.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TVoucher.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucher.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntry.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntry.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntry.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntry.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntryPK.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntryPK.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntryPK.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVoucherEntryPK.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TVouchernoCtl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVouchernoCtl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/domain/TVouchernoCtl.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TVouchernoCtl.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/filter/ValidateCodeFilter.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/filter/ValidateCodeFilter.java similarity index 97% rename from src/main/java/com/supwisdom/dlpay/framework/filter/ValidateCodeFilter.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/filter/ValidateCodeFilter.java index ac7a323b..c58260d8 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/filter/ValidateCodeFilter.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/filter/ValidateCodeFilter.java @@ -1,92 +1,92 @@ -package com.supwisdom.dlpay.framework.filter; - - -import com.supwisdom.dlpay.exception.ValidateCodeException; -import com.supwisdom.dlpay.framework.security.CodeUtil; -import com.supwisdom.dlpay.framework.security.MyAuthenticationFailureHandler; -import com.supwisdom.dlpay.framework.security.validate.ImageCodeUtil; -import com.supwisdom.dlpay.framework.security.validate.VerifyCode; -import com.supwisdom.dlpay.framework.util.StringUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - - -@Component("validateCodeFilter") -public class ValidateCodeFilter extends OncePerRequestFilter { - - /** - * 校验失败处理器 - */ - @Autowired - private MyAuthenticationFailureHandler myAuthenticationFailureHandler; - - - @Override - protected void doFilterInternal(HttpServletRequest request, - HttpServletResponse response, FilterChain filterChain) - throws ServletException, IOException { - String context = request.getContextPath(); - if (context == null || "" == context.trim()) { - context = "/"; - } - if (request.getRequestURI().isEmpty()) { - filterChain.doFilter(request, response); - return; - } - String url = request.getRequestURI(); - if (!"/".equals(context)) { - url = url.replace(context, ""); - } - if (StringUtil.equals("/login/form", url) - && StringUtil.equalsIgnoreCase(request.getMethod(), "post")) { - try { - validate(request); - } catch (ValidateCodeException e) { - //response.setStatus(HttpStatus.OK.value()); - //response.setContentType("application/json;charset=UTF-8"); - //response.getWriter().write(objectMapper.writeValueAsString(JsonResult.error(400, e.getMessage()))); - //response.sendError(HttpStatus.UNAUTHORIZED.value(),e.getMessage()); - myAuthenticationFailureHandler.onAuthenticationFailure(request, response, e); - return; - } - } - filterChain.doFilter(request, response); - } - - private void validate(HttpServletRequest request) throws ValidateCodeException { - if (!CodeUtil.checkVerifyCode(request)) { - throw new ValidateCodeException("验证码不匹配"); - } else { - request.getSession().removeAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY); - } -// VerifyCode imageCode = (VerifyCode) request.getSession().getAttribute(ImageCodeUtil.LOGIN_IMAGECODE_SESSIONKEY); -// String inputCode; -// try { -// inputCode = request.getParameter("imageCode"); -// } catch (Exception e) { -// throw new ValidateCodeException("获取验证码的值失败"); -// } -// if (StringUtil.isEmpty(inputCode)) { -// throw new ValidateCodeException("验证码不能为空"); -// } -// if (null == imageCode) { -// throw new ValidateCodeException("验证码不存在"); -// } -// if (imageCode.isExpired()) { -// request.getSession().removeAttribute(ImageCodeUtil.LOGIN_IMAGECODE_SESSIONKEY); -// throw new ValidateCodeException("验证码已过期"); -// } -// if (!StringUtil.equalsIgnoreCase(imageCode.getText(), inputCode)) { -// throw new ValidateCodeException("验证码不匹配"); -// } -// request.getSession().removeAttribute(ImageCodeUtil.LOGIN_IMAGECODE_SESSIONKEY); - } - -} +package com.supwisdom.dlpay.framework.filter; + + +import com.supwisdom.dlpay.exception.ValidateCodeException; +import com.supwisdom.dlpay.framework.security.CodeUtil; +import com.supwisdom.dlpay.framework.security.MyAuthenticationFailureHandler; +import com.supwisdom.dlpay.framework.security.validate.ImageCodeUtil; +import com.supwisdom.dlpay.framework.security.validate.VerifyCode; +import com.supwisdom.dlpay.framework.util.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + + +@Component("validateCodeFilter") +public class ValidateCodeFilter extends OncePerRequestFilter { + + /** + * 校验失败处理器 + */ + @Autowired + private MyAuthenticationFailureHandler myAuthenticationFailureHandler; + + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + String context = request.getContextPath(); + if (context == null || "" == context.trim()) { + context = "/"; + } + if (request.getRequestURI().isEmpty()) { + filterChain.doFilter(request, response); + return; + } + String url = request.getRequestURI(); + if (!"/".equals(context)) { + url = url.replace(context, ""); + } + if (StringUtil.equals("/login/form", url) + && StringUtil.equalsIgnoreCase(request.getMethod(), "post")) { + try { + validate(request); + } catch (ValidateCodeException e) { + //response.setStatus(HttpStatus.OK.value()); + //response.setContentType("application/json;charset=UTF-8"); + //response.getWriter().write(objectMapper.writeValueAsString(JsonResult.error(400, e.getMessage()))); + //response.sendError(HttpStatus.UNAUTHORIZED.value(),e.getMessage()); + myAuthenticationFailureHandler.onAuthenticationFailure(request, response, e); + return; + } + } + filterChain.doFilter(request, response); + } + + private void validate(HttpServletRequest request) throws ValidateCodeException { + if (!CodeUtil.checkVerifyCode(request)) { + throw new ValidateCodeException("验证码不匹配"); + } else { + request.getSession().removeAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY); + } +// VerifyCode imageCode = (VerifyCode) request.getSession().getAttribute(ImageCodeUtil.LOGIN_IMAGECODE_SESSIONKEY); +// String inputCode; +// try { +// inputCode = request.getParameter("imageCode"); +// } catch (Exception e) { +// throw new ValidateCodeException("获取验证码的值失败"); +// } +// if (StringUtil.isEmpty(inputCode)) { +// throw new ValidateCodeException("验证码不能为空"); +// } +// if (null == imageCode) { +// throw new ValidateCodeException("验证码不存在"); +// } +// if (imageCode.isExpired()) { +// request.getSession().removeAttribute(ImageCodeUtil.LOGIN_IMAGECODE_SESSIONKEY); +// throw new ValidateCodeException("验证码已过期"); +// } +// if (!StringUtil.equalsIgnoreCase(imageCode.getText(), inputCode)) { +// throw new ValidateCodeException("验证码不匹配"); +// } +// request.getSession().removeAttribute(ImageCodeUtil.LOGIN_IMAGECODE_SESSIONKEY); + } + +} diff --git a/src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiClientRepository.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiClientRepository.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiClientRepository.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiClientRepository.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiJwtRepository.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiJwtRepository.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiJwtRepository.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/redisrepo/ApiJwtRepository.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/redisrepo/PersonRepository.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/redisrepo/PersonRepository.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/redisrepo/PersonRepository.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/redisrepo/PersonRepository.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/CodeUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/CodeUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/CodeUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/CodeUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationSuccessHandler.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyInvalidSessionStrategy.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/MyPermissionEvaluator.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyPermissionEvaluator.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/MyPermissionEvaluator.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyPermissionEvaluator.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/OperUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/OperUtil.java similarity index 96% rename from src/main/java/com/supwisdom/dlpay/framework/security/OperUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/OperUtil.java index d576b41a..4dd8c9e4 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/security/OperUtil.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/OperUtil.java @@ -1,68 +1,68 @@ -package com.supwisdom.dlpay.framework.security; - -import com.supwisdom.dlpay.framework.domain.TOperator; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; - -import java.util.Collection; - -public class OperUtil { - - public static TOperator getCurrentOper() { - Authentication au = SecurityContextHolder.getContext() - .getAuthentication(); - if (au == null) - return null; - if (au.getPrincipal() == null) - return null; - if (au != null && au.getPrincipal() instanceof TOperator) { - return (TOperator) au.getPrincipal(); - } else { - TOperator oper = new TOperator(); - oper.setOpername(au.getPrincipal().toString()); - oper.setOperpwd(au.getCredentials() == null ? null : au - .getCredentials().toString()); - return oper; - } - } - - public static String getCurrentOperid() { - TOperator oper = getCurrentOper(); - if (oper == null) - return null; - return oper.getOperid() == null ? oper.getOpercode() : oper.getOperid(); - } - - public static boolean isLogined() { - Authentication au = SecurityContextHolder.getContext() - .getAuthentication(); - if (au == null) - return false; - if (au.getPrincipal() == null) - return false; - if (au.getPrincipal() instanceof TOperator) - return true; - return false; - } - - public static boolean isAdmin() { - TOperator loginOper = OperUtil.getCurrentOper(); - if (loginOper != null) { - Collection gas = loginOper.getAuthorities(); - if (gas == null) { - return false; - } - boolean flag = false; - for (GrantedAuthority grantedAuthority : gas) { - if ("ROLE_ADMIN".equals(grantedAuthority.getAuthority())) { - flag = true; - } - } - return flag; - } else { - return false; - } - } - -} +package com.supwisdom.dlpay.framework.security; + +import com.supwisdom.dlpay.framework.domain.TOperator; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; + +import java.util.Collection; + +public class OperUtil { + + public static TOperator getCurrentOper() { + Authentication au = SecurityContextHolder.getContext() + .getAuthentication(); + if (au == null) + return null; + if (au.getPrincipal() == null) + return null; + if (au != null && au.getPrincipal() instanceof TOperator) { + return (TOperator) au.getPrincipal(); + } else { + TOperator oper = new TOperator(); + oper.setOpername(au.getPrincipal().toString()); + oper.setOperpwd(au.getCredentials() == null ? null : au + .getCredentials().toString()); + return oper; + } + } + + public static String getCurrentOperid() { + TOperator oper = getCurrentOper(); + if (oper == null) + return null; + return oper.getOperid() == null ? oper.getOpercode() : oper.getOperid(); + } + + public static boolean isLogined() { + Authentication au = SecurityContextHolder.getContext() + .getAuthentication(); + if (au == null) + return false; + if (au.getPrincipal() == null) + return false; + if (au.getPrincipal() instanceof TOperator) + return true; + return false; + } + + public static boolean isAdmin() { + TOperator loginOper = OperUtil.getCurrentOper(); + if (loginOper != null) { + Collection gas = loginOper.getAuthorities(); + if (gas == null) { + return false; + } + boolean flag = false; + for (GrantedAuthority grantedAuthority : gas) { + if ("ROLE_ADMIN".equals(grantedAuthority.getAuthority())) { + flag = true; + } + } + return flag; + } else { + return false; + } + } + +} diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/ValidateCodeSecurityConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/ValidateCodeSecurityConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/ValidateCodeSecurityConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/ValidateCodeSecurityConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCode.java similarity index 95% rename from src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCode.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCode.java index 6b56ca85..d88d3af7 100755 --- a/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCode.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCode.java @@ -1,21 +1,21 @@ -package com.supwisdom.dlpay.framework.security.validate; - -import java.awt.image.BufferedImage; - -public class ImageCode extends ValidateCode { - private BufferedImage image; - - public ImageCode(BufferedImage image, String code, int expireTime) { - super(code, expireTime); - this.image = image; - } - - public BufferedImage getImage() { - return image; - } - - public void setImage(BufferedImage image) { - this.image = image; - } - -} +package com.supwisdom.dlpay.framework.security.validate; + +import java.awt.image.BufferedImage; + +public class ImageCode extends ValidateCode { + private BufferedImage image; + + public ImageCode(BufferedImage image, String code, int expireTime) { + super(code, expireTime); + this.image = image; + } + + public BufferedImage getImage() { + return image; + } + + public void setImage(BufferedImage image) { + this.image = image; + } + +} diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCodeUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCodeUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCodeUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ImageCodeUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/validate/ValidateCode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ValidateCode.java similarity index 94% rename from src/main/java/com/supwisdom/dlpay/framework/security/validate/ValidateCode.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ValidateCode.java index b20eca2e..67a48126 100755 --- a/src/main/java/com/supwisdom/dlpay/framework/security/validate/ValidateCode.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/ValidateCode.java @@ -1,55 +1,55 @@ -package com.supwisdom.dlpay.framework.security.validate; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.supwisdom.dlpay.framework.util.DateUtil; -import java.util.Date; - - -public class ValidateCode{ - - private String code; - - private Date expireTime; - - public ValidateCode() { - super(); - } - - public ValidateCode(String code, Date expireTime) { - super(); - this.code = code; - this.expireTime = expireTime; - } - - public ValidateCode(String code, int expireTime) { - super(); - this.code = code; - this.expireTime = DateUtil.setMinutes(new Date(), expireTime); - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public Date getExpireTime() { - return expireTime; - } - - public void setExpireTime(Date expireTime) { - this.expireTime = expireTime; - } - - @JsonIgnore - public boolean isExpired() { - return new Date().compareTo(expireTime) > 0; - } - - @Override - public String toString() { - return "ValidateCode [code=" + code + ", expireTime=" + expireTime + "]"; - } -} +package com.supwisdom.dlpay.framework.security.validate; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.supwisdom.dlpay.framework.util.DateUtil; +import java.util.Date; + + +public class ValidateCode{ + + private String code; + + private Date expireTime; + + public ValidateCode() { + super(); + } + + public ValidateCode(String code, Date expireTime) { + super(); + this.code = code; + this.expireTime = expireTime; + } + + public ValidateCode(String code, int expireTime) { + super(); + this.code = code; + this.expireTime = DateUtil.setMinutes(new Date(), expireTime); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public Date getExpireTime() { + return expireTime; + } + + public void setExpireTime(Date expireTime) { + this.expireTime = expireTime; + } + + @JsonIgnore + public boolean isExpired() { + return new Date().compareTo(expireTime) > 0; + } + + @Override + public String toString() { + return "ValidateCode [code=" + code + ", expireTime=" + expireTime + "]"; + } +} diff --git a/src/main/java/com/supwisdom/dlpay/framework/security/validate/VerifyCode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/VerifyCode.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/security/validate/VerifyCode.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/security/validate/VerifyCode.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/DayendStatisticsService.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/DayendStatisticsService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/DayendStatisticsService.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/DayendStatisticsService.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/OperatorDetailService.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/OperatorDetailService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/OperatorDetailService.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/OperatorDetailService.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/SystemUtilService.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendSettleServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendStatisticsServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendStatisticsServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendStatisticsServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/DayendStatisticsServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/impl/OperatorDetailServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/OperatorDetailServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/impl/OperatorDetailServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/OperatorDetailServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/impl/SystemUtilServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/SystemUtilServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/service/impl/SystemUtilServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/service/impl/SystemUtilServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/tenant/HibernateConfig.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/HibernateConfig.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/tenant/HibernateConfig.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/HibernateConfig.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantConnectionProviderImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantConnectionProviderImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantConnectionProviderImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantConnectionProviderImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantIdentifierResolver.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantIdentifierResolver.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantIdentifierResolver.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/MultiTenantIdentifierResolver.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/tenant/TenantContext.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/TenantContext.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/tenant/TenantContext.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/TenantContext.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/tenant/TenantInterceptor.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/TenantInterceptor.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/tenant/TenantInterceptor.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/tenant/TenantInterceptor.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/Constants.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/Constants.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/Constants.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/Constants.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/DateUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/Dictionary.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/Dictionary.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/Dictionary.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/Dictionary.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/HmacUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/HmacUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/HmacUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/HmacUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/MD5.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/MD5.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/MD5.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/MD5.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/MoneyUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/MoneyUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/MoneyUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/MoneyUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/NumberUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/NumberUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/NumberUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/NumberUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/PageResult.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/PageResult.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/PageResult.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/PageResult.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/PermissionConstants.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/PermissionConstants.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/PermissionConstants.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/PermissionConstants.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/RandomUtils.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/RandomUtils.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/RandomUtils.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/RandomUtils.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/Sign.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/Sign.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/Sign.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/Sign.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/StringUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/Subject.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/Subject.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/Subject.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/Subject.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/SysparaUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/SysparaUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/SysparaUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/SysparaUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TradeCode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeCode.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/TradeCode.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeCode.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeErrorCode.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TradeSummary.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeSummary.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/TradeSummary.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeSummary.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/Tradetype.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/Tradetype.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/Tradetype.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/Tradetype.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TranstypeCode.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TranstypeCode.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/TranstypeCode.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/TranstypeCode.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/WebConstant.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/WebConstant.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/WebConstant.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/WebConstant.java diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/XmlUtils.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/XmlUtils.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/framework/util/XmlUtils.java rename to payapi/src/main/java/com/supwisdom/dlpay/framework/util/XmlUtils.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/AccountPerson.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/AccountPerson.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/AccountPerson.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/AccountPerson.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/FunctionSearchBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/FunctionSearchBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/FunctionSearchBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/FunctionSearchBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/IdTypeBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/IdTypeBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/IdTypeBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/IdTypeBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/LogBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/LogBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/LogBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/LogBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/OperatorSearchBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/OperatorSearchBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/OperatorSearchBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/OperatorSearchBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/PageBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/PageBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/PageBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/PageBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/PersonParamBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/PersonParamBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/PersonParamBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/PersonParamBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessInfo.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessInfo.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessInfo.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessInfo.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessShowBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessShowBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessShowBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopBusinessShowBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/ShopConfigBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopConfigBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/ShopConfigBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopConfigBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/ShopdtlSearchBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopdtlSearchBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/ShopdtlSearchBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/ShopdtlSearchBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayInfo.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDayShowBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDetailShowBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDetailShowBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/SubjectDetailShowBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/SubjectDetailShowBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/TreeSelectNode.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/TreeSelectNode.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/TreeSelectNode.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/TreeSelectNode.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/UserdtlSearchBean.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/UserdtlSearchBean.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/UserdtlSearchBean.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/UserdtlSearchBean.java diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java b/payapi/src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/DictPoolAction.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/DictPoolAction.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/DictPoolAction.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/DictPoolAction.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/DtlController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/DtlController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/DtlController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/DtlController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/OperatorController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/ParamController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/RoleController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/RoleController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/RoleController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/RoleController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/SettleReportController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/SettleReportController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/SettleReportController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/SettleReportController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/UserController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/UserController.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/controller/UserController.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/controller/UserController.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/DictionaryDataService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/DictionaryDataService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/DictionaryDataService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/DictionaryDataService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/DictionaryProxy.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/DictionaryProxy.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/DictionaryProxy.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/DictionaryProxy.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/DtlDataService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/DtlDataService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/DtlDataService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/DtlDataService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/FunctionService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/FunctionService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/FunctionService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/FunctionService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/OperatorService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/OperatorService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/OperatorService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/OperatorService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/ParamService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/ParamService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/ParamService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/ParamService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/RoleService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/RoleService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/RoleService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/RoleService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/SettleReportService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/SettleReportService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/SettleReportService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/SettleReportService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/ShopDataService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/ShopDataService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/ShopDataService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/ShopDataService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/DictionaryDataServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/DictionaryDataServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/DictionaryDataServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/DictionaryDataServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/DtlDataServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/DtlDataServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/DtlDataServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/DtlDataServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/FunctionServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/FunctionServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/FunctionServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/FunctionServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/OperatorServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/OperatorServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/OperatorServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/OperatorServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/RoleServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/RoleServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/RoleServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/RoleServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java rename to payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java diff --git a/src/main/java/com/supwisdom/dlpay/util/Code.java b/payapi/src/main/java/com/supwisdom/dlpay/util/Code.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/util/Code.java rename to payapi/src/main/java/com/supwisdom/dlpay/util/Code.java diff --git a/src/main/java/com/supwisdom/dlpay/util/ConstantUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/util/ConstantUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/util/ConstantUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/util/ConstantUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/util/DESedeUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/util/DESedeUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/util/DESedeUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/util/DESedeUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/util/DlpayUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/util/DlpayUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/util/DlpayUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/util/DlpayUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/util/PaytypeUtil.java b/payapi/src/main/java/com/supwisdom/dlpay/util/PaytypeUtil.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/util/PaytypeUtil.java rename to payapi/src/main/java/com/supwisdom/dlpay/util/PaytypeUtil.java diff --git a/src/main/java/com/supwisdom/dlpay/util/WebCheckException.java b/payapi/src/main/java/com/supwisdom/dlpay/util/WebCheckException.java similarity index 100% rename from src/main/java/com/supwisdom/dlpay/util/WebCheckException.java rename to payapi/src/main/java/com/supwisdom/dlpay/util/WebCheckException.java diff --git a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/ThirdPayCall.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/advices.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/async_tasks.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/bean/api_request_param.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/bean/api_request_param.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/bean/api_request_param.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/bean/api_request_param.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/dali_datasync_api_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/scheduler_task.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/charge_api_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/charge_api_service.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/charge_api_service.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/charge_api_service.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/consume_pay_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/consume_pay_service.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/consume_pay_service.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/consume_pay_service.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/account_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/pay_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/user_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/pay_service.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/shop_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/shop_service.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/shop_service.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/shop_service.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/service/user_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/user_service.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/service/user_service.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/user_service.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/api/transaction_builder.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/app/bean/app_request_param.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/app/bean/app_request_param.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/app/bean/app_request_param.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/app/bean/app_request_param.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/framework/controller/security_controller.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/service/framework_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/service/framework_service.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/framework/service/framework_service.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/framework/service/framework_service.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/framework/service/impl/framework_service_impl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/tenant.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/tenant.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/framework/tenant.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/framework/tenant.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/AuthLoginHandler.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/dao/MobileUserDao.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/dao/MobileUserDao.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/dao/MobileUserDao.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/dao/MobileUserDao.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/domain/TBMobileUser.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/domain/TBMobileUser.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/domain/TBMobileUser.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/domain/TBMobileUser.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/exception/UserLoginFailException.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/exception/UserLoginFailException.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/exception/UserLoginFailException.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/exception/UserLoginFailException.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileUserService.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileUserService.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileUserService.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileUserService.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileUserServiceImpl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileUserServiceImpl.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileUserServiceImpl.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileUserServiceImpl.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/oauth.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/oauth.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/oauth.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/oauth.kt diff --git a/src/main/kotlin/com/supwisdom/dlpay/security.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt similarity index 100% rename from src/main/kotlin/com/supwisdom/dlpay/security.kt rename to payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt diff --git a/src/main/resources/application.properties b/payapi/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to payapi/src/main/resources/application.properties diff --git a/src/main/resources/data-postgresql.sql b/payapi/src/main/resources/data-postgresql.sql similarity index 100% rename from src/main/resources/data-postgresql.sql rename to payapi/src/main/resources/data-postgresql.sql diff --git a/src/main/resources/data.sql b/payapi/src/main/resources/data.sql similarity index 100% rename from src/main/resources/data.sql rename to payapi/src/main/resources/data.sql diff --git a/src/main/resources/static/custom/css/admin.css b/payapi/src/main/resources/static/custom/css/admin.css similarity index 100% rename from src/main/resources/static/custom/css/admin.css rename to payapi/src/main/resources/static/custom/css/admin.css diff --git a/src/main/resources/static/custom/css/console.css b/payapi/src/main/resources/static/custom/css/console.css similarity index 100% rename from src/main/resources/static/custom/css/console.css rename to payapi/src/main/resources/static/custom/css/console.css diff --git a/src/main/resources/static/custom/css/login.css b/payapi/src/main/resources/static/custom/css/login.css similarity index 100% rename from src/main/resources/static/custom/css/login.css rename to payapi/src/main/resources/static/custom/css/login.css diff --git a/src/main/resources/static/custom/css/theme-blue.css b/payapi/src/main/resources/static/custom/css/theme-blue.css similarity index 100% rename from src/main/resources/static/custom/css/theme-blue.css rename to payapi/src/main/resources/static/custom/css/theme-blue.css diff --git a/src/main/resources/static/custom/images/bg_login.png b/payapi/src/main/resources/static/custom/images/bg_login.png similarity index 100% rename from src/main/resources/static/custom/images/bg_login.png rename to payapi/src/main/resources/static/custom/images/bg_login.png diff --git a/src/main/resources/static/custom/images/head.png b/payapi/src/main/resources/static/custom/images/head.png similarity index 100% rename from src/main/resources/static/custom/images/head.png rename to payapi/src/main/resources/static/custom/images/head.png diff --git a/src/main/resources/static/custom/images/logo.png b/payapi/src/main/resources/static/custom/images/logo.png similarity index 100% rename from src/main/resources/static/custom/images/logo.png rename to payapi/src/main/resources/static/custom/images/logo.png diff --git a/src/main/resources/static/custom/module/admin.js b/payapi/src/main/resources/static/custom/module/admin.js similarity index 97% rename from src/main/resources/static/custom/module/admin.js rename to payapi/src/main/resources/static/custom/module/admin.js index e15cfdf8..cbdbc36e 100755 --- a/src/main/resources/static/custom/module/admin.js +++ b/payapi/src/main/resources/static/custom/module/admin.js @@ -1,387 +1,387 @@ -layui.define(['layer'], function (exports) { - var layer = layui.layer; - var popupRightIndex, popupCenterIndex, popupCenterParam; - var baseUrl = window.location.pathname; - - var admin = { - isRefresh: false, - // 设置侧栏折叠 - flexible: function (expand) { - var isExapnd = $('.layui-layout-admin').hasClass('admin-nav-mini'); - if (isExapnd == !expand) { - return; - } - if (expand) { - $('.layui-layout-admin').removeClass('admin-nav-mini'); - } else { - $('.layui-layout-admin').addClass('admin-nav-mini'); - } - }, - // 设置导航栏选中 - activeNav: function (url) { - $('.layui-layout-admin .layui-side .layui-nav .layui-nav-item .layui-nav-child dd').removeClass('layui-this'); - $('.layui-layout-admin .layui-side .layui-nav .layui-nav-item').removeClass('layui-this'); - if (url && url != '') { - $('.layui-layout-admin .layui-side .layui-nav .layui-nav-item').removeClass('layui-nav-itemed'); - var $a = $('.layui-layout-admin .layui-side .layui-nav a[href="#!' + url + '"]'); - $a.parent('li').addClass('layui-this'); - $a.parent('dd').addClass('layui-this'); - $a.parent('dd').parent('.layui-nav-child').parent('.layui-nav-item').addClass('layui-nav-itemed'); - } - }, - // 右侧弹出 - popupRight: function (path) { - var param = new Object(); - param.path = path; - param.id = 'adminPopupR'; - param.title = false; - param.anim = 2; - param.isOutAnim = false; - param.closeBtn = false; - param.offset = 'r'; - param.shadeClose = true; - param.area = '336px'; - param.skin = 'layui-layer-adminRight'; - param.end = function () { - layer.closeAll('tips'); - }; - popupRightIndex = admin.open(param); - return popupRightIndex; - }, - // 关闭右侧弹出 - closePopupRight: function () { - layer.close(popupRightIndex); - }, - // 中间弹出 - popupCenter: function (param) { - param.id = 'adminPopupC'; - popupCenterParam = param; - popupCenterIndex = admin.open(param); - return popupCenterIndex; - }, - // 关闭中间弹出并且触发finish回调 - finishPopupCenter: function () { - layer.close(popupCenterIndex); - popupCenterParam.finish ? popupCenterParam.finish() : ''; - }, - // 关闭中间弹出 - closePopupCenter: function () { - layer.close(popupCenterIndex); - }, - // 封装layer.open - open: function (param) { - var sCallBack = param.success; - param.type = 1; - param.area = param.area ? param.area : '450px'; - param.offset = param.offset ? param.offset : '120px'; - param.resize ? param.resize : false; - param.shade ? param.shade : .2; - param.success = function (layero, index) { - sCallBack ? sCallBack(layero, index) : ''; - admin.ajax({ - url: param.path, - type: 'GET', - dataType: 'html', - success: function (result, status, xhr) { - $(layero).children('.layui-layer-content').html(result); - } - }); - }; - return layer.open(param); - }, - - go:function(url,data,success,error){ - $.ajax({ - url: url, - data: data, - async: false, - dataType: 'json', - type: 'post', - success: success, - error:error - }) - }, - dgo:function(url,data,success,error){ - $.ajax({ - url: url, - data: data, - async: false, - dataType: 'json', - type: 'get', - success: success, - error:error - }) - }, - // 封装ajax请求，返回数据类型为json - req: function (url, data, success, method) { - admin.ajax({ - url: url, - data: data, - async: false, - type: method, - dataType: 'json', - success: success - }); - }, - // 封装ajax请求 - ajax: function (param) { - console.log(param); - var successCallback = param.success; - param.success = function (result, status, xhr) { - // 判断登录过期和没有权限 - var jsonRs; - if ('json' == param.dataType.toLowerCase()) { - jsonRs = result; - } else if ('html' == param.dataType.toLowerCase() || 'text' == param.dataType.toLowerCase()) { - jsonRs = admin.parseJSON(result); - } - if (jsonRs) { - if (jsonRs.code == 401) { - layer.msg(jsonRs.msg, {icon: 2, time: 1500}, function () { - location.replace('/login'); - }, 1000); - return; - } else if ('html' == param.dataType.toLowerCase() && jsonRs.code == 403) { - layer.msg(jsonRs.msg, {icon: 2}); - } - } - successCallback(result, status, xhr); - }; - param.error = function (xhr) { - //{code: xhr.status, msg: xhr.statusText} - param.success(xhr.responseText,xhr.status,xhr); - }; - $.ajax(param); - }, - // 显示加载动画 - showLoading: function (element) { - $(element).append(''); - }, - // 移除加载动画 - removeLoading: function (element) { - $(element + '>.admin-loading').remove(); - }, - // 缓存临时数据 - putTempData: function (key, value) { - if (value) { - layui.sessionData('tempData', {key: key, value: value}); - } else { - layui.sessionData('tempData', {key: key, remove: true}); - } - }, - // 获取缓存临时数据 - getTempData: function (key) { - return layui.sessionData('tempData')[key]; - }, - // 滑动选项卡 - rollPage: function (d) { - var $tabTitle = $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title'); - var left = $tabTitle.scrollLeft(); - if ('left' === d) { - $tabTitle.scrollLeft(left - 120); - } else if ('auto' === d) { - var autoLeft = 0; - $tabTitle.children("li").each(function () { - if ($(this).hasClass('layui-this')) { - return false; - } else { - autoLeft += $(this).outerWidth(); - } - }); - $tabTitle.scrollLeft(autoLeft - 47); - } else { - $tabTitle.scrollLeft(left + 120); - } - }, - // 刷新主题部分 - refresh: function () { - admin.isRefresh = true; - Q.refresh(); - }, - // 判断是否为json - parseJSON: function (str) { - if (typeof str == 'string') { - try { - var obj = JSON.parse(str); - if (typeof obj == 'object' && obj) { - return obj; - } - } catch (e) { - } - } - }, - formatDate:function (str) { - if (str == null || str == "") { - return; - } - switch (str.length) { - case 8: - str = str.substring(0, 4) + "-" + str.substring(4, 6) + "-" + str.substring(6, 8); - return str; - case 12: - str = str.substring(0, 4) + "-" + str.substring(4, 6) + "-" + str.substring(6, 8) + " " + str.substring(8, 10) - + ":" + str.substring(10, 12); - return str; - case 14: - str = str.substring(0, 4) + "-" + str.substring(4, 6) + "-" + str.substring(6, 8) + " " + str.substring(8, 10) - + ":" + str.substring(10, 12) + ":" + str.substring(12, 14); - return str; - default: - return str; - } - }, - errorBack: function (err) { - layer.closeAll('loading'); - if (403 == err.status) { - layer.msg("无资源权限！", {icon: 2, time: 1500}); - return; - } - if (200 == err.status) { - layer.msg("请求异常，请刷新页面重新操作", {icon: 2, time: 1500}); - return; - } else { - layer.msg("请求服务器失败！", {icon: 2}); - } - } - }; - - // ewAdmin提供的事件 - admin.events = { - // 折叠侧导航 - flexible: function (e) { - var expand = $('.layui-layout-admin').hasClass('admin-nav-mini'); - admin.flexible(expand); - }, - // 刷新主体部分 - refresh: function () { - admin.refresh(); - }, - //后退 - back: function () { - history.back(); - }, - // 设置主题 - theme: function () { - admin.popupRight(baseUrl+'home/theme'); - }, - // 全屏 - fullScreen: function (e) { - var ac = 'layui-icon-screen-full', ic = 'layui-icon-screen-restore'; - var ti = $(this).find('i'); - - var isFullscreen = document.fullscreenElement || document.msFullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || false; - if (isFullscreen) { - var efs = document.exitFullscreen || document.webkitExitFullscreen || document.mozCancelFullScreen || document.msExitFullscreen; - if (efs) { - efs.call(document); - } else if (window.ActiveXObject) { - var ws = new ActiveXObject('WScript.Shell'); - ws && ws.SendKeys('{F11}'); - } - ti.addClass(ac).removeClass(ic); - } else { - var el = document.documentElement; - var rfs = el.requestFullscreen || el.webkitRequestFullscreen || el.mozRequestFullScreen || el.msRequestFullscreen; - if (rfs) { - rfs.call(el); - } else if (window.ActiveXObject) { - var ws = new ActiveXObject('WScript.Shell'); - ws && ws.SendKeys('{F11}'); - } - ti.addClass(ic).removeClass(ac); - } - }, - // 左滑动tab - leftPage: function () { - admin.rollPage("left"); - }, - // 右滑动tab - rightPage: function () { - admin.rollPage(); - }, - // 关闭当前选项卡 - closeThisTabs: function () { - var $title = $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title'); - if ($title.find('li').first().hasClass('layui-this')) { - return; - } - $title.find('li.layui-this').find(".layui-tab-close").trigger("click"); - }, - // 关闭其他选项卡 - closeOtherTabs: function () { - $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title li:gt(0):not(.layui-this)').find('.layui-tab-close').trigger('click'); - }, - // 关闭所有选项卡 - closeAllTabs: function () { - $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title li:gt(0)').find('.layui-tab-close').trigger('click'); - }, - // 关闭所有弹窗 - closeDialog: function () { - layer.closeAll('page'); - }, - //刷新字典 - refreshDict: function (){ - layer.confirm('确定要刷新数据字典吗?', { - btn: ['确定', '取消'] - }, function (index, layero) { - layer.closeAll('dialog'); //加入这个信息点击确定 会关闭这个消息框 - admin.dgo(baseUrl+"dictrefresh", {}, function (data) { - if (data.code == 200) { - layer.msg("刷新数据字典成功！", {icon: 1, time: 1000}); - DictPoolToolkit().initAll(baseUrl+"dictpool"); - } else if (data.code == 401) { - layer.msg(data.msg, {icon: 2, time: 1500}, function () { - location.replace('/login'); - }, 1000); - return; - } else { - layer.msg(data.msg, {icon: 2, time: 1500}); - } - }, function () { - layer.msg("数据字典刷新失败，访问服务器失败！", {icon: 2, time: 1500}); - }); - }); - } - }; - - // 所有ew-event - $('body').on('click', '*[ew-event]', function () { - var event = $(this).attr('ew-event'); - var te = admin.events[event]; - te && te.call(this, $(this)); - }); - - // 移动设备遮罩层点击事件 - $('.site-mobile-shade').click(function () { - admin.flexible(true); - }); - - // 侧导航折叠状态下鼠标经过显示提示 - $('body').on('mouseenter', '.layui-layout-admin.admin-nav-mini .layui-side .layui-nav .layui-nav-item>a', function () { - var tipText = $(this).find('cite').text(); - if (document.body.clientWidth > 750) { - layer.tips(tipText, this); - } - }).on('mouseleave', '.layui-layout-admin.admin-nav-mini .layui-side .layui-nav .layui-nav-item>a', function () { - layer.closeAll('tips'); - }); - - // 侧导航折叠状态下点击展开 - $('body').on('click', '.layui-layout-admin.admin-nav-mini .layui-side .layui-nav .layui-nav-item>a', function () { - if (document.body.clientWidth > 750) { - layer.closeAll('tips'); - admin.flexible(true); - } - }); - - // 所有lay-tips处理 - $('body').on('mouseenter', '*[lay-tips]', function () { - var tipText = $(this).attr('lay-tips'); - var dt = $(this).attr('lay-direction'); - layer.tips(tipText, this, {tips: dt || 1, time: -1}); - }).on('mouseleave', '*[lay-tips]', function () { - layer.closeAll('tips'); - }); - - exports('admin', admin); -}); +layui.define(['layer'], function (exports) { + var layer = layui.layer; + var popupRightIndex, popupCenterIndex, popupCenterParam; + var baseUrl = window.location.pathname; + + var admin = { + isRefresh: false, + // 设置侧栏折叠 + flexible: function (expand) { + var isExapnd = $('.layui-layout-admin').hasClass('admin-nav-mini'); + if (isExapnd == !expand) { + return; + } + if (expand) { + $('.layui-layout-admin').removeClass('admin-nav-mini'); + } else { + $('.layui-layout-admin').addClass('admin-nav-mini'); + } + }, + // 设置导航栏选中 + activeNav: function (url) { + $('.layui-layout-admin .layui-side .layui-nav .layui-nav-item .layui-nav-child dd').removeClass('layui-this'); + $('.layui-layout-admin .layui-side .layui-nav .layui-nav-item').removeClass('layui-this'); + if (url && url != '') { + $('.layui-layout-admin .layui-side .layui-nav .layui-nav-item').removeClass('layui-nav-itemed'); + var $a = $('.layui-layout-admin .layui-side .layui-nav a[href="#!' + url + '"]'); + $a.parent('li').addClass('layui-this'); + $a.parent('dd').addClass('layui-this'); + $a.parent('dd').parent('.layui-nav-child').parent('.layui-nav-item').addClass('layui-nav-itemed'); + } + }, + // 右侧弹出 + popupRight: function (path) { + var param = new Object(); + param.path = path; + param.id = 'adminPopupR'; + param.title = false; + param.anim = 2; + param.isOutAnim = false; + param.closeBtn = false; + param.offset = 'r'; + param.shadeClose = true; + param.area = '336px'; + param.skin = 'layui-layer-adminRight'; + param.end = function () { + layer.closeAll('tips'); + }; + popupRightIndex = admin.open(param); + return popupRightIndex; + }, + // 关闭右侧弹出 + closePopupRight: function () { + layer.close(popupRightIndex); + }, + // 中间弹出 + popupCenter: function (param) { + param.id = 'adminPopupC'; + popupCenterParam = param; + popupCenterIndex = admin.open(param); + return popupCenterIndex; + }, + // 关闭中间弹出并且触发finish回调 + finishPopupCenter: function () { + layer.close(popupCenterIndex); + popupCenterParam.finish ? popupCenterParam.finish() : ''; + }, + // 关闭中间弹出 + closePopupCenter: function () { + layer.close(popupCenterIndex); + }, + // 封装layer.open + open: function (param) { + var sCallBack = param.success; + param.type = 1; + param.area = param.area ? param.area : '450px'; + param.offset = param.offset ? param.offset : '120px'; + param.resize ? param.resize : false; + param.shade ? param.shade : .2; + param.success = function (layero, index) { + sCallBack ? sCallBack(layero, index) : ''; + admin.ajax({ + url: param.path, + type: 'GET', + dataType: 'html', + success: function (result, status, xhr) { + $(layero).children('.layui-layer-content').html(result); + } + }); + }; + return layer.open(param); + }, + + go:function(url,data,success,error){ + $.ajax({ + url: url, + data: data, + async: false, + dataType: 'json', + type: 'post', + success: success, + error:error + }) + }, + dgo:function(url,data,success,error){ + $.ajax({ + url: url, + data: data, + async: false, + dataType: 'json', + type: 'get', + success: success, + error:error + }) + }, + // 封装ajax请求，返回数据类型为json + req: function (url, data, success, method) { + admin.ajax({ + url: url, + data: data, + async: false, + type: method, + dataType: 'json', + success: success + }); + }, + // 封装ajax请求 + ajax: function (param) { + console.log(param); + var successCallback = param.success; + param.success = function (result, status, xhr) { + // 判断登录过期和没有权限 + var jsonRs; + if ('json' == param.dataType.toLowerCase()) { + jsonRs = result; + } else if ('html' == param.dataType.toLowerCase() || 'text' == param.dataType.toLowerCase()) { + jsonRs = admin.parseJSON(result); + } + if (jsonRs) { + if (jsonRs.code == 401) { + layer.msg(jsonRs.msg, {icon: 2, time: 1500}, function () { + location.replace('/login'); + }, 1000); + return; + } else if ('html' == param.dataType.toLowerCase() && jsonRs.code == 403) { + layer.msg(jsonRs.msg, {icon: 2}); + } + } + successCallback(result, status, xhr); + }; + param.error = function (xhr) { + //{code: xhr.status, msg: xhr.statusText} + param.success(xhr.responseText,xhr.status,xhr); + }; + $.ajax(param); + }, + // 显示加载动画 + showLoading: function (element) { + $(element).append(''); + }, + // 移除加载动画 + removeLoading: function (element) { + $(element + '>.admin-loading').remove(); + }, + // 缓存临时数据 + putTempData: function (key, value) { + if (value) { + layui.sessionData('tempData', {key: key, value: value}); + } else { + layui.sessionData('tempData', {key: key, remove: true}); + } + }, + // 获取缓存临时数据 + getTempData: function (key) { + return layui.sessionData('tempData')[key]; + }, + // 滑动选项卡 + rollPage: function (d) { + var $tabTitle = $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title'); + var left = $tabTitle.scrollLeft(); + if ('left' === d) { + $tabTitle.scrollLeft(left - 120); + } else if ('auto' === d) { + var autoLeft = 0; + $tabTitle.children("li").each(function () { + if ($(this).hasClass('layui-this')) { + return false; + } else { + autoLeft += $(this).outerWidth(); + } + }); + $tabTitle.scrollLeft(autoLeft - 47); + } else { + $tabTitle.scrollLeft(left + 120); + } + }, + // 刷新主题部分 + refresh: function () { + admin.isRefresh = true; + Q.refresh(); + }, + // 判断是否为json + parseJSON: function (str) { + if (typeof str == 'string') { + try { + var obj = JSON.parse(str); + if (typeof obj == 'object' && obj) { + return obj; + } + } catch (e) { + } + } + }, + formatDate:function (str) { + if (str == null || str == "") { + return; + } + switch (str.length) { + case 8: + str = str.substring(0, 4) + "-" + str.substring(4, 6) + "-" + str.substring(6, 8); + return str; + case 12: + str = str.substring(0, 4) + "-" + str.substring(4, 6) + "-" + str.substring(6, 8) + " " + str.substring(8, 10) + + ":" + str.substring(10, 12); + return str; + case 14: + str = str.substring(0, 4) + "-" + str.substring(4, 6) + "-" + str.substring(6, 8) + " " + str.substring(8, 10) + + ":" + str.substring(10, 12) + ":" + str.substring(12, 14); + return str; + default: + return str; + } + }, + errorBack: function (err) { + layer.closeAll('loading'); + if (403 == err.status) { + layer.msg("无资源权限！", {icon: 2, time: 1500}); + return; + } + if (200 == err.status) { + layer.msg("请求异常，请刷新页面重新操作", {icon: 2, time: 1500}); + return; + } else { + layer.msg("请求服务器失败！", {icon: 2}); + } + } + }; + + // ewAdmin提供的事件 + admin.events = { + // 折叠侧导航 + flexible: function (e) { + var expand = $('.layui-layout-admin').hasClass('admin-nav-mini'); + admin.flexible(expand); + }, + // 刷新主体部分 + refresh: function () { + admin.refresh(); + }, + //后退 + back: function () { + history.back(); + }, + // 设置主题 + theme: function () { + admin.popupRight(baseUrl+'home/theme'); + }, + // 全屏 + fullScreen: function (e) { + var ac = 'layui-icon-screen-full', ic = 'layui-icon-screen-restore'; + var ti = $(this).find('i'); + + var isFullscreen = document.fullscreenElement || document.msFullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || false; + if (isFullscreen) { + var efs = document.exitFullscreen || document.webkitExitFullscreen || document.mozCancelFullScreen || document.msExitFullscreen; + if (efs) { + efs.call(document); + } else if (window.ActiveXObject) { + var ws = new ActiveXObject('WScript.Shell'); + ws && ws.SendKeys('{F11}'); + } + ti.addClass(ac).removeClass(ic); + } else { + var el = document.documentElement; + var rfs = el.requestFullscreen || el.webkitRequestFullscreen || el.mozRequestFullScreen || el.msRequestFullscreen; + if (rfs) { + rfs.call(el); + } else if (window.ActiveXObject) { + var ws = new ActiveXObject('WScript.Shell'); + ws && ws.SendKeys('{F11}'); + } + ti.addClass(ic).removeClass(ac); + } + }, + // 左滑动tab + leftPage: function () { + admin.rollPage("left"); + }, + // 右滑动tab + rightPage: function () { + admin.rollPage(); + }, + // 关闭当前选项卡 + closeThisTabs: function () { + var $title = $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title'); + if ($title.find('li').first().hasClass('layui-this')) { + return; + } + $title.find('li.layui-this').find(".layui-tab-close").trigger("click"); + }, + // 关闭其他选项卡 + closeOtherTabs: function () { + $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title li:gt(0):not(.layui-this)').find('.layui-tab-close').trigger('click'); + }, + // 关闭所有选项卡 + closeAllTabs: function () { + $('.layui-layout-admin .layui-body .layui-tab .layui-tab-title li:gt(0)').find('.layui-tab-close').trigger('click'); + }, + // 关闭所有弹窗 + closeDialog: function () { + layer.closeAll('page'); + }, + //刷新字典 + refreshDict: function (){ + layer.confirm('确定要刷新数据字典吗?', { + btn: ['确定', '取消'] + }, function (index, layero) { + layer.closeAll('dialog'); //加入这个信息点击确定 会关闭这个消息框 + admin.dgo(baseUrl+"dictrefresh", {}, function (data) { + if (data.code == 200) { + layer.msg("刷新数据字典成功！", {icon: 1, time: 1000}); + DictPoolToolkit().initAll(baseUrl+"dictpool"); + } else if (data.code == 401) { + layer.msg(data.msg, {icon: 2, time: 1500}, function () { + location.replace('/login'); + }, 1000); + return; + } else { + layer.msg(data.msg, {icon: 2, time: 1500}); + } + }, function () { + layer.msg("数据字典刷新失败，访问服务器失败！", {icon: 2, time: 1500}); + }); + }); + } + }; + + // 所有ew-event + $('body').on('click', '*[ew-event]', function () { + var event = $(this).attr('ew-event'); + var te = admin.events[event]; + te && te.call(this, $(this)); + }); + + // 移动设备遮罩层点击事件 + $('.site-mobile-shade').click(function () { + admin.flexible(true); + }); + + // 侧导航折叠状态下鼠标经过显示提示 + $('body').on('mouseenter', '.layui-layout-admin.admin-nav-mini .layui-side .layui-nav .layui-nav-item>a', function () { + var tipText = $(this).find('cite').text(); + if (document.body.clientWidth > 750) { + layer.tips(tipText, this); + } + }).on('mouseleave', '.layui-layout-admin.admin-nav-mini .layui-side .layui-nav .layui-nav-item>a', function () { + layer.closeAll('tips'); + }); + + // 侧导航折叠状态下点击展开 + $('body').on('click', '.layui-layout-admin.admin-nav-mini .layui-side .layui-nav .layui-nav-item>a', function () { + if (document.body.clientWidth > 750) { + layer.closeAll('tips'); + admin.flexible(true); + } + }); + + // 所有lay-tips处理 + $('body').on('mouseenter', '*[lay-tips]', function () { + var tipText = $(this).attr('lay-tips'); + var dt = $(this).attr('lay-direction'); + layer.tips(tipText, this, {tips: dt || 1, time: -1}); + }).on('mouseleave', '*[lay-tips]', function () { + layer.closeAll('tips'); + }); + + exports('admin', admin); +}); diff --git a/src/main/resources/static/custom/module/formSelects/formSelects-v4.all.js b/payapi/src/main/resources/static/custom/module/formSelects/formSelects-v4.all.js similarity index 100% rename from src/main/resources/static/custom/module/formSelects/formSelects-v4.all.js rename to payapi/src/main/resources/static/custom/module/formSelects/formSelects-v4.all.js diff --git a/src/main/resources/static/custom/module/formSelects/formSelects-v4.css b/payapi/src/main/resources/static/custom/module/formSelects/formSelects-v4.css similarity index 100% rename from src/main/resources/static/custom/module/formSelects/formSelects-v4.css rename to payapi/src/main/resources/static/custom/module/formSelects/formSelects-v4.css diff --git a/src/main/resources/static/custom/module/formSelects/formSelects-v4.js b/payapi/src/main/resources/static/custom/module/formSelects/formSelects-v4.js similarity index 100% rename from src/main/resources/static/custom/module/formSelects/formSelects-v4.js rename to payapi/src/main/resources/static/custom/module/formSelects/formSelects-v4.js diff --git a/src/main/resources/static/custom/module/index.js b/payapi/src/main/resources/static/custom/module/index.js similarity index 100% rename from src/main/resources/static/custom/module/index.js rename to payapi/src/main/resources/static/custom/module/index.js diff --git a/src/main/resources/static/custom/module/treeSelect/treeSelect.js b/payapi/src/main/resources/static/custom/module/treeSelect/treeSelect.js similarity index 100% rename from src/main/resources/static/custom/module/treeSelect/treeSelect.js rename to payapi/src/main/resources/static/custom/module/treeSelect/treeSelect.js diff --git a/src/main/resources/static/custom/module/treetable-lay/treetable.css b/payapi/src/main/resources/static/custom/module/treetable-lay/treetable.css similarity index 100% rename from src/main/resources/static/custom/module/treetable-lay/treetable.css rename to payapi/src/main/resources/static/custom/module/treetable-lay/treetable.css diff --git a/src/main/resources/static/custom/module/treetable-lay/treetable.js b/payapi/src/main/resources/static/custom/module/treetable-lay/treetable.js similarity index 100% rename from src/main/resources/static/custom/module/treetable-lay/treetable.js rename to payapi/src/main/resources/static/custom/module/treetable-lay/treetable.js diff --git a/src/main/resources/static/libs/custom.js b/payapi/src/main/resources/static/libs/custom.js similarity index 100% rename from src/main/resources/static/libs/custom.js rename to payapi/src/main/resources/static/libs/custom.js diff --git a/src/main/resources/static/libs/jquery/jquery-3.2.1.min.js b/payapi/src/main/resources/static/libs/jquery/jquery-3.2.1.min.js similarity index 100% rename from src/main/resources/static/libs/jquery/jquery-3.2.1.min.js rename to payapi/src/main/resources/static/libs/jquery/jquery-3.2.1.min.js diff --git a/src/main/resources/static/libs/layui/css/layui.css b/payapi/src/main/resources/static/libs/layui/css/layui.css similarity index 100% rename from src/main/resources/static/libs/layui/css/layui.css rename to payapi/src/main/resources/static/libs/layui/css/layui.css diff --git a/src/main/resources/static/libs/layui/css/layui.mobile.css b/payapi/src/main/resources/static/libs/layui/css/layui.mobile.css similarity index 100% rename from src/main/resources/static/libs/layui/css/layui.mobile.css rename to payapi/src/main/resources/static/libs/layui/css/layui.mobile.css diff --git a/src/main/resources/static/libs/layui/css/modules/code.css b/payapi/src/main/resources/static/libs/layui/css/modules/code.css similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/code.css rename to payapi/src/main/resources/static/libs/layui/css/modules/code.css diff --git a/src/main/resources/static/libs/layui/css/modules/laydate/default/laydate.css b/payapi/src/main/resources/static/libs/layui/css/modules/laydate/default/laydate.css similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/laydate/default/laydate.css rename to payapi/src/main/resources/static/libs/layui/css/modules/laydate/default/laydate.css diff --git a/src/main/resources/static/libs/layui/css/modules/layer/default/icon-ext.png b/payapi/src/main/resources/static/libs/layui/css/modules/layer/default/icon-ext.png similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/layer/default/icon-ext.png rename to payapi/src/main/resources/static/libs/layui/css/modules/layer/default/icon-ext.png diff --git a/src/main/resources/static/libs/layui/css/modules/layer/default/icon.png b/payapi/src/main/resources/static/libs/layui/css/modules/layer/default/icon.png similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/layer/default/icon.png rename to payapi/src/main/resources/static/libs/layui/css/modules/layer/default/icon.png diff --git a/src/main/resources/static/libs/layui/css/modules/layer/default/layer.css b/payapi/src/main/resources/static/libs/layui/css/modules/layer/default/layer.css similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/layer/default/layer.css rename to payapi/src/main/resources/static/libs/layui/css/modules/layer/default/layer.css diff --git a/src/main/resources/static/libs/layui/css/modules/layer/default/loading-0.gif b/payapi/src/main/resources/static/libs/layui/css/modules/layer/default/loading-0.gif similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/layer/default/loading-0.gif rename to payapi/src/main/resources/static/libs/layui/css/modules/layer/default/loading-0.gif diff --git a/src/main/resources/static/libs/layui/css/modules/layer/default/loading-1.gif b/payapi/src/main/resources/static/libs/layui/css/modules/layer/default/loading-1.gif similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/layer/default/loading-1.gif rename to payapi/src/main/resources/static/libs/layui/css/modules/layer/default/loading-1.gif diff --git a/src/main/resources/static/libs/layui/css/modules/layer/default/loading-2.gif b/payapi/src/main/resources/static/libs/layui/css/modules/layer/default/loading-2.gif similarity index 100% rename from src/main/resources/static/libs/layui/css/modules/layer/default/loading-2.gif rename to payapi/src/main/resources/static/libs/layui/css/modules/layer/default/loading-2.gif diff --git a/src/main/resources/static/libs/layui/font/iconfont.eot b/payapi/src/main/resources/static/libs/layui/font/iconfont.eot similarity index 100% rename from src/main/resources/static/libs/layui/font/iconfont.eot rename to payapi/src/main/resources/static/libs/layui/font/iconfont.eot diff --git a/src/main/resources/static/libs/layui/font/iconfont.svg b/payapi/src/main/resources/static/libs/layui/font/iconfont.svg similarity index 100% rename from src/main/resources/static/libs/layui/font/iconfont.svg rename to payapi/src/main/resources/static/libs/layui/font/iconfont.svg diff --git a/src/main/resources/static/libs/layui/font/iconfont.ttf b/payapi/src/main/resources/static/libs/layui/font/iconfont.ttf similarity index 100% rename from src/main/resources/static/libs/layui/font/iconfont.ttf rename to payapi/src/main/resources/static/libs/layui/font/iconfont.ttf diff --git a/src/main/resources/static/libs/layui/font/iconfont.woff b/payapi/src/main/resources/static/libs/layui/font/iconfont.woff similarity index 100% rename from src/main/resources/static/libs/layui/font/iconfont.woff rename to payapi/src/main/resources/static/libs/layui/font/iconfont.woff diff --git a/src/main/resources/static/libs/layui/images/face/0.gif b/payapi/src/main/resources/static/libs/layui/images/face/0.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/0.gif rename to payapi/src/main/resources/static/libs/layui/images/face/0.gif diff --git a/src/main/resources/static/libs/layui/images/face/1.gif b/payapi/src/main/resources/static/libs/layui/images/face/1.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/1.gif rename to payapi/src/main/resources/static/libs/layui/images/face/1.gif diff --git a/src/main/resources/static/libs/layui/images/face/10.gif b/payapi/src/main/resources/static/libs/layui/images/face/10.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/10.gif rename to payapi/src/main/resources/static/libs/layui/images/face/10.gif diff --git a/src/main/resources/static/libs/layui/images/face/11.gif b/payapi/src/main/resources/static/libs/layui/images/face/11.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/11.gif rename to payapi/src/main/resources/static/libs/layui/images/face/11.gif diff --git a/src/main/resources/static/libs/layui/images/face/12.gif b/payapi/src/main/resources/static/libs/layui/images/face/12.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/12.gif rename to payapi/src/main/resources/static/libs/layui/images/face/12.gif diff --git a/src/main/resources/static/libs/layui/images/face/13.gif b/payapi/src/main/resources/static/libs/layui/images/face/13.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/13.gif rename to payapi/src/main/resources/static/libs/layui/images/face/13.gif diff --git a/src/main/resources/static/libs/layui/images/face/14.gif b/payapi/src/main/resources/static/libs/layui/images/face/14.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/14.gif rename to payapi/src/main/resources/static/libs/layui/images/face/14.gif diff --git a/src/main/resources/static/libs/layui/images/face/15.gif b/payapi/src/main/resources/static/libs/layui/images/face/15.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/15.gif rename to payapi/src/main/resources/static/libs/layui/images/face/15.gif diff --git a/src/main/resources/static/libs/layui/images/face/16.gif b/payapi/src/main/resources/static/libs/layui/images/face/16.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/16.gif rename to payapi/src/main/resources/static/libs/layui/images/face/16.gif diff --git a/src/main/resources/static/libs/layui/images/face/17.gif b/payapi/src/main/resources/static/libs/layui/images/face/17.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/17.gif rename to payapi/src/main/resources/static/libs/layui/images/face/17.gif diff --git a/src/main/resources/static/libs/layui/images/face/18.gif b/payapi/src/main/resources/static/libs/layui/images/face/18.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/18.gif rename to payapi/src/main/resources/static/libs/layui/images/face/18.gif diff --git a/src/main/resources/static/libs/layui/images/face/19.gif b/payapi/src/main/resources/static/libs/layui/images/face/19.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/19.gif rename to payapi/src/main/resources/static/libs/layui/images/face/19.gif diff --git a/src/main/resources/static/libs/layui/images/face/2.gif b/payapi/src/main/resources/static/libs/layui/images/face/2.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/2.gif rename to payapi/src/main/resources/static/libs/layui/images/face/2.gif diff --git a/src/main/resources/static/libs/layui/images/face/20.gif b/payapi/src/main/resources/static/libs/layui/images/face/20.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/20.gif rename to payapi/src/main/resources/static/libs/layui/images/face/20.gif diff --git a/src/main/resources/static/libs/layui/images/face/21.gif b/payapi/src/main/resources/static/libs/layui/images/face/21.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/21.gif rename to payapi/src/main/resources/static/libs/layui/images/face/21.gif diff --git a/src/main/resources/static/libs/layui/images/face/22.gif b/payapi/src/main/resources/static/libs/layui/images/face/22.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/22.gif rename to payapi/src/main/resources/static/libs/layui/images/face/22.gif diff --git a/src/main/resources/static/libs/layui/images/face/23.gif b/payapi/src/main/resources/static/libs/layui/images/face/23.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/23.gif rename to payapi/src/main/resources/static/libs/layui/images/face/23.gif diff --git a/src/main/resources/static/libs/layui/images/face/24.gif b/payapi/src/main/resources/static/libs/layui/images/face/24.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/24.gif rename to payapi/src/main/resources/static/libs/layui/images/face/24.gif diff --git a/src/main/resources/static/libs/layui/images/face/25.gif b/payapi/src/main/resources/static/libs/layui/images/face/25.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/25.gif rename to payapi/src/main/resources/static/libs/layui/images/face/25.gif diff --git a/src/main/resources/static/libs/layui/images/face/26.gif b/payapi/src/main/resources/static/libs/layui/images/face/26.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/26.gif rename to payapi/src/main/resources/static/libs/layui/images/face/26.gif diff --git a/src/main/resources/static/libs/layui/images/face/27.gif b/payapi/src/main/resources/static/libs/layui/images/face/27.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/27.gif rename to payapi/src/main/resources/static/libs/layui/images/face/27.gif diff --git a/src/main/resources/static/libs/layui/images/face/28.gif b/payapi/src/main/resources/static/libs/layui/images/face/28.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/28.gif rename to payapi/src/main/resources/static/libs/layui/images/face/28.gif diff --git a/src/main/resources/static/libs/layui/images/face/29.gif b/payapi/src/main/resources/static/libs/layui/images/face/29.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/29.gif rename to payapi/src/main/resources/static/libs/layui/images/face/29.gif diff --git a/src/main/resources/static/libs/layui/images/face/3.gif b/payapi/src/main/resources/static/libs/layui/images/face/3.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/3.gif rename to payapi/src/main/resources/static/libs/layui/images/face/3.gif diff --git a/src/main/resources/static/libs/layui/images/face/30.gif b/payapi/src/main/resources/static/libs/layui/images/face/30.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/30.gif rename to payapi/src/main/resources/static/libs/layui/images/face/30.gif diff --git a/src/main/resources/static/libs/layui/images/face/31.gif b/payapi/src/main/resources/static/libs/layui/images/face/31.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/31.gif rename to payapi/src/main/resources/static/libs/layui/images/face/31.gif diff --git a/src/main/resources/static/libs/layui/images/face/32.gif b/payapi/src/main/resources/static/libs/layui/images/face/32.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/32.gif rename to payapi/src/main/resources/static/libs/layui/images/face/32.gif diff --git a/src/main/resources/static/libs/layui/images/face/33.gif b/payapi/src/main/resources/static/libs/layui/images/face/33.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/33.gif rename to payapi/src/main/resources/static/libs/layui/images/face/33.gif diff --git a/src/main/resources/static/libs/layui/images/face/34.gif b/payapi/src/main/resources/static/libs/layui/images/face/34.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/34.gif rename to payapi/src/main/resources/static/libs/layui/images/face/34.gif diff --git a/src/main/resources/static/libs/layui/images/face/35.gif b/payapi/src/main/resources/static/libs/layui/images/face/35.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/35.gif rename to payapi/src/main/resources/static/libs/layui/images/face/35.gif diff --git a/src/main/resources/static/libs/layui/images/face/36.gif b/payapi/src/main/resources/static/libs/layui/images/face/36.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/36.gif rename to payapi/src/main/resources/static/libs/layui/images/face/36.gif diff --git a/src/main/resources/static/libs/layui/images/face/37.gif b/payapi/src/main/resources/static/libs/layui/images/face/37.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/37.gif rename to payapi/src/main/resources/static/libs/layui/images/face/37.gif diff --git a/src/main/resources/static/libs/layui/images/face/38.gif b/payapi/src/main/resources/static/libs/layui/images/face/38.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/38.gif rename to payapi/src/main/resources/static/libs/layui/images/face/38.gif diff --git a/src/main/resources/static/libs/layui/images/face/39.gif b/payapi/src/main/resources/static/libs/layui/images/face/39.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/39.gif rename to payapi/src/main/resources/static/libs/layui/images/face/39.gif diff --git a/src/main/resources/static/libs/layui/images/face/4.gif b/payapi/src/main/resources/static/libs/layui/images/face/4.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/4.gif rename to payapi/src/main/resources/static/libs/layui/images/face/4.gif diff --git a/src/main/resources/static/libs/layui/images/face/40.gif b/payapi/src/main/resources/static/libs/layui/images/face/40.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/40.gif rename to payapi/src/main/resources/static/libs/layui/images/face/40.gif diff --git a/src/main/resources/static/libs/layui/images/face/41.gif b/payapi/src/main/resources/static/libs/layui/images/face/41.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/41.gif rename to payapi/src/main/resources/static/libs/layui/images/face/41.gif diff --git a/src/main/resources/static/libs/layui/images/face/42.gif b/payapi/src/main/resources/static/libs/layui/images/face/42.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/42.gif rename to payapi/src/main/resources/static/libs/layui/images/face/42.gif diff --git a/src/main/resources/static/libs/layui/images/face/43.gif b/payapi/src/main/resources/static/libs/layui/images/face/43.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/43.gif rename to payapi/src/main/resources/static/libs/layui/images/face/43.gif diff --git a/src/main/resources/static/libs/layui/images/face/44.gif b/payapi/src/main/resources/static/libs/layui/images/face/44.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/44.gif rename to payapi/src/main/resources/static/libs/layui/images/face/44.gif diff --git a/src/main/resources/static/libs/layui/images/face/45.gif b/payapi/src/main/resources/static/libs/layui/images/face/45.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/45.gif rename to payapi/src/main/resources/static/libs/layui/images/face/45.gif diff --git a/src/main/resources/static/libs/layui/images/face/46.gif b/payapi/src/main/resources/static/libs/layui/images/face/46.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/46.gif rename to payapi/src/main/resources/static/libs/layui/images/face/46.gif diff --git a/src/main/resources/static/libs/layui/images/face/47.gif b/payapi/src/main/resources/static/libs/layui/images/face/47.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/47.gif rename to payapi/src/main/resources/static/libs/layui/images/face/47.gif diff --git a/src/main/resources/static/libs/layui/images/face/48.gif b/payapi/src/main/resources/static/libs/layui/images/face/48.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/48.gif rename to payapi/src/main/resources/static/libs/layui/images/face/48.gif diff --git a/src/main/resources/static/libs/layui/images/face/49.gif b/payapi/src/main/resources/static/libs/layui/images/face/49.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/49.gif rename to payapi/src/main/resources/static/libs/layui/images/face/49.gif diff --git a/src/main/resources/static/libs/layui/images/face/5.gif b/payapi/src/main/resources/static/libs/layui/images/face/5.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/5.gif rename to payapi/src/main/resources/static/libs/layui/images/face/5.gif diff --git a/src/main/resources/static/libs/layui/images/face/50.gif b/payapi/src/main/resources/static/libs/layui/images/face/50.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/50.gif rename to payapi/src/main/resources/static/libs/layui/images/face/50.gif diff --git a/src/main/resources/static/libs/layui/images/face/51.gif b/payapi/src/main/resources/static/libs/layui/images/face/51.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/51.gif rename to payapi/src/main/resources/static/libs/layui/images/face/51.gif diff --git a/src/main/resources/static/libs/layui/images/face/52.gif b/payapi/src/main/resources/static/libs/layui/images/face/52.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/52.gif rename to payapi/src/main/resources/static/libs/layui/images/face/52.gif diff --git a/src/main/resources/static/libs/layui/images/face/53.gif b/payapi/src/main/resources/static/libs/layui/images/face/53.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/53.gif rename to payapi/src/main/resources/static/libs/layui/images/face/53.gif diff --git a/src/main/resources/static/libs/layui/images/face/54.gif b/payapi/src/main/resources/static/libs/layui/images/face/54.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/54.gif rename to payapi/src/main/resources/static/libs/layui/images/face/54.gif diff --git a/src/main/resources/static/libs/layui/images/face/55.gif b/payapi/src/main/resources/static/libs/layui/images/face/55.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/55.gif rename to payapi/src/main/resources/static/libs/layui/images/face/55.gif diff --git a/src/main/resources/static/libs/layui/images/face/56.gif b/payapi/src/main/resources/static/libs/layui/images/face/56.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/56.gif rename to payapi/src/main/resources/static/libs/layui/images/face/56.gif diff --git a/src/main/resources/static/libs/layui/images/face/57.gif b/payapi/src/main/resources/static/libs/layui/images/face/57.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/57.gif rename to payapi/src/main/resources/static/libs/layui/images/face/57.gif diff --git a/src/main/resources/static/libs/layui/images/face/58.gif b/payapi/src/main/resources/static/libs/layui/images/face/58.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/58.gif rename to payapi/src/main/resources/static/libs/layui/images/face/58.gif diff --git a/src/main/resources/static/libs/layui/images/face/59.gif b/payapi/src/main/resources/static/libs/layui/images/face/59.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/59.gif rename to payapi/src/main/resources/static/libs/layui/images/face/59.gif diff --git a/src/main/resources/static/libs/layui/images/face/6.gif b/payapi/src/main/resources/static/libs/layui/images/face/6.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/6.gif rename to payapi/src/main/resources/static/libs/layui/images/face/6.gif diff --git a/src/main/resources/static/libs/layui/images/face/60.gif b/payapi/src/main/resources/static/libs/layui/images/face/60.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/60.gif rename to payapi/src/main/resources/static/libs/layui/images/face/60.gif diff --git a/src/main/resources/static/libs/layui/images/face/61.gif b/payapi/src/main/resources/static/libs/layui/images/face/61.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/61.gif rename to payapi/src/main/resources/static/libs/layui/images/face/61.gif diff --git a/src/main/resources/static/libs/layui/images/face/62.gif b/payapi/src/main/resources/static/libs/layui/images/face/62.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/62.gif rename to payapi/src/main/resources/static/libs/layui/images/face/62.gif diff --git a/src/main/resources/static/libs/layui/images/face/63.gif b/payapi/src/main/resources/static/libs/layui/images/face/63.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/63.gif rename to payapi/src/main/resources/static/libs/layui/images/face/63.gif diff --git a/src/main/resources/static/libs/layui/images/face/64.gif b/payapi/src/main/resources/static/libs/layui/images/face/64.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/64.gif rename to payapi/src/main/resources/static/libs/layui/images/face/64.gif diff --git a/src/main/resources/static/libs/layui/images/face/65.gif b/payapi/src/main/resources/static/libs/layui/images/face/65.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/65.gif rename to payapi/src/main/resources/static/libs/layui/images/face/65.gif diff --git a/src/main/resources/static/libs/layui/images/face/66.gif b/payapi/src/main/resources/static/libs/layui/images/face/66.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/66.gif rename to payapi/src/main/resources/static/libs/layui/images/face/66.gif diff --git a/src/main/resources/static/libs/layui/images/face/67.gif b/payapi/src/main/resources/static/libs/layui/images/face/67.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/67.gif rename to payapi/src/main/resources/static/libs/layui/images/face/67.gif diff --git a/src/main/resources/static/libs/layui/images/face/68.gif b/payapi/src/main/resources/static/libs/layui/images/face/68.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/68.gif rename to payapi/src/main/resources/static/libs/layui/images/face/68.gif diff --git a/src/main/resources/static/libs/layui/images/face/69.gif b/payapi/src/main/resources/static/libs/layui/images/face/69.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/69.gif rename to payapi/src/main/resources/static/libs/layui/images/face/69.gif diff --git a/src/main/resources/static/libs/layui/images/face/7.gif b/payapi/src/main/resources/static/libs/layui/images/face/7.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/7.gif rename to payapi/src/main/resources/static/libs/layui/images/face/7.gif diff --git a/src/main/resources/static/libs/layui/images/face/70.gif b/payapi/src/main/resources/static/libs/layui/images/face/70.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/70.gif rename to payapi/src/main/resources/static/libs/layui/images/face/70.gif diff --git a/src/main/resources/static/libs/layui/images/face/71.gif b/payapi/src/main/resources/static/libs/layui/images/face/71.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/71.gif rename to payapi/src/main/resources/static/libs/layui/images/face/71.gif diff --git a/src/main/resources/static/libs/layui/images/face/8.gif b/payapi/src/main/resources/static/libs/layui/images/face/8.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/8.gif rename to payapi/src/main/resources/static/libs/layui/images/face/8.gif diff --git a/src/main/resources/static/libs/layui/images/face/9.gif b/payapi/src/main/resources/static/libs/layui/images/face/9.gif similarity index 100% rename from src/main/resources/static/libs/layui/images/face/9.gif rename to payapi/src/main/resources/static/libs/layui/images/face/9.gif diff --git a/src/main/resources/static/libs/layui/lay/modules/carousel.js b/payapi/src/main/resources/static/libs/layui/lay/modules/carousel.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/carousel.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/carousel.js diff --git a/src/main/resources/static/libs/layui/lay/modules/code.js b/payapi/src/main/resources/static/libs/layui/lay/modules/code.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/code.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/code.js diff --git a/src/main/resources/static/libs/layui/lay/modules/colorpicker.js b/payapi/src/main/resources/static/libs/layui/lay/modules/colorpicker.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/colorpicker.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/colorpicker.js diff --git a/src/main/resources/static/libs/layui/lay/modules/element.js b/payapi/src/main/resources/static/libs/layui/lay/modules/element.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/element.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/element.js diff --git a/src/main/resources/static/libs/layui/lay/modules/flow.js b/payapi/src/main/resources/static/libs/layui/lay/modules/flow.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/flow.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/flow.js diff --git a/src/main/resources/static/libs/layui/lay/modules/form.js b/payapi/src/main/resources/static/libs/layui/lay/modules/form.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/form.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/form.js diff --git a/src/main/resources/static/libs/layui/lay/modules/jquery.js b/payapi/src/main/resources/static/libs/layui/lay/modules/jquery.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/jquery.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/jquery.js diff --git a/src/main/resources/static/libs/layui/lay/modules/laydate.js b/payapi/src/main/resources/static/libs/layui/lay/modules/laydate.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/laydate.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/laydate.js diff --git a/src/main/resources/static/libs/layui/lay/modules/layedit.js b/payapi/src/main/resources/static/libs/layui/lay/modules/layedit.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/layedit.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/layedit.js diff --git a/src/main/resources/static/libs/layui/lay/modules/layer.js b/payapi/src/main/resources/static/libs/layui/lay/modules/layer.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/layer.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/layer.js diff --git a/src/main/resources/static/libs/layui/lay/modules/laypage.js b/payapi/src/main/resources/static/libs/layui/lay/modules/laypage.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/laypage.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/laypage.js diff --git a/src/main/resources/static/libs/layui/lay/modules/laytpl.js b/payapi/src/main/resources/static/libs/layui/lay/modules/laytpl.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/laytpl.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/laytpl.js diff --git a/src/main/resources/static/libs/layui/lay/modules/mobile.js b/payapi/src/main/resources/static/libs/layui/lay/modules/mobile.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/mobile.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/mobile.js diff --git a/src/main/resources/static/libs/layui/lay/modules/rate.js b/payapi/src/main/resources/static/libs/layui/lay/modules/rate.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/rate.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/rate.js diff --git a/src/main/resources/static/libs/layui/lay/modules/slider.js b/payapi/src/main/resources/static/libs/layui/lay/modules/slider.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/slider.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/slider.js diff --git a/src/main/resources/static/libs/layui/lay/modules/table.js b/payapi/src/main/resources/static/libs/layui/lay/modules/table.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/table.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/table.js diff --git a/src/main/resources/static/libs/layui/lay/modules/tree.js b/payapi/src/main/resources/static/libs/layui/lay/modules/tree.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/tree.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/tree.js diff --git a/src/main/resources/static/libs/layui/lay/modules/upload.js b/payapi/src/main/resources/static/libs/layui/lay/modules/upload.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/upload.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/upload.js diff --git a/src/main/resources/static/libs/layui/lay/modules/util.js b/payapi/src/main/resources/static/libs/layui/lay/modules/util.js similarity index 100% rename from src/main/resources/static/libs/layui/lay/modules/util.js rename to payapi/src/main/resources/static/libs/layui/lay/modules/util.js diff --git a/src/main/resources/static/libs/layui/layui.all.js b/payapi/src/main/resources/static/libs/layui/layui.all.js similarity index 100% rename from src/main/resources/static/libs/layui/layui.all.js rename to payapi/src/main/resources/static/libs/layui/layui.all.js diff --git a/src/main/resources/static/libs/layui/layui.js b/payapi/src/main/resources/static/libs/layui/layui.js similarity index 100% rename from src/main/resources/static/libs/layui/layui.js rename to payapi/src/main/resources/static/libs/layui/layui.js diff --git a/src/main/resources/static/libs/q.js b/payapi/src/main/resources/static/libs/q.js similarity index 100% rename from src/main/resources/static/libs/q.js rename to payapi/src/main/resources/static/libs/q.js diff --git a/src/main/resources/static/libs/zTree/css/metroStyle/img/line_conn.png b/payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/line_conn.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/metroStyle/img/line_conn.png rename to payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/line_conn.png diff --git a/src/main/resources/static/libs/zTree/css/metroStyle/img/loading.gif b/payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/loading.gif similarity index 100% rename from src/main/resources/static/libs/zTree/css/metroStyle/img/loading.gif rename to payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/loading.gif diff --git a/src/main/resources/static/libs/zTree/css/metroStyle/img/metro.gif b/payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/metro.gif similarity index 100% rename from src/main/resources/static/libs/zTree/css/metroStyle/img/metro.gif rename to payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/metro.gif diff --git a/src/main/resources/static/libs/zTree/css/metroStyle/img/metro.png b/payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/metro.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/metroStyle/img/metro.png rename to payapi/src/main/resources/static/libs/zTree/css/metroStyle/img/metro.png diff --git a/src/main/resources/static/libs/zTree/css/metroStyle/metroStyle.css b/payapi/src/main/resources/static/libs/zTree/css/metroStyle/metroStyle.css similarity index 100% rename from src/main/resources/static/libs/zTree/css/metroStyle/metroStyle.css rename to payapi/src/main/resources/static/libs/zTree/css/metroStyle/metroStyle.css diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_close.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_close.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_close.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_close.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_open.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_open.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_open.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_open.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/2.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/2.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/2.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/2.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/3.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/3.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/3.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/3.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/4.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/4.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/4.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/4.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/5.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/5.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/5.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/5.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/6.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/6.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/6.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/6.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/7.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/7.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/7.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/7.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/8.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/8.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/8.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/8.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/9.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/9.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/9.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/9.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/line_conn.gif b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/line_conn.gif similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/line_conn.gif rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/line_conn.gif diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/loading.gif b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/loading.gif similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/loading.gif rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/loading.gif diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.gif b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.gif similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.gif rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.gif diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.png b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.png similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.png rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/img/zTreeStandard.png diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css b/payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css similarity index 100% rename from src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css rename to payapi/src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css diff --git a/src/main/resources/static/libs/zTree/js/jquery.ztree.all-3.5.min.js b/payapi/src/main/resources/static/libs/zTree/js/jquery.ztree.all-3.5.min.js similarity index 100% rename from src/main/resources/static/libs/zTree/js/jquery.ztree.all-3.5.min.js rename to payapi/src/main/resources/static/libs/zTree/js/jquery.ztree.all-3.5.min.js diff --git a/src/main/resources/templates/error/403.html b/payapi/src/main/resources/templates/error/403.html similarity index 96% rename from src/main/resources/templates/error/403.html rename to payapi/src/main/resources/templates/error/403.html index 155f35a4..a3843f7b 100755 --- a/src/main/resources/templates/error/403.html +++ b/payapi/src/main/resources/templates/error/403.html @@ -1,27 +1,27 @@ - - - - - 403 无权限 - - - - - - - -
-
- -
-

没有权限

-

- 4 - 0 - 3 -

-
-
-
- + + + + + 403 无权限 + + + + + + + +
+
+ +
+

没有权限

+

+ 4 + 0 + 3 +

+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/error/404.html b/payapi/src/main/resources/templates/error/404.html similarity index 96% rename from src/main/resources/templates/error/404.html rename to payapi/src/main/resources/templates/error/404.html index 89144f55..b818658c 100755 --- a/src/main/resources/templates/error/404.html +++ b/payapi/src/main/resources/templates/error/404.html @@ -1,28 +1,28 @@ - - - - - 404 页面不存在 - - - - - - - - -
-
- -
-

页面不存在

-

- 4 - 0 - 4 -

-
-
-
- + + + + + 404 页面不存在 + + + + + + + + +
+
+ +
+

页面不存在

+

+ 4 + 0 + 4 +

+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/error/500.html b/payapi/src/main/resources/templates/error/500.html similarity index 96% rename from src/main/resources/templates/error/500.html rename to payapi/src/main/resources/templates/error/500.html index c46acd23..fc442c77 100755 --- a/src/main/resources/templates/error/500.html +++ b/payapi/src/main/resources/templates/error/500.html @@ -1,28 +1,28 @@ - - - - - 500 服务出错 - - - - - - - - -
-
- -
-

服务器出错了

-

- 5 - 0 - 0 -

-
-
-
- + + + + + 500 服务出错 + + + + + + + + +
+
+ +
+

服务器出错了

+

+ 5 + 0 + 0 +

+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/home/console.html b/payapi/src/main/resources/templates/home/console.html similarity index 95% rename from src/main/resources/templates/home/console.html rename to payapi/src/main/resources/templates/home/console.html index 63cb2607..76b0b79a 100755 --- a/src/main/resources/templates/home/console.html +++ b/payapi/src/main/resources/templates/home/console.html @@ -1,28 +1,28 @@ -
- -
- - - - - - +
+ +
+ + + + + + diff --git a/src/main/resources/templates/home/message.html b/payapi/src/main/resources/templates/home/message.html similarity index 100% rename from src/main/resources/templates/home/message.html rename to payapi/src/main/resources/templates/home/message.html diff --git a/src/main/resources/templates/home/password.html b/payapi/src/main/resources/templates/home/password.html similarity index 97% rename from src/main/resources/templates/home/password.html rename to payapi/src/main/resources/templates/home/password.html index e9e8aee6..e74beba0 100755 --- a/src/main/resources/templates/home/password.html +++ b/payapi/src/main/resources/templates/home/password.html @@ -1,58 +1,58 @@ -
-

修改密码

-
-
-
-
- -
-
- -
-
- -
-
- -
-
-
- - \ No newline at end of file diff --git a/src/main/resources/templates/home/theme.html b/payapi/src/main/resources/templates/home/theme.html similarity index 96% rename from src/main/resources/templates/home/theme.html rename to payapi/src/main/resources/templates/home/theme.html index 392a02ae..71700a02 100755 --- a/src/main/resources/templates/home/theme.html +++ b/payapi/src/main/resources/templates/home/theme.html @@ -1,37 +1,37 @@ -
-

多标签：

-
- -
-
- -

设置主题：

-
- 默认主题 - 蓝色主题 -


- -
- - \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/payapi/src/main/resources/templates/index.html similarity index 97% rename from src/main/resources/templates/index.html rename to payapi/src/main/resources/templates/index.html index 1fb326de..bfea46b4 100755 --- a/src/main/resources/templates/index.html +++ b/payapi/src/main/resources/templates/index.html @@ -1,163 +1,163 @@ - - - - - 首页 - - - - - - - - - - - - - -
- -
- -
    -
  • - -
    • -
  • - -
    • -
- -
- - -
-
- -
-
- - - -
-
-
    -
-
-
-
-
-
-
- -
-
- - -
Copyright © 2018 supwisdom All rights reserved. Version 1.0 -
- - -
-
- - - - - - - - - - - - + + + + + 首页 + + + + + + + + + + + + + +
+ +
+ +
    +
  • + +
    • +
  • + +
    • +
+ +
+ + +
+
+ +
+
+ + + +
+
+
    +
+
+
+
+
+
+
+ +
+
+ + +
Copyright © 2018 supwisdom All rights reserved. Version 1.0 +
+ + +
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/payapi/src/main/resources/templates/login.html similarity index 100% rename from src/main/resources/templates/login.html rename to payapi/src/main/resources/templates/login.html diff --git a/src/main/resources/templates/ologin.html b/payapi/src/main/resources/templates/ologin.html similarity index 100% rename from src/main/resources/templates/ologin.html rename to payapi/src/main/resources/templates/ologin.html diff --git a/src/main/resources/templates/system/dtl/shopdtl.html b/payapi/src/main/resources/templates/system/dtl/shopdtl.html similarity index 100% rename from src/main/resources/templates/system/dtl/shopdtl.html rename to payapi/src/main/resources/templates/system/dtl/shopdtl.html diff --git a/src/main/resources/templates/system/dtl/userdtl.html b/payapi/src/main/resources/templates/system/dtl/userdtl.html similarity index 100% rename from src/main/resources/templates/system/dtl/userdtl.html rename to payapi/src/main/resources/templates/system/dtl/userdtl.html diff --git a/src/main/resources/templates/system/function/form.html b/payapi/src/main/resources/templates/system/function/form.html similarity index 97% rename from src/main/resources/templates/system/function/form.html rename to payapi/src/main/resources/templates/system/function/form.html index e1468be7..fa8d43b1 100755 --- a/src/main/resources/templates/system/function/form.html +++ b/payapi/src/main/resources/templates/system/function/form.html @@ -1,117 +1,117 @@ - -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- - -
-
- - \ No newline at end of file diff --git a/src/main/resources/templates/system/function/index.html b/payapi/src/main/resources/templates/system/function/index.html similarity index 97% rename from src/main/resources/templates/system/function/index.html rename to payapi/src/main/resources/templates/system/function/index.html index 2e85a8c4..5cff759f 100755 --- a/src/main/resources/templates/system/function/index.html +++ b/payapi/src/main/resources/templates/system/function/index.html @@ -1,175 +1,175 @@ -
-
-

功能维护

- - 系统中心 - 功能维护 - -
-
-
- 搜索： -   - - -
-
-
-
- - +
+
+

功能维护

+ + 系统中心 + 功能维护 + +
+
+
+ 搜索： +   + + +
+
+
+
+ + diff --git a/src/main/resources/templates/system/function/resform.html b/payapi/src/main/resources/templates/system/function/resform.html similarity index 97% rename from src/main/resources/templates/system/function/resform.html rename to payapi/src/main/resources/templates/system/function/resform.html index 4ac8b985..50cd1aa8 100755 --- a/src/main/resources/templates/system/function/resform.html +++ b/payapi/src/main/resources/templates/system/function/resform.html @@ -1,94 +1,94 @@ - -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- - -
-
- - \ No newline at end of file diff --git a/src/main/resources/templates/system/function/reslist.html b/payapi/src/main/resources/templates/system/function/reslist.html similarity index 97% rename from src/main/resources/templates/system/function/reslist.html rename to payapi/src/main/resources/templates/system/function/reslist.html index 63ba0429..9a39b923 100755 --- a/src/main/resources/templates/system/function/reslist.html +++ b/payapi/src/main/resources/templates/system/function/reslist.html @@ -1,90 +1,90 @@ -
- -
- - -
- +
+ +
+ + +
+ diff --git a/src/main/resources/templates/system/function/subform.html b/payapi/src/main/resources/templates/system/function/subform.html similarity index 97% rename from src/main/resources/templates/system/function/subform.html rename to payapi/src/main/resources/templates/system/function/subform.html index f04a15e9..d2078077 100755 --- a/src/main/resources/templates/system/function/subform.html +++ b/payapi/src/main/resources/templates/system/function/subform.html @@ -1,106 +1,106 @@ - -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- - -
-
- - \ No newline at end of file diff --git a/src/main/resources/templates/system/operator/index.html b/payapi/src/main/resources/templates/system/operator/index.html similarity index 100% rename from src/main/resources/templates/system/operator/index.html rename to payapi/src/main/resources/templates/system/operator/index.html diff --git a/src/main/resources/templates/system/operator/logs.html b/payapi/src/main/resources/templates/system/operator/logs.html similarity index 100% rename from src/main/resources/templates/system/operator/logs.html rename to payapi/src/main/resources/templates/system/operator/logs.html diff --git a/src/main/resources/templates/system/operator/operator.html b/payapi/src/main/resources/templates/system/operator/operator.html similarity index 100% rename from src/main/resources/templates/system/operator/operator.html rename to payapi/src/main/resources/templates/system/operator/operator.html diff --git a/src/main/resources/templates/system/operator/setpwd.html b/payapi/src/main/resources/templates/system/operator/setpwd.html similarity index 100% rename from src/main/resources/templates/system/operator/setpwd.html rename to payapi/src/main/resources/templates/system/operator/setpwd.html diff --git a/src/main/resources/templates/system/operator/userinfor.html b/payapi/src/main/resources/templates/system/operator/userinfor.html similarity index 100% rename from src/main/resources/templates/system/operator/userinfor.html rename to payapi/src/main/resources/templates/system/operator/userinfor.html diff --git a/src/main/resources/templates/system/param/apiclientform.html b/payapi/src/main/resources/templates/system/param/apiclientform.html similarity index 100% rename from src/main/resources/templates/system/param/apiclientform.html rename to payapi/src/main/resources/templates/system/param/apiclientform.html diff --git a/src/main/resources/templates/system/param/apiclientpara.html b/payapi/src/main/resources/templates/system/param/apiclientpara.html similarity index 100% rename from src/main/resources/templates/system/param/apiclientpara.html rename to payapi/src/main/resources/templates/system/param/apiclientpara.html diff --git a/src/main/resources/templates/system/param/businesspara.html b/payapi/src/main/resources/templates/system/param/businesspara.html similarity index 100% rename from src/main/resources/templates/system/param/businesspara.html rename to payapi/src/main/resources/templates/system/param/businesspara.html diff --git a/src/main/resources/templates/system/param/busparaform.html b/payapi/src/main/resources/templates/system/param/busparaform.html similarity index 100% rename from src/main/resources/templates/system/param/busparaform.html rename to payapi/src/main/resources/templates/system/param/busparaform.html diff --git a/src/main/resources/templates/system/param/paytype.html b/payapi/src/main/resources/templates/system/param/paytype.html similarity index 100% rename from src/main/resources/templates/system/param/paytype.html rename to payapi/src/main/resources/templates/system/param/paytype.html diff --git a/src/main/resources/templates/system/param/paytypeconfig.html b/payapi/src/main/resources/templates/system/param/paytypeconfig.html similarity index 100% rename from src/main/resources/templates/system/param/paytypeconfig.html rename to payapi/src/main/resources/templates/system/param/paytypeconfig.html diff --git a/src/main/resources/templates/system/param/paytypeform.html b/payapi/src/main/resources/templates/system/param/paytypeform.html similarity index 100% rename from src/main/resources/templates/system/param/paytypeform.html rename to payapi/src/main/resources/templates/system/param/paytypeform.html diff --git a/src/main/resources/templates/system/param/syspara.html b/payapi/src/main/resources/templates/system/param/syspara.html similarity index 100% rename from src/main/resources/templates/system/param/syspara.html rename to payapi/src/main/resources/templates/system/param/syspara.html diff --git a/src/main/resources/templates/system/report/shopbusiness.html b/payapi/src/main/resources/templates/system/report/shopbusiness.html similarity index 100% rename from src/main/resources/templates/system/report/shopbusiness.html rename to payapi/src/main/resources/templates/system/report/shopbusiness.html diff --git a/src/main/resources/templates/system/report/subjectday.html b/payapi/src/main/resources/templates/system/report/subjectday.html similarity index 100% rename from src/main/resources/templates/system/report/subjectday.html rename to payapi/src/main/resources/templates/system/report/subjectday.html diff --git a/src/main/resources/templates/system/report/subjectdetail.html b/payapi/src/main/resources/templates/system/report/subjectdetail.html similarity index 100% rename from src/main/resources/templates/system/report/subjectdetail.html rename to payapi/src/main/resources/templates/system/report/subjectdetail.html diff --git a/src/main/resources/templates/system/role/form.html b/payapi/src/main/resources/templates/system/role/form.html similarity index 97% rename from src/main/resources/templates/system/role/form.html rename to payapi/src/main/resources/templates/system/role/form.html index d60bac8c..607c1f33 100755 --- a/src/main/resources/templates/system/role/form.html +++ b/payapi/src/main/resources/templates/system/role/form.html @@ -1,73 +1,73 @@ - -
- -
- -
- -
-
-
- -
- -
-
- -
- - -
-
- - \ No newline at end of file diff --git a/src/main/resources/templates/system/role/func.html b/payapi/src/main/resources/templates/system/role/func.html similarity index 97% rename from src/main/resources/templates/system/role/func.html rename to payapi/src/main/resources/templates/system/role/func.html index f3ebd5e8..917c8d98 100755 --- a/src/main/resources/templates/system/role/func.html +++ b/payapi/src/main/resources/templates/system/role/func.html @@ -1,89 +1,89 @@ -
-
-
    -
    -
    - - -
    -
    - \ No newline at end of file diff --git a/src/main/resources/templates/system/role/index.html b/payapi/src/main/resources/templates/system/role/index.html similarity index 100% rename from src/main/resources/templates/system/role/index.html rename to payapi/src/main/resources/templates/system/role/index.html diff --git a/src/main/resources/templates/system/shop/config.html b/payapi/src/main/resources/templates/system/shop/config.html similarity index 100% rename from src/main/resources/templates/system/shop/config.html rename to payapi/src/main/resources/templates/system/shop/config.html diff --git a/src/main/resources/templates/system/shop/configform.html b/payapi/src/main/resources/templates/system/shop/configform.html similarity index 100% rename from src/main/resources/templates/system/shop/configform.html rename to payapi/src/main/resources/templates/system/shop/configform.html diff --git a/src/main/resources/templates/system/shop/configpara.html b/payapi/src/main/resources/templates/system/shop/configpara.html similarity index 100% rename from src/main/resources/templates/system/shop/configpara.html rename to payapi/src/main/resources/templates/system/shop/configpara.html diff --git a/src/main/resources/templates/system/shop/index.html b/payapi/src/main/resources/templates/system/shop/index.html similarity index 100% rename from src/main/resources/templates/system/shop/index.html rename to payapi/src/main/resources/templates/system/shop/index.html diff --git a/src/main/resources/templates/system/user/account.html b/payapi/src/main/resources/templates/system/user/account.html similarity index 100% rename from src/main/resources/templates/system/user/account.html rename to payapi/src/main/resources/templates/system/user/account.html diff --git a/src/main/resources/templates/system/user/add.html b/payapi/src/main/resources/templates/system/user/add.html similarity index 97% rename from src/main/resources/templates/system/user/add.html rename to payapi/src/main/resources/templates/system/user/add.html index d04999d1..7badc58e 100755 --- a/src/main/resources/templates/system/user/add.html +++ b/payapi/src/main/resources/templates/system/user/add.html @@ -1,110 +1,110 @@ - -
    - -
    - -
    - -
    -
    -
    - -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    - -
    - - -
    -
    - - \ No newline at end of file diff --git a/src/main/resources/templates/system/user/bind.html b/payapi/src/main/resources/templates/system/user/bind.html similarity index 97% rename from src/main/resources/templates/system/user/bind.html rename to payapi/src/main/resources/templates/system/user/bind.html index e5ea4d5a..cba59378 100755 --- a/src/main/resources/templates/system/user/bind.html +++ b/payapi/src/main/resources/templates/system/user/bind.html @@ -1,76 +1,76 @@ -
    - -
    - -
    - +
    + +
    + +
    + diff --git a/src/main/resources/templates/system/user/index.html b/payapi/src/main/resources/templates/system/user/index.html similarity index 100% rename from src/main/resources/templates/system/user/index.html rename to payapi/src/main/resources/templates/system/user/index.html diff --git a/src/main/resources/templates/system/user/point.html b/payapi/src/main/resources/templates/system/user/point.html similarity index 100% rename from src/main/resources/templates/system/user/point.html rename to payapi/src/main/resources/templates/system/user/point.html diff --git a/src/main/resources/templates/system/user/pointdtl.html b/payapi/src/main/resources/templates/system/user/pointdtl.html similarity index 100% rename from src/main/resources/templates/system/user/pointdtl.html rename to payapi/src/main/resources/templates/system/user/pointdtl.html diff --git a/src/main/webapp/WEB-INF/web.xml b/payapi/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/main/webapp/WEB-INF/web.xml rename to payapi/src/main/webapp/WEB-INF/web.xml diff --git a/src/test/kotlin/com/supwisdom/dlpay/DlpayApplicationTests.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/DlpayApplicationTests.kt similarity index 100% rename from src/test/kotlin/com/supwisdom/dlpay/DlpayApplicationTests.kt rename to payapi/src/test/kotlin/com/supwisdom/dlpay/DlpayApplicationTests.kt diff --git a/src/test/kotlin/com/supwisdom/dlpay/MvcBaseTest.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/MvcBaseTest.kt similarity index 100% rename from src/test/kotlin/com/supwisdom/dlpay/MvcBaseTest.kt rename to payapi/src/test/kotlin/com/supwisdom/dlpay/MvcBaseTest.kt diff --git a/src/test/kotlin/com/supwisdom/dlpay/controller/ApiControllerTest.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/ApiControllerTest.kt similarity index 100% rename from src/test/kotlin/com/supwisdom/dlpay/controller/ApiControllerTest.kt rename to payapi/src/test/kotlin/com/supwisdom/dlpay/controller/ApiControllerTest.kt diff --git a/src/test/kotlin/com/supwisdom/dlpay/controller/ShopControllerTest.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/ShopControllerTest.kt similarity index 100% rename from src/test/kotlin/com/supwisdom/dlpay/controller/ShopControllerTest.kt rename to payapi/src/test/kotlin/com/supwisdom/dlpay/controller/ShopControllerTest.kt diff --git a/src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt similarity index 100% rename from src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt rename to payapi/src/test/kotlin/com/supwisdom/dlpay/controller/UserControllerTest.kt diff --git a/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt similarity index 100% rename from src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt rename to payapi/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt diff --git a/src/test/kotlin/com/supwisdom/dlpay/password_test.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/password_test.kt similarity index 100% rename from src/test/kotlin/com/supwisdom/dlpay/password_test.kt rename to payapi/src/test/kotlin/com/supwisdom/dlpay/password_test.kt diff --git a/settings.gradle b/settings.gradle index 60cb1305..4a2e5839 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'payapi' -include 'payapi-sdk', 'common' +include 'payapi', 'payapi-sdk', 'common'