From 3345311d04cf085d2c9c76e1007a2b1bc8275245 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Sun, 17 Sep 2023 10:44:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=203.0.0=201.=20=E5=8F=91=E5=B8=833.0.0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: byteblogs168 <598092184@qq.com>
---
 easy-retry-server/pom.xml                     |  6 ++--
 .../service/impl/DashBoardServiceImpl.java    | 33 ++++++++-----------
 .../support/cache/CacheConsumerGroup.java     |  6 ----
 pom.xml                                       |  8 ++---
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/easy-retry-server/pom.xml b/easy-retry-server/pom.xml
index 0ebae7771..b19a97cd7 100644
--- a/easy-retry-server/pom.xml
+++ b/easy-retry-server/pom.xml
@@ -150,10 +150,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/DashBoardServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/DashBoardServiceImpl.java
index 811e5a728..ffc1f6988 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/DashBoardServiceImpl.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/DashBoardServiceImpl.java
@@ -1,42 +1,38 @@
 package com.aizuda.easy.retry.server.service.impl;
 
+import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum;
+import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum;
 import com.aizuda.easy.retry.common.core.log.LogUtils;
 import com.aizuda.easy.retry.common.core.model.Result;
-import com.aizuda.easy.retry.common.core.util.HostUtils;
 import com.aizuda.easy.retry.common.core.util.JsonUtil;
 import com.aizuda.easy.retry.server.dto.ServerNodeExtAttrs;
-import com.aizuda.easy.retry.server.enums.TaskTypeEnum;
+import com.aizuda.easy.retry.server.service.DashBoardService;
 import com.aizuda.easy.retry.server.service.convert.DispatchQuantityResponseVOConverter;
 import com.aizuda.easy.retry.server.service.convert.SceneQuantityRankResponseVOConverter;
+import com.aizuda.easy.retry.server.service.convert.ServerNodeResponseVOConverter;
+import com.aizuda.easy.retry.server.support.cache.CacheConsumerGroup;
+import com.aizuda.easy.retry.server.support.register.ServerRegister;
+import com.aizuda.easy.retry.server.web.model.base.PageResult;
+import com.aizuda.easy.retry.server.web.model.enums.DateTypeEnum;
+import com.aizuda.easy.retry.server.web.model.request.ServerNodeQueryVO;
+import com.aizuda.easy.retry.server.web.model.response.ActivePodQuantityResponseVO;
+import com.aizuda.easy.retry.server.web.model.response.DispatchQuantityResponseVO;
+import com.aizuda.easy.retry.server.web.model.response.SceneQuantityRankResponseVO;
+import com.aizuda.easy.retry.server.web.model.response.ServerNodeResponseVO;
+import com.aizuda.easy.retry.server.web.model.response.TaskQuantityResponseVO;
 import com.aizuda.easy.retry.template.datasource.persistence.dataobject.DispatchQuantityResponseDO;
 import com.aizuda.easy.retry.template.datasource.persistence.dataobject.SceneQuantityRankResponseDO;
 import com.aizuda.easy.retry.template.datasource.persistence.mapper.RetryTaskLogMapper;
 import com.aizuda.easy.retry.template.datasource.persistence.mapper.RetryTaskLogMessageMapper;
 import com.aizuda.easy.retry.template.datasource.persistence.mapper.ServerNodeMapper;
 import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTaskLog;
-import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTaskLogMessage;
 import com.aizuda.easy.retry.template.datasource.persistence.po.ServerNode;
-import com.aizuda.easy.retry.server.service.convert.ServerNodeResponseVOConverter;
-import com.aizuda.easy.retry.server.support.cache.CacheConsumerGroup;
-import com.aizuda.easy.retry.server.support.register.ServerRegister;
-import com.aizuda.easy.retry.server.web.model.base.PageResult;
-import com.aizuda.easy.retry.server.web.model.request.ServerNodeQueryVO;
-import com.aizuda.easy.retry.server.web.model.response.ServerNodeResponseVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum;
-import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum;
-import com.aizuda.easy.retry.server.service.DashBoardService;
-import com.aizuda.easy.retry.server.web.model.enums.DateTypeEnum;
-import com.aizuda.easy.retry.server.web.model.response.ActivePodQuantityResponseVO;
-import com.aizuda.easy.retry.server.web.model.response.DispatchQuantityResponseVO;
-import com.aizuda.easy.retry.server.web.model.response.SceneQuantityRankResponseVO;
-import com.aizuda.easy.retry.server.web.model.response.TaskQuantityResponseVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.RestTemplate;
@@ -53,7 +49,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheConsumerGroup.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheConsumerGroup.java
index 08caa7152..70ccb9b50 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheConsumerGroup.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheConsumerGroup.java
@@ -1,21 +1,15 @@
 package com.aizuda.easy.retry.server.support.cache;
 
 import com.aizuda.easy.retry.common.core.log.LogUtils;
-import com.aizuda.easy.retry.template.datasource.persistence.po.ServerNode;
 import com.aizuda.easy.retry.server.support.Lifecycle;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.util.Comparator;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
 
 /**
  * 当前POD负责消费的组
diff --git a/pom.xml b/pom.xml
index 7c56d2973..b17ef3df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <revision>3.0.0-SNAPSHOT</revision>
+        <revision>3.0.0</revision>
         <dingding-talk.version>1.0.0</dingding-talk.version>
         <netty-all.version>4.1.94.Final</netty-all.version>
         <hutool-all.version>5.8.19</hutool-all.version>
@@ -152,7 +152,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -228,7 +228,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
+                        <version>3.5.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -246,7 +246,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.7</version>
+                        <version>1.6.13</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>