Commit 3ee0cef93b5ee72c7dc820a60f69fcfe60a5f682

Authored by zhangdaiscott
1 parent 4686398c

cloud 代码示例结构调整

Showing 12 changed files with 99 additions and 99 deletions
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
@@ -29,16 +29,16 @@ @@ -29,16 +29,16 @@
29 </exclusion> 29 </exclusion>
30 </exclusions> 30 </exclusions>
31 </dependency> 31 </dependency>
32 - <!--rabbitmq消息队列-->  
33 - <dependency>  
34 - <groupId>org.jeecgframework.boot</groupId>  
35 - <artifactId>jeecg-boot-starter-rabbitmq</artifactId>  
36 - </dependency>  
37 <!--xxl-job定时任务--> 32 <!--xxl-job定时任务-->
38 <dependency> 33 <dependency>
39 <groupId>org.jeecgframework.boot</groupId> 34 <groupId>org.jeecgframework.boot</groupId>
40 <artifactId>jeecg-boot-starter-job</artifactId> 35 <artifactId>jeecg-boot-starter-job</artifactId>
41 </dependency> 36 </dependency>
  37 + <!--rabbitmq消息队列
  38 + <dependency>
  39 + <groupId>org.jeecgframework.boot</groupId>
  40 + <artifactId>jeecg-boot-starter-rabbitmq</artifactId>
  41 + </dependency>-->
42 </dependencies> 42 </dependencies>
43 43
44 <build> 44 <build>
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/controller/JeecgTestFeignTest.java renamed to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/controller/JeecgTestFeignTest.java
1 -package org.jeecg.modules.feigndemo.controller; 1 +package org.jeecg.modules.cloud.feign.controller;
2 2
3 3
4 import io.swagger.annotations.Api; 4 import io.swagger.annotations.Api;
5 import io.swagger.annotations.ApiOperation; 5 import io.swagger.annotations.ApiOperation;
6 import org.jeecg.common.api.vo.Result; 6 import org.jeecg.common.api.vo.Result;
7 -import org.jeecg.modules.feigndemo.feign.JeecgTestClient;  
8 -import org.jeecg.modules.feigndemo.feign.JeecgTestClient2; 7 +import org.jeecg.modules.cloud.feign.feign.JeecgTestClient;
  8 +import org.jeecg.modules.cloud.feign.feign.JeecgTestClient2;
9 import org.jeecg.starter.cloud.feign.impl.JeecgFeignService; 9 import org.jeecg.starter.cloud.feign.impl.JeecgFeignService;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.web.bind.annotation.GetMapping; 11 import org.springframework.web.bind.annotation.GetMapping;
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/DemoFallback.java renamed to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/DemoFallback.java
1 -package org.jeecg.modules.feigndemo.feign; 1 +package org.jeecg.modules.cloud.feign.feign;
2 2
3 import feign.hystrix.FallbackFactory; 3 import feign.hystrix.FallbackFactory;
4 import org.springframework.stereotype.Component; 4 import org.springframework.stereotype.Component;
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient.java renamed to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient.java
1 -package org.jeecg.modules.feigndemo.feign; 1 +package org.jeecg.modules.cloud.feign.feign;
2 2
3 import org.jeecg.common.api.vo.Result; 3 import org.jeecg.common.api.vo.Result;
4 import org.springframework.cloud.openfeign.FeignClient; 4 import org.springframework.cloud.openfeign.FeignClient;
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/feigndemo/feign/JeecgTestClient2.java renamed to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/feign/feign/JeecgTestClient2.java
1 -package org.jeecg.modules.feigndemo.feign; 1 +package org.jeecg.modules.cloud.feign.feign;
2 2
3 import org.jeecg.common.api.vo.Result; 3 import org.jeecg.common.api.vo.Result;
4 import org.springframework.web.bind.annotation.GetMapping; 4 import org.springframework.web.bind.annotation.GetMapping;
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver1.java 0 → 100644
  1 +//package org.jeecg.modules.cloud.rabbitmq;
  2 +//
  3 +//import com.rabbitmq.client.Channel;
  4 +//import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
  5 +//import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
  6 +//import org.jeecg.common.annotation.RabbitComponent;
  7 +//import org.jeecg.common.base.BaseMap;
  8 +//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
  9 +//import org.springframework.amqp.rabbit.annotation.RabbitListener;
  10 +//import org.springframework.amqp.support.AmqpHeaders;
  11 +//import org.springframework.messaging.handler.annotation.Header;
  12 +//
  13 +//@RabbitListener(queues = "jeecg_place_order")
  14 +//@RabbitComponent(value = "helloReceiver1")
  15 +//public class HelloReceiver1 extends BaseRabbiMqHandler<BaseMap> {
  16 +//
  17 +// @RabbitHandler
  18 +// public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
  19 +// super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
  20 +// @Override
  21 +// public void handler(BaseMap map, Channel channel) {
  22 +// //业务处理
  23 +// String orderId = map.get("orderId").toString();
  24 +// System.out.println("Receiver1 : " + orderId);
  25 +// }
  26 +// });
  27 +// }
  28 +//
  29 +//}
