merge

boot-service/src/main/java/com/xwbing/demo/Ademo.java

@@ -1,8 +1,5 @@
 package com.xwbing.demo;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 项目名称: boot-module-demo
  * 创建时间: 2018/1/23 14:45
@@ -11,17 +8,15 @@ import java.util.List;
  */
 public class Ademo {
     public static void main(String[] args) {
-        qq:
-        for(int i=0;i<10;i++) {
-            for(int j=0;j<10;j++) {
-                if(j == 5) break qq;
-            }
-        }
-        System.out.println("11"=="11");
-        System.out.println("11".equalsIgnoreCase(new String("11")));
-        List<Integer> integers = new ArrayList<>();
-        Integer integer1 = integers.stream().reduce((integer, integer2) -> integer + integer2).get();
-        System.out.println(integer1);
+        String a="aaaaa";
+        String b="bbbbb";
+        String aa = aa(a);
+        System.out.println(aa);
 
     }
+    public static String aa(String aa){
+        aa="aa";
+        return aa;
+    }
+
 }

boot-web/pom.xml

@@ -67,6 +67,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+        <!-- fileupload -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${fileUpLoad.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>boot-web</finalName>

pom.xml

@@ -93,9 +93,9 @@
             <artifactId>commons-beanutils</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>${fileUpLoad.version}</version>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.2</version>
         </dependency>
     </dependencies>
     <build>