Merge remote-tracking branch 'origin/master'

# Conflicts:
#	car-business-server/src/main/java/com/god/base/server/consumer/RabbitConsumer.java

car-business-server/src/main/resources/bootstrap.yml

@@ -22,22 +22,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-  rabbitmq:
-    port: 5672
-    host: 10.100.1.5
-    username: guest
-    password: guest
-    #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
-    publisher-confirm-type: correlated
-    #保证交换机能把消息推送到队列中
-    publisher-returns: true
-    virtual-host: /
-    #这个配置是保证消费者会消费消息，手动确认
-    listener:
-      simple:
-        acknowledge-mode: manual
-    template:
-      mandatory: true
 logging:
   level:
     com.god.system.mapper: DEBUG