summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangshuai <[email protected]>2023-06-29 16:21:25 +0800
committerzhangshuai <[email protected]>2023-06-29 16:21:25 +0800
commit992a32c6b42a0c09531a82cef3dafcae632f8016 (patch)
tree0011c8558a137b7e2708e7984b8e587a0d087b77
parentca2f8e5f3d7d3a1cb563f89aa7de5eac69d83c95 (diff)
fix: NEZ-2952 修复 shiroConfig anon 配置失效
-rw-r--r--nz-admin/src/main/java/com/nis/common/config/ShiroConfig.java5
-rw-r--r--nz-admin/src/main/java/com/nis/common/interceptor/TokenCheckFilter.java6
2 files changed, 5 insertions, 6 deletions
diff --git a/nz-admin/src/main/java/com/nis/common/config/ShiroConfig.java b/nz-admin/src/main/java/com/nis/common/config/ShiroConfig.java
index 9b2927ef..571279a6 100644
--- a/nz-admin/src/main/java/com/nis/common/config/ShiroConfig.java
+++ b/nz-admin/src/main/java/com/nis/common/config/ShiroConfig.java
@@ -67,6 +67,8 @@ public class ShiroConfig {
@Autowired
private RedisTemplate<String,String> redisTemplate;
+ @Autowired
+ private SysApiKeyDao sysApiKeyDao;
@Autowired
private SysConfigService sysconfigService;
@@ -82,8 +84,6 @@ public class ShiroConfig {
private MeterRegistry meterRegistry;
@Autowired
private LicenseService licenseService;
- @Autowired
- private TokenCheckFilter tokenCheckFilter;
@Bean("shiroFilter")
public ShiroFilterFactoryBean shiroFilter(SecurityManager securityManager) {
ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
@@ -135,6 +135,7 @@ public class ShiroConfig {
Map<String, Filter> cumstomFilterMap = new LinkedHashMap<String, Filter>();
LicenseShiroFilter licenseShiroFilter = new LicenseShiroFilter();
MetricsShiroFilter metricsShiroFilter = new MetricsShiroFilter();
+ TokenCheckFilter tokenCheckFilter = new TokenCheckFilter(sysApiKeyDao);
cumstomFilterMap.put("tokenCheckFilter", tokenCheckFilter);
cumstomFilterMap.put("licenseFilter", licenseShiroFilter);
cumstomFilterMap.put("metricsFilter", metricsShiroFilter);
diff --git a/nz-admin/src/main/java/com/nis/common/interceptor/TokenCheckFilter.java b/nz-admin/src/main/java/com/nis/common/interceptor/TokenCheckFilter.java
index 2cd89086..0b6225f4 100644
--- a/nz-admin/src/main/java/com/nis/common/interceptor/TokenCheckFilter.java
+++ b/nz-admin/src/main/java/com/nis/common/interceptor/TokenCheckFilter.java
@@ -35,14 +35,12 @@ import com.nis.modules.sys.shiro.ShiroUtils;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
-@Component
public class TokenCheckFilter extends AccessControlFilter {
- @Autowired
private SysApiKeyDao sysApiKeyDao;
- public TokenCheckFilter() {
-
+ public TokenCheckFilter(SysApiKeyDao sysApiKeyDao) {
+ this.sysApiKeyDao = sysApiKeyDao;
}
@Override