diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
index c62df1090..1c3b31eb5 100644
--- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
@@ -19,7 +19,8 @@
1.8.8
1.7.1
2.4.3
- 3.2.14
+ 3.3.3
+ 3.3.1
1.0.11
@@ -167,9 +168,9 @@
- org.apache.dubbo
+ org.apache.dubbo.extensions
dubbo-metadata-report-redis
- ${dubbo.version}
+ ${dubbo-extensions.version}
diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml
index 5f0088c3a..344e3a1ae 100644
--- a/ruoyi-common/ruoyi-common-dubbo/pom.xml
+++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml
@@ -37,7 +37,7 @@
- org.apache.dubbo
+ org.apache.dubbo.extensions
dubbo-metadata-report-redis
@@ -49,7 +49,7 @@
redis.clients
jedis
- 5.1.0
+ 5.2.0
org.projectlombok
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
deleted file mode 100644
index c1341761e..000000000
--- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dubbo.metadata.report.support;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.CollectionUtils;
-import org.apache.dubbo.common.utils.ConfigUtils;
-import org.apache.dubbo.common.utils.JsonUtils;
-import org.apache.dubbo.common.utils.NamedThreadFactory;
-import org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
-import org.apache.dubbo.metadata.definition.model.ServiceDefinition;
-import org.apache.dubbo.metadata.report.MetadataReport;
-import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
-import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
-import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
-import org.apache.dubbo.metrics.event.MetricsEventBus;
-import org.apache.dubbo.metrics.metadata.event.MetadataEvent;
-import org.apache.dubbo.rpc.model.ApplicationModel;
-
-import java.io.*;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import static org.apache.dubbo.common.constants.CommonConstants.*;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_UNEXPECTED_EXCEPTION;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROXY_FAILED_EXPORT_SERVICE;
-import static org.apache.dubbo.common.utils.StringUtils.replace;
-import static org.apache.dubbo.metadata.report.support.Constants.*;
-
-public abstract class AbstractMetadataReport implements MetadataReport {
-
- protected static final String DEFAULT_ROOT = "dubbo";
-
- protected static final int ONE_DAY_IN_MILLISECONDS = 60 * 24 * 60 * 1000;
- private static final int FOUR_HOURS_IN_MILLISECONDS = 60 * 4 * 60 * 1000;
- // Log output
- protected final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(getClass());
-
- // Local disk cache, where the special key value.registries records the list of metadata centers, and the others are
- // the list of notified service providers
- final Properties properties = new Properties();
- private final ExecutorService reportCacheExecutor =
- Executors.newFixedThreadPool(1, new NamedThreadFactory("DubboSaveMetadataReport", true));
- final Map allMetadataReports = new ConcurrentHashMap<>(4);
-
- private final AtomicLong lastCacheChanged = new AtomicLong();
- final Map failedReports = new ConcurrentHashMap<>(4);
- private URL reportURL;
- boolean syncReport;
- // Local disk cache file
- File file;
- private AtomicBoolean initialized = new AtomicBoolean(false);
- public MetadataReportRetry metadataReportRetry;
- private ScheduledExecutorService reportTimerScheduler;
-
- private final boolean reportMetadata;
- private final boolean reportDefinition;
- protected ApplicationModel applicationModel;
-
- public AbstractMetadataReport(URL reportServerURL) {
- setUrl(reportServerURL);
- applicationModel = reportServerURL.getOrDefaultApplicationModel();
-
- boolean localCacheEnabled = reportServerURL.getParameter(REGISTRY_LOCAL_FILE_CACHE_ENABLED, true);
- // Start file save timer
- String defaultFilename = System.getProperty("user.home") + DUBBO_METADATA
- + reportServerURL.getApplication()
- + "-" + replace(reportServerURL.getAddress(), ":", "-")
- + CACHE;
- String filename = reportServerURL.getParameter(FILE_KEY, defaultFilename);
- File file = null;
- if (localCacheEnabled && ConfigUtils.isNotEmpty(filename)) {
- file = new File(filename);
- if (!file.exists()
- && file.getParentFile() != null
- && !file.getParentFile().exists()) {
- if (!file.getParentFile().mkdirs()) {
- throw new IllegalArgumentException("Invalid service store file " + file
- + ", cause: Failed to create directory " + file.getParentFile() + "!");
- }
- }
- // if this file exists, firstly delete it.
- if (!initialized.getAndSet(true) && file.exists()) {
- file.delete();
- }
- }
- this.file = file;
- loadProperties();
- syncReport = reportServerURL.getParameter(SYNC_REPORT_KEY, false);
- metadataReportRetry = new MetadataReportRetry(
- reportServerURL.getParameter(RETRY_TIMES_KEY, DEFAULT_METADATA_REPORT_RETRY_TIMES),
- reportServerURL.getParameter(RETRY_PERIOD_KEY, DEFAULT_METADATA_REPORT_RETRY_PERIOD));
- // cycle report the data switch
- if (reportServerURL.getParameter(CYCLE_REPORT_KEY, DEFAULT_METADATA_REPORT_CYCLE_REPORT)) {
- reportTimerScheduler = Executors.newSingleThreadScheduledExecutor(
- new NamedThreadFactory("DubboMetadataReportTimer", true));
- reportTimerScheduler.scheduleAtFixedRate(
- this::publishAll, calculateStartTime(), ONE_DAY_IN_MILLISECONDS, TimeUnit.MILLISECONDS);
- }
-
- this.reportMetadata = reportServerURL.getParameter(REPORT_METADATA_KEY, false);
- this.reportDefinition = reportServerURL.getParameter(REPORT_DEFINITION_KEY, true);
- }
-
- public URL getUrl() {
- return reportURL;
- }
-
- protected void setUrl(URL url) {
- if (url == null) {
- throw new IllegalArgumentException("metadataReport url == null");
- }
- this.reportURL = url;
- }
-
- private void doSaveProperties(long version) {
- if (version < lastCacheChanged.get()) {
- return;
- }
- if (file == null) {
- return;
- }
- // Save
- try {
- File lockfile = new File(file.getAbsolutePath() + ".lock");
- if (!lockfile.exists()) {
- lockfile.createNewFile();
- }
- try (RandomAccessFile raf = new RandomAccessFile(lockfile, "rw");
- FileChannel channel = raf.getChannel()) {
- FileLock lock = channel.tryLock();
- if (lock == null) {
- throw new IOException(
- "Can not lock the metadataReport cache file " + file.getAbsolutePath()
- + ", ignore and retry later, maybe multi java process use the file, please config: dubbo.metadata.file=xxx.properties");
- }
- // Save
- try {
- if (!file.exists()) {
- file.createNewFile();
- }
-
- Properties tmpProperties;
- if (!syncReport) {
- // When syncReport = false, properties.setProperty and properties.store are called from the same
- // thread(reportCacheExecutor), so deep copy is not required
- tmpProperties = properties;
- } else {
- // Using store method and setProperty method of the this.properties will cause lock contention
- // under multi-threading, so deep copy a new container
- tmpProperties = new Properties();
- Set> entries = properties.entrySet();
- for (Map.Entry entry : entries) {
- tmpProperties.setProperty((String) entry.getKey(), (String) entry.getValue());
- }
- }
-
- try (FileOutputStream outputFile = new FileOutputStream(file)) {
- tmpProperties.store(outputFile, "Dubbo metadataReport Cache");
- }
- } finally {
- lock.release();
- }
- }
- } catch (Throwable e) {
- if (version < lastCacheChanged.get()) {
- return;
- } else {
- reportCacheExecutor.execute(new SaveProperties(lastCacheChanged.incrementAndGet()));
- }
- logger.warn(
- COMMON_UNEXPECTED_EXCEPTION,
- "",
- "",
- "Failed to save service store file, cause: " + e.getMessage(),
- e);
- }
- }
-
- void loadProperties() {
- if (file != null && file.exists()) {
- try (InputStream in = new FileInputStream(file)) {
- properties.load(in);
- if (logger.isInfoEnabled()) {
- logger.info("Load service store file " + file + ", data: " + properties);
- }
- } catch (Throwable e) {
- logger.warn(COMMON_UNEXPECTED_EXCEPTION, "", "", "Failed to load service store file" + file, e);
- }
- }
- }
-
- private void saveProperties(MetadataIdentifier metadataIdentifier, String value, boolean add, boolean sync) {
- if (file == null) {
- return;
- }
-
- try {
- if (add) {
- properties.setProperty(metadataIdentifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), value);
- } else {
- properties.remove(metadataIdentifier.getUniqueKey(KeyTypeEnum.UNIQUE_KEY));
- }
- long version = lastCacheChanged.incrementAndGet();
- if (sync) {
- new SaveProperties(version).run();
- } else {
- reportCacheExecutor.execute(new SaveProperties(version));
- }
-
- } catch (Throwable t) {
- logger.warn(COMMON_UNEXPECTED_EXCEPTION, "", "", t.getMessage(), t);
- }
- }
-
- @Override
- public String toString() {
- return getUrl().toString();
- }
-
- private class SaveProperties implements Runnable {
- private long version;
-
- private SaveProperties(long version) {
- this.version = version;
- }
-
- @Override
- public void run() {
- doSaveProperties(version);
- }
- }
-
- @Override
- public void storeProviderMetadata(
- MetadataIdentifier providerMetadataIdentifier, ServiceDefinition serviceDefinition) {
- if (syncReport) {
- storeProviderMetadataTask(providerMetadataIdentifier, serviceDefinition);
- } else {
- reportCacheExecutor.execute(() -> storeProviderMetadataTask(providerMetadataIdentifier, serviceDefinition));
- }
- }
-
- private void storeProviderMetadataTask(
- MetadataIdentifier providerMetadataIdentifier, ServiceDefinition serviceDefinition) {
-
- MetadataEvent metadataEvent = MetadataEvent.toServiceSubscribeEvent(
- applicationModel, providerMetadataIdentifier.getUniqueServiceName());
- MetricsEventBus.post(
- metadataEvent,
- () -> {
- boolean result = true;
- try {
- if (logger.isInfoEnabled()) {
- logger.info("store provider metadata. Identifier : " + providerMetadataIdentifier
- + "; definition: " + serviceDefinition);
- }
- allMetadataReports.put(providerMetadataIdentifier, serviceDefinition);
- failedReports.remove(providerMetadataIdentifier);
- String data = JsonUtils.toJson(serviceDefinition);
- doStoreProviderMetadata(providerMetadataIdentifier, data);
- saveProperties(providerMetadataIdentifier, data, true, !syncReport);
- } catch (Exception e) {
- // retry again. If failed again, throw exception.
- failedReports.put(providerMetadataIdentifier, serviceDefinition);
- metadataReportRetry.startRetryTask();
- logger.error(
- PROXY_FAILED_EXPORT_SERVICE,
- "",
- "",
- "Failed to put provider metadata " + providerMetadataIdentifier + " in "
- + serviceDefinition + ", cause: " + e.getMessage(),
- e);
- result = false;
- }
- return result;
- },
- aBoolean -> aBoolean);
- }
-
- @Override
- public void storeConsumerMetadata(
- MetadataIdentifier consumerMetadataIdentifier, Map serviceParameterMap) {
- if (syncReport) {
- storeConsumerMetadataTask(consumerMetadataIdentifier, serviceParameterMap);
- } else {
- reportCacheExecutor.execute(
- () -> storeConsumerMetadataTask(consumerMetadataIdentifier, serviceParameterMap));
- }
- }
-
- protected void storeConsumerMetadataTask(
- MetadataIdentifier consumerMetadataIdentifier, Map serviceParameterMap) {
- try {
- if (logger.isInfoEnabled()) {
- logger.info("store consumer metadata. Identifier : " + consumerMetadataIdentifier + "; definition: "
- + serviceParameterMap);
- }
- allMetadataReports.put(consumerMetadataIdentifier, serviceParameterMap);
- failedReports.remove(consumerMetadataIdentifier);
-
- String data = JsonUtils.toJson(serviceParameterMap);
- doStoreConsumerMetadata(consumerMetadataIdentifier, data);
- saveProperties(consumerMetadataIdentifier, data, true, !syncReport);
- } catch (Exception e) {
- // retry again. If failed again, throw exception.
- failedReports.put(consumerMetadataIdentifier, serviceParameterMap);
- metadataReportRetry.startRetryTask();
- logger.error(
- PROXY_FAILED_EXPORT_SERVICE,
- "",
- "",
- "Failed to put consumer metadata " + consumerMetadataIdentifier + "; " + serviceParameterMap
- + ", cause: " + e.getMessage(),
- e);
- }
- }
-
- @Override
- public void destroy() {
- if (reportCacheExecutor != null) {
- reportCacheExecutor.shutdown();
- }
- if (reportTimerScheduler != null) {
- reportTimerScheduler.shutdown();
- }
- if (metadataReportRetry != null) {
- metadataReportRetry.destroy();
- metadataReportRetry = null;
- }
- }
-
- @Override
- public void saveServiceMetadata(ServiceMetadataIdentifier metadataIdentifier, URL url) {
- if (syncReport) {
- doSaveMetadata(metadataIdentifier, url);
- } else {
- reportCacheExecutor.execute(() -> doSaveMetadata(metadataIdentifier, url));
- }
- }
-
- @Override
- public void removeServiceMetadata(ServiceMetadataIdentifier metadataIdentifier) {
- if (syncReport) {
- doRemoveMetadata(metadataIdentifier);
- } else {
- reportCacheExecutor.execute(() -> doRemoveMetadata(metadataIdentifier));
- }
- }
-
- @Override
- public List getExportedURLs(ServiceMetadataIdentifier metadataIdentifier) {
- // TODO, fallback to local cache
- return doGetExportedURLs(metadataIdentifier);
- }
-
- @Override
- public void saveSubscribedData(SubscriberMetadataIdentifier subscriberMetadataIdentifier, Set urls) {
- if (syncReport) {
- doSaveSubscriberData(subscriberMetadataIdentifier, JsonUtils.toJson(urls));
- } else {
- reportCacheExecutor.execute(
- () -> doSaveSubscriberData(subscriberMetadataIdentifier, JsonUtils.toJson(urls)));
- }
- }
-
- @Override
- public List getSubscribedURLs(SubscriberMetadataIdentifier subscriberMetadataIdentifier) {
- String content = doGetSubscribedURLs(subscriberMetadataIdentifier);
- return JsonUtils.toJavaList(content, String.class);
- }
-
- String getProtocol(URL url) {
- String protocol = url.getSide();
- protocol = protocol == null ? url.getProtocol() : protocol;
- return protocol;
- }
-
- /**
- * @return if need to continue
- */
- public boolean retry() {
- return doHandleMetadataCollection(failedReports);
- }
-
- @Override
- public boolean shouldReportDefinition() {
- return reportDefinition;
- }
-
- @Override
- public boolean shouldReportMetadata() {
- return reportMetadata;
- }
-
- private boolean doHandleMetadataCollection(Map metadataMap) {
- if (metadataMap.isEmpty()) {
- return true;
- }
- Iterator> iterable =
- metadataMap.entrySet().iterator();
- while (iterable.hasNext()) {
- Map.Entry item = iterable.next();
- if (PROVIDER_SIDE.equals(item.getKey().getSide())) {
- this.storeProviderMetadata(item.getKey(), (FullServiceDefinition) item.getValue());
- } else if (CONSUMER_SIDE.equals(item.getKey().getSide())) {
- this.storeConsumerMetadata(item.getKey(), (Map) item.getValue());
- }
- }
- return false;
- }
-
- /**
- * not private. just for unittest.
- */
- void publishAll() {
- logger.info("start to publish all metadata.");
- this.doHandleMetadataCollection(allMetadataReports);
- }
-
- /**
- * between 2:00 am to 6:00 am, the time is random.
- *
- * @return
- */
- long calculateStartTime() {
- Calendar calendar = Calendar.getInstance();
- long nowMill = calendar.getTimeInMillis();
- calendar.set(Calendar.HOUR_OF_DAY, 0);
- calendar.set(Calendar.MINUTE, 0);
- calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MILLISECOND, 0);
- long subtract = calendar.getTimeInMillis() + ONE_DAY_IN_MILLISECONDS - nowMill;
- return subtract
- + (FOUR_HOURS_IN_MILLISECONDS / 2)
- + ThreadLocalRandom.current().nextInt(FOUR_HOURS_IN_MILLISECONDS);
- }
-
- class MetadataReportRetry {
- protected final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(getClass());
-
- final ScheduledExecutorService retryExecutor =
- Executors.newScheduledThreadPool(0, new NamedThreadFactory("DubboMetadataReportRetryTimer", true));
- volatile ScheduledFuture retryScheduledFuture;
- final AtomicInteger retryCounter = new AtomicInteger(0);
- // retry task schedule period
- long retryPeriod;
- // if no failed report, wait how many times to run retry task.
- int retryTimesIfNonFail = 600;
-
- int retryLimit;
-
- public MetadataReportRetry(int retryTimes, int retryPeriod) {
- this.retryPeriod = retryPeriod;
- this.retryLimit = retryTimes;
- }
-
- void startRetryTask() {
- if (retryScheduledFuture == null) {
- synchronized (retryCounter) {
- if (retryScheduledFuture == null) {
- retryScheduledFuture = retryExecutor.scheduleWithFixedDelay(
- () -> {
- // Check and connect to the metadata
- try {
- int times = retryCounter.incrementAndGet();
- logger.info("start to retry task for metadata report. retry times:" + times);
- if (retry() && times > retryTimesIfNonFail) {
- cancelRetryTask();
- }
- if (times > retryLimit) {
- cancelRetryTask();
- }
- } catch (Throwable t) { // Defensive fault tolerance
- logger.error(
- COMMON_UNEXPECTED_EXCEPTION,
- "",
- "",
- "Unexpected error occur at failed retry, cause: " + t.getMessage(),
- t);
- }
- },
- 500,
- retryPeriod,
- TimeUnit.MILLISECONDS);
- }
- }
- }
- }
-
- void cancelRetryTask() {
- if (retryScheduledFuture != null) {
- retryScheduledFuture.cancel(false);
- }
- retryExecutor.shutdown();
- }
-
- void destroy() {
- cancelRetryTask();
- }
-
- /**
- * @deprecated only for test
- */
- @Deprecated
- ScheduledExecutorService getRetryExecutor() {
- return retryExecutor;
- }
- }
-
- private void doSaveSubscriberData(SubscriberMetadataIdentifier subscriberMetadataIdentifier, List urls) {
- if (CollectionUtils.isEmpty(urls)) {
- return;
- }
- List encodedUrlList = new ArrayList<>(urls.size());
- for (String url : urls) {
- encodedUrlList.add(URL.encode(url));
- }
- doSaveSubscriberData(subscriberMetadataIdentifier, encodedUrlList);
- }
-
- protected abstract void doStoreProviderMetadata(
- MetadataIdentifier providerMetadataIdentifier, String serviceDefinitions);
-
- protected abstract void doStoreConsumerMetadata(
- MetadataIdentifier consumerMetadataIdentifier, String serviceParameterString);
-
- protected abstract void doSaveMetadata(ServiceMetadataIdentifier metadataIdentifier, URL url);
-
- protected abstract void doRemoveMetadata(ServiceMetadataIdentifier metadataIdentifier);
-
- protected abstract List doGetExportedURLs(ServiceMetadataIdentifier metadataIdentifier);
-
- protected abstract void doSaveSubscriberData(
- SubscriberMetadataIdentifier subscriberMetadataIdentifier, String urlListStr);
-
- protected abstract String doGetSubscribedURLs(SubscriberMetadataIdentifier subscriberMetadataIdentifier);
-
- /**
- * @deprecated only for unit test
- */
- @Deprecated
- protected ExecutorService getReportCacheExecutor() {
- return reportCacheExecutor;
- }
-
- /**
- * @deprecated only for unit test
- */
- @Deprecated
- protected MetadataReportRetry getMetadataReportRetry() {
- return metadataReportRetry;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
index 51fe9703e..f2272dca2 100644
--- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
@@ -48,6 +48,8 @@ import static org.apache.dubbo.metadata.report.support.Constants.DEFAULT_METADAT
*/
public class RedisMetadataReport extends AbstractMetadataReport {
+ private static final int ONE_DAY_IN_MILLISECONDS = 86400000;
+
private static final String REDIS_DATABASE_KEY = "database";
private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(RedisMetadataReport.class);
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java
index 4a87e22cc..2e2c8531f 100644
--- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java
@@ -8,6 +8,8 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.core.task.VirtualThreadTaskExecutor;
/**
* dubbo 配置类
@@ -33,4 +35,9 @@ public class DubboConfiguration {
return new DubboExceptionHandler();
}
+ @Bean
+ public AsyncTaskExecutor virtualThreadExecutor() {
+ return new VirtualThreadTaskExecutor("dubbo-");
+ }
+
}
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/threadpool/VirtualOrCachedThreadPool.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/threadpool/VirtualOrCachedThreadPool.java
new file mode 100644
index 000000000..c57f8b9f8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/threadpool/VirtualOrCachedThreadPool.java
@@ -0,0 +1,23 @@
+package org.dromara.common.dubbo.threadpool;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.threadpool.ThreadPool;
+import org.apache.dubbo.common.threadpool.support.cached.CachedThreadPool;
+import org.apache.dubbo.common.threadpool.support.loom.VirtualThreadPool;
+import org.dromara.common.core.utils.SpringUtils;
+
+import java.util.concurrent.Executor;
+
+/**
+ * 自定义dubbo线程池配置兼容jdk17与jdk21
+ */
+public class VirtualOrCachedThreadPool implements ThreadPool {
+ @Override
+ public Executor getExecutor(URL url) {
+ if (SpringUtils.isVirtual()) {
+ // 如果开启了虚拟线程 使用虚拟线程池
+ return new VirtualThreadPool().getExecutor(url);
+ }
+ return new CachedThreadPool().getExecutor(url);
+ }
+}
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.threadpool.ThreadPool b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.threadpool.ThreadPool
new file mode 100644
index 000000000..d9bf4f515
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.threadpool.ThreadPool
@@ -0,0 +1,2 @@
+virtualOrCached=org.dromara.common.dubbo.threadpool.VirtualOrCachedThreadPool
+
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml
index 790921517..44ddb236a 100644
--- a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml
@@ -32,6 +32,9 @@ dubbo:
timeout: ${spring.data.redis.timeout}
# 集群地址 cluster 为 true 生效
backup: 127.0.0.1:6379,127.0.0.1:6381
+ protocol:
+ # 自定义线程池 如开启虚拟线程这使用虚拟线程 默认使用cached
+ threadpool: virtualOrCached
# 消费者相关配置
consumer:
# 结果缓存(LRU算法)