diff --git a/doc/若依环境使用手册.docx b/doc/若依环境使用手册.docx deleted file mode 100644 index 9e4daef..0000000 Binary files a/doc/若依环境使用手册.docx and /dev/null differ diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 500c5dd..4548bf2 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -116,7 +116,7 @@ management: logfile: external-file: ./logs/ruoyi-monitor.log ---- # 监控中心配置 +--- # 监控中心客户端配置 spring.boot.admin.client: # 增加客户端开关 enabled: true 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 ad007f0..83efab7 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 @@ -11,14 +11,15 @@ import com.mybatisflex.core.datasource.DataSourceProperty; public class Decipher implements DataSourceDecipher { @Override public String decrypt(DataSourceProperty property, String value) { - //解密用户名,通过编码支持任意加密方式的解密 - if (property == DataSourceProperty.USERNAME) { - return value.substring(0, 4); + //解密数据源URL、用户名、密码,通过编码支持任意加密方式的解密 + + String result = ""; + + switch (property) { + case URL -> result = value; + case USERNAME -> result = value.substring(0, 4); + case PASSWORD -> result = value.substring(0, 8); } - //解密密码 - else if (property == DataSourceProperty.PASSWORD) { - return value.substring(0, 8); - } - return value; + return result; } } diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index 4c33b36..d8c1a72 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -97,6 +97,9 @@ public class GenTable extends BaseEntity /** 上级菜单名称字段 */ private String parentMenuName; + /** 备注 */ + private String remark; + public Long getTableId() { return tableId; @@ -371,4 +374,12 @@ public class GenTable extends BaseEntity } return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } }