diff --git a/pigx-visual/pigx-bi-platform/pom.xml b/pigx-visual/pigx-bi-platform/pom.xml index 26c4fce96..97312ae4a 100755 --- a/pigx-visual/pigx-bi-platform/pom.xml +++ b/pigx-visual/pigx-bi-platform/pom.xml @@ -35,11 +35,6 @@ ureport2-console ${ureport.version} - - - mysql - mysql-connector-java - org.springframework.boot @@ -62,8 +57,12 @@ - org.springframework.boot - spring-boot-starter-security + com.pig4cloud + pigx-common-security + + + com.pig4cloud + pigx-common-data diff --git a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java index b959114e6..36bba6bbe 100755 --- a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java +++ b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.ureport; +import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.cloud.client.SpringCloudApplication; @@ -28,6 +29,7 @@ import org.springframework.cloud.client.SpringCloudApplication; *

* http://127.0.0.1:5006/ureport/designer */ +@EnablePigxFeignClients @SpringCloudApplication public class PigxBiApplication { diff --git a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/config/WebSecurityConfigurer.java b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/config/WebSecurityConfigurer.java index e034e4fa0..3a19fef59 100755 --- a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/config/WebSecurityConfigurer.java +++ b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/config/WebSecurityConfigurer.java @@ -22,8 +22,14 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.authentication.AuthenticationFailureHandler; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; /** * WebSecurityConfigurer @@ -37,24 +43,13 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { @Override @SneakyThrows protected void configure(HttpSecurity http) { - http.formLogin() - .loginPage("/login.html") - .loginProcessingUrl("/login") - .failureHandler((request, response, exception) -> { - response.sendRedirect("/login.html?error=" + URLEncoder.encode(exception.getLocalizedMessage(), "utf-8")); - }) - .and() - .authorizeRequests() - .antMatchers("/login.html", "/login").permitAll() - .anyRequest() - .authenticated() - .and() - .csrf().disable(); + http.formLogin().loginPage("/login.html").loginProcessingUrl("/login").failureHandler(new LoginFailureHandler()) + .and().authorizeRequests().antMatchers("/login.html", "/login").permitAll().anyRequest().authenticated() + .and().csrf().disable(); } /** * 不拦截静态资源 - * * @param web */ @Override @@ -62,5 +57,24 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { web.ignoring().antMatchers("/favicon.ico", "/css/**", "/error"); } + /** + * 登录失败处理器,携带错误信息重定向到首页 + */ + static class LoginFailureHandler implements AuthenticationFailureHandler { + + /** + * Called when an authentication attempt fails. + * @param request the request during which the authentication attempt occurred. + * @param response the response. + * @param exception the exception which was thrown to reject the authentication + */ + @Override + public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, + AuthenticationException exception) throws IOException { + response.sendRedirect("/login.html?error=" + + URLEncoder.encode(exception.getLocalizedMessage(), StandardCharsets.UTF_8.name())); + } + + } } diff --git a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/controller/PageController.java b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/controller/PageController.java index 869ba7d95..66ddeb6ae 100644 --- a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/controller/PageController.java +++ b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/controller/PageController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping; */ @Controller public class PageController { + /** * 表单设计URL */ @@ -18,11 +19,11 @@ public class PageController { /** * 跳转至表单设计 - * * @return */ @GetMapping public String designer() { return REDIRECT_UREPORT_DESIGNER; } + }