diff --git a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java index 063d9ee18a..696748b81b 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java @@ -23,8 +23,6 @@ import com.alibaba.nacos.api.remote.response.ResponseCode; import com.alibaba.nacos.auth.annotation.Secured; import com.alibaba.nacos.common.utils.NamespaceUtil; -import com.alibaba.nacos.common.utils.StringUtils; -import com.alibaba.nacos.config.server.model.CacheItem; import com.alibaba.nacos.config.server.model.ConfigCacheGray; import com.alibaba.nacos.config.server.model.gray.BetaGrayRule; import com.alibaba.nacos.config.server.model.gray.TagGrayRule; @@ -47,6 +45,7 @@ import org.springframework.stereotype.Component; import java.net.URLEncoder; + import static com.alibaba.nacos.config.server.constant.Constants.ENCODE_UTF8; import static com.alibaba.nacos.config.server.utils.LogUtil.PULL_LOG; import static com.alibaba.nacos.config.server.utils.RequestUtil.CLIENT_APPNAME_HEADER; @@ -84,7 +83,8 @@ public ConfigQueryResponse handle(ConfigQueryRequest request, RequestMeta meta) String requestIpApp = meta.getLabels().get(CLIENT_APPNAME_HEADER); String clientIp = meta.getClientIp(); - ConfigQueryChainRequest chainRequest = ConfigChainRequestExtractorService.getExtractor().extract(request, meta); + ConfigQueryChainRequest chainRequest = ConfigChainRequestExtractorService.getExtractor() + .extract(request, meta); ConfigQueryChainResponse chainResponse = configQueryChainService.handle(chainRequest); if (ResponseCode.FAIL.getCode() == chainResponse.getResultCode()) { @@ -92,7 +92,8 @@ public ConfigQueryResponse handle(ConfigQueryRequest request, RequestMeta meta) } if (chainResponse.getStatus() == ConfigQueryChainResponse.ConfigQueryStatus.CONFIG_NOT_FOUND) { - return handlerConfigNotFound(request.getDataId(), request.getGroup(), request.getTenant(), requestIpApp, clientIp, notify); + return handlerConfigNotFound(request.getDataId(), request.getGroup(), request.getTenant(), requestIpApp, + clientIp, notify); } if (chainResponse.getStatus() == ConfigQueryChainResponse.ConfigQueryStatus.CONFIG_QUERY_CONFLICT) { @@ -129,10 +130,11 @@ public ConfigQueryResponse handle(ConfigQueryRequest request, RequestMeta meta) } String pullEvent = resolvePullEventType(chainResponse, request.getTag()); - LogUtil.PULL_CHECK_LOG.warn("{}|{}|{}|{}", groupKey, clientIp, response.getMd5(), TimeUtils.getCurrentTimeStr()); + LogUtil.PULL_CHECK_LOG.warn("{}|{}|{}|{}", groupKey, clientIp, response.getMd5(), + TimeUtils.getCurrentTimeStr()); final long delayed = notify ? -1 : System.currentTimeMillis() - response.getLastModified(); - ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, response.getLastModified(), pullEvent, pullType, - delayed, clientIp, notify, "grpc"); + ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, response.getLastModified(), pullEvent, + pullType, delayed, clientIp, notify, "grpc"); return response; diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html index f1df9f7e19..f6cf7a41f1 100644 --- a/console/src/main/resources/static/index.html +++ b/console/src/main/resources/static/index.html @@ -35,7 +35,7 @@ - +
@@ -56,6 +56,6 @@ - +