修改用户登录,权限分配等

common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqProducerTemplate.java

@@ -84,7 +84,7 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
         try {
             if (!topicIfNotExist) {
                 //topic不存在创建通道队列
-                log.info("queueDeclareAdd==>exchangeName:{} topic:{}",tpi.getExchangeName(),tpi.getTopic());
+                log.info("sendQueueDeclareAdd==>exchangeName:{} topic:{}",tpi.getExchangeName(),tpi.getTopic());
                 Map<String, Object> args = new HashMap<>();
                 args.put("x-message-ttl", Integer.parseInt(rabbitMqSettings.getMessageTtl()));
                 channel.queueDeclare(tpi.getTopic(), true, false, false, args);
@@ -133,17 +133,18 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
     public void queueDeclare(TopicPartitionInfo tpi, TbQueueCallback callback) {
         Boolean topicIfNotExist = createTopicIfNotExist(tpi);
         try {
+            if (!innerExists(tpi.getExchangeName(), channel)) {
+                //判断交换机是否存在，如果不存在则创建后与新加入的队列绑定
+                channel = connection.createChannel();
+                channel.exchangeDeclare(tpi.getExchangeName(), BuiltinExchangeType.DIRECT, true, false, null);
+            }
             if (!topicIfNotExist) {
                 //topic不存在创建通道队列
                 log.info("queueDeclareAdd==>exchangeName:{} topic:{}",tpi.getExchangeName(),tpi.getTopic());
                 Map<String, Object> args = new HashMap<>();
                 args.put("x-message-ttl", Integer.parseInt(rabbitMqSettings.getMessageTtl()));
                 channel.queueDeclare(tpi.getTopic(), true, false, false, args);
-            }
-            if (!innerExists(tpi.getExchangeName(), channel)) {
-                //判断交换机是否存在，如果不存在则创建后与新加入的队列绑定
-                channel = connection.createChannel();
-                channel.exchangeDeclare(tpi.getExchangeName(), BuiltinExchangeType.DIRECT, true, false, null);
+                channel.queueBind(tpi.getTopic(), tpi.getExchangeName(), tpi.getTopic());
             }
 
             // callback.onSuccess(new RabbitQueueMsgMetadata());