From 06aa3b2956484a0a941bd5db11a4fd66e8fc3638 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sat, 10 Mar 2018 12:01:51 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/demo/Ademo.java  | 32 +++++++++++++++++++
 .../java/com/xwbing/demo/FileUploadDemo.java  |  6 ++--
 .../main/java/com/xwbing/demo/LambdaDemo.java |  1 +
 .../src/main/java/com/xwbing/demo/demo.java   | 23 -------------
 boot-web/src/main/resources/log4j2.xml        |  4 +--
 5 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 boot-service/src/main/java/com/xwbing/demo/Ademo.java
 delete mode 100644 boot-service/src/main/java/com/xwbing/demo/demo.java

diff --git a/boot-service/src/main/java/com/xwbing/demo/Ademo.java b/boot-service/src/main/java/com/xwbing/demo/Ademo.java
new file mode 100644
index 0000000..7047748
--- /dev/null
+++ b/boot-service/src/main/java/com/xwbing/demo/Ademo.java
@@ -0,0 +1,32 @@
+package com.xwbing.demo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 项目名称: boot-module-demo
+ * 创建时间: 2018/1/23 14:45
+ * 作者: xiangwb
+ * 说明: 测试用
+ */
+public class Ademo {
+    public static void main(String[] args) {
+        List<Integer> integers = new ArrayList<>();
+        for (int i = 0; i < 1000000; i++) {
+            integers.add(i);
+        }
+        long l = System.currentTimeMillis();
+        integers.forEach(integer -> {
+            int i = integer * 2;
+        });
+        long l1 = System.currentTimeMillis();
+        System.out.println(l1-l);
+        long l3 = System.currentTimeMillis();
+        integers.parallelStream().forEach(integer -> {
+            int i = integer * 2;
+        });
+        long l4 = System.currentTimeMillis();
+        System.out.println(l4-l3);
+
+    }
+}
diff --git a/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java b/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
index 9cbefcb..932b5bc 100644
--- a/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
@@ -16,7 +16,7 @@ import java.util.List;
 
 /**
  * 作者: xiangwb
- * 说明: FileUploadDemo
+ * 说明: FileUpload
  */
 @Service
 public class FileUploadDemo {
@@ -62,7 +62,7 @@ public class FileUploadDemo {
                 ClassPathResource file = new ClassPathResource("file");
                 try {
                     String path = file.getFile().getAbsolutePath();
-                    File targetFile = new File(path+ File.separator+ File.separator+name);
+                    File targetFile = new File(path+ File.separator+name);
                     if (!targetFile.exists()) {
                         targetFile.createNewFile();
                     }
@@ -76,7 +76,7 @@ public class FileUploadDemo {
     public static void main(String[] args) throws Exception{
         ClassPathResource file = new ClassPathResource("file");
         String path = file.getFile().getAbsolutePath();
-        File targetFile = new File(path+ File.separator+ File.separator+"test.txt");
+        File targetFile = new File(path+ File.separator+"test.txt");
         if(!targetFile.exists()){
             targetFile.createNewFile(); //创建文件
         }
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 4370830..96983b1 100644
--- a/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/LambdaDemo.java
@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 /**
  * Date: 2017/6/15 17:09
  * Author: xiangwb
+ * 说明: 纯遍历list.forEach/需要collect用parallelStream
  */
 public class LambdaDemo {
     @Resource
diff --git a/boot-service/src/main/java/com/xwbing/demo/demo.java b/boot-service/src/main/java/com/xwbing/demo/demo.java
deleted file mode 100644
index bcc680f..0000000
--- a/boot-service/src/main/java/com/xwbing/demo/demo.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.xwbing.demo;
-
-import com.xwbing.domain.entity.sys.SysUser;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 项目名称: boot-module-demo
- * 创建时间: 2018/1/23 14:45
- * 作者: xiangwb
- * 说明: 测试用
- */
-public class demo {
-    public static void main(String[] args) {
-        SysUser sysUser=new SysUser();
-        Map<String, Object> stringObjectHashMap = new HashMap<>();
-        Object o = stringObjectHashMap.get(sysUser.getAdmin());
-        System.out.println("");
-
-
-    }
-}
diff --git a/boot-web/src/main/resources/log4j2.xml b/boot-web/src/main/resources/log4j2.xml
index 218f7b8..32b216a 100644
--- a/boot-web/src/main/resources/log4j2.xml
+++ b/boot-web/src/main/resources/log4j2.xml
@@ -35,7 +35,7 @@
         <!-- 自动追加日志信息到文件中，直至文件达到预定的大小，然后自动重新生成另外一个文件来记录之后的日志-->
         <!-- 设置日志格式并配置回滚日志压缩格式(error.log.年份.gz) -->
         <RollingRandomAccessFile name="error_appender"
-                                 immediateFlush="true" fileName="${LOG_HOME}/error.log"
+                                 immediateFlush="false" fileName="${LOG_HOME}/error.log"
                                  filePattern="${LOG_HOME}/error.%d{yyyy-MM-dd}.log.gz">
             <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
@@ -49,7 +49,7 @@
         </RollingRandomAccessFile>
         <!-- info.log-->
         <RollingRandomAccessFile name="info_appender"
-                                 immediateFlush="true" fileName="${LOG_HOME}/info.log"
+                                 immediateFlush="false" fileName="${LOG_HOME}/info.log"
                                  filePattern="${LOG_HOME}/info.%d{yyyy-MM-dd}.log.gz">
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>