diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
index c19e54f6..0d61dcb9 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
@@ -29,16 +29,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--rabbitmq消息队列-->
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-starter-rabbitmq</artifactId>
-        </dependency>
         <!--xxl-job定时任务-->
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-starter-job</artifactId>
         </dependency>
+        <!--rabbitmq消息队列
+       <dependency>
+           <groupId>org.jeecgframework.boot</groupId>
+           <artifactId>jeecg-boot-starter-rabbitmq</artifactId>
+       </dependency>-->
     </dependencies>
 
     <build>
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/controller/JeecgTestFeignTest.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java
similarity index 87%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/controller/JeecgTestFeignTest.java
rename to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java
index 0dbbb6f1..cd3fc0e6 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/controller/JeecgTestFeignTest.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java
@@ -1,11 +1,11 @@
-package org.jeecg.modules.feigndemo.controller;
+package org.jeecg.modules.cloud.feign.controller;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.feigndemo.feign.JeecgTestClient;
-import org.jeecg.modules.feigndemo.feign.JeecgTestClient2;
+import org.jeecg.modules.cloud.feign.feign.JeecgTestClient;
+import org.jeecg.modules.cloud.feign.feign.JeecgTestClient2;
 import org.jeecg.starter.cloud.feign.impl.JeecgFeignService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/DemoFallback.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java
similarity index 86%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/DemoFallback.java
rename to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java
index ea947b66..a23c72ab 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/DemoFallback.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.feigndemo.feign;
+package org.jeecg.modules.cloud.feign.feign;
 
 import feign.hystrix.FallbackFactory;
 import org.springframework.stereotype.Component;
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java
similarity index 92%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient.java
rename to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java
index d3b9a489..3bfa4514 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.feigndemo.feign;
+package org.jeecg.modules.cloud.feign.feign;
 
 import org.jeecg.common.api.vo.Result;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient2.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java
similarity index 88%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient2.java
rename to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java
index d8f91f6a..46f1750f 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient2.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.feigndemo.feign;
+package org.jeecg.modules.cloud.feign.feign;
 
 import org.jeecg.common.api.vo.Result;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver1.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver1.java
