图片显示

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

@@ -71,7 +71,7 @@ public class FileUploadController {
             @ApiImplicitParam(name = "chunk",value = "分片",dataType = "String",paramType = "query")
     })
     @ResponseBody
-    public ServerResponse upload(@RequestParam(value = "file") MultipartFile file,
+    public ServerResponse upload(@RequestParam(value = "file", required = false) MultipartFile file,
                                  @RequestParam(value = "md5File") String md5File,
                                  @RequestParam(value = "chunk",required= false) Integer chunk) { //第几片，从0开始
         return fileUploadService.upload(file,md5File,chunk);

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

@@ -29,20 +29,20 @@ 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");
-        //同时启用http（8080）、https（8443）两个端口
-        connector.setScheme("http");
-        connector.setSecure(false);
-        connector.setPort(8084);
-        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");
+//        //同时启用http（8080）、https（8443）两个端口
+//        connector.setScheme("http");
+//        connector.setPort(8081);
+//        connector.setSecure(false);
+//        connector.setRedirectPort(8082);
+//        return connector;
+//    }
 }

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

@@ -23,11 +23,11 @@ spring.servlet.multipart.max-request-size=100MB
 
 file.address=/Users/ljj/software/ftp
 
-# SSL config
+## 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