更改配置

README.md

@@ -0,0 +1 @@
+#报警引擎的多租户队列更改

src/main/java/com/persagy/mq/RabbitConfig.java

@@ -6,6 +6,7 @@ import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.core.TopicExchange;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 
 /**
  * RabbitConfig
@@ -20,8 +21,8 @@ public class RabbitConfig {
 	 */
 	public static final String exchange = "exchange-msg-service";
 	public static final String exchangeAlarm = "exchange-alarm-service";
-	public static final String alarmMsgRouting = "alarm-data-routing-key";
 	public static final String alarmMsgRoutingKey = "alarm-msg-routing-key";
+	private static final String alarmMsgRouting = "-alarm-data-routing-key";
 	private final String alarmDataQueue = "alarm-data-queue";
 
 	@Bean
@@ -35,7 +36,8 @@ public class RabbitConfig {
 	}
 
 	@Bean
-	public Binding alarmObjBinding() {
-		return BindingBuilder.bind(alarmDataQueue()).to(exchange()).with(alarmMsgRouting);
+	public Binding alarmObjBinding(Environment environment) {
+		return BindingBuilder.bind(alarmDataQueue()).to(exchange())
+				.with(environment.getProperty("group.code") + alarmMsgRouting);
 	}
 }

src/main/resources/application.yml

@@ -2,32 +2,32 @@
 group:
   code: WD
 # rabbitmq连接信息
-alarmengine.rabbitmq.host: 192.168.100.93
-alarmengine.rabbitmq.port: 9936
+alarmengine.rabbitmq.host: 192.168.100.102
+alarmengine.rabbitmq.port: 30199
 alarmengine.rabbitmq.username: pbsage
 alarmengine.rabbitmq.password: pbsage123
 alarmengine.rabbitmq.virtual-host: /test
 # redis连接信息
-alarmengine.redis.host: 192.168.100.93
-alarmengine.redis.port: 9944
+alarmengine.redis.host: 192.168.100.102
+alarmengine.redis.port: 31003
 alarmengine.redis.database: 14
-alarmengine.redis.password.sentinel: test123
-alarmengine.redis.password.standalone: test123
-alarmengine.redis.sentinel.nodes: 39.102.43.179:9940
+alarmengine.redis.password.sentinel: nbmo8c7OaFubRzH
+alarmengine.redis.password.standalone: nbmo8c7OaFubRzH
+alarmengine.redis.sentinel.nodes: 192.168.100.102:31003
 # 数据库连接信息
-datasource.url: jdbc:mysql://192.168.100.94:9934/alarm-quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+datasource.url: jdbc:mysql://192.168.100.102:30101/alarm-quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
 datasource.username: root
-datasource.password: persagy@2020
+datasource.password: Xyi8M9xOsuVs5HX
 server:
   port: 8101
 # -------------------------只需要修改分隔线以上的内容-----------------------------------------------
 spring:
   # 应用名称
   application:
-    name: alarm-engine
+    name: ${group.code}-alarm-engine
   datasource:
     url: ${datasource.url}
-    driver-class-name: com.mysql.jdbc.Driver  # mysql8.0以前使用com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver  # mysql8.0以前使用com.mysql.jdbc.Driver
     username: ${datasource.username}
     password: ${datasource.password}
     type: com.alibaba.druid.pool.DruidDataSource
@@ -80,7 +80,7 @@ spring:
     connection-timeout: 2000ms
     listener:
       simple:
-        acknowledge-mode: manualz
+        acknowledge-mode: manual
         concurrency: 5
         max-concurrency: 10
         default-requeue-rejected: false