From bf24b5d4619de4dd65309b4d210740b24b285e2d Mon Sep 17 00:00:00 2001
From: Sheyu-yao <ysy570231@gmail.com>
Date: Sat, 24 Feb 2024 10:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ysy-common/pom.xml                                        | 8 ++++----
 .../ysy/common/config/rabbitmq/RabbitPublisherConfig.java | 6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ysy-common/pom.xml b/ysy-common/pom.xml
index 2b4edeb..4622c8f 100644
--- a/ysy-common/pom.xml
+++ b/ysy-common/pom.xml
@@ -60,11 +60,11 @@
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
 
-        <!-- javax.annotation -->
+        <!-- https://mvnrepository.com/artifact/jakarta.annotation/jakarta.annotation-api -->
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.1</version>
         </dependency>
 
         <!-- elasticsearch -->
diff --git a/ysy-common/src/main/java/com/ysy/common/config/rabbitmq/RabbitPublisherConfig.java b/ysy-common/src/main/java/com/ysy/common/config/rabbitmq/RabbitPublisherConfig.java
index 1a9a3ee..a3f986a 100644
--- a/ysy-common/src/main/java/com/ysy/common/config/rabbitmq/RabbitPublisherConfig.java
+++ b/ysy-common/src/main/java/com/ysy/common/config/rabbitmq/RabbitPublisherConfig.java
@@ -1,17 +1,13 @@
 package com.ysy.common.config.rabbitmq;
 
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.ReturnedMessage;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-
 @Slf4j
 @Configuration
 public class RabbitPublisherConfig implements RabbitTemplate.ConfirmCallback, RabbitTemplate.ReturnsCallback {