diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index 1f18873..7fdc2a4 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -14,6 +14,7 @@ org.jeecgframework.boot jeecg-system-local-api + 3.8.1 org.hibernate diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 7cfa174..84cc7c6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -79,7 +79,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class SysBaseApiImpl implements ISysBaseAPI { +public class SysBaseApiImpl implements ISysBaseAPI { /** 当前系统数据库类型 */ private static String DB_TYPE = ""; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml index 5060573..1265f53 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml @@ -29,11 +29,6 @@ org.jeecgframework.boot jeecg-boot-starter3-job - - - org.jeecgframework.boot - jeecg-boot-starter3-rabbitmq - org.jeecgframework.boot diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml deleted file mode 100644 index cbf01ca..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - jeecg-cloud-test - org.jeecgframework.boot - 3.8.1 - - 4.0.0 - 消息队列测试模块 - jeecg-cloud-test-rabbitmq - - - - - org.jeecgframework.boot - jeecg-boot-starter3-rabbitmq - - - - \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/constant/CloudConstant.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/constant/CloudConstant.java deleted file mode 100644 index c29f497..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/constant/CloudConstant.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.jeecg.modules.test.rabbitmq.constant; - -/** - * 微服务单元测试常量定义 - * @author: zyf - * @date: 2022/04/21 - */ -public interface CloudConstant { - - - /** - * MQ测试队列名字 - */ - public final static String MQ_JEECG_PLACE_ORDER = "jeecg_place_order"; - public final static String MQ_JEECG_PLACE_ORDER_TIME = "jeecg_place_order_time"; - - /** - * MQ测试消息总线 - */ - public final static String MQ_DEMO_BUS_EVENT = "demoBusEvent"; - - /** - * 分布式锁lock key - */ - public final static String REDISSON_DEMO_LOCK_KEY1 = "demoLockKey1"; - public final static String REDISSON_DEMO_LOCK_KEY2 = "demoLockKey2"; - -} diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java deleted file mode 100644 index 550740e..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.jeecg.modules.test.rabbitmq.controller; - - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.servlet.http.HttpServletRequest; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.base.BaseMap; -import org.jeecg.modules.test.rabbitmq.constant.CloudConstant; -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; - -import cn.hutool.core.util.RandomUtil; - - -/** - * RabbitMqClient发送消息 - * @author: zyf - * @date: 2022/04/21 - */ -@RestController -@RequestMapping("/sys/test") -@Tag(name = "【微服务】MQ单元测试") -public class JeecgMqTestController { - - @Autowired - private RabbitMqClient rabbitMqClient; - - - /** - * 测试方法：快速点击发送MQ消息 - * 观察三个接受者如何分配处理消息：HelloReceiver1、HelloReceiver2、HelloReceiver3，会均衡分配 - * - * @param req - * @return - */ - @GetMapping(value = "/rabbitmq") - @Operation(summary = "测试rabbitmq") - public Result rabbitMqClientTest(HttpServletRequest req) { - //rabbitmq消息队列测试 - BaseMap map = new BaseMap(); - map.put("orderId", RandomUtil.randomNumbers(10)); - rabbitMqClient.sendMessage(CloudConstant.MQ_JEECG_PLACE_ORDER, map); - rabbitMqClient.sendMessage(CloudConstant.MQ_JEECG_PLACE_ORDER_TIME, map,10); - return Result.OK("MQ发送消息成功"); - } - - @GetMapping(value = "/rabbitmq2") - @Operation(summary = "rabbitmq消息总线测试") - public Result rabbitmq2(HttpServletRequest req) { - - //rabbitmq消息总线测试 - BaseMap params = new BaseMap(); - params.put("orderId", "123456"); - rabbitMqClient.publishEvent(CloudConstant.MQ_DEMO_BUS_EVENT, params); - return Result.OK("MQ发送消息成功"); - } -} diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.java deleted file mode 100644 index ac2001b..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.jeecg.modules.test.rabbitmq.event; - -import org.jeecg.boot.starter.rabbitmq.event.EventObj; -import org.jeecg.boot.starter.rabbitmq.event.JeecgBusEventHandler; -import org.jeecg.common.base.BaseMap; -import org.jeecg.modules.test.rabbitmq.constant.CloudConstant; -import org.springframework.stereotype.Component; - -import cn.hutool.core.util.ObjectUtil; -import lombok.extern.slf4j.Slf4j; - -/** - * 消息处理器【发布订阅】 - * @author: zyf - * @date: 2022/04/21 - */ -@Slf4j -@Component(CloudConstant.MQ_DEMO_BUS_EVENT) -public class DemoBusEvent implements JeecgBusEventHandler { - - - @Override - public void onMessage(EventObj obj) { - if (ObjectUtil.isNotEmpty(obj)) { - BaseMap baseMap = obj.getBaseMap(); - String orderId = baseMap.get("orderId"); - log.info("业务处理----订单ID:" + orderId); - } - } -} diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.java deleted file mode 100644 index 77ff14f..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.jeecg.modules.test.rabbitmq.listener; - -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.jeecg.modules.test.rabbitmq.constant.CloudConstant; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.handler.annotation.Header; -import org.springframework.web.client.RestTemplate; - -import com.rabbitmq.client.Channel; - -import lombok.extern.slf4j.Slf4j; - -/** - * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中） - * - * RabbitMq接受者1 - * （@RabbitListener声明类上，一个类只能监听一个队列） - * @author: zyf - * @date: 2022/04/21 - */ -@Slf4j -@RabbitListener(queues = CloudConstant.MQ_JEECG_PLACE_ORDER) -@RabbitComponent(value = "helloReceiver1") -public class HelloReceiver1 extends BaseRabbiMqHandler { - - @Autowired - private RestTemplate restTemplate; - - @RabbitHandler - public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { - super.onMessage(baseMap, deliveryTag, channel, new MqListener() { - @Override - public void handler(BaseMap map, Channel channel) { - //业务处理 - String orderId = map.get("orderId").toString(); - log.info("【我是处理人1】 MQ Receiver1，orderId : " + orderId); - // jeecgTestClient.getMessage("JEECG"); - try{ -// HttpHeaders requestHeaders = new HttpHeaders(); -// requestHeaders.add("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzExOTcyOTEsInVzZXJuYW1lIjoiYWRtaW4ifQ.N8mJvwzb4G0i3vYF9A2Bmf5cDKb1LDnOp1RwtpYEu1E"); -// requestHeaders.add("content-type", MediaType.APPLICATION_JSON_UTF8.toString()); -// MultiValueMap requestBody = new LinkedMultiValueMap<>(); -// requestBody.add("name", "test"); -// HttpEntity< MultiValueMap > requestEntity = new HttpEntity(requestBody, requestHeaders); -// //post -// ResponseEntity responseEntity = restTemplate.postForEntity("http://localhost:7002/test/getMessage", requestEntity, String.class); -// System.out.println(" responseEntity :"+responseEntity.getBody()); - }catch (Exception e){ - e.printStackTrace(); - } - - } - }); - } - -} \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver2.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver2.java deleted file mode 100644 index e5601e3..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver2.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.jeecg.modules.test.rabbitmq.listener;//package org.jeecg.modules.cloud.rabbitmq; - -import com.rabbitmq.client.Channel; -import lombok.extern.slf4j.Slf4j; -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.jeecg.modules.test.rabbitmq.constant.CloudConstant; -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; - -/** - * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中） - * - * RabbitMq接受者2 - * （@RabbitListener声明类上，一个类只能监听一个队列） - * @author: zyf - * @date: 2022/04/21 - */ -@Slf4j -@RabbitListener(queues = CloudConstant.MQ_JEECG_PLACE_ORDER) -@RabbitComponent(value = "helloReceiver2") -public class HelloReceiver2 extends BaseRabbiMqHandler { - - @RabbitHandler - public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { - super.onMessage(baseMap, deliveryTag, channel, new MqListener() { - @Override - public void handler(BaseMap map, Channel channel) { - //业务处理 - String orderId = map.get("orderId").toString(); - log.info("【我是处理人2】 MQ Receiver2，orderId : " + orderId); - } - }); - } - -} \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver3.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver3.java deleted file mode 100644 index c70cb00..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver3.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.jeecg.modules.test.rabbitmq.listener;//package org.jeecg.modules.cloud.rabbitmq; - -import com.rabbitmq.client.Channel; -import lombok.extern.slf4j.Slf4j; -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.jeecg.modules.test.rabbitmq.constant.CloudConstant; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.support.AmqpHeaders; -import org.springframework.messaging.handler.annotation.Header; - -/** - * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中） - * - * RabbitMq接受者3【我是处理人3】 - * （@RabbitListener声明类方法上，一个类可以多监听多个队列） - * @author: zyf - * @date: 2022/04/21 - */ -@Slf4j -@RabbitComponent(value = "helloReceiver3") -public class HelloReceiver3 extends BaseRabbiMqHandler { - - @RabbitListener(queues = CloudConstant.MQ_JEECG_PLACE_ORDER) - public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { - super.onMessage(baseMap, deliveryTag, channel, new MqListener() { - @Override - public void handler(BaseMap map, Channel channel) { - //业务处理 - String orderId = map.get("orderId").toString(); - log.info("【我是处理人3】MQ Receiver3，orderId : " + orderId); - } - }); - } - -} \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.java deleted file mode 100644 index 2404a92..0000000 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.modules.test.rabbitmq.listener; - -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.jeecg.modules.test.rabbitmq.constant.CloudConstant; -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; - -import com.rabbitmq.client.Channel; - -import lombok.extern.slf4j.Slf4j; - -/** - * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中） - * @author: zyf - * @date: 2022/04/21 - */ -@Slf4j -@RabbitListener(queues = CloudConstant.MQ_JEECG_PLACE_ORDER_TIME) -@RabbitComponent(value = "helloTimeReceiver") -public class HelloTimeReceiver extends BaseRabbiMqHandler { - - @RabbitHandler - public void onMessage(BaseMap baseMap, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { - super.onMessage(baseMap, deliveryTag, channel, new MqListener() { - @Override - public void handler(BaseMap map, Channel channel) { - //业务处理 - String orderId = map.get("orderId").toString(); - log.info("Time Receiver1，orderId : " + orderId); - } - }); - } - -} \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml index 53be85b..9fd68cd 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml @@ -22,7 +22,6 @@ jeecg-cloud-test-shardingsphere jeecg-cloud-test-more - jeecg-cloud-test-rabbitmq jeecg-cloud-test-seata jeecg-cloud-test-rocketmq diff --git a/pom.xml b/pom.xml index e9fb7d1..4a76c7c 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,9 @@ 9.0.0 8.1.1.49 + + + 2.0.0 1.10.11 3.5.12 @@ -182,12 +185,6 @@ jeecg-boot-base-core ${jeecgboot.version} - - - org.jeecgframework.boot - jeecg-system-local-api - ${jeecgboot.version} - org.jeecgframework.boot @@ -213,12 +210,6 @@ jeecg-boot-starter3-lock ${jeecgboot.version} - - - org.jeecgframework.boot - jeecg-boot-starter3-rabbitmq - ${jeecgboot.version} - org.jeecgframework.boot @@ -420,7 +411,7 @@ - + org.jeecgframework.boot3 minidao-spring-boot-starter-jsqlparser-4.9 @@ -436,6 +427,12 @@ + + + org.jeecgframework.jimureport + jimubi-spring-boot3-starter + 1.9.5 + org.jeecgframework.boot