20240203

ldcsaa · Feb 3, 2024 · c81d7a9 · c81d7a9
1 parent 4c3e3b3
commit c81d7a9
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 29 deletions.
diff --git a/...o/hp-demo-bff-cloud/src/main/java/io/github/hpsocket/demo/bff/cloud/config/AppConfig.java b/...o/hp-demo-bff-cloud/src/main/java/io/github/hpsocket/demo/bff/cloud/config/AppConfig.java
@@ -37,7 +37,7 @@ TopicExchange userTopicExchange()
     @Bean
     Queue userQueue()
     {
-        Queue queue = QueueBuilder.durable(USER_QUEUE).maxLength(1000000).maxLengthBytes(300485760).build();
+        Queue queue = QueueBuilder.durable(USER_QUEUE).maxLength(1000000L).maxLengthBytes(300485760).build();
         queue.setAdminsThatShouldDeclare(rabbitAmqpAdmin);
 
         return queue;

diff --git a/...-demo-mq-consumer/src/main/java/io/github/hpsocket/demo/mq/consumer/config/AppConfig.java b/...-demo-mq-consumer/src/main/java/io/github/hpsocket/demo/mq/consumer/config/AppConfig.java
@@ -80,7 +80,7 @@ TopicExchange region3TopicExchange()
     @Bean
     Queue region0Queue()
     {
-        Queue queue = QueueBuilder.durable(REGION_QUEUES[0]).maxLength(1000000).maxLengthBytes(300485760).build();
+        Queue queue = QueueBuilder.durable(REGION_QUEUES[0]).maxLength(1000000L).maxLengthBytes(300485760).build();
         queue.setAdminsThatShouldDeclare(defaultRabbitAmqpAdmin);
 
         return queue;
@@ -89,7 +89,7 @@ Queue region0Queue()
     @Bean
     Queue region1Queue()
     {
-        Queue queue = QueueBuilder.durable(REGION_QUEUES[1]).maxLength(1000000).maxLengthBytes(300485760).build();
+        Queue queue = QueueBuilder.durable(REGION_QUEUES[1]).maxLength(1000000L).maxLengthBytes(300485760).build();
         queue.setAdminsThatShouldDeclare(firstRabbitAmqpAdmin);
 
         return queue;
@@ -98,7 +98,7 @@ Queue region1Queue()
     @Bean
     Queue region2Queue()
     {
-        Queue queue = QueueBuilder.durable(REGION_QUEUES[2]).maxLength(1000000).maxLengthBytes(300485760).build();
+        Queue queue = QueueBuilder.durable(REGION_QUEUES[2]).maxLength(1000000L).maxLengthBytes(300485760).build();
         queue.setAdminsThatShouldDeclare(secondRabbitAmqpAdmin);
 
         return queue;
@@ -107,7 +107,7 @@ Queue region2Queue()
     @Bean
     Queue region3Queue()
     {
-        Queue queue = QueueBuilder.durable(REGION_QUEUES[3]).maxLength(1000000).maxLengthBytes(300485760).build();
+        Queue queue = QueueBuilder.durable(REGION_QUEUES[3]).maxLength(1000000L).maxLengthBytes(300485760).build();
         queue.setAdminsThatShouldDeclare(thirdRabbitAmqpAdmin);
 
         return queue;

diff --git a/hp-soa-dependencies/pom.xml b/hp-soa-dependencies/pom.xml
@@ -25,15 +25,15 @@
         <xxl-job.version>2.4.0</xxl-job.version>
         <sentinel.version>1.8.7</sentinel.version>
 
-        <spring.version>6.0.16</spring.version>
-        <spring-boot.version>3.1.8</spring-boot.version>
-        <spring-security.version>6.1.6</spring-security.version>
-        <spring-cloud.version>2022.0.5</spring-cloud.version>
+        <spring.version>6.1.3</spring.version>
+        <spring-boot.version>3.2.2</spring-boot.version>
+        <spring-security.version>6.2.1</spring-security.version>
+        <spring-cloud.version>2023.0.0</spring-cloud.version>
         <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <caffeine.version>3.1.8</caffeine.version>
         <spring-retry.version>2.0.5</spring-retry.version>
-        <spring-amqp.version>3.0.10</spring-amqp.version>
-        <spring-kafka.version>3.0.13</spring-kafka.version>
+        <spring-amqp.version>3.1.1</spring-amqp.version>
+        <spring-kafka.version>3.1.1</spring-kafka.version>
         <kafka-clients.version>3.6.1</kafka-clients.version>
         <zstd-jni.version>1.5.5-11</zstd-jni.version>
         <feign.version>13.1</feign.version>
@@ -65,13 +65,13 @@
         <commons-pool2.version>2.12.0</commons-pool2.version>
         <commons-httpclient.version>3.1</commons-httpclient.version>
 
-        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
-        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
-        <jakarta.el-api.version>5.0.1</jakarta.el-api.version>
-        <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
+        <jakarta.servlet-api.version>6.1.0-M1</jakarta.servlet-api.version>
+        <jakarta.validation-api.version>3.1.0-M1</jakarta.validation-api.version>
+        <jakarta.el-api.version>6.0.0-M2</jakarta.el-api.version>
+        <jakarta.annotation-api.version>3.0.0-M1</jakarta.annotation-api.version>
         <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
         <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
-        <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
+        <jakarta.persistence-api.version>3.2.0-M1</jakarta.persistence-api.version>
         <jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
 
         <javax-javaee-api.version>8.0.1</javax-javaee-api.version>
@@ -750,7 +750,7 @@
             </dependency>
             <dependency>
                 <groupId>org.redisson</groupId>
-                <artifactId>redisson-spring-data-31</artifactId>
+                <artifactId>redisson-spring-data-32</artifactId>
                 <version>${redisson.version}</version>
             </dependency>
             <dependency>

diff --git a/hp-soa-starter/hp-soa-starter-data-redis/pom.xml b/hp-soa-starter/hp-soa-starter-data-redis/pom.xml
@@ -41,7 +41,7 @@
         -->
         <dependency>
             <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-data-31</artifactId>
+            <artifactId>redisson-spring-data-32</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/.../main/java/io/github/hpsocket/soa/starter/job/exclusive/aspect/ExclusiveJobInspector.java b/.../main/java/io/github/hpsocket/soa/starter/job/exclusive/aspect/ExclusiveJobInspector.java
@@ -125,7 +125,7 @@ public Object inspect(ProceedingJoinPoint joinPoint) throws Throwable
                     {
                         sw.stop();
 
-                        log.trace("end exclusive job -> {} (costTime: {})", fullJobName, sw.getLastTaskTimeMillis());
+                        log.trace("end exclusive job -> {} (costTime: {})", fullJobName, sw.lastTaskInfo().getTimeMillis());
                     }
                 }
             }

diff --git a/...xljob/src/main/java/io/github/hpsocket/soa/starter/job/xxljob/aspect/XxlJobInspector.java b/...xljob/src/main/java/io/github/hpsocket/soa/starter/job/xxljob/aspect/XxlJobInspector.java
@@ -107,7 +107,7 @@ public Object inspect(ProceedingJoinPoint joinPoint) throws Throwable
                 {
                     sw.stop();
 
-                    log.trace("end xxl-job -> {} (id: {}, costTime: {})", jobName, jobId, sw.getLastTaskTimeMillis());
+                    log.trace("end xxl-job -> {} (id: {}, costTime: {})", jobName, jobId, sw.lastTaskInfo().getTimeMillis());
                 }
             }
         }

diff --git a/.../java/io/github/hpsocket/soa/starter/kafka/consumer/aspect/KafkaListenerMdcInspector.java b/.../java/io/github/hpsocket/soa/starter/kafka/consumer/aspect/KafkaListenerMdcInspector.java
@@ -123,7 +123,7 @@ else if(obj instanceof ConsumerRecord crc)
                 sw.stop();
 
                 log.trace("kafka listener end consume message -> (listenerId: {}, correlationId: {}, messageId: {}, sourceRequestId: {}, domainName: {}, eventName: {}, costTime: {})"
-                    , listenerId, correlationId, messageId, sourceRequestId, domainName, eventName, sw.getLastTaskTimeMillis());
+                    , listenerId, correlationId, messageId, sourceRequestId, domainName, eventName, sw.lastTaskInfo().getTimeMillis());
             }
 
             mdcAttr.removeMdc();

