From a4b28f718aa0ac3d51c6818769540f0677197743 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Mon, 24 Dec 2018 14:32:20 +0800
Subject: [PATCH] =?UTF-8?q?oracle=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../omms/adminapi/config/PrimaryDataSourceConfig.java  |  3 ++-
 .../gzzn/omms/adminapi/config/PrimaryDsProperties.java | 10 ++++++++++
 .../adminapi/config/SecondaryDataSourceConfig.java     |  1 +
 .../omms/adminapi/config/SecondaryDsProperties.java    | 10 ++++++++++
 src/main/resources/application-dev.yml                 |  2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDataSourceConfig.java b/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDataSourceConfig.java
index dae5398..d05d842 100644
--- a/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDataSourceConfig.java
+++ b/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDataSourceConfig.java
@@ -49,7 +49,8 @@ public class PrimaryDataSourceConfig {
          dataSource.setMaxWait(properties.getMaxWait());
          dataSource.setTimeBetweenEvictionRunsMillis(properties.getTimeBetweenEvictionRunsMillis());
          dataSource.setMinEvictableIdleTimeMillis(properties.getMinEvictableIdleTimeMillis());
-		 
+         dataSource.setValidationQuery(properties.getValidationQuery());
+         
          return dataSource;
 	 }
 }
diff --git a/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDsProperties.java b/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDsProperties.java
index 73dc587..bf620eb 100644
--- a/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDsProperties.java
+++ b/src/main/java/com/gzzn/omms/adminapi/config/PrimaryDsProperties.java
@@ -29,6 +29,8 @@ public class PrimaryDsProperties {
     private boolean poolPreparedStatements;
 
     private boolean testOnBorrow;
+    
+    private String validationQuery;
 
     public String getUrl() {
         return url;
@@ -133,4 +135,12 @@ public class PrimaryDsProperties {
     public void setTestOnBorrow(boolean testOnBorrow) {
         this.testOnBorrow = testOnBorrow;
     }
+
+	public String getValidationQuery() {
+		return validationQuery;
+	}
+
+	public void setValidationQuery(String validationQuery) {
+		this.validationQuery = validationQuery;
+	}
 }
diff --git a/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDataSourceConfig.java b/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDataSourceConfig.java
index 2959581..6d8ca57 100644
--- a/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDataSourceConfig.java
+++ b/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDataSourceConfig.java
@@ -46,6 +46,7 @@ public class SecondaryDataSourceConfig {
         dataSource.setMaxWait(properties.getMaxWait());
         dataSource.setTimeBetweenEvictionRunsMillis(properties.getTimeBetweenEvictionRunsMillis());
         dataSource.setMinEvictableIdleTimeMillis(properties.getMinEvictableIdleTimeMillis());
+        dataSource.setValidationQuery(properties.getValidationQuery());
 		 
         return dataSource;
 	}
diff --git a/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDsProperties.java b/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDsProperties.java
index faa1396..170974b 100644
--- a/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDsProperties.java
+++ b/src/main/java/com/gzzn/omms/adminapi/config/SecondaryDsProperties.java
@@ -30,6 +30,8 @@ public class SecondaryDsProperties {
 
     private boolean testOnBorrow;
 
+    private String validationQuery;
+    
     public String getUrl() {
         return url;
     }
@@ -133,4 +135,12 @@ public class SecondaryDsProperties {
     public void setTestOnBorrow(boolean testOnBorrow) {
         this.testOnBorrow = testOnBorrow;
     }
+
+	public String getValidationQuery() {
+		return validationQuery;
+	}
+
+	public void setValidationQuery(String validationQuery) {
+		this.validationQuery = validationQuery;
+	}
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3bde29e..cb62312 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -26,7 +26,7 @@ spring:
       driver: oracle.jdbc.driver.OracleDriver
       max-active: 30
       test-on-borrow: true
-      validation-query: SELECT 1
+      validation-query: SELECT 1 FROM dual
       initial-size: 10
       min-idle: 1
       max-wait: 60000