diff --git a/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/java/cn/iocoder/springcloud/labx18/listenerdemo/ListenerDemoApplication.java b/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/java/cn/iocoder/springcloud/labx18/listenerdemo/ListenerDemoApplication.java
index 7307592a..c50fa864 100644
--- a/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/java/cn/iocoder/springcloud/labx18/listenerdemo/ListenerDemoApplication.java
+++ b/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/java/cn/iocoder/springcloud/labx18/listenerdemo/ListenerDemoApplication.java
@@ -1,12 +1,11 @@
 package cn.iocoder.springcloud.labx18.listenerdemo;
 
-import cn.iocoder.springcloud.labx18.listenerdemo.event.UserRegisterEvent;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.bus.jackson.RemoteApplicationEventScan;
 
 @SpringBootApplication
-@RemoteApplicationEventScan(basePackageClasses = UserRegisterEvent.class)
+@RemoteApplicationEventScan
 public class ListenerDemoApplication {
 
     public static void main(String[] args) {
diff --git a/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/resources/application.yml b/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/resources/application.yml
index 7a3f45c3..8f9f3084 100644
--- a/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/resources/application.yml
+++ b/labx-18/labx-18-sc-bus-rabbitmq-demo-listener/src/main/resources/application.yml
@@ -10,4 +10,4 @@ spring:
     password: guest
 
 server:
-  port: -1
+  port: ${random.int[10000,19999]} # 随机端口，方便启动多个消费者
diff --git a/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/PublisherDemoApplication.java b/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/PublisherDemoApplication.java
index b821fe54..91e100cb 100644
--- a/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/PublisherDemoApplication.java
+++ b/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/PublisherDemoApplication.java
@@ -1,12 +1,10 @@
 package cn.iocoder.springcloud.labx18.publisherdemo;
 
-import cn.iocoder.springcloud.labx18.publisherdemo.event.UserRegisterEvent;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.bus.jackson.RemoteApplicationEventScan;
 
 @SpringBootApplication
-@RemoteApplicationEventScan(basePackageClasses = UserRegisterEvent.class)
+//@RemoteApplicationEventScan
 public class PublisherDemoApplication {
 
     public static void main(String[] args) {
diff --git a/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/controller/DemoController.java b/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/controller/DemoController.java
index 1cc633cf..72e4aa29 100644
--- a/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/controller/DemoController.java
+++ b/labx-18/labx-18-sc-bus-rabbitmq-demo-publisher/src/main/java/cn/iocoder/springcloud/labx18/publisherdemo/controller/DemoController.java
@@ -3,7 +3,8 @@ package cn.iocoder.springcloud.labx18.publisherdemo.controller;
 import cn.iocoder.springcloud.labx18.publisherdemo.event.UserRegisterEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.bus.ServiceMatcher;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,8 +19,8 @@ public class DemoController implements ApplicationEventPublisherAware {
 
     private ApplicationEventPublisher applicationEventPublisher;
 
-    @Value("${spring.application.name}")
-    private String applicationName;
+    @Autowired
+    private ServiceMatcher busServiceMatcher;
 
     @Override
     public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
@@ -32,7 +33,7 @@ public class DemoController implements ApplicationEventPublisherAware {
         logger.info("[register][执行用户({}) 的注册逻辑]", username);
 
         // ... 发布
-        applicationEventPublisher.publishEvent(new UserRegisterEvent(this, applicationName,
+        applicationEventPublisher.publishEvent(new UserRegisterEvent(this, busServiceMatcher.getServiceId(),
                 "**", username));
         return "success";
     }