diff --git a/pom.xml b/pom.xml
index 39094e9e..48e9060a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,8 @@
dev
127.0.0.1:8848
+ nacos
+ nacos
DEFAULT_GROUP
DEFAULT_GROUP
127.0.0.1:4560
@@ -85,6 +87,8 @@
prod
127.0.0.1:8848
+ nacos
+ nacos
DEFAULT_GROUP
DEFAULT_GROUP
127.0.0.1:4560
diff --git a/ruoyi-auth/src/main/resources/application.yml b/ruoyi-auth/src/main/resources/application.yml
index 24f58103..f1668017 100644
--- a/ruoyi-auth/src/main/resources/application.yml
+++ b/ruoyi-auth/src/main/resources/application.yml
@@ -25,6 +25,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml
index fdc21f6a..45324774 100644
--- a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml
@@ -15,6 +15,8 @@ dubbo:
registry:
address: nacos://${spring.cloud.nacos.server-addr}
group: DUBBO_GROUP
+ username: ${spring.cloud.nacos.username}
+ password: ${spring.cloud.nacos.password}
parameters:
namespace: ${spring.profiles.active}
# 消费者相关配置
diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml
index d35ec413..1d64ba28 100644
--- a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml
+++ b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml
@@ -25,6 +25,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml b/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml
index 35b6d1f6..85577bf8 100644
--- a/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml
+++ b/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml
@@ -102,6 +102,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-gateway/src/main/resources/application.yml b/ruoyi-gateway/src/main/resources/application.yml
index 08bd112a..29d35f34 100644
--- a/ruoyi-gateway/src/main/resources/application.yml
+++ b/ruoyi-gateway/src/main/resources/application.yml
@@ -27,6 +27,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml
index a6761d83..ab1a950f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml
@@ -25,6 +25,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml
index 5d5b2d77..6110143a 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml
@@ -25,6 +25,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml b/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml
index c86ad8ba..0e78f7c7 100644
--- a/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml
+++ b/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml
@@ -25,6 +25,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml b/ruoyi-modules/ruoyi-system/src/main/resources/application.yml
index e2ec8528..957ca72e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/application.yml
@@ -25,6 +25,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml
index fe8b3573..72df1f87 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml
@@ -25,6 +25,8 @@ spring:
# 配置组
group: @nacos.config.group@
namespace: ${spring.profiles.active}
+ username: @nacos.username@
+ password: @nacos.password@
config:
import:
- optional:nacos:application-common.yml
diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml
index a1ae716c..9b1e65b5 100644
--- a/ruoyi-visual/ruoyi-nacos/pom.xml
+++ b/ruoyi-visual/ruoyi-nacos/pom.xml
@@ -27,7 +27,7 @@
jar
- 2.2.1
+ 2.3.0
2.7.18
2.7.11
@@ -76,6 +76,13 @@
system
${nacos.lib.path}/nacos-config-${nacos.version}.jar
+
+ com.alibaba.nacos
+ nacos-persistence
+ ${nacos.version}
+ system
+ ${nacos.lib.path}/nacos-persistence-${nacos.version}.jar
+
com.alibaba.nacos
nacos-consistency
@@ -85,10 +92,17 @@
com.alibaba.nacos
- nacos-contrl-plugin
+ nacos-control-plugin
${nacos.version}
system
- ${nacos.lib.path}/nacos-contrl-plugin-${nacos.version}.jar
+ ${nacos.lib.path}/nacos-control-plugin-${nacos.version}.jar
+
+
+ com.alibaba.nacos
+ nacos-config-plugin
+ ${nacos.version}
+ system
+ ${nacos.lib.path}/nacos-config-plugin-${nacos.version}.jar
com.alibaba.nacos
@@ -113,10 +127,24 @@
com.alibaba.nacos
- nacos-plugin-default-impl
+ default-auth-plugin
${nacos.version}
system
- ${nacos.lib.path}/nacos-plugin-default-impl-${nacos.version}.jar
+ ${nacos.lib.path}/default-auth-plugin-${nacos.version}.jar
+
+
+ com.alibaba.nacos
+ default-control-plugin
+ ${nacos.version}
+ system
+ ${nacos.lib.path}/default-control-plugin-${nacos.version}.jar
+
+
+ com.alibaba.nacos
+ nacos-trace-plugin
+ ${nacos.version}
+ system
+ ${nacos.lib.path}/nacos-trace-plugin-${nacos.version}.jar
com.alibaba.nacos
@@ -132,30 +160,20 @@
system
${nacos.lib.path}/nacos-sys-${nacos.version}.jar
-
- com.alibaba.nacos
- nacos-custom-environment-plugin
- ${nacos.version}
-
com.alibaba.nacos
nacos-datasource-plugin
${nacos.version}
+ system
+ ${nacos.lib.path}/nacos-datasource-plugin-${nacos.version}.jar
com.alibaba.nacos
nacos-encryption-plugin
- ${nacos.version}
-
-
- com.alibaba.nacos
- nacos-trace-plugin
- ${nacos.version}
com.alibaba.nacos
nacos-common
- ${nacos.version}
com.alibaba.nacos
@@ -227,10 +245,6 @@
com.alipay.sofa
rpc-grpc-impl
-
- org.codehaus.jackson
- jackson-core-asl
-
io.jsonwebtoken
jjwt-api
@@ -248,6 +262,7 @@
com.google.guava
guava
+ 31.1-jre
org.javatuples
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/Nacos.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/Nacos.java
index 61a6f81a..467cc6e9 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/Nacos.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/Nacos.java
@@ -16,9 +16,14 @@
package com.alibaba.nacos;
+import com.alibaba.nacos.sys.filter.NacosTypeExcludeFilter;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.AutoConfigurationExcludeFilter;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.TypeExcludeFilter;
import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java
index 2afdaaef..5062d495 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java
@@ -19,6 +19,7 @@ package com.alibaba.nacos.console.config;
import com.alibaba.nacos.console.filter.XssFilter;
import com.alibaba.nacos.core.code.ControllerMethodsCache;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.PropertySource;
@@ -46,6 +47,9 @@ public class ConsoleConfig {
@Autowired
private ControllerMethodsCache methodsCache;
+ @Value("${nacos.console.ui.enabled:true}")
+ private boolean consoleUiEnabled;
+
/**
* Init.
*/
@@ -79,4 +83,8 @@ public class ConsoleConfig {
public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(ZoneId.systemDefault().toString());
}
+
+ public boolean isConsoleUiEnabled() {
+ return consoleUiEnabled;
+ }
}
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleModuleStateBuilder.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleModuleStateBuilder.java
new file mode 100644
index 00000000..3ab7a6ae
--- /dev/null
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleModuleStateBuilder.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-2023 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.nacos.console.config;
+
+import com.alibaba.nacos.sys.module.ModuleState;
+import com.alibaba.nacos.sys.module.ModuleStateBuilder;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
+
+/**
+ * Console module state builder.
+ *
+ * @author xiweng.yy
+ */
+public class ConsoleModuleStateBuilder implements ModuleStateBuilder {
+
+ public static final String CONSOLE_MODULE = "console";
+
+ private static final String CONSOLE_UI_ENABLED = "console_ui_enabled";
+
+ @Override
+ public ModuleState build() {
+ ModuleState result = new ModuleState(CONSOLE_MODULE);
+ try {
+ ConsoleConfig consoleConfig = ApplicationUtils.getBean(ConsoleConfig.class);
+ result.newState(CONSOLE_UI_ENABLED, consoleConfig.isConsoleUiEnabled());
+ } catch (Exception ignored) {
+ }
+ return result;
+ }
+}
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java
index f5b0e981..fd191023 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java
@@ -16,11 +16,10 @@
package com.alibaba.nacos.console.controller;
-import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService;
-import com.alibaba.nacos.naming.controllers.OperatorController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.alibaba.nacos.console.paramcheck.ConsoleDefaultHttpParamExtractor;
+import com.alibaba.nacos.core.cluster.health.ModuleHealthCheckerHolder;
+import com.alibaba.nacos.core.cluster.health.ReadinessResult;
+import com.alibaba.nacos.core.paramcheck.ExtractorManager;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
@@ -36,20 +35,9 @@ import javax.servlet.http.HttpServletRequest;
*/
@RestController("consoleHealth")
@RequestMapping("/v1/console/health")
+@ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class)
public class HealthController {
- private static final Logger LOGGER = LoggerFactory.getLogger(HealthController.class);
-
- private final ConfigInfoPersistService configInfoPersistService;
-
- private final OperatorController apiCommands;
-
- @Autowired
- public HealthController(ConfigInfoPersistService configInfoPersistService, OperatorController apiCommands) {
- this.configInfoPersistService = configInfoPersistService;
- this.apiCommands = apiCommands;
- }
-
/**
* Whether the Nacos is in broken states or not, and cannot recover except by being restarted.
*
@@ -69,42 +57,11 @@ public class HealthController {
*/
@GetMapping("/readiness")
public ResponseEntity readiness(HttpServletRequest request) {
- boolean isConfigReadiness = isConfigReadiness();
- boolean isNamingReadiness = isNamingReadiness(request);
-
- if (isConfigReadiness && isNamingReadiness) {
+ ReadinessResult result = ModuleHealthCheckerHolder.getInstance().checkReadiness();
+ if (result.isSuccess()) {
return ResponseEntity.ok().body("OK");
}
-
- if (!isConfigReadiness && !isNamingReadiness) {
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Config and Naming are not in readiness");
- }
-
- if (!isConfigReadiness) {
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Config is not in readiness");
- }
-
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Naming is not in readiness");
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result.getResultMessage());
}
- private boolean isConfigReadiness() {
- // check db
- try {
- configInfoPersistService.configInfoCount("");
- return true;
- } catch (Exception e) {
- LOGGER.error("Config health check fail.", e);
- }
- return false;
- }
-
- private boolean isNamingReadiness(HttpServletRequest request) {
- try {
- apiCommands.metrics(request);
- return true;
- } catch (Exception e) {
- LOGGER.error("Naming health check fail.", e);
- }
- return false;
- }
}
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 ffe1e31d..a02ca070 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
@@ -21,10 +21,11 @@ import com.alibaba.nacos.auth.annotation.Secured;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.model.RestResultUtils;
import com.alibaba.nacos.common.utils.StringUtils;
-import com.alibaba.nacos.config.server.service.repository.CommonPersistService;
-import com.alibaba.nacos.console.model.Namespace;
-import com.alibaba.nacos.console.model.NamespaceAllInfo;
-import com.alibaba.nacos.console.service.NamespaceOperationService;
+import com.alibaba.nacos.console.paramcheck.ConsoleDefaultHttpParamExtractor;
+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;
@@ -47,15 +48,18 @@ import java.util.regex.Pattern;
*/
@RestController
@RequestMapping("/v1/console/namespaces")
+@ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class)
public class NamespaceController {
@Autowired
- private CommonPersistService commonPersistService;
+ private NamespacePersistService namespacePersistService;
@Autowired
private NamespaceOperationService namespaceOperationService;
private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");
+
+ private final Pattern namespaceNameCheckPattern = Pattern.compile("^[^@#$%^&*]+$");
private static final int NAMESPACE_ID_MAX_LENGTH = 128;
@@ -76,7 +80,7 @@ public class NamespaceController {
* @return namespace all info
*/
@GetMapping(params = "show=all")
- public NamespaceAllInfo getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
+ public Namespace getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
return namespaceOperationService.getNamespace(namespaceId);
}
@@ -102,6 +106,14 @@ public class NamespaceController {
if (namespaceId.length() > NAMESPACE_ID_MAX_LENGTH) {
return false;
}
+ // check unique
+ if (namespacePersistService.tenantInfoCountByTenantId(namespaceId) > 0) {
+ return false;
+ }
+ }
+ // contains illegal chars
+ if (!namespaceNameCheckPattern.matcher(namespaceName).matches()) {
+ return false;
}
try {
return namespaceOperationService.createNamespace(namespaceId, namespaceName, namespaceDesc);
@@ -121,7 +133,7 @@ public class NamespaceController {
if (StringUtils.isBlank(namespaceId)) {
return false;
}
- return (commonPersistService.tenantInfoCountByTenantId(namespaceId) > 0);
+ return (namespacePersistService.tenantInfoCountByTenantId(namespaceId) > 0);
}
/**
@@ -137,6 +149,10 @@ public class NamespaceController {
public Boolean editNamespace(@RequestParam("namespace") String namespace,
@RequestParam("namespaceShowName") String namespaceShowName,
@RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
+ // contains illegal chars
+ if (!namespaceNameCheckPattern.matcher(namespaceShowName).matches()) {
+ return false;
+ }
return namespaceOperationService.editNamespace(namespace, namespaceShowName, namespaceDesc);
}
diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
index aa5ead4b..c0b7c0cf 100644
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
@@ -16,13 +16,20 @@
package com.alibaba.nacos.console.controller;
-import com.alibaba.nacos.common.utils.VersionUtils;
+import com.alibaba.nacos.common.model.RestResult;
+import com.alibaba.nacos.common.model.RestResultUtils;
+import com.alibaba.nacos.console.paramcheck.ConsoleDefaultHttpParamExtractor;
+import com.alibaba.nacos.core.paramcheck.ExtractorManager;
import com.alibaba.nacos.sys.env.EnvUtil;
+import com.alibaba.nacos.sys.module.ModuleState;
+import com.alibaba.nacos.sys.module.ModuleStateHolder;
+import com.alibaba.nacos.sys.utils.DiskUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -33,8 +40,13 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/v1/console/server")
+@ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class)
public class ServerStateController {
+ private static final String ANNOUNCEMENT_FILE = "announcement.conf";
+
+ private static final String GUIDE_FILE = "console-guide.conf";
+
/**
* Get server state of current server.
*
@@ -43,13 +55,29 @@ public class ServerStateController {
@GetMapping("/state")
public ResponseEntity