From 2a18fbc9441fd0df86243bb2bbeffe3d259b53b3 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Thu, 9 May 2024 12:20:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E4=BC=98=E5=8C=96=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../snailjob/client/common/NettyClient.java   |  4 +--
 .../common/handler/SyncRemoteConfig.java      | 27 ++++++++-----------
 .../handler/ConfigHttpRequestHandler.java     |  1 -
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java
index a2d58097..70a1ab8b 100644
--- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java
+++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java
@@ -4,8 +4,6 @@ import com.aizuda.snailjob.client.common.annotation.Mapping;
 import com.aizuda.snailjob.client.common.rpc.client.RequestMethod;
 import com.aizuda.snailjob.common.core.constant.SystemConstants.HTTP_PATH;
 import com.aizuda.snailjob.common.core.model.Result;
-import com.aizuda.snailjob.client.common.annotation.Mapping;
-import com.aizuda.snailjob.client.common.rpc.client.RequestMethod;
 
 
 /**
@@ -18,7 +16,7 @@ import com.aizuda.snailjob.client.common.rpc.client.RequestMethod;
 public interface NettyClient {
 
     @Mapping(method = RequestMethod.GET, path = HTTP_PATH.SYNC_CONFIG)
-    Result getConfig(Integer version);
+    Result syncRemoteConfig();
 
     @Mapping(method = RequestMethod.GET, path = HTTP_PATH.BEAT)
     Result beat(String mark);
diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/handler/SyncRemoteConfig.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/handler/SyncRemoteConfig.java
index 49cfb577..d086140b 100644
--- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/handler/SyncRemoteConfig.java
+++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/handler/SyncRemoteConfig.java
@@ -31,23 +31,18 @@ public class SyncRemoteConfig implements Lifecycle {
 
         SCHEDULE_EXECUTOR.scheduleAtFixedRate(() -> {
             try {
-                try {
-                    NettyClient client = RequestBuilder.<NettyClient, NettyResult>newBuilder()
-                        .client(NettyClient.class)
-                        .callback(nettyResult -> {
-                            if (Objects.isNull(nettyResult.getData())) {
-                                SnailJobLog.LOCAL.error("获取配置结果为null");
-                                return;
-                            }
+                NettyClient client = RequestBuilder.<NettyClient, NettyResult>newBuilder()
+                    .client(NettyClient.class)
+                    .callback(nettyResult -> {
+                        if (Objects.isNull(nettyResult.getData())) {
+                            SnailJobLog.LOCAL.error("获取配置结果为null");
+                            return;
+                        }
 
-                            GroupVersionCache.setConfig(
-                                JsonUtil.parseObject(nettyResult.getData().toString(), ConfigDTO.class));
-                        })
-                        .build();
-                    client.getConfig(0);
-                } catch (Exception e) {
-                    SnailJobLog.LOCAL.error("同步版本失败", e);
-                }
+                        GroupVersionCache.setConfig(
+                            JsonUtil.parseObject(nettyResult.getData().toString(), ConfigDTO.class));
+                    }).build();
+                client.syncRemoteConfig();
             } catch (Exception e) {
                 SnailJobLog.LOCAL.error("通知配置失败", e);
             }
diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java
index 5f0da2da..ff4d3ccb 100644
--- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java
+++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java
@@ -37,7 +37,6 @@ public class ConfigHttpRequestHandler extends GetHttpRequestHandler {
 
     @Override
     public String doHandler(String content, UrlQuery urlQuery, HttpHeaders headers) {
-        SnailJobLog.LOCAL.info("版本同步 content:[{}]", urlQuery.toString());
         SnailJobRequest retryRequest = JsonUtil.parseObject(content, SnailJobRequest.class);
         String groupName = headers.get(HeadersEnum.GROUP_NAME.getKey());
         String namespace = headers.get(HeadersEnum.NAMESPACE.getKey());