From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 14 十二月 2022 15:11:09 +0800 Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符(+、-、*...)的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置 --- ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java index 24356bc..1b41c66 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java @@ -1,5 +1,7 @@ package com.ruoyi.framework.config.properties; +import com.ruoyi.common.enums.CaptchaCategory; +import com.ruoyi.common.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -13,12 +15,24 @@ @Component @ConfigurationProperties(prefix = "captcha") public class CaptchaProperties { - // 楠岃瘉鐮佺被鍨� - private String type; - // 楠岃瘉鐮佺被鍒� - private String category; - // 鏁板瓧楠岃瘉鐮佷綅鏁� + + /** + * 楠岃瘉鐮佺被鍨� + */ + private CaptchaType type; + + /** + * 楠岃瘉鐮佺被鍒� + */ + private CaptchaCategory category; + + /** + * 鏁板瓧楠岃瘉鐮佷綅鏁� + */ private Integer numberLength; - // 瀛楃楠岃瘉鐮侀暱搴� + + /** + * 瀛楃楠岃瘉鐮侀暱搴� + */ private Integer charLength; } -- Gitblit v1.9.3