From 6976c7f386568ad3f935a606d25173242032a4b7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 17:26:45 +0800
Subject: [PATCH] update security 路径配置抽取到配置文件
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 25 ++++++-------------------
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java | 13 ++-----------
ruoyi-admin/src/main/resources/application.yml | 14 ++++++++------
3 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 3d5e8df..a3e525c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -124,13 +124,17 @@
# security閰嶇疆
security:
- # 鐧诲嚭璺緞
- logout-url: /logout
- # 鍖垮悕璺緞
- anonymous:
+ # 鎺掗櫎璺緞
+ excludes:
- /login
+ - /logout
- /register
- /captchaImage
+ # 闈欐�佽祫婧�
+ - /*.html
+ - /**/*.html
+ - /**/*.css
+ - /**/*.js
# swagger 鏂囨。閰嶇疆
- /doc.html
- /swagger-resources/**
@@ -141,8 +145,6 @@
# actuator 鐩戞帶閰嶇疆
- /actuator
- /actuator/**
- # 鐢ㄦ埛鏀捐
- permit-all:
# 閲嶅鎻愪氦
repeat-submit:
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index 5224b14..dc7821e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -6,6 +6,8 @@
import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.config.properties.SecurityProperties;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
@@ -17,7 +19,6 @@
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;
/**
* 閫氱敤閰嶇疆
@@ -27,26 +28,12 @@
@Configuration
public class ResourcesConfig implements WebMvcConfigurer {
+ @Autowired
+ private SecurityProperties securityProperties;
+
// 娉ㄥ唽sa-token鐨勬嫤鎴櫒
@Override
public void addInterceptors(InterceptorRegistry registry) {
- List<String> urlPath = Arrays.asList(
- "/login",
- "/logout",
- "/register",
- "/captchaImage",
- "/*.html",
- "/**/*.html",
- "/**/*.css",
- "/**/*.js",
- "/doc.html",
- "/swagger-resources/**",
- "/webjars/**",
- "/*/api-docs",
- "/druid/**",
- "/actuator",
- "/actuator/**"
- );
// 娉ㄥ唽璺敱鎷︽埅鍣紝鑷畾涔夐獙璇佽鍒�
registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> {
// 鐧诲綍楠岃瘉 -- 鎺掗櫎澶氫釜璺緞
@@ -54,7 +41,7 @@
//鑾峰彇鎵�鏈夌殑
Collections.singletonList("/**"),
//鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
- urlPath,
+ Arrays.asList(securityProperties.getExcludes()),
() -> {
Long userId = SecurityUtils.getUserId();
if(StringUtils.isNotNull(userId) ) {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java
index c83ffcc..b374181 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java
@@ -15,18 +15,9 @@
public class SecurityProperties {
/**
- * 閫�鍑虹櫥褰晆rl
+ * 鎺掗櫎璺緞
*/
- private String logoutUrl;
+ private String[] excludes;
- /**
- * 鍖垮悕鏀捐璺緞
- */
- private String[] anonymous;
-
- /**
- * 鐢ㄦ埛浠绘剰璁块棶鏀捐璺緞
- */
- private String[] permitAll;
}
--
Gitblit v1.9.3