new file mode 100644
index 00000000..f79647f2
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver1.java
@@ -0,0 +1,29 @@
+//package org.jeecg.modules.cloud.rabbitmq;
+//
+//import com.rabbitmq.client.Channel;
+//import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
+//import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
+//import org.jeecg.common.annotation.RabbitComponent;
+//import org.jeecg.common.base.BaseMap;
+//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.support.AmqpHeaders;
+//import org.springframework.messaging.handler.annotation.Header;
+//
+//@RabbitListener(queues = "jeecg_place_order")
+//@RabbitComponent(value = "helloReceiver1")
+//public class HelloReceiver1 extends BaseRabbiMqHandler<BaseMap> {
+//
+//    @RabbitHandler
+//    public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
+//        super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
+//            @Override
+//            public void handler(BaseMap map, Channel channel) {
+//                //业务处理
+//                String orderId = map.get("orderId").toString();
+//                System.out.println("Receiver1  : " + orderId);
+//            }
+//        });
+//    }
+//
+//}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver2.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver2.java
new file mode 100644
index 00000000..4bb0a027
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver2.java
@@ -0,0 +1,29 @@
+//package org.jeecg.modules.cloud.rabbitmq;
+//
+//import com.rabbitmq.client.Channel;
+//import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
+//import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
+//import org.jeecg.common.annotation.RabbitComponent;
+//import org.jeecg.common.base.BaseMap;
+//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.support.AmqpHeaders;
+//import org.springframework.messaging.handler.annotation.Header;
+//
+//@RabbitListener(queues = "jeecg_place_order")
+//@RabbitComponent(value = "helloReceiver2")
+//public class HelloReceiver2 extends BaseRabbiMqHandler<BaseMap> {
+//
+//    @RabbitHandler
+//    public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
+//        super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
+//            @Override
+//            public void handler(BaseMap map, Channel channel) {
+//                //业务处理
+//                String orderId = map.get("orderId").toString();
+//                System.out.println("Receiver2  : " + orderId);
+//            }
+//        });
+//    }
+//
+//}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloTimeReceiver.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloTimeReceiver.java
new file mode 100644
index 00000000..50411e49
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloTimeReceiver.java
@@ -0,0 +1,29 @@
+//package org.jeecg.modules.cloud.rabbitmq;
+//
+//import com.rabbitmq.client.Channel;
+//import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
+//import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
+//import org.jeecg.common.annotation.RabbitComponent;
+//import org.jeecg.common.base.BaseMap;
+//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.support.AmqpHeaders;
+//import org.springframework.messaging.handler.annotation.Header;
+//
+//@RabbitListener(queues = "jeecg_place_order_time")
+//@RabbitComponent(value = "helloTimeReceiver")
+//public class HelloTimeReceiver extends BaseRabbiMqHandler<BaseMap> {
+//
+//    @RabbitHandler
+//    public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
+//        super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
+//            @Override
+//            public void handler(BaseMap map, Channel channel) {
+//                //业务处理
+//                String orderId = map.get("orderId").toString();
+//                System.out.println("Receiver1  : " + orderId);
+//            }
+//        });
+//    }
+//
+//}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver1.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver1.java
deleted file mode 100644
index a14bc4c5..00000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver1.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.modules.cloud.test;
-
-import com.rabbitmq.client.Channel;
-import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
-import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
-import org.jeecg.common.annotation.RabbitComponent;
-import org.jeecg.common.base.BaseMap;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.support.AmqpHeaders;
-import org.springframework.messaging.handler.annotation.Header;
-
-@RabbitListener(queues = "jeecg_place_order")
-@RabbitComponent(value = "helloReceiver1")
-public class HelloReceiver1 extends BaseRabbiMqHandler<BaseMap> {
-
-    @RabbitHandler
-    public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
-        super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
-            @Override
-            public void handler(BaseMap map, Channel channel) {
-                //业务处理
-                String orderId = map.get("orderId").toString();
-                System.out.println("Receiver1  : " + orderId);
-            }
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver2.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver2.java
deleted file mode 100644
index 581d02f0..00000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.modules.cloud.test;
-
-import com.rabbitmq.client.Channel;
-import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
-import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
-import org.jeecg.common.annotation.RabbitComponent;
-import org.jeecg.common.base.BaseMap;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.support.AmqpHeaders;
-import org.springframework.messaging.handler.annotation.Header;
-
-@RabbitListener(queues = "jeecg_place_order")
-@RabbitComponent(value = "helloReceiver2")
-public class HelloReceiver2 extends BaseRabbiMqHandler<BaseMap> {
-
-    @RabbitHandler
-    public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
-        super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
-            @Override
-            public void handler(BaseMap map, Channel channel) {
-                //业务处理
-                String orderId = map.get("orderId").toString();
-                System.out.println("Receiver2  : " + orderId);
-            }
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloTimeReceiver.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloTimeReceiver.java
deleted file mode 100644
index a7c8b3c0..00000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloTimeReceiver.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.modules.cloud.test;
-
-import com.rabbitmq.client.Channel;
-import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
-import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
-import org.jeecg.common.annotation.RabbitComponent;
-import org.jeecg.common.base.BaseMap;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.support.AmqpHeaders;
-import org.springframework.messaging.handler.annotation.Header;
-
-@RabbitListener(queues = "jeecg_place_order_time")
-@RabbitComponent(value = "helloTimeReceiver")
-public class HelloTimeReceiver extends BaseRabbiMqHandler<BaseMap> {
-
-    @RabbitHandler
-    public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
-        super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
-            @Override
-            public void handler(BaseMap map, Channel channel) {
-                //业务处理
-                String orderId = map.get("orderId").toString();
-                System.out.println("Receiver1  : " + orderId);
-            }
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java
similarity index 97%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java
rename to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java
index 58171925..ef06a9d9 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java
@@ -1,5 +1,5 @@
 
-package org.jeecg.modules.cloud.test;;
+package org.jeecg.modules.cloud.xxljob;;
 
 
 import com.xxl.job.core.biz.model.ReturnT;