1.优化mq配置，添加默认数据源和默认队列

xianghan
Commit 1a39d208 ... 1a39d2088c557b8a799be958bad87ae0262c8356 authored 2022-06-09 13:15:20 +0800 by xianghan
Showing 2 changed files with 90 additions and 38 deletions
src/main/java/com/topdraw/config/RabbitMqSourceConfig.java
src/main/resources/config/application-dev.yml
--- a/src/main/java/com/topdraw/config/RabbitMqSourceConfig.java
View file @1a39d20
+++ b/src/main/java/com/topdraw/config/RabbitMqSourceConfig.java
View file @1a39d20
@@ -18,6 +18,7 @@ import org.springframework.context.annotation.Primary;
 import javax.naming.ConfigurationException;
 import java.util.Map;
+import java.util.Objects;
 @Data
 @Configuration
@@ -166,34 +167,40 @@ public class RabbitMqSourceConfig {
    private Map<String, String> ucgEventInfo;
    public String getUcgEventQueue(){
+        if (Objects.nonNull(ucgEventInfo)) {
            if (MapUtils.isNotEmpty(ucgEventInfo)) {
                String queue = ucgEventInfo.get("queue");
                return queue;
            }
+        }
        return EVENT_QUEUE;
    }
    public String getUcgEventSource(){
+        if (Objects.nonNull(ucgEventInfo)) {
            if (MapUtils.isNotEmpty(ucgEventInfo)) {
                String source = ucgEventInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return this.chargeSource(source);
                } else {
-                return "";
+                    return SERVICE_;
+                }
            }
        }
-        return null;
+        return SERVICE_;
    }
    public String getUcgEventStartUp(){
+        if (Objects.nonNull(ucgEventInfo)) {
            if (MapUtils.isNotEmpty(ucgEventInfo)) {
                String source = ucgEventInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return "true";
                }
            }
+        }
        return "false";
    }
@@ -209,34 +216,40 @@ public class RabbitMqSourceConfig {
    private Map<String, String> ucgIptvCollectionInfo;
    public String getUcgCollectionQueue(){
+        if (Objects.nonNull(ucgIptvCollectionInfo)) {
            if (MapUtils.isNotEmpty(ucgIptvCollectionInfo)) {
                String queue = ucgIptvCollectionInfo.get("queue");
                return queue;
            }
+        }
        return COLLECTION_QUEUE;
    }
    public String getUcgCollectionSource(){
+        if (Objects.nonNull(ucgIptvCollectionInfo)) {
            if (MapUtils.isNotEmpty(ucgIptvCollectionInfo)) {
                String source = ucgIptvCollectionInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return this.chargeSource(source);
                } else {
-                return "";
+                    return SERVICE_;
+                }
            }
        }
-        return null;
+        return SERVICE_;
    }
    public String getUcgCollectionStartUp(){
+        if (Objects.nonNull(ucgIptvCollectionInfo)) {
            if (MapUtils.isNotEmpty(ucgIptvCollectionInfo)) {
                String source = ucgIptvCollectionInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return "true";
                }
            }
+        }
        return "false";
    }
@@ -248,34 +261,40 @@ public class RabbitMqSourceConfig {
    private Map<String, String> viewRecordInfo;
    public String getViewRecordQueue(){
+        if (Objects.nonNull(viewRecordInfo)) {
            if (MapUtils.isNotEmpty(viewRecordInfo)) {
                String queue = viewRecordInfo.get("queue");
                return queue;
            }
+        }
        return VIEW_RECORD_QUEUE;
    }
    public String getViewRecordSource(){
+        if (Objects.nonNull(viewRecordInfo)) {
            if (MapUtils.isNotEmpty(viewRecordInfo)) {
                String source = viewRecordInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return this.chargeSource(source);
                } else {
-                return "";
+                    return SERVICE_;
+                }
            }
        }
-        return null;
+        return SERVICE_;
    }
    public String getViewRecordStartUp(){
+        if (Objects.nonNull(viewRecordInfo)) {
            if (MapUtils.isNotEmpty(viewRecordInfo)) {
                String source = viewRecordInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return "true";
                }
            }
+        }
        return "false";
    }
@@ -289,34 +308,40 @@ public class RabbitMqSourceConfig {
    private Map<String, String> uceInfo;
    public String getUceQueue(){
+        if (Objects.nonNull(uceInfo)) {
            if (MapUtils.isNotEmpty(uceInfo)) {
                String queue = uceInfo.get("queue");
                return queue;
            }
+        }
        return UCE_QUEUE;
    }
    public String getUceSource(){
+        if (Objects.nonNull(uceInfo)) {
            if (MapUtils.isNotEmpty(uceInfo)) {
                String source = uceInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return this.chargeSource(source);
                } else {
-                return "";
+                    return MANAGEMENT_;
+                }
            }
        }
-        return null;
+        return MANAGEMENT_;
    }
    public String getUceStartUp(){
+        if (Objects.nonNull(uceInfo)) {
            if (MapUtils.isNotEmpty(uceInfo)) {
                String source = uceInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return "true";
                }
            }
+        }
        return "false";
    }
