Merge branch 'dev-antispam-20181210' into release

server/src/main/java/com/pica/cloud/online/exam/analysis/server/configuration/DataSourceConfig.java

@@ -3,6 +3,7 @@ package com.pica.cloud.online.exam.analysis.server.configuration;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
@@ -16,6 +17,7 @@ import javax.sql.DataSource;
  * @date 2018/8/23 8:46
  */
 @Configuration
+@RefreshScope
 public class DataSourceConfig {
     /**
      * 如果取不到  就用默认值
@@ -35,6 +37,9 @@ public class DataSourceConfig {
     @Value("${spring.datasource.hikari.connection-test-query}")
     private String testQuery;
 
+    @Value("${spring.datasource.tomcat.init-s-q-l}")
+    private String initQuery;
+
     @Value("${spring.hikari.cachePrepStmts}")
     private String cachePrepStmts             ;
 
@@ -77,6 +82,7 @@ public class DataSourceConfig {
         config.setPassword(password); //密码
         config.setConnectionTestQuery(testQuery);
         config.setPoolName(poolName);
+        config.setConnectionInitSql(initQuery);
         config.addDataSourceProperty("cachePrepStmts", cachePrepStmts); //是否自定义配置，为true时下面两个参数才生效
         config.addDataSourceProperty("prepStmtCacheSize", prepStmtCacheSize); //连接池大小默认25，官方推荐250-500
         config.addDataSourceProperty("prepStmtCacheSqlLimit", prepStmtCacheSqlLimit); //单条语句最大长度默认256，官方推荐2048