diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index e16a18d9..3a2a03d6 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 @@ spring: 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 @@ spring: # redis 配置 redis: # 地址 - host: localhost + host: 39.101.143.184 # 端口,默认为6379 port: 6379 # 数据库索引 database: 0 # 密码 - password: + password: ryvue # 连接超时时间 timeout: 10s lettuce: @@ -76,4 +80,4 @@ spring: # 连接池的最大数据库连接数 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 24356bca..86ac7060 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 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties(prefix = "captcha") public class CaptchaProperties { - // 验证码类型 + + /** + * 验证码开关 + */ + private Boolean enabled; + + /** + * 验证码类型 + */ private String type; - // 验证码类别 + + /** + * 验证码类别 + */ private String category; - // 数字验证码位数 + + /** + * 数字验证码位数 + */ private Integer numberLength; - // 字符验证码长度 + + /** + * 字符验证码长度 + */ private Integer charLength; }