修改了 payapi 充值接口的bug

diff --git a/multi-tenant/build.gradle b/multi-tenant/build.gradle
new file mode 100644 (file)
index 0000000..031c0a3
--- /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 (file)
index 0000000..898e647
--- /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 (file)
index 0000000..1c829f8
--- /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 (file)
index 0000000..4236e29
--- /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<TenantProps> 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 (file)
index 0000000..6e0abf8
--- /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 (file)
index 0000000..718d869
--- /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 a4cac87..5f31477 100644 (file)
--- 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 b3e1fac..9cad14f 100644 (file)
--- 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 c670d5a..43ea36e 100644 (file)
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,4 +4,5 @@ include 'payapi-sdk'
 include 'payapi-common'
 include 'ynrcc-agent'
 include 'oauth'
+include 'multi-tenant'