From 7afcbeeb0e1c3003d1e3ef697b614209ea0adc4c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Jun 2022 10:00:59 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/configurations/WebMvcConfig.java | 12 ++++++------
src/main/java/com/xcong/farmer/cms/configurations/security/WebSecurityConfig.java | 2 --
src/main/java/com/xcong/farmer/cms/utils/SpringContextHolder.java | 2 ++
src/main/java/com/xcong/farmer/cms/configurations/security/TokenConfigurer.java | 1 -
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/configurations/WebMvcConfig.java b/src/main/java/com/xcong/farmer/cms/configurations/WebMvcConfig.java
index c2a851c..6e527c6 100644
--- a/src/main/java/com/xcong/farmer/cms/configurations/WebMvcConfig.java
+++ b/src/main/java/com/xcong/farmer/cms/configurations/WebMvcConfig.java
@@ -17,8 +17,8 @@
* @author wzy
* @date 2020-04-27 11:54
**/
-@SpringBootConfiguration
@Slf4j
+@SpringBootConfiguration
public class WebMvcConfig implements WebMvcConfigurer {
@Override
@@ -38,11 +38,11 @@
.allowCredentials(true).maxAge(3600);
}
- @Bean
- public SpringContextHolder springContextHolder() {
- System.out.println(111111);
- return new SpringContextHolder();
- }
+// @Bean
+// public SpringContextHolder springContextHolder() {
+// System.out.println(111111);
+// return new SpringContextHolder();
+// }
// @Value("${upload.file.location}")
// private String fileLocation;
diff --git a/src/main/java/com/xcong/farmer/cms/configurations/security/TokenConfigurer.java b/src/main/java/com/xcong/farmer/cms/configurations/security/TokenConfigurer.java
index df832ef..a5cc8e5 100644
--- a/src/main/java/com/xcong/farmer/cms/configurations/security/TokenConfigurer.java
+++ b/src/main/java/com/xcong/farmer/cms/configurations/security/TokenConfigurer.java
@@ -15,7 +15,6 @@
@Override
public void configure(HttpSecurity http) {
- System.out.println(2222222);
TokenFilter customFilter = new TokenFilter();
http.addFilterBefore(customFilter, UsernamePasswordAuthenticationFilter.class);
}
diff --git a/src/main/java/com/xcong/farmer/cms/configurations/security/WebSecurityConfig.java b/src/main/java/com/xcong/farmer/cms/configurations/security/WebSecurityConfig.java
index f815b15..e3de21a 100644
--- a/src/main/java/com/xcong/farmer/cms/configurations/security/WebSecurityConfig.java
+++ b/src/main/java/com/xcong/farmer/cms/configurations/security/WebSecurityConfig.java
@@ -36,7 +36,6 @@
@Override
protected void configure(HttpSecurity http) throws Exception {
- System.out.println(4444414);
http.httpBasic().and().
cors().and().csrf().disable()
.exceptionHandling().authenticationEntryPoint(authenticationEntryPoint())
@@ -79,7 +78,6 @@
}
public TokenConfigurer securityConfiguereAdapter() {
- System.out.println(33333333);
return new TokenConfigurer();
}
}
diff --git a/src/main/java/com/xcong/farmer/cms/utils/SpringContextHolder.java b/src/main/java/com/xcong/farmer/cms/utils/SpringContextHolder.java
index e2009e1..30b7b1a 100644
--- a/src/main/java/com/xcong/farmer/cms/utils/SpringContextHolder.java
+++ b/src/main/java/com/xcong/farmer/cms/utils/SpringContextHolder.java
@@ -5,6 +5,7 @@
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
/**
* @Author wzy
@@ -13,6 +14,7 @@
* @Version V1.0
**/
@Slf4j
+@Component
public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
private static ApplicationContext applicationContext = null;
--
Gitblit v1.9.1