diff --git a/pigx-config/src/main/resources/config/pigx-monitor-dev.yml b/pigx-config/src/main/resources/config/pigx-monitor-dev.yml index 39e609042..43b098d31 100644 --- a/pigx-config/src/main/resources/config/pigx-monitor-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-monitor-dev.yml @@ -2,5 +2,5 @@ spring: # 安全配置 security: user: - name: ENC(rZHA4LW5hHmhLAAzJoFNag==) - password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) + name: ENC(rZHA4LW5hHmhLAAzJoFNag==) # pigx + password: ENC(bjeyh+Aeii3kHXkoo00ZUw==) # pigx diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 2eb40ceb9..d482c5803 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -63,8 +63,8 @@ - org.springframework.cloud - spring-cloud-starter-security + org.springframework.boot + spring-boot-starter-security 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 0360680ce..7fe360c13 100644 --- 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 @@ -24,13 +24,12 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; -import org.springframework.security.web.csrf.CookieCsrfTokenRepository; /** * WebSecurityConfigurer * - * @author: lishangbu - * @date: 2018/10/8 + * @author lishangbu + * @date 2018/10/8 */ @Configuration public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { @@ -43,24 +42,24 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { // @formatter:off - SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); - successHandler.setTargetUrlParameter("redirectTo"); - successHandler.setDefaultTargetUrl(adminContextPath + "/"); + SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); + successHandler.setTargetUrlParameter("redirectTo"); + successHandler.setDefaultTargetUrl(adminContextPath + "/"); - http.authorizeRequests() - .antMatchers(adminContextPath + "/assets/**").permitAll() - .antMatchers(adminContextPath + "/login").permitAll() - .anyRequest().authenticated() - .and() - .formLogin().loginPage(adminContextPath + "/login").successHandler(successHandler).and() - .logout().logoutUrl(adminContextPath + "/logout").and() - .httpBasic().and() - .csrf() - .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()) - .ignoringAntMatchers( - adminContextPath + "/instances", - adminContextPath + "/actuator/**" - ); - // @formatter:on + http.authorizeRequests() + .antMatchers(adminContextPath + "/assets/**" + , adminContextPath + "/login" + , adminContextPath + "/actuator/**" + ).permitAll() + .anyRequest().authenticated() + .and() + .formLogin().loginPage(adminContextPath + "/login") + .successHandler(successHandler).and() + .logout().logoutUrl(adminContextPath + "/logout") + .and() + .httpBasic().and() + .csrf() + .disable(); + // @formatter:on } }