From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java | 51 ++++++++++++++-------------------------------------
1 files changed, 14 insertions(+), 37 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
index 30d5ef9..f6e07fe 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
@@ -1,8 +1,10 @@
package com.ruoyi.framework.config;
import com.ruoyi.common.utils.Threads;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.framework.config.properties.ThreadPoolProperties;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,44 +23,18 @@
@Configuration
public class ThreadPoolConfig {
- // 鏍稿績绾跨▼姹犲ぇ灏�
- @Value("${threadPoolConfig.corePoolSize}")
- private int corePoolSize;
-
- // 鏈�澶у彲鍒涘缓鐨勭嚎绋嬫暟
- @Value("${threadPoolConfig.maxPoolSize}")
- private int maxPoolSize;
-
- // 闃熷垪鏈�澶ч暱搴�
- @Value("${threadPoolConfig.queueCapacity}")
- private int queueCapacity;
-
- // 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
- @Value("${threadPoolConfig.keepAliveSeconds}")
- private int keepAliveSeconds;
-
- // 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
- @Value("${threadPoolConfig.rejectedExecutionHandler}")
- private String rejectedExecutionHandler;
+ @Autowired
+ private ThreadPoolProperties threadPoolProperties;
@Bean(name = "threadPoolTaskExecutor")
- @ConditionalOnProperty(prefix = "threadPoolTaskExecutor", name = "enabled", havingValue = "true")
+ @ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true")
public ThreadPoolTaskExecutor threadPoolTaskExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
- executor.setMaxPoolSize(maxPoolSize);
- executor.setCorePoolSize(corePoolSize);
- executor.setQueueCapacity(queueCapacity);
- executor.setKeepAliveSeconds(keepAliveSeconds);
- RejectedExecutionHandler handler;
- if (rejectedExecutionHandler.equals("CallerRunsPolicy")) {
- handler = new ThreadPoolExecutor.CallerRunsPolicy();
- } else if (rejectedExecutionHandler.equals("DiscardOldestPolicy")) {
- handler = new ThreadPoolExecutor.DiscardOldestPolicy();
- } else if (rejectedExecutionHandler.equals("DiscardPolicy")) {
- handler = new ThreadPoolExecutor.DiscardPolicy();
- } else {
- handler = new ThreadPoolExecutor.AbortPolicy();
- }
+ executor.setMaxPoolSize(threadPoolProperties.getMaxPoolSize());
+ executor.setCorePoolSize(threadPoolProperties.getCorePoolSize());
+ executor.setQueueCapacity(threadPoolProperties.getQueueCapacity());
+ executor.setKeepAliveSeconds(threadPoolProperties.getKeepAliveSeconds());
+ RejectedExecutionHandler handler = ReflectUtils.newInstance(threadPoolProperties.getRejectedExecutionHandler().getClazz());
executor.setRejectedExecutionHandler(handler);
return executor;
}
@@ -68,8 +44,9 @@
*/
@Bean(name = "scheduledExecutorService")
protected ScheduledExecutorService scheduledExecutorService() {
- return new ScheduledThreadPoolExecutor(corePoolSize,
- new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build()) {
+ return new ScheduledThreadPoolExecutor(threadPoolProperties.getCorePoolSize(),
+ new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
+ new ThreadPoolExecutor.CallerRunsPolicy()) {
@Override
protected void afterExecute(Runnable r, Throwable t) {
super.afterExecute(r, t);
--
Gitblit v1.9.3