From 2885ced2c79558bec87571dbfc7383c406cb3d44 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 25 五月 2021 14:02:50 +0800
Subject: [PATCH] add 增加验证码开关

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java |   25 +++++++++++++++++++++----
 ruoyi-admin/src/main/resources/application-dev.yml                                         |   16 ++++++++++------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index e16a18d..3a2a03d 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,3 +1,7 @@
+---
+server:
+  port: 8081
+---
 # 鏁版嵁婧愰厤缃�
 spring:
   datasource:
@@ -6,9 +10,9 @@
     druid:
       # 涓诲簱鏁版嵁婧�
       master:
-        url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-        username: root
-        password: root
+        url: jdbc:mysql://39.101.143.184:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+        username: ruoyi-vue
+        password: ryvue
       # 浠庡簱鏁版嵁婧�
       slave:
         # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -58,13 +62,13 @@
   # redis 閰嶇疆
   redis:
     # 鍦板潃
-    host: localhost
+    host: 39.101.143.184
     # 绔彛锛岄粯璁や负6379
     port: 6379
     # 鏁版嵁搴撶储寮�
     database: 0
     # 瀵嗙爜
-    password:
+    password: ryvue
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
     lettuce:
@@ -76,4 +80,4 @@
         # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
         max-active: 8
         # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
-        max-wait: -1ms
\ No newline at end of file
+        max-wait: -1ms
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..86ac706 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
@@ -13,12 +13,29 @@
 @Component
 @ConfigurationProperties(prefix = "captcha")
 public class CaptchaProperties {
-    // 楠岃瘉鐮佺被鍨�
+
+	/**
+	 * 楠岃瘉鐮佸紑鍏�
+	 */
+	private Boolean enabled;
+
+	/**
+	 * 楠岃瘉鐮佺被鍨�
+ 	 */
     private String type;
-    // 楠岃瘉鐮佺被鍒�
+
+	/**
+	 * 楠岃瘉鐮佺被鍒�
+	 */
     private String category;
-    // 鏁板瓧楠岃瘉鐮佷綅鏁�
+
+	/**
+	 * 鏁板瓧楠岃瘉鐮佷綅鏁�
+	 */
     private Integer numberLength;
-    // 瀛楃楠岃瘉鐮侀暱搴�
+
+	/**
+	 * 瀛楃楠岃瘉鐮侀暱搴�
+	 */
     private Integer charLength;
 }

--
Gitblit v1.9.3