Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-21 c636e6909b8ed1dc1dba18bceca2554d5adde7f9

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java

@@ -1,11 +1,12 @@
package com.ruoyi.framework.config.properties;

import com.ruoyi.common.enums.ThreadPoolRejectedPolicy;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

/**
 * 验证码 配置属性
 * 线程池 配置属性
 *
 * @author Lion Li
 */
@@ -42,6 +43,6 @@
    /**
     * 线程池对拒绝任务(无线程可用)的处理策略
     */
    private String rejectedExecutionHandler;
    private ThreadPoolRejectedPolicy rejectedExecutionHandler;

}