Fix conflict compile problem & rebuild ui.

alibaba · Dec 9, 2024 · 11618be · 11618be
1 parent 6f39407
commit 11618be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
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
@@ -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,15 +83,17 @@ 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()) {
                 return ConfigQueryResponse.buildFailResponse(ResponseCode.FAIL.getCode(), chainResponse.getMessage());
             }
 
             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
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?9d8695491c78c43bce63" rel="stylesheet"></head>
+<link href="./css/main.css?526ecd0f13996f374b88" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?9d8695491c78c43bce63"></script></body>
+<script type="text/javascript" src="./js/main.js?526ecd0f13996f374b88"></script></body>
 
 </html>