回退 'Pull Request !135 : nacos升级到最新版本并默认开启鉴权框架内组件也默认附带鉴权信息'

2026-04-24 11:28:39 +08:00 · 2023-12-29 08:39:30 +00:00
parent 9d96433c47
commit 8ee87aef5e
65 changed files with 603 additions and 718 deletions
--- 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,14 +16,9 @@

 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;

 /**
--- 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,7 +19,6 @@ 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;
@@ -47,9 +46,6 @@ public class ConsoleConfig {
    @Autowired
    private ControllerMethodsCache methodsCache;
    
-    @Value("${nacos.console.ui.enabled:true}")
-    private boolean consoleUiEnabled;
-    
    /**
     * Init.
     */
@@ -83,8 +79,4 @@ public class ConsoleConfig {
    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(ZoneId.systemDefault().toString());
    }
-    
-    public boolean isConsoleUiEnabled() {
-        return consoleUiEnabled;
-    }
 }
--- 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
@@ -1,44 +0,0 @@
-/*
- * 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;
-    }
-}
--- 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,10 +16,11 @@

 package com.alibaba.nacos.console.controller;

-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 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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,9 +36,20 @@ 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.
     *
@@ -57,11 +69,42 @@ public class HealthController {
     */
    @GetMapping("/readiness")
    public ResponseEntity<String> readiness(HttpServletRequest request) {
-        ReadinessResult result = ModuleHealthCheckerHolder.getInstance().checkReadiness();
-        if (result.isSuccess()) {
+        boolean isConfigReadiness = isConfigReadiness();
+        boolean isNamingReadiness = isNamingReadiness(request);
+        
+        if (isConfigReadiness && isNamingReadiness) {
            return ResponseEntity.ok().body("OK");
        }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result.getResultMessage());
+        
+        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");
    }
    
+    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;
+    }
 }
--- 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,11 +21,10 @@ 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.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.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.plugin.auth.constant.ActionTypes;
 import com.alibaba.nacos.plugin.auth.impl.constant.AuthConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,18 +47,15 @@ import java.util.regex.Pattern;
 */