diff --git a/...io/github/hpsocket/soa/starter/rabbitmq/consumer/aspect/RabbitmqListenerMdcInspector.java b/...io/github/hpsocket/soa/starter/rabbitmq/consumer/aspect/RabbitmqListenerMdcInspector.java
@@ -128,7 +128,7 @@ else if(obj instanceof com.rabbitmq.stream.Message msg)
                 sw.stop();
 
                 log.trace("rabbit listener end consume message -> (listenerId: {}, correlationId: {}, messageId: {}, sourceRequestId: {}, domainName: {}, eventName: {}, costTime: {})"
-                    , listenerId, correlationId, messageId, sourceRequestId, domainName, eventName, sw.getLastTaskTimeMillis());                
+                    , listenerId, correlationId, messageId, sourceRequestId, domainName, eventName, sw.lastTaskInfo().getTimeMillis());                
             }
 
             mdcAttr.removeMdc();

diff --git a/...-starter-task/src/main/java/io/github/hpsocket/soa/starter/task/config/SoaTaskConfig.java b/...-starter-task/src/main/java/io/github/hpsocket/soa/starter/task/config/SoaTaskConfig.java
@@ -13,7 +13,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.task.TaskExecutorCustomizer;
+import org.springframework.boot.task.ThreadPoolTaskExecutorCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.task.TaskDecorator;
@@ -79,9 +79,9 @@ public void run()
     }
 
     @Bean
