From 3b765f3ac9f816332a79b2e4405ed49005bbeb5f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 11:24:12 +0800
Subject: [PATCH] fix 修复代码生成字典为null问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 4822c91..0a8337e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -3,7 +3,6 @@
import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
-import de.codecentric.boot.admin.server.config.AdminServerProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpMethod;
@@ -21,7 +20,7 @@
/**
* spring security閰嶇疆
- *
+ *
* @author ruoyi
*/
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -32,7 +31,7 @@
*/
@Autowired
private UserDetailsService userDetailsService;
-
+
/**
* 璁よ瘉澶辫触澶勭悊绫�
*/
@@ -57,9 +56,6 @@
@Autowired
private CorsFilter corsFilter;
- @Autowired
- private AdminServerProperties adminServerProperties;
-
/**
* 瑙ｅ喅 鏃犳硶鐩存帴娉ㄥ叆 AuthenticationManager
*
@@ -104,22 +100,20 @@
.antMatchers("/login", "/captchaImage").anonymous()
.antMatchers(
HttpMethod.GET,
+ "/",
"/*.html",
"/**/*.html",
"/**/*.css",
- "/**/*.js"
+ "/**/*.js",
+ "/profile/**"
).permitAll()
- .antMatchers("/profile/**").anonymous()
.antMatchers("/common/download**").anonymous()
.antMatchers("/common/download/resource**").anonymous()
- .antMatchers("/swagger-ui.html").anonymous()
+ .antMatchers("/doc.html").anonymous()
.antMatchers("/swagger-resources/**").anonymous()
.antMatchers("/webjars/**").anonymous()
.antMatchers("/*/api-docs").anonymous()
.antMatchers("/druid/**").anonymous()
- // Spring Boot Admin Server 鐨勫畨鍏ㄩ厤缃�
- .antMatchers(adminServerProperties.getContextPath()).anonymous()
- .antMatchers(adminServerProperties.getContextPath() + "/**").anonymous()
// Spring Boot Actuator 鐨勫畨鍏ㄩ厤缃�
.antMatchers("/actuator").anonymous()
.antMatchers("/actuator/**").anonymous()
@@ -135,7 +129,7 @@
httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
}
-
+
/**
* 寮烘暎鍒楀搱甯屽姞瀵嗗疄鐜�
*/
--
Gitblit v1.9.3