0 \ No newline at end of file 30 \ No newline at end of file
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloReceiver2.java 0 → 100644
  1 +//package org.jeecg.modules.cloud.rabbitmq;
  2 +//
  3 +//import com.rabbitmq.client.Channel;
  4 +//import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
  5 +//import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
  6 +//import org.jeecg.common.annotation.RabbitComponent;
  7 +//import org.jeecg.common.base.BaseMap;
  8 +//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
  9 +//import org.springframework.amqp.rabbit.annotation.RabbitListener;
  10 +//import org.springframework.amqp.support.AmqpHeaders;
  11 +//import org.springframework.messaging.handler.annotation.Header;
  12 +//
  13 +//@RabbitListener(queues = "jeecg_place_order")
  14 +//@RabbitComponent(value = "helloReceiver2")
  15 +//public class HelloReceiver2 extends BaseRabbiMqHandler<BaseMap> {
  16 +//
  17 +// @RabbitHandler
  18 +// public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
  19 +// super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
  20 +// @Override
  21 +// public void handler(BaseMap map, Channel channel) {
  22 +// //业务处理
  23 +// String orderId = map.get("orderId").toString();
  24 +// System.out.println("Receiver2 : " + orderId);
  25 +// }
  26 +// });
  27 +// }
  28 +//
  29 +//}
0 \ No newline at end of file 30 \ No newline at end of file
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/rabbitmq/HelloTimeReceiver.java 0 → 100644
  1 +//package org.jeecg.modules.cloud.rabbitmq;
  2 +//
  3 +//import com.rabbitmq.client.Channel;
  4 +//import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
  5 +//import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
  6 +//import org.jeecg.common.annotation.RabbitComponent;
  7 +//import org.jeecg.common.base.BaseMap;
  8 +//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
  9 +//import org.springframework.amqp.rabbit.annotation.RabbitListener;
  10 +//import org.springframework.amqp.support.AmqpHeaders;
  11 +//import org.springframework.messaging.handler.annotation.Header;
  12 +//
  13 +//@RabbitListener(queues = "jeecg_place_order_time")
  14 +//@RabbitComponent(value = "helloTimeReceiver")
  15 +//public class HelloTimeReceiver extends BaseRabbiMqHandler<BaseMap> {
  16 +//
  17 +// @RabbitHandler
  18 +// public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
  19 +// super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {
  20 +// @Override
  21 +// public void handler(BaseMap map, Channel channel) {
  22 +// //业务处理
  23 +// String orderId = map.get("orderId").toString();
  24 +// System.out.println("Receiver1 : " + orderId);
  25 +// }
  26 +// });
  27 +// }
  28 +//
  29 +//}
