update

Author: guoyuanlu

docs/zh-CN/DEVELOPMENT-GUIDE.md

@@ -159,7 +159,7 @@
 		<caffeine.version>3.1.8</caffeine.version>
 		<hotkey.version>0.0.4-SNAPSHOT</hotkey.version>
 		<hazelcast.version>5.5.0</hazelcast.version>
-		<hazelcast-hibernate.version>5.2.0</hazelcast-hibernate.version>
+		<hazelcast-hibernate.version>2.2.1</hazelcast-hibernate.version>
 
 		<!-- 消息队列 -->
 		<spring-kafka.version>3.3.1</spring-kafka.version>
@@ -197,7 +197,7 @@
 
 		<!-- 通讯组件 -->
 		<netty.version>4.1.115.Final</netty.version>
-		<javamail.version>1.6.7</javamail.version>
+		<javamail.version>2.0.1</javamail.version>
 
 		<!-- 日志组件 -->
 		<log4j2.version>2.24.2</log4j2.version>

docs/zh-CN/migration-2.4.x-to-2.7.x.md

@@ -22,15 +22,15 @@
 import org.apache.kafka.clients.producer.RecordMetadata;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.SendResult;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
 import org.ylzl.eden.common.mq.MessageQueueProvider;
 import org.ylzl.eden.common.mq.MessageQueueType;
 import org.ylzl.eden.common.mq.model.Message;
 import org.ylzl.eden.common.mq.producer.MessageSendCallback;
 import org.ylzl.eden.common.mq.producer.MessageSendException;
 import org.ylzl.eden.common.mq.producer.MessageSendResult;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * Kafka 生产者
  *
@@ -66,7 +66,7 @@ public String messageQueueType() {
 	@Override
 	public MessageSendResult syncSend(Message message) {
 		try {
-			ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send(message.getTopic(), message.getBody());
+			CompletableFuture<SendResult<String, String>> future = kafkaTemplate.send(message.getTopic(), message.getBody());
 			SendResult<String, String> sendResult = future.get();
 			return transfer(sendResult);
 		} catch (InterruptedException e) {
@@ -88,17 +88,12 @@ public MessageSendResult syncSend(Message message) {
 	@Override
 	public void asyncSend(Message message, MessageSendCallback messageCallback) {
 		try {
-			ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send(message.getTopic(), message.getBody());
-			future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-
-				@Override
-				public void onSuccess(SendResult<String, String> sendResult) {
+			CompletableFuture<SendResult<String, String>> future = kafkaTemplate.send(message.getTopic(), message.getBody());
+			future.whenComplete((sendResult, ex) -> {
+				if (ex == null) {
 					messageCallback.onSuccess(transfer(sendResult));
-				}
-
-				@Override
-				public void onFailure(Throwable e) {
-					messageCallback.onFailed(e);
+				} else {
+					messageCallback.onFailed(ex);
 				}
 			});
 		} catch (Exception e) {

docs/zh-CN/migration-2.7.x-to-3.5.x.md

@@ -30,7 +30,7 @@
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.filter.ExpressionType;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
 import org.apache.rocketmq.remoting.RPCHook;
 import org.apache.rocketmq.spring.support.RocketMQUtil;
 import org.jetbrains.annotations.NotNull;

eden-components/eden-dependencies/pom.xml

@@ -20,12 +20,11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.SendResult;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
 import org.ylzl.eden.event.auditor.EventSender;
 import org.ylzl.eden.event.auditor.model.AuditingEvent;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 /**
@@ -60,18 +59,13 @@ public void send(List<AuditingEvent> events) {
 		messages.forEach(
 			message -> {
 				try {
-					ListenableFuture<SendResult<String, String>> future =
+					CompletableFuture<SendResult<String, String>> future =
 						kafkaTemplate.send(topic, message);
-					future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-
-						@Override
-						public void onSuccess(SendResult<String, String> sendResult) {
+					future.whenComplete((sendResult, ex) -> {
+						if (ex == null) {
 							log.debug(KAFKA_SEND_AUDIT_EVENT_SUCCESS, message);
-						}
-
-						@Override
-						public void onFailure(Throwable e) {
-							log.warn(KAFKA_SEND_AUDIT_EVENT_FAILED, message, e);
+						} else {
+							log.warn(KAFKA_SEND_AUDIT_EVENT_FAILED, message, ex);
 						}
 					});
 				} catch (Exception e) {

eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaProvider.java

@@ -65,9 +65,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>io.github.shiyindaxiaojie</groupId>
-			<artifactId>eden-spring-data</artifactId>
-		</dependency>
+
 	</dependencies>
 </project>

eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQConsumer.java

@@ -44,7 +44,7 @@
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;

eden-components/eden-solutions/eden-event-auditor/src/main/java/org/ylzl/eden/event/auditor/integration/kafka/KafkaEventSender.java

@@ -27,7 +27,7 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.web.util.UrlPathHelper;
 
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServlet;
 
 /**
  * Spring 内置工具自动装配