-    TaskExecutorCustomizer taskExecutorCustomizer()
+    ThreadPoolTaskExecutorCustomizer taskExecutorCustomizer()
     {
-        return new TaskExecutorCustomizer()
+        return new ThreadPoolTaskExecutorCustomizer()
         {
             @Override
             public void customize(ThreadPoolTaskExecutor taskExecutor)

diff --git a/misc/sentinel/sentinel-dashboard.jar b/misc/sentinel/sentinel-dashboard.jar
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <url>https://github.com/ldcsaa/hp-soa</url>
 
     <properties>
-        <revision>1.0.7</revision>
+        <revision>1.1.0</revision>
         <hp-soa.version>${revision}</hp-soa.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -44,7 +44,7 @@
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
         <docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
-        <spring-boot-maven-plugin.version>3.1.8</spring-boot-maven-plugin.version>
+        <spring-boot-maven-plugin.version>3.2.2</spring-boot-maven-plugin.version>
 
         <maven.surefire.conf.forkCount>1C</maven.surefire.conf.forkCount>
         <maven.surefire.conf.reuseForks>true</maven.surefire.conf.reuseForks>
@@ -562,7 +562,7 @@
             <!-- >> BEGIN >> : Publish Plugins -->
             <!--
             -->
-             <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
@@ -574,7 +574,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
             </plugin>
-           <!-- << END << : Publish Plugins -->
+            <!-- << END << : Publish Plugins -->
         </plugins>
 
     </build>
-Original file line number
+Diff line change
@@ Expand Up @@
                         {
                             sw.stop();
-                            log.trace("end exclusive job -> {} (costTime: {})", fullJobName, sw.getLastTaskTimeMillis());
+                            log.trace("end exclusive job -> {} (costTime: {})", fullJobName, sw.lastTaskInfo().getTimeMillis());
                         }
                     }
                 }
@@ Expand Down @@