From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 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 86ac706..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;
@@ -14,28 +16,23 @@
@ConfigurationProperties(prefix = "captcha")
public class CaptchaProperties {
- /**
- * 楠岃瘉鐮佸紑鍏�
- */
- private Boolean enabled;
+ /**
+ * 楠岃瘉鐮佺被鍨�
+ */
+ private CaptchaType type;
- /**
- * 楠岃瘉鐮佺被鍨�
- */
- private String type;
+ /**
+ * 楠岃瘉鐮佺被鍒�
+ */
+ private CaptchaCategory category;
- /**
- * 楠岃瘉鐮佺被鍒�
- */
- private String category;
-
- /**
- * 鏁板瓧楠岃瘉鐮佷綅鏁�
- */
+ /**
+ * 鏁板瓧楠岃瘉鐮佷綅鏁�
+ */
private Integer numberLength;
- /**
- * 瀛楃楠岃瘉鐮侀暱搴�
- */
+ /**
+ * 瀛楃楠岃瘉鐮侀暱搴�
+ */
private Integer charLength;
}
--
Gitblit v1.9.3