diff --git a/doc/Ruoyi-Flex-Guide.docx b/doc/Ruoyi-Flex-Guide.docx index aee266a..19030ee 100644 Binary files a/doc/Ruoyi-Flex-Guide.docx and b/doc/Ruoyi-Flex-Guide.docx differ diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 210d92a..8197913 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -37,10 +37,16 @@ mybatis-flex: ds1: # 指定为HikariDataSource type: com.zaxxer.hikari.HikariDataSource + # mysql数据库 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true - username: root123 - password: Root@369---0000 + username: root + password: Root@369 + #postgresql数据库 +# driver-class-name: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: postgres +# password: postgres@369 hikari: #连接池名 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 0b45080..e305a21 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -43,10 +43,16 @@ mybatis-flex: PrimaryDS: # 指定为HikariDataSource type: com.zaxxer.hikari.HikariDataSource + # mysql数据库 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/ruoyi-flex?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true - username: root123 - password: Root@369---0000 + username: root + password: Root@369 + #postgresql数据库 +# driver-class-name: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/ruoyi-flex?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: postgres +# password: postgres@369 hikari: #连接池名 diff --git a/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/decipher/Decipher.java b/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/decipher/Decipher.java index 83efab7..25edbdb 100644 --- a/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/decipher/Decipher.java +++ b/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/decipher/Decipher.java @@ -12,13 +12,14 @@ public class Decipher implements DataSourceDecipher { @Override public String decrypt(DataSourceProperty property, String value) { //解密数据源URL、用户名、密码,通过编码支持任意加密方式的解密 + //为了减轻入门用户负担,默认返回原字符,用户可以定制加解密算法 String result = ""; switch (property) { case URL -> result = value; - case USERNAME -> result = value.substring(0, 4); - case PASSWORD -> result = value.substring(0, 8); + case USERNAME -> result = value; + case PASSWORD -> result = value; } return result; }