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

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

@@ -168,12 +168,46 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
     }
 
     private Boolean createTopicIfNotExist(TopicPartitionInfo tpi) {
-        if (topics.contains(tpi)) {
-            log.debug("contains topc:{}", tpi.getTopic());
-            return true;
+        //判断绑定的交换机与队列是否相同，如果不同返回false
+        TopicPartitionInfo topicPartitionInfo = topics.stream()
+                .filter(f -> f.getTopic().equals(tpi.getTopic())
+                        && f.getExchangeName().equals(tpi.getExchangeName()))
+                .findAny().orElseGet(() -> null);
+        if (ObjectUtils.isEmpty(topicPartitionInfo)) {
+            //exchange queue都不同
+            topics.add(tpi);
+            return false;
+        }else{
+            //queue相同 exchange不同
+            TopicPartitionInfo temp = topics.stream()
+                    .filter(f -> f.getTopic().equals(tpi.getTopic()))
+                    .findAny().orElseGet(() -> null);
+            if(!ObjectUtils.isEmpty(temp)){
+                //queue相同 exchange不同 需重新绑定
+                topics.remove(temp);
+                topics.add(tpi);
+                return false;
+            }else{
+                return true;
+            }
+
         }
-        topics.add(tpi);
-        return false;
+//
+//        if (topics.contains(tpi)) {
+//            //topic相同，exchange可能不同
+//            TopicPartitionInfo topicPartitionInfo = topics.stream().filter(f -> f.getTopic().equals(tpi.getTopic()) && f.getExchangeName().equals(tpi.getExchangeName())).findAny().orElseGet(() -> null);
+//            if (ObjectUtils.isEmpty(topicPartitionInfo)) {
+//                //exchange不同
+//                topics.add(tpi);
+//                //topics.remove()
+//                return true;
+//            }
+//
+//            log.debug("contains topc:{}", tpi.getTopic());
+//            return true;
+//        }
+//        topics.add(tpi);
+//        return false;
     }
 
     private boolean innerExists(String exchangeName, Channel outerChannel) {

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -147,7 +147,7 @@ Content-Type: application/json
 Authorization: {{authToken}}
 
 {
-  "deviceCode": "94-DE-80-D5-3D-63",
+  "deviceCode": "18-93-7F-C0-AD-B5",
   "action": "upload"
 }