diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 94956fd90..c62df1090 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -18,7 +18,7 @@ 2023.0.1.2 1.8.8 1.7.1 - 2.3.3 + 2.4.3 3.2.14 1.0.11 diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml index 21d577c83..ad2bd1397 100644 --- a/ruoyi-visual/ruoyi-nacos/pom.xml +++ b/ruoyi-visual/ruoyi-nacos/pom.xml @@ -27,7 +27,8 @@ jar - 2.3.2 + 2.4.3 + 2.0 2.7.18 2.7.11 @@ -253,10 +254,6 @@ jjwt-jackson runtime - - org.javatuples - javatuples - com.google.code.gson gson @@ -295,6 +292,13 @@ org.slf4j jul-to-slf4j + + + org.yaml + snakeyaml + ${SnakeYaml.version} + + org.springframework.boot spring-boot-starter-security 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 160a4b47f..5062d4958 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 @@ -43,13 +43,13 @@ import java.time.ZoneId; @EnableScheduling @PropertySource("/application.properties") public class ConsoleConfig { - + @Autowired private ControllerMethodsCache methodsCache; - + @Value("${nacos.console.ui.enabled:true}") private boolean consoleUiEnabled; - + /** * Init. */ @@ -60,7 +60,7 @@ public class ConsoleConfig { methodsCache.initClassMethod("com.alibaba.nacos.config.server.controller"); methodsCache.initClassMethod("com.alibaba.nacos.console.controller"); } - + @Bean public CorsFilter corsFilter() { CorsConfiguration config = new CorsConfiguration(); @@ -73,17 +73,17 @@ public class ConsoleConfig { 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()); } - + 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 index bc036ad00..3ab7a6ae4 100644 --- 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 @@ -26,11 +26,11 @@ import com.alibaba.nacos.sys.utils.ApplicationUtils; * @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); 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 70988587c..fd191023d 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 @@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping("/v1/console/health") @ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class) public class HealthController { - + /** * Whether the Nacos is in broken states or not, and cannot recover except by being restarted. * @@ -48,7 +48,7 @@ public class HealthController { public ResponseEntity liveness() { return ResponseEntity.ok().body("OK"); } - + /** * Ready to receive the request or not. * @@ -63,5 +63,5 @@ public class HealthController { } return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result.getResultMessage()); } - + } 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 fe358c08e..39c7b1615 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 @@ -22,20 +22,14 @@ 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.namespace.repository.NamespacePersistService; import com.alibaba.nacos.core.paramcheck.ExtractorManager; import com.alibaba.nacos.core.service.NamespaceOperationService; import com.alibaba.nacos.plugin.auth.constant.ActionTypes; import com.alibaba.nacos.plugin.auth.impl.constant.AuthConstants; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.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 org.springframework.web.bind.annotation.*; import java.util.List; import java.util.UUID; @@ -94,8 +88,8 @@ public class NamespaceController { @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) { + @RequestParam("namespaceName") String namespaceName, + @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) { if (StringUtils.isBlank(namespaceId)) { namespaceId = UUID.randomUUID().toString(); } else { @@ -147,8 +141,8 @@ public class NamespaceController { @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) { + @RequestParam("namespaceShowName") String namespaceShowName, + @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) { // contains illegal chars if (!namespaceNameCheckPattern.matcher(namespaceShowName).matches()) { return false; 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 4c6cf0552..1ff3b1d19 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 @@ -34,9 +34,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import static com.alibaba.nacos.common.utils.StringUtils.FOLDER_SEPARATOR; -import static com.alibaba.nacos.common.utils.StringUtils.TOP_PATH; -import static com.alibaba.nacos.common.utils.StringUtils.WINDOWS_FOLDER_SEPARATOR; +import static com.alibaba.nacos.common.utils.StringUtils.*; /** * Server state controller. @@ -68,7 +66,7 @@ public class ServerStateController { @GetMapping("/announcement") public RestResult getAnnouncement( - @RequestParam(required = false, name = "language", defaultValue = "zh-CN") String language) { + @RequestParam(required = false, name = "language", defaultValue = "zh-CN") String language) { String file = ANNOUNCEMENT_FILE.substring(0, ANNOUNCEMENT_FILE.length() - 5) + "_" + language + ".conf"; if (file.contains(TOP_PATH) || file.contains(FOLDER_SEPARATOR) || file.contains(WINDOWS_FOLDER_SEPARATOR)) { throw new IllegalArgumentException("Invalid filename"); diff --git 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 index 75d9a130e..a60eb4ad0 100644 --- 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 @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest; @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. * @@ -47,7 +47,7 @@ public class HealthControllerV2 { public Result liveness() { return Result.success("ok"); } - + /** * Ready to receive the request or not. * @@ -62,5 +62,5 @@ public class HealthControllerV2 { } return Result.failure(result.getResultMessage()); } - + } 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 ea5cb1502..662f6a894 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 @@ -33,13 +33,7 @@ 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.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 org.springframework.web.bind.annotation.*; import java.util.List; import java.util.UUID; @@ -90,7 +84,7 @@ public class NamespaceControllerV2 { */ @GetMapping() @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX - + "namespaces", action = ActionTypes.READ, signType = SignType.CONSOLE) + + "namespaces", action = ActionTypes.READ, signType = SignType.CONSOLE) public Result getNamespace(@RequestParam("namespaceId") String namespaceId) throws NacosException { return Result.success(namespaceOperationService.getNamespace(namespaceId)); } @@ -103,7 +97,7 @@ public class NamespaceControllerV2 { */ @PostMapping @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX - + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE) + + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE) public Result createNamespace(NamespaceForm namespaceForm) throws NacosException { namespaceForm.validate(); @@ -118,16 +112,16 @@ public class NamespaceControllerV2 { namespaceId = namespaceId.trim(); if (!namespaceIdCheckPattern.matcher(namespaceId).matches()) { throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.ILLEGAL_NAMESPACE, - "namespaceId [" + namespaceId + "] mismatch the pattern"); + "namespaceId [" + namespaceId + "] mismatch the pattern"); } if (namespaceId.length() > NAMESPACE_ID_MAX_LENGTH) { throw new NacosApiException(HttpStatus.BAD_REQUEST.value(), ErrorCode.ILLEGAL_NAMESPACE, - "too long namespaceId, over " + NAMESPACE_ID_MAX_LENGTH); + "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()); + "the namespaceId is existed, namespaceId: " + namespaceForm.getNamespaceId()); } } // contains illegal chars @@ -146,7 +140,7 @@ public class NamespaceControllerV2 { */ @PutMapping @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX - + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE) + + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE) public Result editNamespace(NamespaceForm namespaceForm) throws NacosException { namespaceForm.validate(); // contains illegal chars @@ -155,8 +149,8 @@ public class NamespaceControllerV2 { "namespaceName [" + namespaceForm.getNamespaceName() + "] contains illegal char"); } return Result.success(namespaceOperationService - .editNamespace(namespaceForm.getNamespaceId(), namespaceForm.getNamespaceName(), - namespaceForm.getNamespaceDesc())); + .editNamespace(namespaceForm.getNamespaceId(), namespaceForm.getNamespaceName(), + namespaceForm.getNamespaceDesc())); } /** @@ -167,7 +161,7 @@ public class NamespaceControllerV2 { */ @DeleteMapping @Secured(resource = AuthConstants.CONSOLE_RESOURCE_NAME_PREFIX - + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE) + + "namespaces", action = ActionTypes.WRITE, signType = SignType.CONSOLE) public Result deleteNamespace(@RequestParam("namespaceId") String namespaceId) { return Result.success(namespaceOperationService.removeNamespace(namespaceId)); } 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 25ba51e2e..33daeff13 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 @@ -17,10 +17,10 @@ package com.alibaba.nacos.console.exception; import com.alibaba.nacos.api.exception.runtime.NacosRuntimeException; -import com.alibaba.nacos.plugin.auth.exception.AccessException; import com.alibaba.nacos.common.model.RestResultUtils; import com.alibaba.nacos.common.utils.ExceptionUtil; import com.alibaba.nacos.core.utils.Commons; +import com.alibaba.nacos.plugin.auth.exception.AccessException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -65,9 +65,9 @@ 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(HtmlUtils.htmlEscape(ExceptionUtil.getAllExceptionMsg(e), "utf-8"))); } return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) - .body(HtmlUtils.htmlEscape(ExceptionUtil.getAllExceptionMsg(e), "utf-8")); + .body(HtmlUtils.htmlEscape(ExceptionUtil.getAllExceptionMsg(e), "utf-8")); } } diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java index bb3267697..754e4a9c7 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java +++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java @@ -52,15 +52,15 @@ import java.io.IOException; @ControllerAdvice(annotations = {NacosApi.class}) @ResponseBody public class NacosApiExceptionHandler { - + private static final Logger LOGGER = LoggerFactory.getLogger(NacosApiExceptionHandler.class); - + @ExceptionHandler(NacosApiException.class) public ResponseEntity> handleNacosApiException(NacosApiException e) { LOGGER.error("got exception. {} {}", e.getErrAbstract(), e.getErrMsg()); return ResponseEntity.status(e.getErrCode()).body(new Result<>(e.getDetailErrCode(), e.getErrAbstract(), e.getErrMsg())); } - + @ExceptionHandler(NacosException.class) public ResponseEntity> handleNacosException(NacosException e) { LOGGER.error("got exception. {}", e.getErrMsg()); @@ -72,63 +72,63 @@ public class NacosApiExceptionHandler { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return ResponseEntity.status(e.getErrCode()).body(Result.failure(ErrorCode.SERVER_ERROR, e.getMessage())); } - + @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(HttpMessageNotReadableException.class) public Result handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.PARAMETER_MISSING, e.getMessage()); } - + @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(HttpMessageConversionException.class) public Result handleHttpMessageConversionException(HttpMessageConversionException e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.PARAMETER_VALIDATE_ERROR, e.getMessage()); } - + @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(NumberFormatException.class) public Result handleNumberFormatException(NumberFormatException e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.PARAMETER_VALIDATE_ERROR, e.getMessage()); } - + @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(IllegalArgumentException.class) public Result handleIllegalArgumentException(IllegalArgumentException e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.PARAMETER_VALIDATE_ERROR, e.getMessage()); } - + @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(MissingServletRequestParameterException.class) public Result handleMissingServletRequestParameterException(MissingServletRequestParameterException e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.PARAMETER_MISSING, e.getMessage()); } - + @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(HttpMediaTypeException.class) public Result handleHttpMediaTypeException(HttpMediaTypeException e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.MEDIA_TYPE_ERROR, e.getMessage()); } - + @ResponseStatus(HttpStatus.FORBIDDEN) @ExceptionHandler(AccessException.class) public Result handleAccessException(AccessException e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.ACCESS_DENIED, e.getErrMsg()); } - + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) @ExceptionHandler(value = {DataAccessException.class, ServletException.class, IOException.class}) public Result handleDataAccessException(Exception e) { LOGGER.error("got exception. {} {}", e.getMessage(), ExceptionUtil.getAllExceptionMsg(e)); return Result.failure(ErrorCode.DATA_ACCESS_ERROR, e.getMessage()); } - + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) @ExceptionHandler(Exception.class) public Result handleOtherException(Exception e) { diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java index 796a09cac..192a609ac 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java +++ b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java @@ -29,15 +29,15 @@ import java.io.IOException; * @author onewe */ public class XssFilter extends OncePerRequestFilter { - + private static final String CONTENT_SECURITY_POLICY_HEADER = "Content-Security-Policy"; - + private static final String CONTENT_SECURITY_POLICY = "script-src 'self'"; - + @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) - throws ServletException, IOException { - + throws ServletException, IOException { + response.setHeader(CONTENT_SECURITY_POLICY_HEADER, CONTENT_SECURITY_POLICY); filterChain.doFilter(request, response); } diff --git 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 index 24604eba0..0d71d6ab3 100644 --- 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 @@ -30,7 +30,7 @@ import java.util.List; * @author zhuoguang */ public class ConsoleDefaultHttpParamExtractor extends AbstractHttpParamExtractor { - + @Override public List extractParam(HttpServletRequest request) { ParamInfo paramInfo = new ParamInfo(); @@ -40,7 +40,7 @@ public class ConsoleDefaultHttpParamExtractor extends AbstractHttpParamExtractor paramInfos.add(paramInfo); return paramInfos; } - + private String getAliasNamespaceId(HttpServletRequest request) { String namespaceId = request.getParameter("namespaceId"); if (StringUtils.isBlank(namespaceId)) { @@ -48,7 +48,7 @@ public class ConsoleDefaultHttpParamExtractor extends AbstractHttpParamExtractor } return namespaceId; } - + private String getAliasNamespaceShowName(HttpServletRequest request) { String namespaceShowName = request.getParameter("namespaceName"); return namespaceShowName; diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties index f4b94fcf1..a9d1bd270 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties @@ -48,14 +48,6 @@ db.password.0=root nacos.config.push.maxRetryTime=50 #*************** Naming Module Related Configurations ***************# -### Data dispatch task execution period in milliseconds: - - - - - - - ### If enable data warmup. If set to false, the server would accept request without local data preparation: # nacos.naming.data.warmup=true diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.4.3.jar similarity index 58% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.4.3.jar index 87b37ae39..51a495806 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.3.2.jar deleted file mode 100644 index daa5ad3e9..000000000 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.3.2.jar and /dev/null differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.4.3.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.4.3.jar new file mode 100644 index 000000000..2749ab513 Binary files /dev/null and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.4.3.jar similarity index 57% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.4.3.jar index 36972a1ea..785038c17 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.4.3.jar similarity index 72% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.4.3.jar index 8e40fdb3c..fb3b06ba0 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.4.3.jar similarity index 61% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.4.3.jar index e01c4ce9e..f25ca45fd 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.4.3.jar similarity index 59% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.4.3.jar index af568e964..ad6d941bf 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.3.2.jar deleted file mode 100644 index 6d2bd46a6..000000000 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.3.2.jar and /dev/null differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.4.3.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.4.3.jar new file mode 100644 index 000000000..b7e35fe2e Binary files /dev/null and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.4.3.jar similarity index 76% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.4.3.jar index bbdb04044..5a5deb03f 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.4.3.jar similarity index 65% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.4.3.jar index c07e115ab..a26338362 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.3.2.jar deleted file mode 100644 index 4bf7b2381..000000000 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.3.2.jar and /dev/null differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.4.3.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.4.3.jar new file mode 100644 index 000000000..36baba0ca Binary files /dev/null and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.4.3.jar similarity index 70% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.4.3.jar index 0a3ecb8a3..0a27dbdf8 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.4.3.jar similarity index 70% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.4.3.jar index 081e28614..3040bb62c 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.4.3.jar similarity index 53% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.4.3.jar index 9f0761815..78421d274 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.4.3.jar differ diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.3.2.jar b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.4.3.jar similarity index 59% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.3.2.jar rename to ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.4.3.jar index 8d9547b5a..31bee6d85 100644 Binary files a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.3.2.jar and b/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.4.3.jar differ diff --git a/sql/ry-config.sql b/sql/ry-config.sql index 68d8370d6..af2f4b2c2 100644 --- a/sql/ry-config.sql +++ b/sql/ry-config.sql @@ -172,7 +172,7 @@ CREATE TABLE `his_config_info` ( `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', `op_type` char(10) DEFAULT NULL COMMENT 'operation type', `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`),