diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 0c70876a3..eb70c5865 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -59,21 +59,27 @@ spring: url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: password: + type: ${spring.datasource.type} # oracle: # driverClassName: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@//localhost:1521/XE # username: ROOT # password: root +# type: ${spring.datasource.type} +# hikari: +# connectionTestQuery: SELECT 1 FROM DUAL # postgres: # driverClassName: org.postgresql.Driver # url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true # username: root # password: root +# type: ${spring.datasource.type} # sqlserver: # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true # username: SA # password: root +# type: ${spring.datasource.type} hikari: # 配置获取连接等待超时的时间 connection-timeout: 60000 @@ -86,9 +92,9 @@ spring: # 最小连接池数量 min-idle: 10 # 连接测试query(配置检测连接是否有效) - connection-test-query: SELECT 1 + connectionTestQuery: SELECT 1 # 此属性控制从池返回的连接的默认自动提交行为,默认值:true - is-auto-commit: true + isAutoCommit: true --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring: diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 24a3b3b9f..bbd10948e 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -62,21 +62,27 @@ spring: url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: password: + type: ${spring.datasource.type} # oracle: # driverClassName: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@//localhost:1521/XE # username: ROOT # password: root +# type: ${spring.datasource.type} +# hikari: +# connectionTestQuery: SELECT 1 FROM DUAL # postgres: # driverClassName: org.postgresql.Driver # url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true # username: root # password: root +# type: ${spring.datasource.type} # sqlserver: # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true # username: SA # password: root +# type: ${spring.datasource.type} hikari: # 配置获取连接等待超时的时间 connection-timeout: 60000 @@ -89,9 +95,9 @@ spring: # 最小连接池数量 min-idle: 10 # 连接测试query(配置检测连接是否有效) - connection-test-query: SELECT 1 + connectionTestQuery: SELECT 1 # 此属性控制从池返回的连接的默认自动提交行为,默认值:true - is-auto-commit: true + isAutoCommit: true --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring: