diff --git a/blade-service/logpm-distribution/src/main/resources/application-dev.yml b/blade-service/logpm-distribution/src/main/resources/application-dev.yml index 2ced6d350..886f4678d 100644 --- a/blade-service/logpm-distribution/src/main/resources/application-dev.yml +++ b/blade-service/logpm-distribution/src/main/resources/application-dev.yml @@ -45,6 +45,9 @@ spring: datasource: dynamic: druid: +# connect-timeout: 60000 + + #通用校验配置 validation-query: select 1 #启用sql日志拦截器 diff --git a/blade-service/logpm-report/src/main/resources/application-dev.yml b/blade-service/logpm-report/src/main/resources/application-dev.yml index e75326109..fb8d122aa 100644 --- a/blade-service/logpm-report/src/main/resources/application-dev.yml +++ b/blade-service/logpm-report/src/main/resources/application-dev.yml @@ -21,16 +21,32 @@ spring: #启用sql日志拦截器 proxy-filters: - sqlLogInterceptor - query-timeout: 60000 - #设置默认的数据源或者数据源组,默认值即为master +# query-timeout: 60000 +# connect-timeout: 60000 +# transaction-timeout: 60000 +# max-wait: 60000 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# connectTimeout: 60000 +# socketTimeout: 60000 +# queryTimeout: 60000 + #设置默认的数据源或者数据源组,默认值即为master primary: master datasource: master: druid: #独立校验配置 validation-query: select 1 + queryTimeout: 60000 #oracle校验 #validation-query: select 1 from dual url: ${blade.datasource.report.master.url} username: ${blade.datasource.report.master.username} password: ${blade.datasource.report.master.password} + 627683: + druid: + validation-query: select 1 + queryTimeout: 60000 + url: jdbc:mysql://192.168.2.46:3306/logpm_platform?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&socketTimeout=30000 + username: root + password: 12345678 diff --git a/blade-service/logpm-report/src/main/resources/application-prod.yml b/blade-service/logpm-report/src/main/resources/application-prod.yml index d2d395e11..09f492296 100644 --- a/blade-service/logpm-report/src/main/resources/application-prod.yml +++ b/blade-service/logpm-report/src/main/resources/application-prod.yml @@ -21,9 +21,6 @@ spring: #启用sql日志拦截器 proxy-filters: - sqlLogInterceptor - query-timeout: 60000 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 #设置默认的数据源或者数据源组,默认值即为master primary: master datasource: @@ -36,3 +33,10 @@ spring: url: ${blade.datasource.report.master.url} username: ${blade.datasource.report.master.username} password: ${blade.datasource.report.master.password} + 627683: + druid: + validation-query: select 1 + queryTimeout: 60000 + url: ${blade.datasource.report.627683.url} + username: ${blade.datasource.report.627683.username} + password: ${blade.datasource.report.627683.password} diff --git a/blade-service/logpm-report/src/main/resources/application-test.yml b/blade-service/logpm-report/src/main/resources/application-test.yml index e75326109..9f962556a 100644 --- a/blade-service/logpm-report/src/main/resources/application-test.yml +++ b/blade-service/logpm-report/src/main/resources/application-test.yml @@ -34,3 +34,10 @@ spring: url: ${blade.datasource.report.master.url} username: ${blade.datasource.report.master.username} password: ${blade.datasource.report.master.password} + 627683: + druid: + validation-query: select 1 + queryTimeout: 60000 + url: ${blade.datasource.report.627683.url} + username: ${blade.datasource.report.627683.username} + password: ${blade.datasource.report.627683.password}