From 5df00710bcd07a9398751496c58634dea51da386 Mon Sep 17 00:00:00 2001 From: lerry903 Date: Sat, 18 May 2019 17:41:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/dev/application.yml | 2 ++ ruoyi-admin/src/main/resources/run/application.yml | 2 ++ ruoyi-admin/src/main/resources/uat/application.yml | 2 ++ .../framework/config/properties/DruidProperties.java | 12 ++++++++++++ 4 files changed, 18 insertions(+) diff --git a/ruoyi-admin/src/main/resources/dev/application.yml b/ruoyi-admin/src/main/resources/dev/application.yml index 05ae447f..8d64b7dd 100644 --- a/ruoyi-admin/src/main/resources/dev/application.yml +++ b/ruoyi-admin/src/main/resources/dev/application.yml @@ -75,6 +75,8 @@ spring: url: username: password: + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + filters: config,wall,stat # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-admin/src/main/resources/run/application.yml b/ruoyi-admin/src/main/resources/run/application.yml index 115beb28..0ed9279c 100644 --- a/ruoyi-admin/src/main/resources/run/application.yml +++ b/ruoyi-admin/src/main/resources/run/application.yml @@ -75,6 +75,8 @@ spring: url: username: password: + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + filters: config,wall,stat # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-admin/src/main/resources/uat/application.yml b/ruoyi-admin/src/main/resources/uat/application.yml index 3eb59f54..a90fc781 100644 --- a/ruoyi-admin/src/main/resources/uat/application.yml +++ b/ruoyi-admin/src/main/resources/uat/application.yml @@ -75,6 +75,8 @@ spring: url: username: password: + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + filters: config,wall,stat # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java index e2f4d76a..7bf2b215 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java @@ -4,6 +4,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +import java.sql.SQLException; + /** * druid 配置属性 * @@ -11,9 +13,13 @@ */ @Configuration public class DruidProperties { + @Value("${spring.datasource.druid.initialSize}") private int initialSize; + @Value("${spring.datasource.druid.filters}") + private String filters; + @Value("${spring.datasource.druid.minIdle}") private int minIdle; @@ -68,6 +74,12 @@ public DruidDataSource dataSource(DruidDataSource datasource){ datasource.setTestOnBorrow(testOnBorrow); // 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能 datasource.setTestOnReturn(testOnReturn); + //开启数据源监控 + try { + datasource.addFilters(filters); + } catch (SQLException e) { + e.printStackTrace(); + } return datasource; } }