remove unused code.

src/main/java/cn/quantgroup/xyqb/config/mq/LoanVestMqConfig.java

-package cn.quantgroup.xyqb.config.mq;
-
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-/**
- * //马甲包 xuran
- */
-@Primary
-@Configuration
-public class LoanVestMqConfig {
-    @Value("${loanvest.rabbitmq.queue}")
-    private String queueName;
-    @Value("${loanvest.rabbitmq.exchange}")
-    private String loanVestExchange;
-
-    @Value("${loanvest.rabbitmq.connection.host}")
-    private String host;
-    @Value("${loanvest.rabbitmq.connection.port}")
-    private Integer port;
-    @Value("${loanvest.rabbitmq.connection.user}")
-    private String user;
-    @Value("${loanvest.rabbitmq.connection.password}")
-    private String password;
-    @Value("${loanvest.rabbitmq.connection.virtual-host}")
-    private String virtualHost;
-
-
-    @Primary
-    @Bean(name = "vestFactory")
-    public ConnectionFactory vestFactory() {
-        CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host, port);
-        connectionFactory.setChannelCacheSize(1024);
-        connectionFactory.setCacheMode(CachingConnectionFactory.CacheMode.CONNECTION);
-        connectionFactory.setChannelCacheSize(180 * 1000);
-        connectionFactory.setConnectionCacheSize(1024);
-        connectionFactory.setUsername(user);
-        connectionFactory.setPassword(password);
-        connectionFactory.setVirtualHost(virtualHost);
-        connectionFactory.setPublisherReturns(false);
-        connectionFactory.setPublisherConfirms(false);
-        return connectionFactory;
-    }
-
-    @Primary
-    @Bean(name = "loanVestAmqpAdmin")
-    public AmqpAdmin loanVestAdmin(@Qualifier("vestFactory") ConnectionFactory vestFactory) {
-        return new RabbitAdmin(vestFactory);
-    }
-
-    @Primary
-    @Bean(name = "loanVestExchange")
-    public FanoutExchange loanVestExchange() {
-        return new FanoutExchange(loanVestExchange);
-    }
-
-    @Primary
-    @Bean(name = "loanVestQueue")
-    public Queue loanVestQueue() {
-        return new Queue(queueName);
-    }
-
-    @Primary
-    @Bean(name = "loanVestBinding")
-    public Binding bindingLoanVest(@Qualifier("loanVestAmqpAdmin") AmqpAdmin loanVestAdmin, @Qualifier("loanVestQueue") Queue loanVestQueue, @Qualifier("loanVestExchange") FanoutExchange loanVestExchange) {
-        Binding binding = BindingBuilder.bind(loanVestQueue).to(loanVestExchange);
-        loanVestAdmin.declareBinding(binding);
-        return binding;
-    }
-
-    @Primary
-    @Bean(name = "rabbitTemplate")
-    public RabbitTemplate loanVestTemplate(@Qualifier("vestFactory") ConnectionFactory vestFactory) {
-        RabbitTemplate template = new RabbitTemplate(vestFactory);
-        template.setExchange(loanVestExchange);
-        return template;
-    }
-}

