From 41242cd4aa6c59ae96a1937510c1dd6edc850983 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:08 +0800
Subject: [PATCH] update java 1.8 => 17 update springboot 2.7.7 => 3.0.1 update springboot-admin 2.7.10 => 3.0.0-M8 update springdoc 1.6.14 => 2.0.2 update lock4j 2.2.3 => 2.2.4 update dynamic-ds 3.5.2 => 3.6.1

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
index 5682602..d011b58 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
@@ -1,27 +1,37 @@
 package com.ruoyi.framework.config;
 
-import com.ruoyi.common.exception.CustomException;
+import cn.hutool.core.util.ArrayUtil;
+import com.ruoyi.common.exception.ServiceException;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.security.concurrent.DelegatingSecurityContextExecutorService;
 
 import java.util.Arrays;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 
-@EnableAsync
+/**
+ * 寮傛閰嶇疆
+ *
+ * @author Lion Li
+ */
+@EnableAsync(proxyTargetClass = true)
 @Configuration
 public class AsyncConfig extends AsyncConfigurerSupport {
 
+    @Autowired
+    @Qualifier("scheduledExecutorService")
+    private ScheduledExecutorService scheduledExecutorService;
+
     /**
-     * 寮傛鎵ц闇�瑕佷娇鐢ㄦ潈闄愭鏋惰嚜甯︾殑鍖呰绾跨▼姹�  淇濊瘉鏉冮檺淇℃伅鐨勪紶閫�
+     * 鑷畾涔� @Async 娉ㄨВ浣跨敤绯荤粺绾跨▼姹�
      */
     @Override
     public Executor getAsyncExecutor() {
-        return new DelegatingSecurityContextExecutorService(
-        	Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()));
+        return scheduledExecutorService;
     }
 
     /**
@@ -31,10 +41,13 @@
     public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
         return (throwable, method, objects) -> {
             throwable.printStackTrace();
-            throw new CustomException(
-                    "Exception message - " + throwable.getMessage()
-                    + ", Method name - " + method.getName()
-                    + ", Parameter value - " + Arrays.toString(objects));
+            StringBuilder sb = new StringBuilder();
+            sb.append("Exception message - ").append(throwable.getMessage())
+                .append(", Method name - ").append(method.getName());
+            if (ArrayUtil.isNotEmpty(objects)) {
+                sb.append(", Parameter value - ").append(Arrays.toString(objects));
+            }
+            throw new ServiceException(sb.toString());
         };
     }
 

--
Gitblit v1.9.3