diff --git a/dependencies/.flattened-pom.xml b/dependencies/.flattened-pom.xml index 85629b0..807e307 100644 --- a/dependencies/.flattened-pom.xml +++ b/dependencies/.flattened-pom.xml @@ -135,11 +135,6 @@ spring-boot-starter-mq ${revision} - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - cd.casic.boot spring-boot-starter-mybatis diff --git a/dependencies/pom.xml b/dependencies/pom.xml index c7ec9dd..9f79aee 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -35,8 +35,6 @@ 42.7.4 2.0.8.3 - - 2.3.1 2.2.7 @@ -155,12 +153,6 @@ ${revision} - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - - cd.casic.boot spring-boot-starter-mybatis diff --git a/framework/spring-boot-starter-biz-tenant/pom.xml b/framework/spring-boot-starter-biz-tenant/pom.xml index 6976d4b..b89e903 100644 --- a/framework/spring-boot-starter-biz-tenant/pom.xml +++ b/framework/spring-boot-starter-biz-tenant/pom.xml @@ -59,12 +59,6 @@ true - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - com.google.guava diff --git a/framework/spring-boot-starter-mq/pom.xml b/framework/spring-boot-starter-mq/pom.xml index d708ec5..3f7a23b 100644 --- a/framework/spring-boot-starter-mq/pom.xml +++ b/framework/spring-boot-starter-mq/pom.xml @@ -28,10 +28,5 @@ spring-rabbit true - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - diff --git a/framework/spring-boot-starter-mq/src/main/java/cd/casic/framework/mq/rabbitmq/config/OpsRabbitMQAutoConfiguration.java b/framework/spring-boot-starter-mq/src/main/java/cd/casic/framework/mq/rabbitmq/config/OpsRabbitMQAutoConfiguration.java index caff3c0..85bff2e 100644 --- a/framework/spring-boot-starter-mq/src/main/java/cd/casic/framework/mq/rabbitmq/config/OpsRabbitMQAutoConfiguration.java +++ b/framework/spring-boot-starter-mq/src/main/java/cd/casic/framework/mq/rabbitmq/config/OpsRabbitMQAutoConfiguration.java @@ -1,9 +1,6 @@ package cd.casic.framework.mq.rabbitmq.config; import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; -import org.springframework.amqp.rabbit.connection.CorrelationData; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -28,23 +25,5 @@ public class OpsRabbitMQAutoConfiguration { return new Jackson2JsonMessageConverter(); } - /** - * 这里我这样写,默认租户的信息不通过socket 发送,rabbitmq处理流水线相关的消息,因为具有回调 - * - * @param connectionFactory - * @return - */ - @Bean - public RabbitTemplate rabbitTemplate(CachingConnectionFactory connectionFactory) { - RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory); - rabbitTemplate.setMessageConverter(createMessageConverter()); - rabbitTemplate.setConfirmCallback(new RabbitTemplate.ConfirmCallback() { - @Override - public void confirm(CorrelationData correlationData, boolean ack, String cause) { - log.debug("收到消息发送异步确认, 消息ID:{}, ack:{}, cause:{}", correlationData.getId(), ack, cause); - } - }); - return rabbitTemplate; - } } diff --git a/framework/spring-boot-starter-websocket/pom.xml b/framework/spring-boot-starter-websocket/pom.xml index 71c0fee..d27fcab 100644 --- a/framework/spring-boot-starter-websocket/pom.xml +++ b/framework/spring-boot-starter-websocket/pom.xml @@ -43,12 +43,6 @@ spring-rabbit true - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - - @@ -56,7 +50,6 @@ spring-boot-starter-biz-tenant provided - cd.casic.boot