diff --git a/yshop-admin/src/main/java/co/yixiang/config/ConfigurerAdapter.java b/yshop-admin/src/main/java/co/yixiang/config/ConfigurerAdapter.java index 3c1f2528..ac69d88e 100644 --- a/yshop-admin/src/main/java/co/yixiang/config/ConfigurerAdapter.java +++ b/yshop-admin/src/main/java/co/yixiang/config/ConfigurerAdapter.java @@ -24,7 +24,7 @@ import java.util.Arrays; * @author hupeng * @date 2018-11-30 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableWebMvc public class ConfigurerAdapter implements WebMvcConfigurer { @@ -38,11 +38,16 @@ public class ConfigurerAdapter implements WebMvcConfigurer { public CorsFilter corsFilter() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = new CorsConfiguration(); - config.setAllowCredentials(true); // 允许cookies跨域 - config.addAllowedOriginPattern("*");// #允许向该服务器提交请求的URI，*表示全部允许，在SpringMVC中，如果设成*，会自动转成当前请求头中的Origin - config.addAllowedHeader("*");// #允许访问的头信息,*表示全部 - config.setMaxAge(18000L);// 预检请求的缓存时间（秒），即在这个时间段里，对于相同的跨域请求不会再预检了 - config.addAllowedMethod("OPTIONS");// 允许提交请求的方法类型，*表示全部允许 + // 允许cookies跨域 + config.setAllowCredentials(true); + // #允许向该服务器提交请求的URI，*表示全部允许，在SpringMVC中，如果设成*，会自动转成当前请求头中的Origin + config.addAllowedOriginPattern("*"); + // #允许访问的头信息,*表示全部 + config.addAllowedHeader("*"); + // 预检请求的缓存时间（秒），即在这个时间段里，对于相同的跨域请求不会再预检了 + config.setMaxAge(18000L); + // 允许提交请求的方法类型，*表示全部允许 + config.addAllowedMethod("OPTIONS"); config.addAllowedMethod("HEAD"); config.addAllowedMethod("GET"); config.addAllowedMethod("PUT"); diff --git a/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java b/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java index 4e2a1130..c089a24c 100644 --- a/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java +++ b/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * MybatisPlus配置 * */ -@Configuration +@Configuration(proxyBeanMethods = false) public class MybatisPlusConfig { /** diff --git a/yshop-admin/src/main/java/co/yixiang/config/WebSocketConfig.java b/yshop-admin/src/main/java/co/yixiang/config/WebSocketConfig.java index 72fb36b2..81102d81 100644 --- a/yshop-admin/src/main/java/co/yixiang/config/WebSocketConfig.java +++ b/yshop-admin/src/main/java/co/yixiang/config/WebSocketConfig.java @@ -13,7 +13,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; * @author: ZhangHouYing * @date: 2019-08-24 15:44 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class WebSocketConfig { @Bean diff --git a/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java b/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java index 86bf0d6e..c262e127 100644 --- a/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java +++ b/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java @@ -20,7 +20,7 @@ import java.util.concurrent.ThreadPoolExecutor; * @date 2019年10月31日15:06:18 */ @Slf4j -@Configuration +@Configuration(proxyBeanMethods = false) public class AsyncTaskExecutePool implements AsyncConfigurer { /** 注入配置类 */ diff --git a/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/QuartzConfig.java b/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/QuartzConfig.java index cec469b1..ffdbfc51 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/QuartzConfig.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/QuartzConfig.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; * @author / * @date 2019-01-07 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class QuartzConfig { /** diff --git a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java index df222114..10d6ee6d 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java @@ -35,7 +35,7 @@ import java.util.Set; /** * @author hupeng */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) public class SecurityConfig extends WebSecurityConfigurerAdapter { diff --git a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java index 0dbbc4d5..c11bb5a4 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; * @date 2019年11月28日 */ @Data -@Configuration +@Configuration(proxyBeanMethods = false) @ConfigurationProperties(prefix = "jwt") public class SecurityProperties { diff --git a/yshop-app/src/main/java/co/yixiang/common/config/DruidConfig.java b/yshop-app/src/main/java/co/yixiang/common/config/DruidConfig.java index 7cb3b93b..85e2b57e 100644 --- a/yshop-app/src/main/java/co/yixiang/common/config/DruidConfig.java +++ b/yshop-app/src/main/java/co/yixiang/common/config/DruidConfig.java @@ -20,7 +20,7 @@ import java.util.Map; * @Author hupeng <610796224@qq.com> * @Date 2020/4/30 **/ -@Configuration +@Configuration(proxyBeanMethods = false) public class DruidConfig { @Bean diff --git a/yshop-app/src/main/java/co/yixiang/common/config/DruidProperties.java b/yshop-app/src/main/java/co/yixiang/common/config/DruidProperties.java index b0b87e51..85b6398a 100644 --- a/yshop-app/src/main/java/co/yixiang/common/config/DruidProperties.java +++ b/yshop-app/src/main/java/co/yixiang/common/config/DruidProperties.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * @Author hupeng <610796224@qq.com> * @Date 2020/4/30 **/ -@Configuration +@Configuration(proxyBeanMethods = false) public class DruidProperties { @Value("${spring.datasource.druid.initialSize}") diff --git a/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java b/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java index fff3e25b..c00433a1 100644 --- a/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java +++ b/yshop-app/src/main/java/co/yixiang/common/config/FilterConfig.java @@ -17,7 +17,7 @@ import java.util.Map; * @Author hupeng <610796224@qq.com> * @Date 2020/4/30 **/ -@Configuration +@Configuration(proxyBeanMethods = false) public class FilterConfig { @Value("${xss.enabled}") diff --git a/yshop-app/src/main/java/co/yixiang/common/config/InterceptorConfig.java b/yshop-app/src/main/java/co/yixiang/common/config/InterceptorConfig.java index 2cc24eed..c706e66c 100644 --- a/yshop-app/src/main/java/co/yixiang/common/config/InterceptorConfig.java +++ b/yshop-app/src/main/java/co/yixiang/common/config/InterceptorConfig.java @@ -27,7 +27,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @Author hupeng <610796224@qq.com> * @Date 2020/4/30 **/ -@Configuration +@Configuration(proxyBeanMethods = false) public class InterceptorConfig implements WebMvcConfigurer { @Value("${file.path}") diff --git a/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java b/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java index 81c26f59..269375b3 100644 --- a/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java +++ b/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java @@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration; * MybatisPlus配置 * */ -@Configuration +@Configuration(proxyBeanMethods = false) public class MybatisPlusConfig { /** diff --git a/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java b/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java index bc67807e..a7d3b559 100644 --- a/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java +++ b/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration; * @Date 2020/6/26 **/ @Slf4j -@Configuration +@Configuration(proxyBeanMethods = false) public class SmsUtils { private static RedisUtils redisUtils; diff --git a/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java b/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java index a3fbab59..dff92046 100644 --- a/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java +++ b/yshop-common/src/main/java/co/yixiang/config/RedisConfig.java @@ -41,7 +41,7 @@ import java.util.Map; * @date 2018-11-24 */ @Slf4j -@Configuration +@Configuration(proxyBeanMethods = false) @EnableCaching @ConditionalOnClass(RedisOperations.class) @EnableConfigurationProperties(RedisProperties.class) diff --git a/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java b/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java index 8ee7c7a0..7dcd7ab7 100644 --- a/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java +++ b/yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java @@ -45,7 +45,7 @@ import static springfox.documentation.schema.AlternateTypeRules.newRule; * @Date 2019/1/9 **/ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableSwagger2 public class SwaggerConfig { @@ -104,7 +104,7 @@ public class SwaggerConfig { /** * 将Pageable转换展示在swagger中 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableSwagger2 @EnableKnife4j @Import(BeanValidatorPluginsConfiguration.class) diff --git a/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java b/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java index eb3d5a68..0a684e30 100644 --- a/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java +++ b/yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java @@ -18,7 +18,7 @@ import org.springframework.core.io.Resource; * @modified By： * @version: 1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class DozerMapperConfig { @Bean public DozerBeanMapperFactoryBean dozerBeanMapperFactoryBean(@Value("classpath*:dozer/*.xml" ) Resource[] resources) throws Exception { diff --git a/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisConfigProperties.java b/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisConfigProperties.java index 1e1961c5..9b8c6653 100644 --- a/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisConfigProperties.java +++ b/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisConfigProperties.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration; * @since 2020-02-27 */ @Data -@Configuration +@Configuration(proxyBeanMethods = false) @ConfigurationProperties(prefix = "spring.redis") public class RedisConfigProperties { diff --git a/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisListenerConfig.java b/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisListenerConfig.java index d1840a45..6f354160 100644 --- a/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisListenerConfig.java +++ b/yshop-message/src/main/java/co/yixiang/message/redis/config/RedisListenerConfig.java @@ -27,7 +27,7 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer; * @since 2020-02-27 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AllArgsConstructor public class RedisListenerConfig { diff --git a/yshop-mproot/src/main/java/co/yixiang/config/MybatisConfig.java b/yshop-mproot/src/main/java/co/yixiang/config/MybatisConfig.java index 3315a7fc..ba97c144 100644 --- a/yshop-mproot/src/main/java/co/yixiang/config/MybatisConfig.java +++ b/yshop-mproot/src/main/java/co/yixiang/config/MybatisConfig.java @@ -19,7 +19,7 @@ import org.springframework.context.annotation.Configuration; import java.util.Properties; -@Configuration +@Configuration(proxyBeanMethods = false) public class MybatisConfig { /** * 配置mybatis的分页插件pageHelper diff --git a/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java index 65176f57..46f91ff2 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java @@ -16,7 +16,7 @@ import java.io.File; * @date 2018-12-28 * @author https://blog.csdn.net/llibin1024530411/article/details/79474953 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class MultipartConfig { /** diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java index afbb23a9..e283798d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java @@ -16,7 +16,7 @@ import co.yixiang.utils.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) public class ExpressAutoConfiguration { diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMaConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMaConfiguration.java index 2a908b4e..0d36bbdc 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMaConfiguration.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMaConfiguration.java @@ -19,7 +19,7 @@ import java.util.Map; /** * @author Binary Wang */ -@Configuration +@Configuration(proxyBeanMethods = false) public class WxMaConfiguration { private static Map maServices = Maps.newHashMap(); private static Map routers = Maps.newHashMap(); diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMpConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMpConfiguration.java index daa31b3e..7dfb7269 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMpConfiguration.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMpConfiguration.java @@ -38,7 +38,7 @@ import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType; * @author hupeng * @date 2020/01/20 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class WxMpConfiguration { private static Map mpServices = Maps.newHashMap(); diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java index 1f3045af..be8767df 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java @@ -25,7 +25,7 @@ import java.util.Map; * @date 2020/03/01 */ @Slf4j -@Configuration +@Configuration(proxyBeanMethods = false) public class WxPayConfiguration { private static Map payServices = Maps.newHashMap();