0 \ No newline at end of file 30 \ No newline at end of file
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver1.java deleted
1 -package org.jeecg.modules.cloud.test;  
2 -  
3 -import com.rabbitmq.client.Channel;  
4 -import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;  
5 -import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;  
6 -import org.jeecg.common.annotation.RabbitComponent;  
7 -import org.jeecg.common.base.BaseMap;  
8 -import org.springframework.amqp.rabbit.annotation.RabbitHandler;  
9 -import org.springframework.amqp.rabbit.annotation.RabbitListener;  
10 -import org.springframework.amqp.support.AmqpHeaders;  
11 -import org.springframework.messaging.handler.annotation.Header;  
12 -  
13 -@RabbitListener(queues = "jeecg_place_order")  
14 -@RabbitComponent(value = "helloReceiver1")  
15 -public class HelloReceiver1 extends BaseRabbiMqHandler<BaseMap> {  
16 -  
17 - @RabbitHandler  
18 - public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {  
19 - super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {  
20 - @Override  
21 - public void handler(BaseMap map, Channel channel) {  
22 - //业务处理  
23 - String orderId = map.get("orderId").toString();  
24 - System.out.println("Receiver1 : " + orderId);  
25 - }  
26 - });  
27 - }  
28 -  
29 -}  
30 \ No newline at end of file 0 \ No newline at end of file
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloReceiver2.java deleted
1 -package org.jeecg.modules.cloud.test;  
2 -  
3 -import com.rabbitmq.client.Channel;  
4 -import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;  
5 -import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;  
6 -import org.jeecg.common.annotation.RabbitComponent;  
7 -import org.jeecg.common.base.BaseMap;  
8 -import org.springframework.amqp.rabbit.annotation.RabbitHandler;  
9 -import org.springframework.amqp.rabbit.annotation.RabbitListener;  
10 -import org.springframework.amqp.support.AmqpHeaders;  
11 -import org.springframework.messaging.handler.annotation.Header;  
12 -  
13 -@RabbitListener(queues = "jeecg_place_order")  
14 -@RabbitComponent(value = "helloReceiver2")  
15 -public class HelloReceiver2 extends BaseRabbiMqHandler<BaseMap> {  
16 -  
17 - @RabbitHandler  
18 - public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {  
19 - super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {  
20 - @Override  
21 - public void handler(BaseMap map, Channel channel) {  
22 - //业务处理  
23 - String orderId = map.get("orderId").toString();  
24 - System.out.println("Receiver2 : " + orderId);  
25 - }  
26 - });  
27 - }  
28 -  
29 -}  
30 \ No newline at end of file 0 \ No newline at end of file
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/HelloTimeReceiver.java deleted
1 -package org.jeecg.modules.cloud.test;  
2 -  
3 -import com.rabbitmq.client.Channel;  
4 -import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;  
5 -import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;  
6 -import org.jeecg.common.annotation.RabbitComponent;  
7 -import org.jeecg.common.base.BaseMap;  
8 -import org.springframework.amqp.rabbit.annotation.RabbitHandler;  
9 -import org.springframework.amqp.rabbit.annotation.RabbitListener;  
10 -import org.springframework.amqp.support.AmqpHeaders;  
11 -import org.springframework.messaging.handler.annotation.Header;  
12 -  
13 -@RabbitListener(queues = "jeecg_place_order_time")  
14 -@RabbitComponent(value = "helloTimeReceiver")  
15 -public class HelloTimeReceiver extends BaseRabbiMqHandler<BaseMap> {  
16 -  
17 - @RabbitHandler  
18 - public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {  
19 - super.onMessage(baseMap, deliveryTag, channel, new MqListener<BaseMap>() {  
20 - @Override  
21 - public void handler(BaseMap map, Channel channel) {  
22 - //业务处理  
23 - String orderId = map.get("orderId").toString();  
24 - System.out.println("Receiver1 : " + orderId);  
25 - }  
26 - });  
27 - }  
28 -  
29 -}  
30 \ No newline at end of file 0 \ No newline at end of file
jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/test/Demo2JobHandler.java renamed to jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/xxljob/Demo2JobHandler.java
1 1
2 -package org.jeecg.modules.cloud.test;; 2 +package org.jeecg.modules.cloud.xxljob;;
3 3
4 4
5 import com.xxl.job.core.biz.model.ReturnT; 5 import com.xxl.job.core.biz.model.ReturnT;