diff --git a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/listener/OrderTransactionListener.java b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/listener/OrderTransactionListener.java
index 3ec9cc29..863527c7 100644
--- a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/listener/OrderTransactionListener.java
+++ b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/listener/OrderTransactionListener.java
@@ -1,3 +1,4 @@
+/*
package com.cloud.kicc.mq.listener;
import com.alibaba.fastjson.JSON;
@@ -15,24 +16,28 @@ import org.springframework.messaging.MessageHeaders;
import java.util.ArrayList;
import java.util.List;
+*/
/**
* 发送之后用于控制原子性的类
* 在消息发送之后,收到rocketmq的发送结果通知后才提交的本地事务。
*
* @author entfrm开发团队-王翔
* @link https://blog.csdn.net/guzhangyu12345/article/details/107989633
- */
+ *//*
+
@Slf4j
@RocketMQTransactionListener(txProducerGroup = MessageConstant.ORDER_BINDER_GROUP)
public class OrderTransactionListener implements RocketMQLocalTransactionListener {
- /**
+ */
+/**
* rocketmq 消息发送成功之后,提交本地事务
*
* @param message 消息
* @param o args
* @return RocketMQLocalTransactionState
- */
+ *//*
+
@Override
public RocketMQLocalTransactionState executeLocalTransaction(Message message, Object o) {
@@ -53,12 +58,14 @@ public class OrderTransactionListener implements RocketMQLocalTransactionListene
}
- /**
+ */
+/**
* rocketmq 回查,判断提交还是回滚
*
* @param message Message
* @return RocketMQLocalTransactionState
- */
+ *//*
+
@Override
public RocketMQLocalTransactionState checkLocalTransaction(Message message) {
Order order = JSON.parseObject(new String((byte[]) message.getPayload()), Order.class);
@@ -73,3 +80,4 @@ public class OrderTransactionListener implements RocketMQLocalTransactionListene
}
}
}
+*/
diff --git a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/service/impl/TransactionOrderServiceImpl.java b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/service/impl/TransactionOrderServiceImpl.java
index b9450b21..c7aa6205 100644
--- a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/service/impl/TransactionOrderServiceImpl.java
+++ b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/service/impl/TransactionOrderServiceImpl.java
@@ -1,3 +1,4 @@
+/*
package com.cloud.kicc.mq.service.impl;
import com.cloud.kicc.common.rocketmq.channel.KiccSource;
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.UUID;
+*/
/**
*
* 订单事务消息实现
@@ -22,7 +24,8 @@ import java.util.UUID;
*
* @Author: entfrm开发团队-王翔
* @Date: 2022/3/9
- */
+ *//*
+
@Slf4j
@Service
@AllArgsConstructor
@@ -32,10 +35,12 @@ public class TransactionOrderServiceImpl implements TransactionOrderService {
private final KiccSource kiccSource;
- /**
+ */
+/**
* 这里消息发送只是half发送,
* 后面消息队列中half成功后,在TestTransactionListener中的executeLocalTransaction的方法中决定是否要提交本地事务
- */
+ *//*
+
@Override
public void testTransaction() {
@@ -78,3 +83,4 @@ public class TransactionOrderServiceImpl implements TransactionOrderService {
log.info("half消息发送成功");
}
}
+*/
diff --git a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/resources/application.yml b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/resources/application.yml
index 839063a4..c479598f 100644
--- a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/resources/application.yml
+++ b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/resources/application.yml
@@ -4,6 +4,12 @@ spring:
application:
name: @artifactId@
cloud:
+ cloud:
+ nacos:
+ discovery:
+ server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+ namespace: ${seata.registry.nacos.namespace}
+ group: ${seata.registry.nacos.group}
stream:
rocketmq:
# rocketmq-binder配置项,对应RocketMQBinderConfigurationProperties类
diff --git a/kicc-common/kicc-common-bom/pom.xml b/kicc-common/kicc-common-bom/pom.xml
index 73c76452..b1c7fb8c 100644
--- a/kicc-common/kicc-common-bom/pom.xml
+++ b/kicc-common/kicc-common-bom/pom.xml
@@ -17,9 +17,8 @@
1.8
${project.version}
2.6.3
- 2.1.8.RELEASE
- 3.0.13.RELEASE
- 2021.0.1.0
+
+
2.17.1
1.2.78
1.5.24
@@ -116,24 +115,17 @@
-
+
-
- org.springframework.cloud
- spring-cloud-stream
- ${cloud.stream.version}
-
+ -->
-
+
io.swagger