@RestController
@RequestMapping("/v1/console/namespaces")
-@ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class)
 public class NamespaceController {
    
    @Autowired
-    private NamespacePersistService namespacePersistService;
+    private CommonPersistService commonPersistService;
    
    @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;
    
@@ -80,7 +76,7 @@ public class NamespaceController {
     * @return namespace all info
     */
    @GetMapping(params = "show=all")
-    public Namespace getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
+    public NamespaceAllInfo getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
        return namespaceOperationService.getNamespace(namespaceId);
    }
    
@@ -106,14 +102,6 @@ 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);
@@ -133,7 +121,7 @@ public class NamespaceController {
        if (StringUtils.isBlank(namespaceId)) {
            return false;
        }
-        return (namespacePersistService.tenantInfoCountByTenantId(namespaceId) > 0);
+        return (commonPersistService.tenantInfoCountByTenantId(namespaceId) > 0);
    }
    
    /**
@@ -149,10 +137,6 @@ 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);
    }
    
--- 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,20 +16,13 @@

 package com.alibaba.nacos.console.controller;

-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.common.utils.VersionUtils;
 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;

@@ -40,13 +33,8 @@ 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.
     *
@@ -55,29 +43,13 @@ public class ServerStateController {
    @GetMapping("/state")
    public ResponseEntity<Map<String, String>> serverState() {
        Map<String, String> serverState = new HashMap<>(4);
-        for (ModuleState each : ModuleStateHolder.getInstance().getAllModuleStates()) {
-            each.getStates().forEach((s, o) -> serverState.put(s, null == o ? null : o.toString()));
-        }
+        serverState.put("standalone_mode",
+                EnvUtil.getStandaloneMode() ? EnvUtil.STANDALONE_MODE_ALONE : EnvUtil.STANDALONE_MODE_CLUSTER);
+        
+        serverState.put("function_mode", EnvUtil.getFunctionMode());
+        serverState.put("version", VersionUtils.version);
+        
        return ResponseEntity.ok().body(serverState);
    }
    
-    @GetMapping("/announcement")
-    public RestResult<String> getAnnouncement() {
-        File announcementFile = new File(EnvUtil.getConfPath(), ANNOUNCEMENT_FILE);
-        String announcement = null;
-        if (announcementFile.exists() && announcementFile.isFile()) {
-            announcement = DiskUtils.readFile(announcementFile);
-        }
-        return RestResultUtils.success(announcement);
-    }
-    
-    @GetMapping("/guide")
-    public RestResult<String> getConsoleUiGuide() {
-        File guideFile = new File(EnvUtil.getConfPath(), GUIDE_FILE);
-        String guideInformation = null;
-        if (guideFile.exists() && guideFile.isFile()) {
-            guideInformation = DiskUtils.readFile(guideFile);
-        }
-        return RestResultUtils.success(guideInformation);
-    }
 }
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/HealthControllerV2.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/HealthControllerV2.java
@@ -1,66 +0,0 @@
-/*
- * Copyright 1999-2018 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.controller.v2;
-
-import com.alibaba.nacos.api.model.v2.Result;
-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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Health ControllerV2.
- *
- * @author DiligenceLai
- */
-@RestController("consoleHealthV2")
-@RequestMapping("/v2/console/health")
-@ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class)
-public class HealthControllerV2 {
-    
-    /**
-     * Whether the Nacos is in broken states or not, and cannot recover except by being restarted.
-     *
-     * @return HTTP code equal to 200 indicates that Nacos is in right states. HTTP code equal to 500 indicates that
-     * Nacos is in broken states.
-     */
-    @GetMapping("/liveness")
-    public Result<String> liveness() {
-        return Result.success("ok");
-    }
-    
-    /**
-     * Ready to receive the request or not.
-     *
-     * @return HTTP code equal to 200 indicates that Nacos is ready. HTTP code equal to 500 indicates that Nacos is not
-     * ready.
-     */
-    @GetMapping("/readiness")
-    public Result<String> readiness(HttpServletRequest request) {
-        ReadinessResult result = ModuleHealthCheckerHolder.getInstance().checkReadiness();
-        if (result.isSuccess()) {
-            return Result.success("ok");
-        }
-        return Result.failure(result.getResultMessage());
-    }
-    
-}
--- 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
@@ -23,12 +23,10 @@ import com.alibaba.nacos.api.model.v2.ErrorCode;
 import com.alibaba.nacos.api.model.v2.Result;
 import com.alibaba.nacos.auth.annotation.Secured;
 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.model.form.NamespaceForm;
-import com.alibaba.nacos.core.namespace.repository.NamespacePersistService;
-import com.alibaba.nacos.core.paramcheck.ExtractorManager;
-import com.alibaba.nacos.core.service.NamespaceOperationService;
+import com.alibaba.nacos.console.model.Namespace;
+import com.alibaba.nacos.console.model.NamespaceAllInfo;
+import com.alibaba.nacos.console.model.form.NamespaceForm;
+import com.alibaba.nacos.console.service.NamespaceOperationService;
 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;
@@ -54,21 +52,15 @@ import java.util.regex.Pattern;
@NacosApi
@RestController
@RequestMapping("/v2/console/namespace")
-@ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class)
 public class NamespaceControllerV2 {
    
    private final NamespaceOperationService namespaceOperationService;
-
-    private NamespacePersistService namespacePersistService;
    
-    public NamespaceControllerV2(NamespaceOperationService namespaceOperationService, NamespacePersistService namespacePersistService) {
+    public NamespaceControllerV2(NamespaceOperationService namespaceOperationService) {
        this.namespaceOperationService = namespaceOperationService;
-        this.namespacePersistService = namespacePersistService;
    }
    
    private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");
-
-    private final Pattern namespaceNameCheckPattern = Pattern.compile("^[^@#$%^&*]+$");
    
    private static final int NAMESPACE_ID_MAX_LENGTH = 128;
    
@@ -91,7 +83,8 @@ public class NamespaceControllerV2 {
    @GetMapping()
    @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX
            + "namespaces", action = ActionTypes.READ, signType = SignType.CONSOLE)
-    public Result<Namespace> getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
+    public Result<NamespaceAllInfo> getNamespace(@RequestParam("namespaceId") String namespaceId)
+            throws NacosException {
        return Result.success(namespaceOperationService.getNamespace(namespaceId));
    }
    
@@ -124,16 +117,6 @@ public class NamespaceControllerV2 {
                throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.ILLEGAL_NAMESPACE,
                        "too long namespaceId, over " + NAMESPACE_ID_MAX_LENGTH);
            }
-            // check unique
-            if (namespacePersistService.tenantInfoCountByTenantId(namespaceId) > 0) {
-                throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.ILLEGAL_NAMESPACE,
-                        "the namespaceId is existed, namespaceId: " + namespaceForm.getNamespaceId());
-            }
-        }
-        // contains illegal chars
-        if (!namespaceNameCheckPattern.matcher(namespaceName).matches()) {
-            throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.ILLEGAL_NAMESPACE,
-                "namespaceName [" + namespaceName + "] contains illegal char");
        }
        return Result.success(namespaceOperationService.createNamespace(namespaceId, namespaceName, namespaceDesc));
    }
