diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index f5f8872f..d55ed6a9 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -118,7 +118,7 @@ spring: timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间,单位是毫秒 minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 + validationQuery: SELECT 1 FROM DUAL testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -129,6 +129,8 @@ spring: filters: stat,wall,slf4j # 通过connectProperties属性来打开mergeSql功能;慢SQL记录 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 + primary: master #设置默认的数据源或者数据源组,默认值即为master + strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 datasource: master: url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai @@ -136,11 +138,12 @@ spring: password: root driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 - #multi-datasource1: - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #username: root - #password: root - #driver-class-name: com.mysql.cj.jdbc.Driver + multi-oracle: + #url: jdbc:oracle:thin:@//JN7JP1QPL10ZKOW:1521/ORCL + url: jdbc:oracle:thin:@JN7JP1QPL10ZKOW:1521:ORCL + username: xskc + password: xskc + driver-class-name: oracle.jdbc.OracleDriver #redis 配置 redis: database: 1 diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties index e8316050..4d18f8ab 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties @@ -1,16 +1,16 @@ #mysql -diver_name=com.mysql.jdbc.Driver -url=jdbc:mysql://localhost:3306/course_information_center_jeecg_db?useUnicode=true&characterEncoding=UTF-8 -username=root -password=root -database_name=course_information_center_jeecg_db +#diver_name=com.mysql.jdbc.Driver +#url=jdbc:mysql://localhost:3306/course_information_center_jeecg_db?useUnicode=true&characterEncoding=UTF-8 +#username=root +#password=root +#database_name=course_information_center_jeecg_db #oracle -#diver_name=oracle.jdbc.driver.OracleDriver -#url=jdbc:oracle:thin:@192.168.1.200:1521:ORCL -#username=scott -#password=tiger -#database_name=ORCL +diver_name=oracle.jdbc.driver.OracleDriver +url=jdbc:oracle:thin:@JN7JP1QPL10ZKOW:1521:ORCL +username=xskc +password=xskc +database_name=XSKC #postgre #diver_name=org.postgresql.Driver