From 600a80e6195a971b50257ad91d08e4fbbb260422 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 28 Jul 2019 14:09:15 +0800 Subject: [PATCH] :tada: 2.0.6.RELEASE --- .../src/main/resources/application-dev.yml | 9 +++++++++ .../blade-flow-design/src/main/resources/application.yml | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/blade-ops/blade-flow-design/src/main/resources/application-dev.yml b/blade-ops/blade-flow-design/src/main/resources/application-dev.yml index 7c4ec73e..ebdb4f8b 100644 --- a/blade-ops/blade-flow-design/src/main/resources/application-dev.yml +++ b/blade-ops/blade-flow-design/src/main/resources/application-dev.yml @@ -1,6 +1,15 @@ #数据源配置 spring: datasource: + # MySql url: jdbc:mysql://localhost:3306/bladex_flow?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true username: root password: root + # PostgreSQL + #url: jdbc:postgresql://127.0.0.1:5432/bladex_flow + #username: postgres + #password: 123456 + # Oracle + #url: jdbc:oracle:thin:@127.0.0.1:49161:xe + #username: BLADEX_FLOW + #password: oracle diff --git a/blade-ops/blade-flow-design/src/main/resources/application.yml b/blade-ops/blade-flow-design/src/main/resources/application.yml index 12e349f2..1e412824 100644 --- a/blade-ops/blade-flow-design/src/main/resources/application.yml +++ b/blade-ops/blade-flow-design/src/main/resources/application.yml @@ -7,19 +7,23 @@ spring: mode: LEGACYHTML5 datasource: driver-class-name: com.mysql.cj.jdbc.Driver + #driver-class-name: org.postgresql.Driver + #driver-class-name: oracle.jdbc.OracleDriver druid: + # MySql、PostgreSQL校验 + validation-query: select 1 + # Oracle校验 + #validation-query: select 1 from dual initial-size: 5 max-active: 20 min-idle: 5 max-wait: 60000 - validation-query: select 1 validation-query-timeout: 2000 test-on-borrow: false test-on-return: false test-while-idle: true time-between-eviction-runs-millis: 60000 min-evictable-idle-time-millis: 300000 - filters: stat,wall stat-view-servlet: enabled: true login-username: blade