From a08e138af93d830ed88a4adef5888fa9575c581f Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sun, 11 Mar 2018 14:22:52 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java   | 5 +----
 .../com/xwbing/configuration/ApplicationContextConfig.java   | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java b/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
index 472aad2..3128d65 100644
--- a/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
@@ -1,8 +1,6 @@
 package com.xwbing.demo;
 
 import com.alibaba.fastjson.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import javax.annotation.Resource;
@@ -19,8 +17,7 @@ import java.util.stream.Collectors;
  */
 public class LambdaDemo {
     @Resource
-    private static ThreadPoolTaskExecutor taskExecutor;
-    private static final Logger logger = LoggerFactory.getLogger(LambdaDemo.class);
+    private ThreadPoolTaskExecutor taskExecutor;
 
     public static void main(String[] args) {
         //匿名内部类
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 5e15785..f765314 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
@@ -52,7 +52,7 @@ public class ApplicationContextConfig {
      * @return
      */
     @Bean(name = "taskExecutor")
-    public static ThreadPoolTaskExecutor getPoolTaskExecutor() {
+    public ThreadPoolTaskExecutor getPoolTaskExecutor() {
         ThreadPoolTaskExecutor poolTaskExecutor = new ThreadPoolTaskExecutor();
         poolTaskExecutor.setCorePoolSize(5);//核心线程数
         poolTaskExecutor.setMaxPoolSize(1000);//最大线程数