From 2d2ce25376f735d9abc95f44559a705da9622d02 Mon Sep 17 00:00:00 2001 From: kk <1910333201@qq.com> Date: Wed, 11 Oct 2023 14:52:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E5=AF=86=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-admin/src/main/resources/application-dev.yml | 4 ++-- .../framework/config/properties/DruidProperties.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index e8401d0..fb36362 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -13,8 +13,8 @@ spring: # url: jdbc:mysql://58.87.71.213:3306/jianshui_dev_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: jianshui_dev # username: jianshui_dev_new -# password: tHsWetXEjYFJsdAC - password: kaMSddCzO54qtIg0I9N8iKA2iSFrm8YdBK55Zxdjxy8Zuo7+GoRcZHUOI9UmY1JtrMP6wA//Bftj8oq8zRbbPA== + password: tHsWetXEjYFJsdAC +# password: kaMSddCzO54qtIg0I9N8iKA2iSFrm8YdBK55Zxdjxy8Zuo7+GoRcZHUOI9UmY1JtrMP6wA//Bftj8oq8zRbbPA== # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java b/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java index 96eea21..e774022 100644 --- a/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java +++ b/jianshui-framework/src/main/java/com/jianshui/framework/config/properties/DruidProperties.java @@ -77,7 +77,8 @@ public class DruidProperties /** 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */ datasource.setTestOnReturn(testOnReturn); - Properties properties = new Properties(); + // TODO: 2023/10/11 不加密版本 + /*Properties properties = new Properties(); properties.setProperty("config.decrypt","true"); properties.setProperty("config.decrypt.key",publicKey); datasource.setConnectProperties(properties); @@ -85,7 +86,7 @@ public class DruidProperties datasource.setFilters("config"); } catch (SQLException e) { - } + }*/ return datasource; }