From 3ee0cef93b5ee72c7dc820a60f69fcfe60a5f682 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sat, 28 Nov 2020 11:06:59 +0800
Subject: [PATCH] cloud 代码示例结构调整

---
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml                                                                        | 10 +++++-----
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java | 39 +++++++++++++++++++++++++++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java            | 16 ++++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java         | 18 ++++++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java        | 14 ++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver1.java             | 29 +++++++++++++++++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver2.java             | 29 +++++++++++++++++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloTimeReceiver.java          | 29 +++++++++++++++++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java                | 57 ---------------------------------------------------------
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver1.java                 | 29 -----------------------------
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver2.java                 | 29 -----------------------------
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloTimeReceiver.java              | 29 -----------------------------
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java              | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/controller/JeecgTestFeignTest.java   | 39 ---------------------------------------
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/DemoFallback.java              | 16 ----------------
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient.java           | 18 ------------------
 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient2.java          | 14 --------------
 17 files changed, 236 insertions(+), 236 deletions(-)
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver1.java
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver2.java
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloTimeReceiver.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver1.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver2.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloTimeReceiver.java
 create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/controller/JeecgTestFeignTest.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/DemoFallback.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient.java
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient2.java

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 c19e54f..0d61dcb 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/cloud/feign/controller/JeecgTestFeignTest.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java
new file mode 100644
index 0000000..cd3fc0e
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java
@@ -0,0 +1,39 @@
+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.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;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/sys/test")
+@Api(tags = "feign测试")
+public class JeecgTestFeignTest {
+
+    @Autowired
+    private JeecgFeignService jeecgFeignService;
+
+    @Autowired
+    private JeecgTestClient jeecgTestClient;
+
+
+    @GetMapping("getMessage")
+    @ApiOperation(value = "测试feign", notes = "测试feign")
+    public Result<String> getMessage() {
+        return jeecgTestClient.getMessage("jeecg-boot");
+    }
+
+    @GetMapping("getMessage2")
+    @ApiOperation(value = "测试动态feign", notes = "测试动态feign")
+    public Result<String> getMessage2() {
+        JeecgTestClient2 jeecgTestClient = jeecgFeignService.newInstance(JeecgTestClient2.class, "jeecg-demo");
+        return jeecgTestClient.getMessage("jeecg-boot2");
+    }
+}
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java
new file mode 100644
index 0000000..a23c72a
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.cloud.feign.feign;
+
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author qinfeng
+ */
+@Component
+public class DemoFallback implements FallbackFactory<JeecgTestClient> {
+
+    @Override
+    public JeecgTestClient create(Throwable throwable) {
+        return null;
+    }
+}
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java
new file mode 100644
index 0000000..3bfa451
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.cloud.feign.feign;
+
+import org.jeecg.common.api.vo.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 常规feign接口定义
+ */
+@FeignClient(value = "jeecg-demo", fallbackFactory = DemoFallback.class)
+@Component
+public interface JeecgTestClient {
+
+    @GetMapping(value = "/test/getMessage")
+    Result<String> getMessage(@RequestParam("name") String name);
+}
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java
new file mode 100644
index 0000000..46f1750
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.cloud.feign.feign;
+
+import org.jeecg.common.api.vo.Result;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 动态feign接口定义
+ */
+public interface JeecgTestClient2 {
+
+    @GetMapping(value = "/test/getMessage")
+    Result<String> getMessage(@RequestParam("name") String name);
+}
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 0000000..f79647f
--- /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 0000000..4bb0a02
--- /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 0000000..50411e4
--- /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/Demo2JobHandler.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java
deleted file mode 100644
index 5817192..0000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package org.jeecg.modules.cloud.test;;
-
-
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import com.xxl.job.core.log.XxlJobLogger;
-import com.xxl.job.core.util.ShardingUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-
-/**
- * xxl-job定时任务测试
- */
-@Component
-@Slf4j
-public class Demo2JobHandler {
-
-
-    /**
-     * 简单任务
-     *
-     * @param params
-     * @return
-     */
-
-    @XxlJob(value = "demoJob2")
-    public ReturnT<String> demoJobHandler(String params) {
-        log.info("我是定时任务,我执行了...............................");
-        return ReturnT.SUCCESS;
-    }
-
-    /**
-     * 2、分片广播任务
-     */
-
-    @XxlJob("shardingJobHandler3")
-    public ReturnT<String> shardingJobHandler(String param) throws Exception {
-
-        // 分片参数
-        ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
-        XxlJobLogger.log("分片参数：当前分片序号 = {}, 总分片数 = {}", shardingVO.getIndex(), shardingVO.getTotal());
-
-        // 业务逻辑
-        for (int i = 0; i < shardingVO.getTotal(); i++) {
-            if (i == shardingVO.getIndex()) {
-                XxlJobLogger.log("第 {} 片, 命中分片开始处理", i);
-            } else {
-                XxlJobLogger.log("第 {} 片, 忽略", i);
-            }
-        }
-
-        return ReturnT.SUCCESS;
-    }
-}
-
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 a14bc4c..0000000
--- 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 581d02f..0000000
--- 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 a7c8b3c..0000000
--- 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/xxljob/Demo2JobHandler.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java
new file mode 100644
index 0000000..ef06a9d
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java
@@ -0,0 +1,57 @@
+
+package org.jeecg.modules.cloud.xxljob;;
+
+
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import com.xxl.job.core.log.XxlJobLogger;
+import com.xxl.job.core.util.ShardingUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * xxl-job定时任务测试
+ */
+@Component
+@Slf4j
+public class Demo2JobHandler {
+
+
+    /**
+     * 简单任务
+     *
+     * @param params
+     * @return
+     */
+
+    @XxlJob(value = "demoJob2")
+    public ReturnT<String> demoJobHandler(String params) {
+        log.info("我是定时任务,我执行了...............................");
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 2、分片广播任务
+     */
+
+    @XxlJob("shardingJobHandler3")
+    public ReturnT<String> shardingJobHandler(String param) throws Exception {
+
+        // 分片参数
+        ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo();
+        XxlJobLogger.log("分片参数：当前分片序号 = {}, 总分片数 = {}", shardingVO.getIndex(), shardingVO.getTotal());
+
+        // 业务逻辑
+        for (int i = 0; i < shardingVO.getTotal(); i++) {
+            if (i == shardingVO.getIndex()) {
+                XxlJobLogger.log("第 {} 片, 命中分片开始处理", i);
+            } else {
+                XxlJobLogger.log("第 {} 片, 忽略", i);
+            }
+        }
+
+        return ReturnT.SUCCESS;
+    }
+}
+
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/feigndemo/controller/JeecgTestFeignTest.java
deleted file mode 100644
index 0dbbb6f..0000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/controller/JeecgTestFeignTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.modules.feigndemo.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.starter.cloud.feign.impl.JeecgFeignService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/sys/test")
-@Api(tags = "feign测试")
-public class JeecgTestFeignTest {
-
-    @Autowired
-    private JeecgFeignService jeecgFeignService;
-
-    @Autowired
-    private JeecgTestClient jeecgTestClient;
-
-
-    @GetMapping("getMessage")
-    @ApiOperation(value = "测试feign", notes = "测试feign")
-    public Result<String> getMessage() {
-        return jeecgTestClient.getMessage("jeecg-boot");
-    }
-
-    @GetMapping("getMessage2")
-    @ApiOperation(value = "测试动态feign", notes = "测试动态feign")
-    public Result<String> getMessage2() {
-        JeecgTestClient2 jeecgTestClient = jeecgFeignService.newInstance(JeecgTestClient2.class, "jeecg-demo");
-        return jeecgTestClient.getMessage("jeecg-boot2");
-    }
-}
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/feigndemo/feign/DemoFallback.java
deleted file mode 100644
index ea947b6..0000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/DemoFallback.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jeecg.modules.feigndemo.feign;
-
-import feign.hystrix.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * @author qinfeng
- */
-@Component
-public class DemoFallback implements FallbackFactory<JeecgTestClient> {
-
-    @Override
-    public JeecgTestClient create(Throwable throwable) {
-        return null;
-    }
-}
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/feigndemo/feign/JeecgTestClient.java
deleted file mode 100644
index d3b9a48..0000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jeecg.modules.feigndemo.feign;
-
-import org.jeecg.common.api.vo.Result;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * 常规feign接口定义
- */
-@FeignClient(value = "jeecg-demo", fallbackFactory = DemoFallback.class)
-@Component
-public interface JeecgTestClient {
-
-    @GetMapping(value = "/test/getMessage")
-    Result<String> getMessage(@RequestParam("name") String name);
-}
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/feigndemo/feign/JeecgTestClient2.java
deleted file mode 100644
index d8f91f6..0000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient2.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.feigndemo.feign;
-
-import org.jeecg.common.api.vo.Result;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * 动态feign接口定义
- */
-public interface JeecgTestClient2 {
-
-    @GetMapping(value = "/test/getMessage")
-    Result<String> getMessage(@RequestParam("name") String name);
-}
--
libgit2 0.22.2