From fe7085da07ebf93383358f6e8c421fd08ae571ac Mon Sep 17 00:00:00 2001
From: jlzhou <12020042@qq.com>
Date: Wed, 19 Feb 2025 10:12:03 +0800
Subject: [PATCH] .

---
 ruoyi-admin/src/main/resources/application.yml                | 2 +-
 ruoyi-admin/src/test/java/com/ruoyi/MongoGenerator.java       | 4 ++++
 .../java/com/ruoyi/framework/config/ThreadPoolConfig.java     | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 842af6a..37603d6 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -275,7 +275,7 @@ xss:
 # 全局线程池相关配置
 thread-pool:
   # 是否开启线程池
-  enabled: false
+  enabled: true
   # 队列最大长度
   queueCapacity: 128
   # 线程池维护线程所允许的空闲时间
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/MongoGenerator.java b/ruoyi-admin/src/test/java/com/ruoyi/MongoGenerator.java
index ff95a31..0d3c65b 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/MongoGenerator.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/MongoGenerator.java
@@ -12,6 +12,8 @@ import com.ruoyi.common.annotation.Info;
 import lombok.Data;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Id;
 
@@ -37,6 +39,8 @@ public class MongoGenerator {
   private String moduleName = "jobs";
 
   @Test
+  @Disabled
+  @DisplayName("mongodb代码生成")
   public void generate() throws Exception {
 
     List<BaseInfo> entityList = scan(); //所有编写了@Info的实体类
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 b4d8bbf..5a0d497 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
@@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -68,7 +69,7 @@ public class ThreadPoolConfig {
   }
 
   @Bean
-  @ConditionalOnMissingBean(ThreadPoolTaskScheduler.class)
+  @Primary
   public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
     ThreadPoolTaskScheduler t = new ThreadPoolTaskScheduler();