文件上传配置及静态目录配置修改

@@ -7,8 +7,6 @@ readDirectory = /Users/mrz/Documents/java项目/test
 #接收存储报文目录
 #接收存储报文目录
 bakDirectory = kakoRevice
 bakDirectory = kakoRevice
 #是否需要发送报文,默认N不发,Y将发送readDirectory下的XML扩展名的报文
 #是否需要发送报文,默认N不发,Y将发送readDirectory下的XML扩展名的报文
-#上传文件路径，必填
-uploadDirectory = upload
 isNeedSend = Y
 isNeedSend = Y
 
 
 #IMF MEAT报头配置
 #IMF MEAT报头配置

@@ -22,4 +22,4 @@
 * 集成websocket
 * 集成websocket
 * 集成lombok，简化部分代码录入，比如实体类,方便实体及表结构修改,敏捷开发必用,使用方法见[lombok集成使用说明](https://jingyan.baidu.com/article/0a52e3f4e53ca1bf63ed725c.html)
 * 集成lombok，简化部分代码录入，比如实体类,方便实体及表结构修改,敏捷开发必用,使用方法见[lombok集成使用说明](https://jingyan.baidu.com/article/0a52e3f4e53ca1bf63ed725c.html)
 )
 )
-   
+* 集成了单文件、多文件上传接口   

@@ -7,6 +7,7 @@ import com.tianbo.warehouse.util.Date.DateUtil;
 import com.tianbo.warehouse.util.Helper;
 import com.tianbo.warehouse.util.Helper;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,6 +24,8 @@ public class UploadController {
     @Autowired
     @Autowired
     private AttachmentService attachmentService;
     private AttachmentService attachmentService;
 
 
+    @Value("${web.upload-path}")
+    private String uploadPath; // =./upload/
     /**
     /**
      * 单个文件上传
      * 单个文件上传
      * @param file
      * @param file
@@ -37,9 +40,8 @@ public class UploadController {
                     String fileLitleName = file.getName();
                     String fileLitleName = file.getName();
                     String fileName = file.getOriginalFilename();
                     String fileName = file.getOriginalFilename();
                     String fileType =  fileName.substring((fileName.lastIndexOf(".")));
                     String fileType =  fileName.substring((fileName.lastIndexOf(".")));
-                    String saveDir = readProperties("uploadDirectory");
                     StringBuffer stringBuffer = new StringBuffer();
                     StringBuffer stringBuffer = new StringBuffer();
-                    String saveFileName =  stringBuffer.append(saveDir).append("/").append(DateUtil.getToday()).append("/").append(Helper.getUUID()).append(fileType).toString();
+                    String saveFileName =  stringBuffer.append(uploadPath).append(DateUtil.getToday()).append("/").append(Helper.getUUID()).append(fileType).toString();
                     File saveFile = new File(saveFileName);
                     File saveFile = new File(saveFileName);
                     if(!saveFile.getParentFile().exists()){
                     if(!saveFile.getParentFile().exists()){
                         saveFile.mkdirs();
                         saveFile.mkdirs();

@@ -3,6 +3,13 @@
 server.port=7003
 server.port=7003
 server.servlet.context-path=${SERVER_CONTEXTPATH:}
 server.servlet.context-path=${SERVER_CONTEXTPATH:}
 
 
+#静态资源，设置上传文件的访问，上传文件的路径，要带斜杠
+web.upload-path=upload/
+#表示所有的访问经过静态资源路径
+springboot.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
+
+
 
 
 #服务名
 #服务名
 spring.application.name=tianbo.base.dev.devkit
 spring.application.name=tianbo.base.dev.devkit

@@ -6,7 +6,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
 @RunWith(SpringRunner.class)
 @RunWith(SpringRunner.class)
-@SpringBootTest
+//解决mvn clean package打包项目websocketjavax.websocket.server.ServerContainer not available报错的问题
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class WarehouseApplicationTests {
 public class WarehouseApplicationTests {
 
 
 	@Test
 	@Test