From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Wed, 19 Jun 2019 01:10:00 +0000 (+0800)
Subject: chore: 增加 ApplicationReadyEnvent 初始化字典
X-Git-Tag: 1.0.0^2~168
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=4f99027a0917d6303a5503d4efe99ba366d7b67a;p=epayment%2Ffood_payapi.git

chore: 增加 ApplicationReadyEnvent 初始化字典
---

diff --git a/src/main/java/com/supwisdom/dlpay/AppPreparedEvent.java b/src/main/java/com/supwisdom/dlpay/AppPreparedEvent.java
new file mode 100644
index 00000000..77830294
--- /dev/null
+++ b/src/main/java/com/supwisdom/dlpay/AppPreparedEvent.java
@@ -0,0 +1,22 @@
+package com.supwisdom.dlpay;
+
+import com.supwisdom.dlpay.system.common.DictPool;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+
+@Configuration
+public class AppPreparedEvent {
+  private final DictPool dictPool;
+
+  public AppPreparedEvent(@Autowired DictPool dictPool) {
+    this.dictPool = dictPool;
+  }
+
+  @EventListener(ApplicationReadyEvent.class)
+  public void setupDictPool() {
+    dictPool.init(); //初始化字典
+  }
+}
diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java b/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java
index bd4a00f9..d0572f2d 100644
--- a/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java
+++ b/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java
@@ -12,6 +12,7 @@ import static javax.persistence.FetchType.LAZY;
     indexes = {@Index(name = "transmain_accdate", columnList = "accdate"),
         @Index(name = "transmain_status", columnList = "status"),
         @Index(name = "transmain_outtrade", unique = true, columnList = "outid, outtradeno")})
+@SequenceGenerator(name = "seq_refno", allocationSize = 100)
 public class TTransactionMain {
   @Id
   @Column(name = "refno", nullable = false, length = 32)
diff --git a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
index 6810f893..3cfe7818 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/PayApiApplication.kt
@@ -1,12 +1,15 @@
 package com.supwisdom.dlpay
 
-import com.fasterxml.jackson.databind.ser.std.StringSerializer
+import com.supwisdom.dlpay.system.common.DictPool
 import io.lettuce.core.ReadFrom
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.context.event.ApplicationPreparedEvent
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.event.EventListener
 import org.springframework.data.redis.connection.RedisConnectionFactory
 import org.springframework.data.redis.connection.RedisPassword
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration
@@ -66,6 +69,7 @@ class HttpSessionConfig {
 }
 
 
+
 @SpringBootApplication
 @EnableScheduling
 class PayApiApplication
diff --git a/src/main/kotlin/com/supwisdom/dlpay/security.kt b/src/main/kotlin/com/supwisdom/dlpay/security.kt
index 6417117a..514b80c4 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/security.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/security.kt
@@ -181,11 +181,7 @@ class WebSecurityConfig {
             @Autowired
             lateinit var authenticationFailureHandler: AuthenticationFailureHandler
             @Autowired
-            lateinit var authenticationSuccessHandler: AuthenticationSuccessHandler
-            @Autowired
             lateinit var passwordBCryptConfig: PasswordBCryptConfig
-            @Autowired
-            lateinit var dictPool: DictPool
 
             @Autowired
             lateinit var userDetailsService: OperatorDetailService
@@ -220,8 +216,6 @@ class WebSecurityConfig {
             }
 
             override fun configure(http: HttpSecurity) {
-                dictPool.init() //初始化字典
-
                 // 设置 Web MVC 应用权限
                 http.apply(validateCodeSecurityConfig)
                         .and()