From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Tue, 21 Jan 2020 01:14:27 +0000 (+0800)
Subject: 增加 multi-tenant-library 到 1.2.5
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=0a137442bf9ead23b2218dfcad221f749113a76e;p=epayment%2Ffood_payapi.git

增加 multi-tenant-library 到 1.2.5
---

diff --git a/build.gradle b/build.gradle
index 04479583..a860d67d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,7 +102,7 @@ subprojects {
             springSocialVersion = '1.1.6.RELEASE'
             springKafkaVersion = '2.2.8.RELEASE'
             postgresVersion = '42.2.5'
-            multiTenantLibVersion = '1.2.4'
+            multiTenantLibVersion = '1.2.5'
         }
         implementation "org.jetbrains.kotlin:kotlin-reflect"
         implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt
index da40c22a..324c5a69 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/security.kt
@@ -11,6 +11,7 @@ import com.supwisdom.multitenant.jwt.JwtTokenContext
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Lazy
 import org.springframework.core.annotation.Order
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
@@ -44,6 +45,7 @@ import javax.sql.DataSource
 class ApiJwtAuthenticationFilter : OncePerRequestFilter() {
 
     @Autowired
+    @Lazy
     private lateinit var jwtTokenContext: JwtTokenContext
 
     override fun doFilterInternal(request: HttpServletRequest, response: HttpServletResponse, filterChain: FilterChain) {
diff --git a/payapi/src/main/resources/application.properties b/payapi/src/main/resources/application.properties
index 377a873c..efef870f 100644
--- a/payapi/src/main/resources/application.properties
+++ b/payapi/src/main/resources/application.properties
@@ -45,3 +45,4 @@ multi-tenant.header.key=X-TENANT-ID
 multi-tenant.session.name=tenant-id
 multi-tenant.session.enableSessionScopedBean=false
 multi-tenant.dbschema=public
+multi-tenant.datasource.base-package=com.supwisdom.dlpay