bug修改

efs-ftp/src/main/java/com/zjty/efs/ftp/controller/FileUploadController.java

@@ -27,10 +27,10 @@ public class FileUploadController {
     private FileUploadService fileUploadService;
 
     //文件上传
-    /*@PutMapping("/upload")
+    @PutMapping("/upload")
     public ServerResponse fileUpload(HttpServletRequest httpServletRequest){
         return fileUploadService.fileUpload(httpServletRequest);
-    }*/
+    }
 
    /* *//**
      * @author zs

efs-ftp/src/main/java/com/zjty/efs/ftp/service/impl/FileUploadServiceImpl.java

@@ -127,7 +127,7 @@ public class FileUploadServiceImpl implements FileUploadService {
         log.info("文件：" + file);
         log.info("md5File" + md5File);
         log.info("当前分片" + chunk);
-        log.info("文件名称" + file.getName());
+        log.info("文件名称" + file.getOriginalFilename());
         String chunkPath = fileAddress + "/" + md5File + "/";//分片存放目录
         File dirFile = new File(chunkPath);
         if (!dirFile.exists()) {//目录不存在，创建目录

efs-union/src/main/java/com/zjty/efs/union/UnionApplication.java

@@ -29,19 +29,19 @@ public class UnionApplication {
         SpringApplication.run(UnionApplication.class, args);
     }
 
-    @Bean
-    public ServletWebServerFactory servletContainer() {
-    TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-    tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
-    return tomcat;
-    }
-
-    private Connector createHTTPConnector() {
-        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-        connector.setScheme("http");
-        connector.setPort(8081);
-        connector.setSecure(false);
-        connector.setRedirectPort(8082);
-        return connector;
-    }
+//    @Bean
+//    public ServletWebServerFactory servletContainer() {
+//    TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+//    tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
+//    return tomcat;
+//    }
+//
+//    private Connector createHTTPConnector() {
+//        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+//        connector.setScheme("http");
+//        connector.setPort(8081);
+//        connector.setSecure(false);
+//        connector.setRedirectPort(8082);
+//        return connector;
+//    }
 }

efs-union/src/main/resources/application.properties

@@ -22,15 +22,15 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 
 #100MB
-server.tomcat.max-http-form-post-size=0
+server.tomcat.max-http-form-post-size=-1
 
 file.address=/Users/ljj/software/ftp
 
 # SSL config
-server.ssl.key-store=classpath:3725333_filetransfer.products.zjtys.com.cn.pfx
-# 证书密码，请修改为您自己证书的密码.
-server.ssl.key-store-password=lR4072XF
-# 秘钥库类型
-server.ssl.keyStoreType=PKCS12
-# 证书别名
-server.ssl.keyAlias= alias
\ No newline at end of file
+#server.ssl.key-store=classpath:3725333_filetransfer.products.zjtys.com.cn.pfx
+## 证书密码，请修改为您自己证书的密码.
+#server.ssl.key-store-password=lR4072XF
+## 秘钥库类型
+#server.ssl.keyStoreType=PKCS12
+## 证书别名
+#server.ssl.keyAlias= alias
\ No newline at end of file