@@ -330,35 +355,39 @@ public class RabbitMqSourceConfig {
    private Map<String, String> eventBusInfo;
    public String getEventBusQueue(){
+        if (Objects.nonNull(eventBusInfo)) {
            if (MapUtils.isNotEmpty(eventBusInfo)) {
                String queue = eventBusInfo.get("queue");
                return queue;
            }
+        }
        return UC_EVENTBUS_QUEUE;
    }
    public String getEventBusSource(){
+        if (Objects.nonNull(eventBusInfo)) {
            if (MapUtils.isNotEmpty(eventBusInfo)) {
                String source = eventBusInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return this.chargeSource(source);
                } else {
-                return "";
+                    return SERVICE_;
+                }
            }
        }
-        return null;
+        return SERVICE_;
    }
    public String getEventBusStartUp(){
+        if (Objects.nonNull(eventBusInfo)) {
            if (MapUtils.isNotEmpty(eventBusInfo)) {
                String source = eventBusInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return "true";
                }
            }
+        }
        return "false";
    }
@@ -371,34 +400,39 @@ public class RabbitMqSourceConfig {
    private Map<String, String> wechatInfo;
    public String getWechatQueue(){
+        if (Objects.nonNull(wechatInfo)) {
            if (MapUtils.isNotEmpty(wechatInfo)) {
                String queue = wechatInfo.get("queue");
                return queue;
            }
+        }
        return WEIXIN_SUBORUNSUB_QUEUE;
    }
    public String getWechatSource(){
+        if (Objects.nonNull(wechatInfo)) {
            if (MapUtils.isNotEmpty(wechatInfo)) {
                String source = wechatInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return this.chargeSource(source);
                } else {
-                return "";
+                    return SERVICE_;
+                }
            }
        }
-        return null;
+        return SERVICE_;
    }
    public String getWechatStartUp(){
+        if (Objects.nonNull(wechatInfo)) {
            if (MapUtils.isNotEmpty(wechatInfo)) {
                String source = wechatInfo.get("active");
                if (StringUtils.isNotBlank(source)) {
                    return "true";
                }
            }
+        }
        return "false";
    }
--- a/src/main/resources/config/application-dev.yml
View file @1a39d20
+++ b/src/main/resources/config/application-dev.yml
View file @1a39d20
@@ -79,7 +79,7 @@ mutil-mq:
 #    password: Topdraw1qaz
    # 虚拟空间
 #    virtual-host: member_center_iptv_sichuan
-    virtual-host: member_center_iptv_chongshu
+    virtual-host: user_center
    publisher-confirms: true #如果对异步消息需要回调必须设置为true
  # 管理侧
@@ -99,42 +99,60 @@ mutil-mq:
 service:
  mq:
    list:
-      - source: event
+#      - source: event
-        exchange: event.exchange
+#        exchange: event.exchange
-        queue: event.queue
+#        queue: event.queue
+#        exchange-type: direct
+#        routing-key:
+#        active: service
+      - source: collection
+        exchange: userCenter_exchange
+        queue: queue.collection.add
        exchange-type: direct
-        routing-key:
+        routing-key: route.UserCollection.add
        active: service
      - source: collection
-        exchange: collection.exchange
+        exchange: userCenter_exchange
-        queue: collection.queue
+        queue: queue.collection.delete
        exchange-type: direct
-        routing-key: service
+        routing-key: route.UserCollection.delete
        active: service
-      - source: viewRecord
+      - source: collection
-        exchange: viewRecord.exchange
+        exchange: userCenter_exchange
-        queue: viewRecord.queue
+        queue: queue.collection.deleteall
        exchange-type: direct
-        routing-key:
+        routing-key: route.UserCollection.deleteall
        active: service
-      - source: eventBus
+      - source: collection
-        exchange: uc.eventbus
+        exchange: exchange.collection
-        queue: uc.eventbus
+        queue: collection.queue
-        exchange-type: topic
+        exchange-type: direct
-        routing-key: uc.eventbus.*.topic
+        routing-key:
        active: service
+#      - source: viewRecord
+#        exchange: viewRecord.exchange
+#        queue: viewRecord.queue
+#        exchange-type: direct
+#        routing-key:
+#        active: service
+#      - source: eventBus
+#        exchange: uc.eventbus
+#        queue: uc.eventbus
+#        exchange-type: topic
+#        routing-key: uc.eventbus.*.topic
+#        active: service
      - source: uce
        exchange: uce.exchange
        queue: uce.queue
        exchange-type: direct
        routing-key:
        active: management
-      - source: wechat
+#      - source: wechat
-        exchange: weixin.subOrUnSub.direct
+#        exchange: weixin.subOrUnSub.direct
-        queue: weixin.subOrUnSub.queue
+#        queue: weixin.subOrUnSub.queue
-        exchange-type: direct
+#        exchange-type: direct
-        routing-key:
+#        routing-key:
-        active:
+#        active: active
    error:
      logs:
        list: