upgrade(nacos): 2.4.3

pig-mesh · Nov 10, 2024 · f9b58f0 · f9b58f0
1 parent a24a044
commit f9b58f0
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 25 deletions.
diff --git a/pig-register/pom.xml b/pig-register/pom.xml
@@ -28,7 +28,7 @@
     <description>nacos 注册配置中心</description>
 
     <properties>
-        <nacos.version>2.4.1.0</nacos.version>
+        <nacos.version>2.4.3</nacos.version>
         <spring-boot.version>2.7.18</spring-boot.version>
         <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
     </properties>

diff --git a/pig-register/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java b/pig-register/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
@@ -22,14 +22,20 @@
 import com.alibaba.nacos.common.model.RestResultUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.alibaba.nacos.console.paramcheck.ConsoleDefaultHttpParamExtractor;
-import com.alibaba.nacos.core.namespace.model.Namespace;
 import com.alibaba.nacos.core.namespace.repository.NamespacePersistService;
+import com.alibaba.nacos.core.namespace.model.Namespace;
 import com.alibaba.nacos.core.paramcheck.ExtractorManager;
 import com.alibaba.nacos.core.service.NamespaceOperationService;
 import com.alibaba.nacos.plugin.auth.constant.ActionTypes;
 import com.alibaba.nacos.plugin.auth.impl.constant.AuthConstants;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.UUID;

diff --git a/pig-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java b/pig-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
@@ -34,7 +34,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.alibaba.nacos.common.utils.StringUtils.*;
+import static com.alibaba.nacos.common.utils.StringUtils.FOLDER_SEPARATOR;
+import static com.alibaba.nacos.common.utils.StringUtils.TOP_PATH;
+import static com.alibaba.nacos.common.utils.StringUtils.WINDOWS_FOLDER_SEPARATOR;
 
 /**
  * Server state controller.

diff --git a/...register/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java b/...register/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java
@@ -33,7 +33,13 @@
 import com.alibaba.nacos.plugin.auth.constant.SignType;
 import com.alibaba.nacos.plugin.auth.impl.constant.AuthConstants;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.UUID;

diff --git a/pig-register/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java b/pig-register/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java
@@ -17,10 +17,10 @@
 package com.alibaba.nacos.console.exception;
 
 import com.alibaba.nacos.api.exception.runtime.NacosRuntimeException;
+import com.alibaba.nacos.plugin.auth.exception.AccessException;
 import com.alibaba.nacos.common.model.RestResultUtils;
 import com.alibaba.nacos.common.utils.ExceptionUtil;
 import com.alibaba.nacos.core.utils.Commons;
-import com.alibaba.nacos.plugin.auth.exception.AccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;

diff --git a/pig-register/src/main/resources/nacos-version.txt b/pig-register/src/main/resources/nacos-version.txt
@@ -1 +1 @@
-version=2.4.1
+version=2.4.3
diff --git a/pig-register/src/main/resources/static/index.html b/pig-register/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?0c44b904d360f744c82e" rel="stylesheet"></head>
+<link href="./css/main.css?6d7b5e4fd7099b3cad92" 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?0c44b904d360f744c82e"></script></body>
+<script type="text/javascript" src="./js/main.js?6d7b5e4fd7099b3cad92"></script></body>
 
 </html>
diff --git a/pig-register/src/main/resources/static/js/main.js b/pig-register/src/main/resources/static/js/main.js