dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-09-09 21:59:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ruoyi-cloud/master' into dev

Browse Source 
# Conflicts:
#	pom.xml
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
#	ruoyi-gateway/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
#	ruoyi-ui/vue.config.js
#	ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
This commit is contained in:
疯狂的狮子li
2022-07-06 15:55:48 +08:00
parent 0b7b8fd986 0d58ecb09c
commit aa5ea44dde
3 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/system/dict/data.vue
View File

@@ -163,7 +163,7 @@
<el-option <el-option
v-for="item in listClassOptions" v-for="item in listClassOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label + '(' + item.value + ')'"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>

1
ruoyi-ui/vue.config.js
View File

@@ -61,6 +61,7 @@ module.exports = {
plugins: [ plugins: [
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
new CompressionPlugin({ new CompressionPlugin({
cache: false, // 不启用文件缓存
test: /\.(js|css|html)?$/i, // 压缩文件格式 test: /\.(js|css|html)?$/i, // 压缩文件格式
filename: '[path].gz[query]', // 压缩后的文件名 filename: '[path].gz[query]', // 压缩后的文件名
algorithm: 'gzip', // 使用gzip压缩 algorithm: 'gzip', // 使用gzip压缩

94
ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
View File

@@ -1,46 +1,48 @@
package com.ruoyi.modules.monitor.config; package com.ruoyi.modules.monitor.config;
import de.codecentric.boot.admin.server.config.AdminServerProperties; import de.codecentric.boot.admin.server.config.AdminServerProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Bean;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
/**
* 监控权限配置 /**
* * 监控权限配置
* @author ruoyi *
*/ * @author ruoyi
@Configuration */
public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { @EnableWebSecurity
private final String adminContextPath; public class WebSecurityConfigurer {
private final String adminContextPath;
public WebSecurityConfigurer(AdminServerProperties adminServerProperties) {
this.adminContextPath = adminServerProperties.getContextPath(); public WebSecurityConfigurer(AdminServerProperties adminServerProperties) {
} this.adminContextPath = adminServerProperties.getContextPath();
}
@Override
protected void configure(HttpSecurity http) throws Exception { @Bean
SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
successHandler.setTargetUrlParameter("redirectTo"); SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
successHandler.setDefaultTargetUrl(adminContextPath + "/"); successHandler.setTargetUrlParameter("redirectTo");
successHandler.setDefaultTargetUrl(adminContextPath + "/");
http
.headers().frameOptions().disable() return httpSecurity
.and().authorizeRequests() .headers().frameOptions().disable()
.antMatchers(adminContextPath + "/assets/**" .and().authorizeRequests()
, adminContextPath + "/login" .antMatchers(adminContextPath + "/assets/**"
, adminContextPath + "/actuator/**" , adminContextPath + "/login"
, adminContextPath + "/instances/**" , adminContextPath + "/actuator/**"
).permitAll() , adminContextPath + "/instances/**"
.anyRequest().authenticated() ).permitAll()
.and() .anyRequest().authenticated()
.formLogin().loginPage(adminContextPath + "/login") .and()
.successHandler(successHandler).and() .formLogin().loginPage(adminContextPath + "/login")
.logout().logoutUrl(adminContextPath + "/logout") .successHandler(successHandler).and()
.and() .logout().logoutUrl(adminContextPath + "/logout")
.httpBasic().and() .and()
.csrf() .httpBasic().and()
.disable(); .csrf()
} .disable()
} .build();
}
}