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

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

@@ -94,7 +94,7 @@ public class TbRabbitMqProducerTemplate<T extends TbQueueMsg> implements TbQueue
                 channel = connection.createChannel();
                 channel.exchangeDeclare(tpi.getExchangeName(), BuiltinExchangeType.DIRECT, true, false, null);
             }
-            channel.queueBind(tpi.getTopic(), tpi.getExchangeName(), tpi.getTopic());
+            //channel.queueBind(tpi.getTopic(), tpi.getExchangeName(), tpi.getTopic());
             channel.basicPublish(tpi.getExchangeName(), tpi.getTopic(), properties, JSON.toJSONString(new DefaultTbQueueMsg(msg)).getBytes());
             if (callback != null) {
                 callback.onSuccess(new RabbitQueueMsgMetadata(msg.getKey()));

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -507,6 +507,8 @@ public class DeviceApiController {
                 header.put(MessageHeader.MESSAGETYPE, Constant.MESSAGETYPE_HEARTBEAT);
                 header.put(MessageHeader.DEVICECODE, deviceEntity.getDeviceCode());
                 for (int i = 0; i < 100; i++) {
+
+                    log.info("sendMesageTopic:{}",JSON.toJSONString(info));
                     deviceService.sendDeviceMessage(deviceEntity, info, header, JSON.toJSONString(req),null, null);
                     Thread.sleep(50);
                 }

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

@@ -147,7 +147,7 @@ Content-Type: application/json
 Authorization: {{authToken}}
 
 {
-  "deviceCode": "18-93-7F-C0-AD-B5",
+  "deviceCode": "70-4A-0E-BC-EE-8A",
   "action": "upload"
 }