From ca7bb696b394a83dc9ad965f1159dd44723573dd Mon Sep 17 00:00:00 2001 From: qraddx Date: Thu, 17 Mar 2022 12:00:43 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20#3?= =?UTF-8?q?711=20ureport2=20=E6=94=AF=E6=8C=81preview=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E4=BA=8C=E6=AC=A1=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/service/impl/SysRoleMenuServiceImpl.java | 2 +- .../pigx/ureport/config/WebSecurityConfigurer.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index a2173029f..f98b0d7cc 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -65,7 +65,7 @@ public class SysRoleMenuServiceImpl extends ServiceImpl roleMenuList = Arrays.stream(menuIds.split(",")).map(menuId -> { + List roleMenuList = Arrays.stream(menuIds.split(StrUtil.COMMA)).map(menuId -> { SysRoleMenu roleMenu = new SysRoleMenu(); roleMenu.setRoleId(roleId); roleMenu.setMenuId(Long.valueOf(menuId)); 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 b640e7e77..df5e2dc92 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 @@ -45,8 +45,8 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) { http.headers().frameOptions().disable().and().formLogin().loginPage("/login.html").loginProcessingUrl("/login") .failureHandler(new LoginFailureHandler()).and().authorizeRequests() - .antMatchers("/login.html", "/login", "/actuator/**").permitAll().anyRequest().authenticated().and() - .csrf().disable(); + .antMatchers("/login.html", "/login", "/actuator/**", "/ureport/preview").permitAll().anyRequest() + .authenticated().and().csrf().disable(); } /** @@ -55,7 +55,7 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { */ @Override public void configure(WebSecurity web) { - web.ignoring().antMatchers("/favicon.ico", "/css/**", "/error"); + web.ignoring().antMatchers("/favicon.ico", "/css/**", "/ureport/res/**", "/error"); } /**