@@ -149,11 +132,6 @@ public class NamespaceControllerV2 {
            + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE)
    public Result<Boolean> editNamespace(NamespaceForm namespaceForm) throws NacosException {
        namespaceForm.validate();
-        // contains illegal chars
-        if (!namespaceNameCheckPattern.matcher(namespaceForm.getNamespaceName()).matches()) {
-            throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.ILLEGAL_NAMESPACE,
-                "namespaceName [" + namespaceForm.getNamespaceName() + "] contains illegal char");
-        }
        return Result.success(namespaceOperationService
                .editNamespace(namespaceForm.getNamespaceId(), namespaceForm.getNamespaceName(),
                        namespaceForm.getNamespaceDesc()));
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/enums/NamespaceTypeEnum.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/enums/NamespaceTypeEnum.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 1999-2021 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.enums;
+
+/**
+ * the enum of namespace.
+ * 0 : Global configuration， 1 : Default private namespace ，2 : Custom namespace.
+ *
+ * @author chenglu
+ * @date 2021-05-25 17:01
+ */
+public enum NamespaceTypeEnum {
+    
+    /**
+     * Global configuration.
+     */
+    GLOBAL(0, "Global configuration"),
+    
+    /**
+     * Default private namespace.
+     */
+    PRIVATE(1, "Default private namespace"),
+    
+    /**
+     * Custom namespace.
+     */
+    CUSTOM(2, "Custom namespace");
+    
+    /**
+     * the namespace type.
+     */
+    private final int type;
+    
+    /**
+     * the description.
+     */
+    private final String description;
+    
+    NamespaceTypeEnum(int type, String description) {
+        this.type = type;
+        this.description = description;
+    }
+    
+    public int getType() {
+        return type;
+    }
+    
+    public String getDescription() {
+        return description;
+    }
+}
+
--- 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
@@ -26,7 +26,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.util.HtmlUtils;

 import javax.servlet.http.HttpServletRequest;

