From b74faa19bd619213d4de8772b1816c2f87c29449 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Aug 2022 15:44:50 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve
---
src/main/java/com/xcong/farmer/cms/configurations/WebMvcConfig.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 65506ef..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,10 +38,11 @@
.allowCredentials(true).maxAge(3600);
}
- @Bean
- public SpringContextHolder springContextHolder() {
- return new SpringContextHolder();
- }
+// @Bean
+// public SpringContextHolder springContextHolder() {
+// System.out.println(111111);
+// return new SpringContextHolder();
+// }
// @Value("${upload.file.location}")
// private String fileLocation;
--
Gitblit v1.9.1