diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml
old mode 100755
new mode 100644
index ed1b53654..c90ba8aa3
--- a/pigx-register/pom.xml
+++ b/pigx-register/pom.xml
@@ -12,138 +12,138 @@
limitations under the License.
-->
- 4.0.0
-
- com.pig4cloud
- pigx
- 5.2.0-snapshot
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
+
+ com.pig4cloud
+ pigx
+ 5.2.0-snapshot
+
- pigx-register
- jar
- pigx-register
- nacos 注册配置中心
+ pigx-register
+ jar
+ pigx-register
+ nacos 注册配置中心
-
- 2.2.0.PIGOEM
- 2.7.14
- 2021.0.8
- 2.7.10
-
+
+ 2.2.4
+ 2.7.12
+ 2021.0.8
+ 2.7.8
+
-
-
- io.springboot.nacos
- nacos-config
- ${nacos.version}
-
-
- org.apache.tomcat.embed
- tomcat-embed-jasper
-
+
+
+ io.springboot.nacos
+ nacos-config
+ ${nacos.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-jasper
+
-
- io.springboot.nacos
- nacos-naming
- ${nacos.version}
-
+
+ io.springboot.nacos
+ nacos-naming
+ ${nacos.version}
+
-
- io.springboot.nacos
- nacos-istio
- ${nacos.version}
-
+
+ io.springboot.nacos
+ nacos-istio
+ ${nacos.version}
+
-
- io.springboot.nacos
- nacos-plugin-default-impl
- ${nacos.version}
-
+
+ io.springboot.nacos
+ nacos-plugin-default-impl
+ ${nacos.version}
+
-
- io.springboot.nacos
- nacos-prometheus
- ${nacos.version}
-
+
+ io.springboot.nacos
+ nacos-prometheus
+ ${nacos.version}
+
-
- org.springframework.boot
- spring-boot-starter-security
-
+
+ org.springframework.boot
+ spring-boot-starter-security
+
-
- cn.hutool
- hutool-system
-
-
+
+ cn.hutool
+ hutool-system
+
+
-
-
-
+
+
+
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot-dependencies.version}
- pom
- import
-
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${spring-boot-dependencies.version}
+ pom
+ import
+
-
-
- org.springframework.cloud
- spring-cloud-dependencies
- ${spring-cloud.version}
- pom
- import
-
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ ${spring-cloud.version}
+ pom
+ import
+
-
-
- de.codecentric
- spring-boot-admin-starter-server
- ${spring-boot-admin.version}
-
+
+
+ de.codecentric
+ spring-boot-admin-starter-server
+ ${spring-boot-admin.version}
+
-
-
+
+
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
- io.fabric8
- docker-maven-plugin
-
-
-
-
- src/main/resources
- true
-
- **/*.woff
- **/*.woff2
- **/*.ttf
- **/*.eot
-
-
-
- src/main/resources
- false
-
- **/*.woff
- **/*.woff2
- **/*.ttf
- **/*.eot
-
-
-
-
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ io.fabric8
+ docker-maven-plugin
+
+
+
+
+ src/main/resources
+ true
+
+ **/*.woff
+ **/*.woff2
+ **/*.ttf
+ **/*.eot
+
+
+
+ src/main/resources
+ false
+
+ **/*.woff
+ **/*.woff2
+ **/*.ttf
+ **/*.eot
+
+
+
+
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
old mode 100755
new mode 100644
index 5d301bd93..73192b250
--- a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
@@ -43,9 +43,10 @@ public class PigxNacosApplication {
*/
private static boolean initEnv() {
System.setProperty(ConfigConstants.STANDALONE_MODE, "true");
- System.setProperty(ConfigConstants.AUTH_ENABLED, "true");
+ System.setProperty(ConfigConstants.AUTH_ENABLED, "false");
System.setProperty(ConfigConstants.LOG_BASEDIR, "logs");
- System.setProperty(ConfigConstants.LOG_ENABLED, "true");
+ System.setProperty(ConfigConstants.LOG_ENABLED, "false");
+ System.setProperty(ConfigConstants.NACOS_CONTEXT_PATH, "/nacos");
return true;
}
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/ConfigConstants.java b/pigx-register/src/main/java/com/alibaba/nacos/config/ConfigConstants.java
index 91133f546..b4998e421 100644
--- a/pigx-register/src/main/java/com/alibaba/nacos/config/ConfigConstants.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/config/ConfigConstants.java
@@ -45,4 +45,9 @@ public interface ConfigConstants {
*/
String LOG_ENABLED = "server.tomcat.accesslog.enabled";
+ /**
+ * 路径 nacos context path
+ */
+ String NACOS_CONTEXT_PATH = "server.servlet.contextPath";
+
}
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java
index b5dbe6e89..be96ebcbe 100644
--- a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java
@@ -16,7 +16,6 @@
package com.alibaba.nacos.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.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -65,17 +64,11 @@ public class ConsoleConfig {
config.addAllowedHeader("*");
config.setMaxAge(18000L);
config.addAllowedMethod("*");
- config.addAllowedOriginPattern("*");
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config);
return new CorsFilter(source);
}
- @Bean
- public XssFilter xssFilter() {
- return new XssFilter();
- }
-
@Bean
public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(ZoneId.systemDefault().toString());
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/server/service/HistoryService.java b/pigx-register/src/main/java/com/alibaba/nacos/config/server/service/HistoryService.java
deleted file mode 100644
index 3e3c5cb6b..000000000
--- a/pigx-register/src/main/java/com/alibaba/nacos/config/server/service/HistoryService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.alibaba.nacos.config.server.service;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.nacos.common.utils.Pair;
-import com.alibaba.nacos.config.server.model.ConfigHistoryInfo;
-import com.alibaba.nacos.config.server.model.ConfigInfoWrapper;
-import com.alibaba.nacos.config.server.model.Page;
-import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService;
-import com.alibaba.nacos.config.server.service.repository.HistoryConfigInfoPersistService;
-import com.alibaba.nacos.plugin.auth.exception.AccessException;
-import com.alibaba.nacos.plugin.encryption.handler.EncryptionHandler;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-@Service
-public class HistoryService {
-
- private final HistoryConfigInfoPersistService historyConfigInfoPersistService;
-
- private final ConfigInfoPersistService configInfoPersistService;
-
- public HistoryService(HistoryConfigInfoPersistService historyConfigInfoPersistService,
- ConfigInfoPersistService configInfoPersistService) {
- this.historyConfigInfoPersistService = historyConfigInfoPersistService;
- this.configInfoPersistService = configInfoPersistService;
- }
-
- public Page listConfigHistory(String dataId, String group, String namespaceId, Integer pageNo,
- Integer pageSize) {
- return this.historyConfigInfoPersistService.findConfigHistory(dataId, group, namespaceId, pageNo, pageSize);
- }
-
- public ConfigHistoryInfo getConfigHistoryInfo(String dataId, String group, String namespaceId, Long nid)
- throws AccessException {
- ConfigHistoryInfo configHistoryInfo = this.historyConfigInfoPersistService.detailConfigHistory(nid);
- if (Objects.isNull(configHistoryInfo)) {
- return null;
- }
- else {
- this.checkHistoryInfoPermission(configHistoryInfo, dataId, group, namespaceId);
- String encryptedDataKey = configHistoryInfo.getEncryptedDataKey();
- Pair pair = EncryptionHandler.decryptHandler(dataId, encryptedDataKey,
- configHistoryInfo.getContent());
- configHistoryInfo.setContent((String) pair.getSecond());
- return configHistoryInfo;
- }
- }
-
- public ConfigHistoryInfo getPreviousConfigHistoryInfo(String dataId, String group, String namespaceId, Long id)
- throws AccessException {
- ConfigHistoryInfo configHistoryInfo = this.historyConfigInfoPersistService.detailPreviousConfigHistory(id);
- if (Objects.isNull(configHistoryInfo)) {
- return null;
- }
- else {
- this.checkHistoryInfoPermission(configHistoryInfo, dataId, group, namespaceId);
- return configHistoryInfo;
- }
- }
-
- public List getConfigListByNamespace(String namespaceId) {
- return this.configInfoPersistService.queryConfigInfoByNamespace(namespaceId);
- }
-
- /**
- * 覆盖原有的校验方式,oracle 数据库没有空 字符串 只有 null
- * @param configHistoryInfo
- * @param dataId
- * @param group
- * @param namespaceId
- * @throws AccessException
- */
- private void checkHistoryInfoPermission(ConfigHistoryInfo configHistoryInfo, String dataId, String group,
- String namespaceId) throws AccessException {
- if (!Objects.equals(configHistoryInfo.getDataId(), dataId)
- || !Objects.equals(configHistoryInfo.getGroup(), group)
- || (!StrUtil.isEmpty(configHistoryInfo.getTenant())
- && !Objects.equals(configHistoryInfo.getTenant(), namespaceId))) {
- throw new AccessException("Please check dataId, group or namespaceId.");
- }
- }
-
-}
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/server/service/package-info.java b/pigx-register/src/main/java/com/alibaba/nacos/config/server/service/package-info.java
deleted file mode 100644
index d3c747a1d..000000000
--- a/pigx-register/src/main/java/com/alibaba/nacos/config/server/service/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 处理再oracle数据库下空置的判断
- */
-package com.alibaba.nacos.config.server.service;
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/console/controller/HealthController.java b/pigx-register/src/main/java/com/alibaba/nacos/console/controller/HealthController.java
index 2b088165d..f5b0e9813 100644
--- a/pigx-register/src/main/java/com/alibaba/nacos/console/controller/HealthController.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/console/controller/HealthController.java
@@ -37,77 +37,74 @@ import javax.servlet.http.HttpServletRequest;
@RestController("consoleHealth")
@RequestMapping("/v1/console/health")
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.
- * @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 ResponseEntity liveness() {
- return ResponseEntity.ok().body("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 ResponseEntity readiness(HttpServletRequest request) {
- boolean isConfigReadiness = isConfigReadiness();
- boolean isNamingReadiness = isNamingReadiness(request);
-
- if (isConfigReadiness && isNamingReadiness) {
- 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");
- }
-
- 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;
- }
-
+
+ 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.
+ *
+ * @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 ResponseEntity liveness() {
+ return ResponseEntity.ok().body("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 ResponseEntity readiness(HttpServletRequest request) {
+ boolean isConfigReadiness = isConfigReadiness();
+ boolean isNamingReadiness = isNamingReadiness(request);
+
+ if (isConfigReadiness && isNamingReadiness) {
+ 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");
+ }
+
+ 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/pigx-register/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java b/pigx-register/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
index 995767c0f..ffe1e31de 100644
--- a/pigx-register/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
+++ b/pigx-register/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,104 +48,108 @@ 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.
- * @return namespace list
- */
- @GetMapping
- public RestResult> getNamespaces() {
- return RestResultUtils.success(namespaceOperationService.getNamespaceList());
- }
-
- /**
- * get namespace all info by namespace id.
- * @param namespaceId namespaceId
- * @return namespace all info
- */
- @GetMapping(params = "show=all")
- public NamespaceAllInfo getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
- return namespaceOperationService.getNamespace(namespaceId);
- }
-
- /**
- * create namespace.
- * @param namespaceName namespace Name
- * @param namespaceDesc namespace Desc
- * @return whether create ok
- */
- @PostMapping
- @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX + "namespaces", action = ActionTypes.WRITE)
- public Boolean createNamespace(@RequestParam("customNamespaceId") String namespaceId,
- @RequestParam("namespaceName") String namespaceName,
- @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
- if (StringUtils.isBlank(namespaceId)) {
- namespaceId = UUID.randomUUID().toString();
- }
- else {
- namespaceId = namespaceId.trim();
- if (!namespaceIdCheckPattern.matcher(namespaceId).matches()) {
- return false;
- }
- if (namespaceId.length() > NAMESPACE_ID_MAX_LENGTH) {
- return false;
- }
- }
- try {
- return namespaceOperationService.createNamespace(namespaceId, namespaceName, namespaceDesc);
- }
- catch (NacosException e) {
- return false;
- }
- }
-
- /**
- * check namespaceId exist.
- * @param namespaceId namespace id
- * @return true if exist, otherwise false
- */
- @GetMapping(params = "checkNamespaceIdExist=true")
- public Boolean checkNamespaceIdExist(@RequestParam("customNamespaceId") String namespaceId) {
- if (StringUtils.isBlank(namespaceId)) {
- return false;
- }
- return (commonPersistService.tenantInfoCountByTenantId(namespaceId) > 0);
- }
-
- /**
- * edit namespace.
- * @param namespace namespace
- * @param namespaceShowName namespace ShowName
- * @param namespaceDesc namespace Desc
- * @return whether edit ok
- */
- @PutMapping
- @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX + "namespaces", action = ActionTypes.WRITE)
- public Boolean editNamespace(@RequestParam("namespace") String namespace,
- @RequestParam("namespaceShowName") String namespaceShowName,
- @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
- return namespaceOperationService.editNamespace(namespace, namespaceShowName, namespaceDesc);
- }
-
- /**
- * del namespace by id.
- * @param namespaceId namespace Id
- * @return whether del ok
- */
- @DeleteMapping
- @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX + "namespaces", action = ActionTypes.WRITE)
- public Boolean deleteNamespace(@RequestParam("namespaceId") String namespaceId) {
- return namespaceOperationService.removeNamespace(namespaceId);
- }
-
+
+ @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.
+ *
+ * @return namespace list
+ */
+ @GetMapping
+ public RestResult> getNamespaces() {
+ return RestResultUtils.success(namespaceOperationService.getNamespaceList());
+ }
+
+ /**
+ * get namespace all info by namespace id.
+ *
+ * @param namespaceId namespaceId
+ * @return namespace all info
+ */
+ @GetMapping(params = "show=all")
+ public NamespaceAllInfo getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException {
+ return namespaceOperationService.getNamespace(namespaceId);
+ }
+
+ /**
+ * create namespace.
+ *
+ * @param namespaceName namespace Name
+ * @param namespaceDesc namespace Desc
+ * @return whether create ok
+ */
+ @PostMapping
+ @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX + "namespaces", action = ActionTypes.WRITE)
+ public Boolean createNamespace(@RequestParam("customNamespaceId") String namespaceId,
+ @RequestParam("namespaceName") String namespaceName,
+ @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
+ if (StringUtils.isBlank(namespaceId)) {
+ namespaceId = UUID.randomUUID().toString();
+ } else {
+ namespaceId = namespaceId.trim();
+ if (!namespaceIdCheckPattern.matcher(namespaceId).matches()) {
+ return false;
+ }
+ if (namespaceId.length() > NAMESPACE_ID_MAX_LENGTH) {
+ return false;
+ }
+ }
+ try {
+ return namespaceOperationService.createNamespace(namespaceId, namespaceName, namespaceDesc);
+ } catch (NacosException e) {
+ return false;
+ }
+ }
+
+ /**
+ * check namespaceId exist.
+ *
+ * @param namespaceId namespace id
+ * @return true if exist, otherwise false
+ */
+ @GetMapping(params = "checkNamespaceIdExist=true")
+ public Boolean checkNamespaceIdExist(@RequestParam("customNamespaceId") String namespaceId) {
+ if (StringUtils.isBlank(namespaceId)) {
+ return false;
+ }
+ return (commonPersistService.tenantInfoCountByTenantId(namespaceId) > 0);
+ }
+
+ /**
+ * edit namespace.
+ *
+ * @param namespace namespace
+ * @param namespaceShowName namespace ShowName
+ * @param namespaceDesc namespace Desc
+ * @return whether edit ok
+ */
+ @PutMapping
+ @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX + "namespaces", action = ActionTypes.WRITE)
+ public Boolean editNamespace(@RequestParam("namespace") String namespace,
+ @RequestParam("namespaceShowName") String namespaceShowName,
+ @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
+ return namespaceOperationService.editNamespace(namespace, namespaceShowName, namespaceDesc);
+ }
+
+ /**
+ * del namespace by id.
+ *
+ * @param namespaceId namespace Id
+ * @return whether del ok
+ */
+ @DeleteMapping
+ @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX + "namespaces", action = ActionTypes.WRITE)
+ public Boolean deleteNamespace(@RequestParam("namespaceId") String namespaceId) {
+ return namespaceOperationService.removeNamespace(namespaceId);
+ }
+
}
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java b/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
index ceb34fa5a..22cd26ae4 100644
--- a/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
@@ -16,13 +16,19 @@
package com.alibaba.nacos.console.controller;
-import com.alibaba.nacos.common.utils.VersionUtils;
-import com.alibaba.nacos.sys.env.EnvUtil;
+import cn.hutool.core.io.FileUtil;
+import com.alibaba.nacos.common.model.RestResult;
+import com.alibaba.nacos.common.model.RestResultUtils;
+import com.alibaba.nacos.sys.module.ModuleState;
+import com.alibaba.nacos.sys.module.ModuleStateHolder;
+import lombok.SneakyThrows;
+import org.springframework.core.io.ClassPathResource;
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.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
@@ -35,20 +41,26 @@ import java.util.Map;
@RequestMapping("/v1/console/server")
public class ServerStateController {
- /**
- * Get server state of current server.
- * @return state json.
- */
- @GetMapping("/state")
- public ResponseEntity