From 99153f8321d0f66f6501c7d0aed81dcd783efd5d Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Tue, 15 Apr 2025 15:30:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 20 +++++++++---------- .../src/main/resources/application-prod.yml | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index d84b036..265d49c 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -2,19 +2,17 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource -# driverClassName: com.mysql.cj.jdbc.Driver - driverClassName: com.kingbase8.Driver + #driverClassName: org.postgresql.Driver + driverClassName: com.highgo.jdbc.Driver druid: # 主库数据源 master: -# url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:kingbase8://192.168.254.197:54321/test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&clientEncoding=UTF8 - - #username: root - #password: qwer1234 - username: ENC(ElFzIjuV3codlxGotvqqyA==) -# password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ) - password: ENC(YgAg6bUSgw1uc1H17kDw0g==) + #url: jdbc:postgresql://192.168.254.176:5432/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:highgo://192.168.110.12:5866/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #username: highgo sysdba + #password: Qwer@1234 Hello@1234 + username: ENC(/jFMZu5cFaeGn2aOj2TDPQ==) + password: ENC(UEjJ3NH3USPF5rEHm6+Zck2ncNpuug4W) # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -41,7 +39,7 @@ spring: # 配置一个连接在池中最大生存的时间,单位是毫秒 maxEvictableIdleTimeMillis: 900000 # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 479e158..a24713a 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -8,7 +8,7 @@ spring: # 主库数据源 master: #url: jdbc:postgresql://192.168.254.176:5432/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:highgo://192.168.254.195:5866/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:highgo://61.178.84.89:5866/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #username: highgo sysdba #password: Qwer@1234 Hello@1234 username: ENC(qgUzNagVYIQs/h1PUI+5Gg==)