Merge branch 'dev' into local-master

# Conflicts:
#	nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManager.java

nb-admin/src/main/resources/application-dev.yml

@@ -100,6 +100,11 @@ spring:
         max-active: 16
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+  rabbitmq:
+    username: guest
+    host: 192.168.100.32
+    port: 5672
+    password: guest
 request:
   check:
     enable: false

nb-service/iot-service/src/main/java/com/nb/aliyun/service/distribute/MasterDistributeQueueConfig.java

@@ -0,0 +1,22 @@
+package com.nb.aliyun.service.distribute;
+
+import com.nb.aliyun.service.AliIotConstant;
+import lombok.AllArgsConstructor;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName : RabbitMqChannelConfig
+ * @Description :
+ * @Author : LF
+ * @Date: 2023年07月31日
+ */
+@Component
+@AllArgsConstructor
+public class MasterDistributeQueueConfig {
+    @Bean
+    DirectExchange distributeExchange() {
+        return new DirectExchange(AliIotConstant.Exchange,true,false);
+    }
+}

nb-service/iot-service/src/main/java/com/nb/aliyun/service/mq/RabbitMqChannelConfig.java

@@ -1,25 +0,0 @@
-package com.nb.aliyun.service.mq;
-
-import lombok.AllArgsConstructor;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @ClassName : RabbitMqChannelConfig
- * @Description :
- * @Author : LF
- * @Date: 2023年07月31日
- */
-@Component
-@ConditionalOnBean(RabbitTemplate.class)
-@AllArgsConstructor
-public class RabbitMqChannelConfig {
-    private final RabbitTemplate rabbitTemplate;
-    @PostConstruct
-    public void init(){
-
-    }
-}