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; }