From 180a3204fb63b19117d2069784ef20239e957a5a Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Fri, 9 Mar 2018 11:42:58 +0800
Subject: [PATCH] merge

---
 .../main/java/com/xwbing/demo/FileUploadDemo.java    | 12 +++++++++---
 .../src/main/java/com/xwbing/demo/IODemo.java        |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

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 628055d..9cbefcb 100644
--- a/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/FileUploadDemo.java
@@ -38,7 +38,7 @@ public class FileUploadDemo {
                 byte[] data;
                 try {
                     InputStream is = multipartFile.getInputStream();//文件输入流
-                    data = new byte[1024 * 10];
+                    data = new byte[is.available()];
                     is.read(data);
                     is.close();
                 } catch (IOException e) {
@@ -59,11 +59,10 @@ public class FileUploadDemo {
     public void fileUpload(CommonsMultipartFile multipartFile) {
             if (!multipartFile.isEmpty()) {
                 String name = multipartFile.getOriginalFilename();//原始名字
-                String fileType = name.substring(name.lastIndexOf("."));//获取文件后缀
                 ClassPathResource file = new ClassPathResource("file");
                 try {
                     String path = file.getFile().getAbsolutePath();
-                    File targetFile = new File(path+ File.separator+name+fileType);
+                    File targetFile = new File(path+ File.separator+ File.separator+name);
                     if (!targetFile.exists()) {
                         targetFile.createNewFile();
                     }
@@ -75,5 +74,12 @@ 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");
+        if(!targetFile.exists()){
+            targetFile.createNewFile(); //创建文件
+        }
+        System.out.println("");
     }
 }
diff --git a/boot-service/src/main/java/com/xwbing/demo/IODemo.java b/boot-service/src/main/java/com/xwbing/demo/IODemo.java
index 26ae3d7..5e48696 100644
--- a/boot-service/src/main/java/com/xwbing/demo/IODemo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/IODemo.java
@@ -27,7 +27,7 @@ public class IODemo {
          * 读
          */
         FileInputStream fis = new FileInputStream("fos.txt");
-        byte[] data = new byte[1024 * 10];
+        byte[] data = new byte[fis.available()];
         int len = fis.read(data);//数据读入data里
         String str = new String(data, 0, len, "gbk");
         fis.close();