diff --git a/ruoyi-admin/src/main/resources/application-middleware.yml b/ruoyi-admin/src/main/resources/application-middleware.yml index 07f9a99..875acbc 100644 --- a/ruoyi-admin/src/main/resources/application-middleware.yml +++ b/ruoyi-admin/src/main/resources/application-middleware.yml @@ -27,6 +27,7 @@ spring: name: ruoyi #配置rabbitMq 服务器 rabbitmq: + enable: false host: 127.0.0.1 port: 5672 username: guest diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpClientUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpClientUtil.java index 04b4c23..fcc7391 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpClientUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpClientUtil.java @@ -31,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.utils.spring.SpringUtils; public class HttpClientUtil { @@ -46,7 +45,7 @@ public class HttpClientUtil { .setConnectTimeout(600000) .setConnectionRequestTimeout(600000).build(); - private static CloseableHttpClient client = SpringUtils.getBean("closeableHttpClient"); + private static CloseableHttpClient client = HttpUtils.initClient(); /** * 发送 post请求 diff --git a/ruoyi-middleware/ruoyi-middleware-rabbitmq/src/main/java/com/ruoyi/middleware/rabbitmq/DirectReceiver.java b/ruoyi-middleware/ruoyi-middleware-rabbitmq/src/main/java/com/ruoyi/middleware/rabbitmq/DirectReceiver.java index 569ae3f..996fb8f 100644 --- a/ruoyi-middleware/ruoyi-middleware-rabbitmq/src/main/java/com/ruoyi/middleware/rabbitmq/DirectReceiver.java +++ b/ruoyi-middleware/ruoyi-middleware-rabbitmq/src/main/java/com/ruoyi/middleware/rabbitmq/DirectReceiver.java @@ -2,12 +2,14 @@ package com.ruoyi.middleware.rabbitmq; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import com.ruoyi.common.core.domain.Message; @Component @RabbitListener(queues = "TestDirectQueue") // 监听的队列名称 TestDirectQueue +@ConditionalOnProperty(prefix = "spring.rabbitmq", name = { "enable" }, havingValue = "true", matchIfMissing = false) public class DirectReceiver { @RabbitHandler