From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

---
 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..354d8c3 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