diff --git a/fast-server/pom.xml b/fast-server/pom.xml index 4769e48..03af6c4 100644 --- a/fast-server/pom.xml +++ b/fast-server/pom.xml @@ -23,22 +23,6 @@ ${project.artifactId} - - - - - - - - - - - - - - - - org.springframework.boot spring-boot-maven-plugin diff --git a/fast-server/src/main/resources/application-dev.yml b/fast-server/src/main/resources/application-dev.yml index 52de226..21a4216 100644 --- a/fast-server/src/main/resources/application-dev.yml +++ b/fast-server/src/main/resources/application-dev.yml @@ -7,14 +7,9 @@ spring: #timeout: 6000ms # 连接超时时长(毫秒) datasource: druid: - # MySQL url: jdbc:mysql://localhost:3306/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: baba + username: fast password: 123456 - # Oracle -# url: jdbc:oracle:thin:@localhost:1521:xe -# username: fast_boot -# password: 123456 initial-size: 5 min-idle: 10 max-active: 20 @@ -22,16 +17,14 @@ spring: min-evictable-idle-time-millis: 600000 max-evictable-idle-time-millis: 900000 validation-query: SELECT 1 - # Oracle数据库 - #validation-query: SELECT 1 FROM DUAL test-on-borrow: false test-on-return: false test-while-idle: true stat-view-servlet: enabled: true url-pattern: /druid/* - #login-username: admin - #login-password: admin + login-username: admin + login-password: admin filter: stat: log-slow-sql: true diff --git a/fast-server/src/main/resources/application-prod.yml b/fast-server/src/main/resources/application-prod.yml index 614a22c..9573970 100644 --- a/fast-server/src/main/resources/application-prod.yml +++ b/fast-server/src/main/resources/application-prod.yml @@ -10,14 +10,9 @@ spring: #timeout: 6000ms # 连接超时时长(毫秒) datasource: druid: - #MySQL url: jdbc:mysql://localhost:3306/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: baba + username: fast password: 123456 - #Oracle -# url: jdbc:oracle:thin:@localhost:1521:xe -# username: fast_boot -# password: 123456 initial-size: 5 min-idle: 10 max-active: 20 @@ -25,16 +20,14 @@ spring: min-evictable-idle-time-millis: 600000 max-evictable-idle-time-millis: 900000 validation-query: SELECT 1 - #Oracle数据库 - #validation-query: SELECT 1 FROM DUAL test-on-borrow: false test-on-return: false test-while-idle: true stat-view-servlet: enabled: true url-pattern: /druid/* - #login-username: admin - #login-password: admin + login-username: admin + login-password: admin filter: stat: log-slow-sql: true diff --git a/fast-server/src/main/resources/application-test.yml b/fast-server/src/main/resources/application-test.yml index 218b161..4ea54a3 100644 --- a/fast-server/src/main/resources/application-test.yml +++ b/fast-server/src/main/resources/application-test.yml @@ -7,14 +7,9 @@ spring: #timeout: 6000ms # 连接超时时长(毫秒) datasource: druid: - #MySQL url: jdbc:mysql://mysql:3306/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: baba - password: jg5RPEZDcuFC2BX460LzAMlvdf3T9eWy - #Oracle -# url: jdbc:oracle:thin:@localhost:1521:xe -# username: fast_boot -# password: 123456 + username: fast + password: 123456 initial-size: 1 min-idle: 1 max-active: 1 @@ -22,16 +17,14 @@ spring: min-evictable-idle-time-millis: 600000 max-evictable-idle-time-millis: 900000 validation-query: SELECT 1 - #Oracle数据库 - #validation-query: SELECT 1 FROM DUAL test-on-borrow: false test-on-return: false test-while-idle: true stat-view-servlet: enabled: true url-pattern: /druid/* - #login-username: admin - #login-password: admin + login-username: admin + login-password: admin filter: stat: log-slow-sql: true