From f822934164a90f5772d474629bfd6eb9f0b95eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Fri, 24 Mar 2023 12:53:20 +0800
Subject: [PATCH] update nacos 2.2.0 => 2.2.1
---
pom.xml | 2 +-
ruoyi-common/ruoyi-common-alibaba-bom/pom.xml | 2 +-
ruoyi-visual/ruoyi-nacos/pom.xml | 2 +-
.../controller/NamespaceController.java | 30 +++++++++-------
.../controller/v2/NamespaceControllerV2.java | 34 ++++++++++--------
.../exception/ConsoleExceptionHandler.java | 10 +++---
.../service/NamespaceOperationService.java | 5 +--
.../src/main/resources/application.properties | 10 +++---
.../main/resources/lib/nacos-auth-2.2.0.jar | Bin 26414 -> 0 bytes
.../main/resources/lib/nacos-auth-2.2.1.jar | Bin 0 -> 27354 bytes
.../main/resources/lib/nacos-cmdb-2.2.0.jar | Bin 16657 -> 0 bytes
.../main/resources/lib/nacos-cmdb-2.2.1.jar | Bin 0 -> 16034 bytes
...onfig-2.2.0.jar => nacos-config-2.2.1.jar} | Bin 605306 -> 602886 bytes
.../resources/lib/nacos-consistency-2.2.0.jar | Bin 98648 -> 0 bytes
.../resources/lib/nacos-consistency-2.2.1.jar | Bin 0 -> 98817 bytes
.../lib/nacos-contrl-plugin-2.2.0.jar | Bin 61639 -> 0 bytes
.../lib/nacos-contrl-plugin-2.2.1.jar | Bin 0 -> 69690 bytes
...os-core-2.2.0.jar => nacos-core-2.2.1.jar} | Bin 330773 -> 346960 bytes
.../main/resources/lib/nacos-istio-2.2.0.jar | Bin 1404448 -> 0 bytes
.../main/resources/lib/nacos-istio-2.2.1.jar | Bin 0 -> 1424063 bytes
...aming-2.2.0.jar => nacos-naming-2.2.1.jar} | Bin 501481 -> 505758 bytes
.../lib/nacos-plugin-default-impl-2.2.0.jar | Bin 74497 -> 0 bytes
.../lib/nacos-plugin-default-impl-2.2.1.jar | Bin 0 -> 96458 bytes
.../resources/lib/nacos-prometheus-2.2.0.jar | Bin 6927 -> 0 bytes
.../resources/lib/nacos-prometheus-2.2.1.jar | Bin 0 -> 10251 bytes
...acos-sys-2.2.0.jar => nacos-sys-2.2.1.jar} | Bin 45284 -> 44821 bytes
.../public/fonts/font_1533967_slipq25tezj.ttf | Bin 0 -> 13564 bytes
.../fonts/font_1533967_slipq25tezj.woff | Bin 0 -> 7724 bytes
.../fonts/font_1533967_slipq25tezj.woff2 | Bin 0 -> 6448 bytes
.../src/main/resources/static/css/main.css | 20 ++++-------
.../src/main/resources/static/index.html | 4 +--
.../src/main/resources/static/js/main.js | 12 +++----
32 files changed, 69 insertions(+), 62 deletions(-)
delete mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.2.0.jar
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.2.1.jar
delete mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.2.0.jar
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.2.1.jar
rename ruoyi-visual/ruoyi-nacos/src/main/resources/lib/{nacos-config-2.2.0.jar => nacos-config-2.2.1.jar} (51%)
delete mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.2.0.jar
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.2.1.jar
delete mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-contrl-plugin-2.2.0.jar
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-contrl-plugin-2.2.1.jar
rename ruoyi-visual/ruoyi-nacos/src/main/resources/lib/{nacos-core-2.2.0.jar => nacos-core-2.2.1.jar} (53%)
delete mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.2.0.jar
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.2.1.jar
rename ruoyi-visual/ruoyi-nacos/src/main/resources/lib/{nacos-naming-2.2.0.jar => nacos-naming-2.2.1.jar} (66%)
delete mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-plugin-default-impl-2.2.0.jar
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-plugin-default-impl-2.2.1.jar
delete mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.2.0.jar
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.2.1.jar
rename ruoyi-visual/ruoyi-nacos/src/main/resources/lib/{nacos-sys-2.2.0.jar => nacos-sys-2.2.1.jar} (69%)
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff
create mode 100644 ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2
diff --git a/pom.xml b/pom.xml
index e2c01ce8..4bb4e881 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
UTF-8
UTF-8
1.8
- 2.7.9
+ 2.7.10
2021.0.6
2.7.10
2.2.2
diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
index 802098e7..36ff9530 100644
--- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
@@ -17,7 +17,7 @@
2021.0.4.0
1.8.6
1.6.1
- 2.2.0
+ 2.2.1
3.1.7
1.0.11
diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml
index cefef667..eb600dde 100644
--- a/ruoyi-visual/ruoyi-nacos/pom.xml
+++ b/ruoyi-visual/ruoyi-nacos/pom.xml
@@ -27,7 +27,7 @@
jar
- 2.2.0
+ 2.2.1
2.6.11
${project.basedir}/src/main/resources/lib
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
index 90c86dce..ffe1e31d 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
@@ -28,7 +28,13 @@ import com.alibaba.nacos.console.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;
@@ -42,17 +48,17 @@ import java.util.regex.Pattern;
@RestController
@RequestMapping("/v1/console/namespaces")
public class NamespaceController {
-
+
@Autowired
private CommonPersistService commonPersistService;
-
+
@Autowired
private NamespaceOperationService namespaceOperationService;
-
+
private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");
-
+
private static final int NAMESPACE_ID_MAX_LENGTH = 128;
-
+
/**
* Get namespace list.
*
@@ -62,7 +68,7 @@ public class NamespaceController {
public RestResult> getNamespaces() {
return RestResultUtils.success(namespaceOperationService.getNamespaceList());
}
-
+
/**
* get namespace all info by namespace id.
*
@@ -73,7 +79,7 @@ public class NamespaceController {
public NamespaceAllInfo getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
return namespaceOperationService.getNamespace(namespaceId);
}
-
+
/**
* create namespace.
*
@@ -103,7 +109,7 @@ public class NamespaceController {
return false;
}
}
-
+
/**
* check namespaceId exist.
*
@@ -117,7 +123,7 @@ public class NamespaceController {
}
return (commonPersistService.tenantInfoCountByTenantId(namespaceId) > 0);
}
-
+
/**
* edit namespace.
*
@@ -133,7 +139,7 @@ public class NamespaceController {
@RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
return namespaceOperationService.editNamespace(namespace, namespaceShowName, namespaceDesc);
}
-
+
/**
* del namespace by id.
*
@@ -145,5 +151,5 @@ public class NamespaceController {
public Boolean deleteNamespace(@RequestParam("namespaceId") String namespaceId) {
return namespaceOperationService.removeNamespace(namespaceId);
}
-
+
}
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java
index d9e0f1d6..c01325d5 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java
@@ -31,7 +31,13 @@ import com.alibaba.nacos.plugin.auth.constant.ActionTypes;
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;
@@ -45,19 +51,19 @@ import java.util.regex.Pattern;
*/
@NacosApi
@RestController
-@RequestMapping(path = "/v2/console/namespace")
+@RequestMapping("/v2/console/namespace")
public class NamespaceControllerV2 {
-
+
private final NamespaceOperationService namespaceOperationService;
-
+
public NamespaceControllerV2(NamespaceOperationService namespaceOperationService) {
this.namespaceOperationService = namespaceOperationService;
}
-
+
private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");
-
+
private static final int NAMESPACE_ID_MAX_LENGTH = 128;
-
+
/**
* Get namespace list.
*
@@ -67,7 +73,7 @@ public class NamespaceControllerV2 {
public Result> getNamespaceList() {
return Result.success(namespaceOperationService.getNamespaceList());
}
-
+
/**
* get namespace all info by namespace id.
*
@@ -81,7 +87,7 @@ public class NamespaceControllerV2 {
throws NacosException {
return Result.success(namespaceOperationService.getNamespace(namespaceId));
}
-
+
/**
* create namespace.
*
@@ -92,13 +98,13 @@ public class NamespaceControllerV2 {
@Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX
+ "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE)
public Result createNamespace(NamespaceForm namespaceForm) throws NacosException {
-
+
namespaceForm.validate();
-
+
String namespaceId = namespaceForm.getNamespaceId();
String namespaceName = namespaceForm.getNamespaceName();
String namespaceDesc = namespaceForm.getNamespaceDesc();
-
+
if (StringUtils.isBlank(namespaceId)) {
namespaceId = UUID.randomUUID().toString();
} else {
@@ -114,7 +120,7 @@ public class NamespaceControllerV2 {
}
return Result.success(namespaceOperationService.createNamespace(namespaceId, namespaceName, namespaceDesc));
}
-
+
/**
* edit namespace.
*
@@ -130,7 +136,7 @@ public class NamespaceControllerV2 {
.editNamespace(namespaceForm.getNamespaceId(), namespaceForm.getNamespaceName(),
namespaceForm.getNamespaceDesc()));
}
-
+
/**
* delete namespace by id.
*
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java
index 04b7abde..b7c7fcdb 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java
@@ -16,10 +16,10 @@
package com.alibaba.nacos.console.exception;
+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;
@@ -37,20 +37,20 @@ import javax.servlet.http.HttpServletRequest;
*/
@ControllerAdvice
public class ConsoleExceptionHandler {
-
+
private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleExceptionHandler.class);
-
+
@ExceptionHandler(AccessException.class)
private ResponseEntity handleAccessException(AccessException e) {
LOGGER.error("got exception. {}", e.getErrMsg());
return ResponseEntity.status(HttpStatus.FORBIDDEN).body(e.getErrMsg());
}
-
+
@ExceptionHandler(IllegalArgumentException.class)
private ResponseEntity handleIllegalArgumentException(IllegalArgumentException e) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ExceptionUtil.getAllExceptionMsg(e));
}
-
+
@ExceptionHandler(Exception.class)
private ResponseEntity