From 0738b7ae2a09701a5af3765e973e7137155ae2c5 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sun, 11 Mar 2018 13:49:39 +0800
Subject: [PATCH] merge

---
 .../com/xwbing/redis/RedisStartupInit.java    |  3 ++
 .../ApplicationContextConfig.java             | 30 +++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java b/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java
index 3fb7390..0f01eb5 100644
--- a/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java
+++ b/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java
@@ -25,6 +25,9 @@ public class RedisStartupInit implements InitializingBean {
     @Value("${redisCode}")
     private String redisCode;
 
+    /**
+     * 初始化bean的时候会执行该方法
+     */
     @Override
     public void afterPropertiesSet() {
         logger.info("redis has been start");
diff --git a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
index f289880..5e15785 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
@@ -19,6 +19,20 @@ import javax.servlet.Filter;
 //@Import(xxx.class)//用来导入其他配置类
 //@ImportResource("classpath:applicationContext.xml")//用来加载其他xml配置文件
 public class ApplicationContextConfig {
+    /**
+     * encoding编码问题(springBoot默认已经配置好)
+     *
+     * @return
+     */
+    @Bean//相当于XML中的<bean></bean>
+    @ConditionalOnMissingBean(CharacterEncodingFilter.class)
+    public Filter characterEncodingFilter() {
+        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
+        characterEncodingFilter.setEncoding("UTF-8");
+        characterEncodingFilter.setForceEncoding(true);
+        return characterEncodingFilter;
+    }
+
     /**
      * 文件上传解析器
      *
@@ -32,26 +46,12 @@ public class ApplicationContextConfig {
         return multipartResolver;
     }
 
-    /**
-     * encoding编码问题(springBoot默认已经配置好)
-     *
-     * @return
-     */
-    @Bean
-    @ConditionalOnMissingBean(CharacterEncodingFilter.class)
-    public Filter characterEncodingFilter() {
-        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
-        characterEncodingFilter.setEncoding("UTF-8");
-        characterEncodingFilter.setForceEncoding(true);
-        return characterEncodingFilter;
-    }
-
     /**
      * 任务线程池
      *
      * @return
      */
-    @Bean(name = "taskExecutor")//相当于XML中的<bean></bean>
+    @Bean(name = "taskExecutor")
     public static ThreadPoolTaskExecutor getPoolTaskExecutor() {
         ThreadPoolTaskExecutor poolTaskExecutor = new ThreadPoolTaskExecutor();
         poolTaskExecutor.setCorePoolSize(5);//核心线程数