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 755523d52..327f8cc7a 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java @@ -15,6 +15,8 @@ */ package com.alibaba.nacos.config; +import javax.annotation.PostConstruct; + import com.alibaba.nacos.core.code.ControllerMethodsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -25,8 +27,6 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import javax.annotation.PostConstruct; - /** * @author yshen * @author nkorange @@ -52,7 +52,7 @@ public class ConsoleConfig { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); - config.addAllowedOrigin("*"); + config.addAllowedOriginPattern("*"); config.addAllowedHeader("*"); config.setMaxAge(18000L); config.addAllowedMethod("*"); diff --git a/pigx-register/src/main/resources/application.yml b/pigx-register/src/main/resources/application.yml index 14189a581..d55854071 100755 --- a/pigx-register/src/main/resources/application.yml +++ b/pigx-register/src/main/resources/application.yml @@ -36,6 +36,10 @@ spring: useAddressServer: true management: + endpoints: + web: + exposure: + include: '*' metrics: export: influx: @@ -45,5 +49,5 @@ management: # 屏蔽scanner warning 日志 logging: -
 level: -
 org.apache.tomcat.util.scan.StandardJarScanner: ERROR \ No newline at end of file + level: + org.apache.tomcat.util.scan.StandardJarScanner: ERROR \ No newline at end of file diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/config/WebSecurityConfigurer.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/config/WebSecurityConfigurer.java index fbccb93ff..7687ccf37 100755 --- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/config/WebSecurityConfigurer.java +++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/config/WebSecurityConfigurer.java @@ -51,8 +51,9 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { .headers().frameOptions().disable() .and().authorizeRequests() .antMatchers(adminContextPath + "/assets/**" - , adminContextPath + "/login" + ,adminContextPath + "/login" , adminContextPath + "/actuator/**" + , adminContextPath + "/instances/**" , adminContextPath + "/redis/info" ).permitAll() .anyRequest().authenticated() diff --git a/pom.xml b/pom.xml index 1bdab45f3..578994cfd 100644 --- a/pom.xml +++ b/pom.xml @@ -42,8 +42,8 @@ 3.8.1 0.0.23 2.2.5 - 2.3.1 - 5.5.7 + 2.4.0 + 5.5.8 1.2.7 3.0.0 3.0.2