去掉物料公共服务的SSO配置；数据库连接配置增加闲置连接自动断开

pom.xml

@@ -25,10 +25,10 @@
             <artifactId>ps-entity</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.uas.account</groupId>
-            <artifactId>sso-integration</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.uas.account</groupId>-->
+            <!--<artifactId>sso-integration</artifactId>-->
+        <!--</dependency>-->
 
         <!-- spring boot -->
         <dependency>

src/main/java/com/uas/ps/product/Application.java

@@ -1,6 +1,5 @@
 package com.uas.ps.product;
 
-import com.uas.account.sso.integration.config.EnableSSO;
 import com.uas.ps.core.util.ContextUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -24,7 +23,7 @@ import java.io.PrintStream;
 @EnableTransactionManagement
 @SpringBootApplication
 @EnableWebMvc
-@EnableSSO
+//@EnableSSO
 public class Application {
     public static void main(String[] args) throws FileNotFoundException {
         File logFile = new File("logs/log.log");

src/main/java/com/uas/ps/product/DruidDBConfiguration.java

@@ -59,6 +59,12 @@ public class DruidDBConfiguration {
 
     private String connectionProperties;
 
+    private boolean removeAbandoned;
+
+    private int removeAbandonedTimeout;
+
+    private boolean logAbandoned;
+
     @Bean
     @Primary
     public DataSource dataSource() {
@@ -80,6 +86,10 @@ public class DruidDBConfiguration {
         dataSource.setTestWhileIdle(testWhileIdle);
         dataSource.setTestOnBorrow(testOnBorrow);
         dataSource.setTestOnReturn(testOnReturn);
+        // 设置闲置连接断开
+        dataSource.setRemoveAbandoned(removeAbandoned);
+        dataSource.setRemoveAbandonedTimeout(removeAbandonedTimeout);
+        dataSource.setLogAbandoned(logAbandoned);
         dataSource.setTimeBetweenLogStatsMillis(timeBetweenLogStatsMillis);
         dataSource.setPoolPreparedStatements(poolPreparedStatements);
         dataSource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);

src/main/resources/config/application-cloud.properties

@@ -12,6 +12,9 @@ datasource.validationQuery=SELECT 1 FROM DUAL
 datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false
+datasource.removeAbandoned=true
+datasource.removeAbandonedTimeout=1800
+datasource.logAbandoned=true
 datasource.poolPreparedStatements=true
 datasource.timeBetweenLogStatsMillis=300000
 datasource.maxPoolPreparedStatementPerConnectionSize=20

src/main/resources/config/application-dev.properties

@@ -12,6 +12,9 @@ datasource.validationQuery=SELECT 1 FROM DUAL
 datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false
+datasource.removeAbandoned=true
+datasource.removeAbandonedTimeout=1800
+datasource.logAbandoned=true
 datasource.poolPreparedStatements=true
 datasource.timeBetweenLogStatsMillis=60000
 datasource.maxPoolPreparedStatementPerConnectionSize=20

src/main/resources/config/application-test.properties

@@ -12,6 +12,9 @@ datasource.validationQuery=SELECT 1 FROM DUAL
 datasource.testWhileIdle=true
 datasource.testOnBorrow=true
 datasource.testOnReturn=false
+datasource.removeAbandoned=true
+datasource.removeAbandonedTimeout=1800
+datasource.logAbandoned=true
 datasource.poolPreparedStatements=true
 datasource.timeBetweenLogStatsMillis=60000
 datasource.maxPoolPreparedStatementPerConnectionSize=20