From d0f4414bdd3bef134f3a7404ba7bdf45471bd0e4 Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Fri, 20 Dec 2019 08:59:14 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=20payapi=20=E5=85=85?= =?utf8?q?=E5=80=BC=E6=8E=A5=E5=8F=A3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- multi-tenant/build.gradle | 28 +++++++++++++++++++ .../DefaultMultiTenantFactory.java | 4 +++ .../multitenant/MultiTenantFactory.java | 5 ++++ .../payapi/multitenant/TenantContext.java | 15 ++++++++++ .../payapi/multitenant/beans/TenantProps.java | 4 +++ .../config/MultiTenantAutoConfiguration.java | 16 +++++++++++ .../api/controller/charge_api_controller.kt | 8 +++--- .../kotlin/com/supwisdom/dlpay/security.kt | 2 -- settings.gradle | 1 + 9 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 multi-tenant/build.gradle create mode 100644 multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/DefaultMultiTenantFactory.java create mode 100644 multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/MultiTenantFactory.java create mode 100644 multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/TenantContext.java create mode 100644 multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/beans/TenantProps.java create mode 100644 multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/config/MultiTenantAutoConfiguration.java diff --git a/multi-tenant/build.gradle b/multi-tenant/build.gradle new file mode 100644 index 00000000..031c0a33 --- /dev/null +++ b/multi-tenant/build.gradle @@ -0,0 +1,28 @@ +plugins { + id "java-library" + id "org.springframework.boot" +} + +jar { + enabled = true + archiveFileName = "${project.name}-${buildVersion}.${archiveExtension.getOrElse('.jar')}" + manifest { + attributes('Implementation-Title': project.name, + 'Implementation-Version': buildVersion) + } +} +println("Build Version: $buildVersion") +bootJar { + enabled = false +} + +dependencies { + implementation "org.springframework.boot:spring-boot-autoconfigure" + implementation "commons-beanutils:commons-beanutils:${beanutilsVersion}" + implementation "commons-codec:commons-codec:${codecVersion}" + implementation "org.apache.commons:commons-lang3:${lang3Version}" + + compileOnly "org.projectlombok:lombok:${lombokVersion}" + annotationProcessor "org.projectlombok:lombok:${lombokVersion}" +} + diff --git a/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/DefaultMultiTenantFactory.java b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/DefaultMultiTenantFactory.java new file mode 100644 index 00000000..898e6474 --- /dev/null +++ b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/DefaultMultiTenantFactory.java @@ -0,0 +1,4 @@ +package com.supwisdom.payapi.multitenant; + +public class DefaultMultiTenantFactory implements MultiTenantFactory { +} diff --git a/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/MultiTenantFactory.java b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/MultiTenantFactory.java new file mode 100644 index 00000000..1c829f82 --- /dev/null +++ b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/MultiTenantFactory.java @@ -0,0 +1,5 @@ +package com.supwisdom.payapi.multitenant; + +public interface MultiTenantFactory { + +} diff --git a/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/TenantContext.java b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/TenantContext.java new file mode 100644 index 00000000..4236e297 --- /dev/null +++ b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/TenantContext.java @@ -0,0 +1,15 @@ +package com.supwisdom.payapi.multitenant; + +import com.supwisdom.payapi.multitenant.beans.TenantProps; + +public class TenantContext { + private static final ThreadLocal tenantHolder = new ThreadLocal<>(); + + public static TenantProps getTenant() { + return tenantHolder.get(); + } + + public static void setTenant(String tenant) { + + } +} diff --git a/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/beans/TenantProps.java b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/beans/TenantProps.java new file mode 100644 index 00000000..6e0abf88 --- /dev/null +++ b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/beans/TenantProps.java @@ -0,0 +1,4 @@ +package com.supwisdom.payapi.multitenant.beans; + +public class TenantProps { +} diff --git a/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/config/MultiTenantAutoConfiguration.java b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/config/MultiTenantAutoConfiguration.java new file mode 100644 index 00000000..718d869d --- /dev/null +++ b/multi-tenant/src/main/java/com/supwisdom/payapi/multitenant/config/MultiTenantAutoConfiguration.java @@ -0,0 +1,16 @@ +package com.supwisdom.payapi.multitenant.config; + +import com.supwisdom.payapi.multitenant.DefaultMultiTenantFactory; +import com.supwisdom.payapi.multitenant.MultiTenantFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MultiTenantAutoConfiguration { + @Bean + @ConditionalOnMissingBean(MultiTenantFactory.class) + public MultiTenantFactory createFactory() { + return new DefaultMultiTenantFactory(); + } +} diff --git a/payapi/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 index a4cac87e..5f314770 100644 --- a/payapi/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 @@ -190,11 +190,11 @@ class ChargeAPIController { setAmount(param.depositAmount / 100.0, TradeDict.TRADE_FLAG_OUT) setOpposite(account.accno, account.accname) }.and() - .addDebitCreditRecord(subject.subjno, subject.subjname, - shopacc.shopaccno, shopacc.shopname, param.depositAmount / 100.0, + .addDebitCreditRecord(subject.subjno, subject.subjno, + shopacc.shopaccno, shopacc.subjno, param.depositAmount / 100.0, capitalType.capital + "充值") - .addDebitCreditRecord(shopacc.shopaccno, shopacc.shopname, - account.accno, account.accname, param.depositAmount / 100.0, + .addDebitCreditRecord(shopacc.shopaccno, shopacc.subjno, + account.accno, account.subjno, param.depositAmount / 100.0, capitalType.capital + "充值") val transaction = builder.init(transactionService) diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt index b3e1fac0..9cad14f2 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt @@ -41,11 +41,9 @@ import org.springframework.web.cors.CorsConfiguration import org.springframework.web.cors.CorsConfigurationSource import org.springframework.web.cors.UrlBasedCorsConfigurationSource import org.springframework.web.filter.OncePerRequestFilter -import org.springframework.web.servlet.config.annotation.CorsRegistry import java.security.SecureRandom import java.util.* import javax.servlet.FilterChain -import javax.servlet.http.HttpFilter import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse import javax.sql.DataSource diff --git a/settings.gradle b/settings.gradle index c670d5a2..43ea36ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,4 +4,5 @@ include 'payapi-sdk' include 'payapi-common' include 'ynrcc-agent' include 'oauth' +include 'multi-tenant' -- 2.17.1