@@ -58,9 +57,8 @@ public class ConsoleExceptionHandler {
        LOGGER.error("CONSOLE {}", uri, e);
        if (uri.contains(Commons.NACOS_SERVER_VERSION_V2)) {
            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(RestResultUtils.failed(HtmlUtils.htmlEscape(ExceptionUtil.getAllExceptionMsg(e), "utf-8")));
+                    .body(RestResultUtils.failed(ExceptionUtil.getAllExceptionMsg(e)));
        }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(HtmlUtils.htmlEscape(ExceptionUtil.getAllExceptionMsg(e), "utf-8"));
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ExceptionUtil.getAllExceptionMsg(e));
    }
 }
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/model/Namespace.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/model/Namespace.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 1999-2018 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.model;
+
+/**
+ * Namespace.
+ *
+ * @author diamond
+ */
+public class Namespace {
+    
+    private String namespace;
+    
+    private String namespaceShowName;
+    
+    private String namespaceDesc;
+    
+    private int quota;
+    
+    private int configCount;
+    
+    /**
+     * see {@link com.alibaba.nacos.console.enums.NamespaceTypeEnum}.
+     */
+    private int type;
+    
+    public String getNamespaceShowName() {
+        return namespaceShowName;
+    }
+    
+    public void setNamespaceShowName(String namespaceShowName) {
+        this.namespaceShowName = namespaceShowName;
+    }
+    
+    public String getNamespace() {
+        return namespace;
+    }
+    
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
+    
+    public Namespace() {
+    }
+    
+    public Namespace(String namespace, String namespaceShowName) {
+        this.namespace = namespace;
+        this.namespaceShowName = namespaceShowName;
+    }
+    
+    public Namespace(String namespace, String namespaceShowName, int quota, int configCount, int type) {
+        this.namespace = namespace;
+        this.namespaceShowName = namespaceShowName;
+        this.quota = quota;
+        this.configCount = configCount;
+        this.type = type;
+    }
+    
+    public Namespace(String namespace, String namespaceShowName, String namespaceDesc, int quota, int configCount,
+            int type) {
+        this.namespace = namespace;
+        this.namespaceShowName = namespaceShowName;
+        this.quota = quota;
+        this.configCount = configCount;
+        this.type = type;
+        this.namespaceDesc = namespaceDesc;
+    }
+    
+    public String getNamespaceDesc() {
+        return namespaceDesc;
+    }
+    
+    public void setNamespaceDesc(String namespaceDesc) {
+        this.namespaceDesc = namespaceDesc;
+    }
+    
+    public int getQuota() {
+        return quota;
+    }
+    
+    public void setQuota(int quota) {
+        this.quota = quota;
+    }
+    
+    public int getConfigCount() {
+        return configCount;
+    }
+    
+    public void setConfigCount(int configCount) {
+        this.configCount = configCount;
+    }
+    
+    public int getType() {
+        return type;
+    }
+    
+    public void setType(int type) {
+        this.type = type;
+    }
+    
+}
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/model/NamespaceAllInfo.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/model/NamespaceAllInfo.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 1999-2018 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.model;
+
+/**
+ * all namespace info.
+ *
+ * @author Nacos
+ */
+public class NamespaceAllInfo extends Namespace {
+    
+    public NamespaceAllInfo(String namespace, String namespaceShowName, int quota, int configCount, int type,
+            String namespaceDesc) {
+        super(namespace, namespaceShowName, namespaceDesc, quota, configCount, type);
+    }
+    
+}
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/model/form/NamespaceForm.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/model/form/NamespaceForm.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 1999-2022 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.model.form;
+
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.exception.api.NacosApiException;
+import com.alibaba.nacos.api.model.v2.ErrorCode;
+import org.springframework.http.HttpStatus;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * NamespaceForm.
+ * @author dongyafei
+ * @date 2022/8/16
+ */
+public class NamespaceForm implements Serializable {
+    
+    private static final long serialVersionUID = -1078976569495343487L;
+    
+    private String namespaceId;
+    
+    private String namespaceName;
+    
+    private String namespaceDesc;
+    
+    public NamespaceForm() {
+    }
+    
+    public NamespaceForm(String namespaceId, String namespaceName, String namespaceDesc) {
+        this.namespaceId = namespaceId;
+        this.namespaceName = namespaceName;
+        this.namespaceDesc = namespaceDesc;
+    }
+    
+    public String getNamespaceId() {
+        return namespaceId;
+    }
+    
+    public void setNamespaceId(String namespaceId) {
+        this.namespaceId = namespaceId;
+    }
+    
+    public String getNamespaceName() {
+        return namespaceName;
+    }
+    
+    public void setNamespaceName(String namespaceName) {
+        this.namespaceName = namespaceName;
+    }
+    
+    public String getNamespaceDesc() {
+        return namespaceDesc;
+    }
+    
+    public void setNamespaceDesc(String namespaceDesc) {
+        this.namespaceDesc = namespaceDesc;
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        NamespaceForm that = (NamespaceForm) o;
+        return Objects.equals(namespaceId, that.namespaceId) && Objects.equals(namespaceName, that.namespaceName)
+                && Objects.equals(namespaceDesc, that.namespaceDesc);
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(namespaceId, namespaceName, namespaceDesc);
+    }
+    
+    @Override
+    public String toString() {
+        return "NamespaceVo{" + "namespaceId='" + namespaceId + '\'' + ", namespaceName='" + namespaceName + '\''
+                + ", namespaceDesc='" + namespaceDesc + '\'' + '}';
+    }
+    
+    /**
+     * check required param.
+     * @throws NacosException NacosException
+     */
+    public void validate() throws NacosException {
+        if (null == namespaceId) {
+            throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.PARAMETER_MISSING, "required parameter 'namespaceId' is missing");
+        }
+        if (null == namespaceName) {
+            throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.PARAMETER_MISSING, "required parameter 'namespaceName' is missing");
+        }
+    }
+}
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/paramcheck/ConsoleDefaultHttpParamExtractor.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/paramcheck/ConsoleDefaultHttpParamExtractor.java
@@ -1,56 +0,0 @@
-/*
- * 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.paramcheck;
-
-import com.alibaba.nacos.common.paramcheck.ParamInfo;
-import com.alibaba.nacos.common.utils.StringUtils;
-import com.alibaba.nacos.core.paramcheck.AbstractHttpParamExtractor;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Console default http param extractor.
- *
- * @author zhuoguang
- */
-public class ConsoleDefaultHttpParamExtractor extends AbstractHttpParamExtractor {
-    
-    @Override
-    public List<ParamInfo> extractParam(HttpServletRequest request) {
-        ParamInfo paramInfo = new ParamInfo();
-        paramInfo.setNamespaceId(getAliasNamespaceId(request));
-        paramInfo.setNamespaceShowName(getAliasNamespaceShowName(request));
-        ArrayList<ParamInfo> paramInfos = new ArrayList<>();
-        paramInfos.add(paramInfo);
-        return paramInfos;
-    }
-    
-    private String getAliasNamespaceId(HttpServletRequest request) {
-        String namespaceId = request.getParameter("namespaceId");
-        if (StringUtils.isBlank(namespaceId)) {
-            namespaceId = request.getParameter("customNamespaceId");
-        }
-        return namespaceId;
-    }
-    
-    private String getAliasNamespaceShowName(HttpServletRequest request) {
-        String namespaceShowName = request.getParameter("namespaceName");
-        return namespaceShowName;
-    }
-}
--- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/service/NamespaceOperationService.java
+++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/service/NamespaceOperationService.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 1999-2022 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.service;
+
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.exception.api.NacosApiException;
+import com.alibaba.nacos.api.model.v2.ErrorCode;
+import com.alibaba.nacos.common.utils.NamespaceUtil;
+import com.alibaba.nacos.common.utils.StringUtils;
+import com.alibaba.nacos.config.server.model.TenantInfo;
+import com.alibaba.nacos.config.server.service.repository.CommonPersistService;
+import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService;
+import com.alibaba.nacos.console.enums.NamespaceTypeEnum;
+import com.alibaba.nacos.console.model.Namespace;
+import com.alibaba.nacos.console.model.NamespaceAllInfo;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * NamespaceOperationService.
+ *
+ * @author dongyafei
+ * @date 2022/8/16
+ */
+
+@Service
+public class NamespaceOperationService {
+    
+    private final ConfigInfoPersistService configInfoPersistService;
+    
+    private final CommonPersistService commonPersistService;
+    
+    private static final String DEFAULT_NAMESPACE = "public";
+    
+    private static final String DEFAULT_NAMESPACE_SHOW_NAME = "Public";
+    
+    private static final String DEFAULT_NAMESPACE_DESCRIPTION = "Public Namespace";
+    
+    private static final int DEFAULT_QUOTA = 200;
+    
+    private static final String DEFAULT_CREATE_SOURCE = "nacos";
+    
+    private static final String DEFAULT_TENANT = "";
+    
+    private static final String DEFAULT_KP = "1";
+    
+    public NamespaceOperationService(ConfigInfoPersistService configInfoPersistService,
+            CommonPersistService commonPersistService) {
+        this.configInfoPersistService = configInfoPersistService;
+        this.commonPersistService = commonPersistService;
+    }
+    
+    public List<Namespace> getNamespaceList() {
+        // TODO 获取用kp
+        List<TenantInfo> tenantInfos = commonPersistService.findTenantByKp(DEFAULT_KP);
+        
+        Namespace namespace0 = new Namespace(NamespaceUtil.getNamespaceDefaultId(), DEFAULT_NAMESPACE, DEFAULT_QUOTA,
+                configInfoPersistService.configInfoCount(DEFAULT_TENANT), NamespaceTypeEnum.GLOBAL.getType());
+        List<Namespace> namespaceList = new ArrayList<>();
+        namespaceList.add(namespace0);
+        
+        for (TenantInfo tenantInfo : tenantInfos) {
+            int configCount = configInfoPersistService.configInfoCount(tenantInfo.getTenantId());
+            Namespace namespaceTmp = new Namespace(tenantInfo.getTenantId(), tenantInfo.getTenantName(),
+                    tenantInfo.getTenantDesc(), DEFAULT_QUOTA, configCount, NamespaceTypeEnum.CUSTOM.getType());
+            namespaceList.add(namespaceTmp);
+        }
+        return namespaceList;
+    }
+    
+    /**
+     * query namespace by namespace id.
+     *
+     * @param namespaceId namespace Id.
+     * @return NamespaceAllInfo.
+     */
+    public NamespaceAllInfo getNamespace(String namespaceId) throws NacosException {
+        // TODO 获取用kp
+        if (StringUtils.isBlank(namespaceId) || namespaceId.equals(NamespaceUtil.getNamespaceDefaultId())) {
+            return new NamespaceAllInfo(namespaceId, DEFAULT_NAMESPACE_SHOW_NAME, DEFAULT_QUOTA,
+                    configInfoPersistService.configInfoCount(DEFAULT_TENANT), NamespaceTypeEnum.GLOBAL.getType(),
+                    DEFAULT_NAMESPACE_DESCRIPTION);
+        } else {
+            TenantInfo tenantInfo = commonPersistService.findTenantByKp(DEFAULT_KP, namespaceId);
+            if (null == tenantInfo) {
+                throw new NacosApiException(HttpStatus.NOT_FOUND.value(), ErrorCode.NAMESPACE_NOT_EXIST,
+                        "namespaceId [ " + namespaceId + " ] not exist");
+            }
+            int configCount = configInfoPersistService.configInfoCount(namespaceId);
+            return new NamespaceAllInfo(namespaceId, tenantInfo.getTenantName(), DEFAULT_QUOTA, configCount,
+                    NamespaceTypeEnum.CUSTOM.getType(), tenantInfo.getTenantDesc());
+        }
+    }
+    
+    /**
+     * create namespace.
+     *
+     * @param namespaceId   namespace ID
+     * @param namespaceName namespace Name
+     * @param namespaceDesc namespace Desc
+     * @return whether create ok
+     */
+    public Boolean createNamespace(String namespaceId, String namespaceName, String namespaceDesc)
+            throws NacosException {
+        // TODO 获取用kp
+        if (commonPersistService.tenantInfoCountByTenantId(namespaceId) > 0) {
+            throw new NacosApiException(HttpStatus.INTERNAL_SERVER_ERROR.value(), ErrorCode.NAMESPACE_ALREADY_EXIST,
+                    "namespaceId [" + namespaceId + "] already exist");
+        }
+    
+        commonPersistService
+                .insertTenantInfoAtomic(DEFAULT_KP, namespaceId, namespaceName, namespaceDesc, DEFAULT_CREATE_SOURCE,
+                        System.currentTimeMillis());
+        return true;
+    }
+    
+    /**
+     * edit namespace.
+     */
+    public Boolean editNamespace(String namespaceId, String namespaceName, String namespaceDesc) {
+        // TODO 获取用kp
+        commonPersistService.updateTenantNameAtomic(DEFAULT_KP, namespaceId, namespaceName, namespaceDesc);
+        return true;
+    }
+    
+    /**
+     * remove namespace.
+     */
+    public Boolean removeNamespace(String namespaceId) {
+        commonPersistService.removeTenantInfoAtomic(DEFAULT_KP, namespaceId);
+        return true;
+    }
+}