src/main/java/cn/quantgroup/xyqb/config/mq/RegisterMqConfig.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -42,6 +43,89 @@ public class RegisterMqConfig {
     @Value("${register.rabbitmq.connection.virtual-host}")
     private String virtualHost;
 
+    @Value("${registered.notify.black.hole.rabbitmq.connection.virtual-host}")
+    private String BlackVirtualHost;
+
+    @Value("${loanvest.rabbitmq.connection.virtual-host}")
+    private String loanVirtualHost;
+
+    @Value("${loanvest.rabbitmq.exchange}")
+    private String loanVestExchange;
+
+    @Value("${loanvest.rabbitmq.queue}")
+    private String loanQueueName;
+    @Primary
+    @Bean(name = "loanVestQueue")
+    public Queue loanVestQueue() {
+        return new Queue(loanQueueName);
+    }
+
+    @Primary
+    @Bean(name = "loanVestBinding")
+    public Binding bindingLoanVest(@Qualifier("loanVestAmqpAdmin") AmqpAdmin loanVestAdmin, @Qualifier("loanVestQueue") Queue loanVestQueue, @Qualifier("loanVestExchange") FanoutExchange loanVestExchange) {
+        Binding binding = BindingBuilder.bind(loanVestQueue).to(loanVestExchange);
+        loanVestAdmin.declareBinding(binding);
+        return binding;
+    }
+    @Primary
+    @Bean(name = "rabbitTemplate")
+    public RabbitTemplate loanVestTemplate(@Qualifier("vestFactory") ConnectionFactory vestFactory) {
+        RabbitTemplate template = new RabbitTemplate(vestFactory);
+        template.setExchange(loanVestExchange);
+        return template;
+    }
+
+    @Primary
+    @Bean(name = "loanVestAmqpAdmin")
+    public AmqpAdmin loanVestAdmin(@Qualifier("vestFactory") ConnectionFactory vestFactory) {
+        return new RabbitAdmin(vestFactory);
+    }
+
+    @Primary
+    @Bean(name = "loanVestExchange")
+    public FanoutExchange loanVestExchange() {
+        return new FanoutExchange(loanVestExchange);
+    }
+
+
+    @Primary
+    @Bean(name = "vestFactory")
+    public ConnectionFactory vestFactory() {
+        CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host, port);
+        connectionFactory.setChannelCacheSize(1024);
+        connectionFactory.setCacheMode(CachingConnectionFactory.CacheMode.CONNECTION);
+        connectionFactory.setChannelCacheSize(180 * 1000);
+        connectionFactory.setConnectionCacheSize(1024);
+        connectionFactory.setUsername(user);
+        connectionFactory.setPassword(password);
+        connectionFactory.setVirtualHost(loanVirtualHost);
+        connectionFactory.setPublisherReturns(false);
+        connectionFactory.setPublisherConfirms(false);
+        return connectionFactory;
+    }
+
+
+
+    @Bean(name = "registeredNotifyBlackHoleFactory")
+    public ConnectionFactory connectionFactory() {
+        CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host, port);
+        connectionFactory.setChannelCacheSize(1024);
+        connectionFactory.setCacheMode(CachingConnectionFactory.CacheMode.CONNECTION);
+        connectionFactory.setChannelCacheSize(180 * 1000);
+        connectionFactory.setConnectionCacheSize(1024);
+        connectionFactory.setUsername(user);
+        connectionFactory.setPassword(password);
+        connectionFactory.setVirtualHost(BlackVirtualHost);
+        connectionFactory.setPublisherReturns(true);
+        connectionFactory.setPublisherConfirms(true);
+        return connectionFactory;
+    }
+
+    @Bean(name = "registeredNotifyBlackHoleRabbitTemplate")
+    public RabbitTemplate registeredNotifyBlackHoleRabbitTemplate(@Qualifier("registeredNotifyBlackHoleFactory") ConnectionFactory connectionFactory) {
+        return new RabbitTemplate(connectionFactory);
+    }
+
 
     @Bean(name = "registerMqFactory")
     public ConnectionFactory registerMqFactory() {
@@ -138,7 +222,6 @@ public class RegisterMqConfig {
         queueArgs.put("x-message-ttl", 24 * 60 * 60 * 1000);
         Queue wechatBind = new Queue(queueName, true, false, false, queueArgs);
         rabbitAdmin.declareQueue(wechatBind);
-//        rabbitTemplate.setQueue(queueName);
         rabbitTemplate.setRoutingKey(queueName);
         return rabbitTemplate;
     }

src/main/java/cn/quantgroup/xyqb/config/mq/RegisteredNotifyBlackHoleMqConfig.java

-package cn.quantgroup.xyqb.config.mq;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Date: 2020/1/15
- * Time: 下午2:20
- *
- * @author: yangrui
- */
-@Slf4j
-@Configuration
-public class RegisteredNotifyBlackHoleMqConfig {
-
-    @Value("${rabbitmq.connection.host}")
-    private String host;
-    @Value("${rabbitmq.connection.port}")
-    private Integer port;
-    @Value("${rabbitmq.connection.user}")
-    private String user;
-    @Value("${rabbitmq.connection.password}")
-    private String password;
-    @Value("${registered.notify.black.hole.rabbitmq.connection.virtual-host}")
-    private String virtualHost;
-
-    @Bean(name = "registeredNotifyBlackHoleFactory")
-    public ConnectionFactory connectionFactory() {
-        CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host, port);
-        connectionFactory.setChannelCacheSize(1024);
-        connectionFactory.setCacheMode(CachingConnectionFactory.CacheMode.CONNECTION);
-        connectionFactory.setChannelCacheSize(180 * 1000);
-        connectionFactory.setConnectionCacheSize(1024);
-        connectionFactory.setUsername(user);
-        connectionFactory.setPassword(password);
-        connectionFactory.setVirtualHost(virtualHost);
-        connectionFactory.setPublisherReturns(true);
-        connectionFactory.setPublisherConfirms(true);
-        return connectionFactory;
-    }
-
-    @Bean(name = "registeredNotifyBlackHoleRabbitTemplate")
-    public RabbitTemplate rabbitTemplate(@Qualifier("registeredNotifyBlackHoleFactory") ConnectionFactory connectionFactory) {
-         RabbitTemplate template = new RabbitTemplate(connectionFactory);
-         return template;
-    }
-}