提交 cc4505a6 authored 作者: zhangshuang's avatar zhangshuang

bug修改

上级 806cd3f0
...@@ -27,10 +27,10 @@ public class FileUploadController { ...@@ -27,10 +27,10 @@ public class FileUploadController {
private FileUploadService fileUploadService; private FileUploadService fileUploadService;
//文件上传 //文件上传
/*@PutMapping("/upload") @PutMapping("/upload")
public ServerResponse fileUpload(HttpServletRequest httpServletRequest){ public ServerResponse fileUpload(HttpServletRequest httpServletRequest){
return fileUploadService.fileUpload(httpServletRequest); return fileUploadService.fileUpload(httpServletRequest);
}*/ }
/* *//** /* *//**
* @author zs * @author zs
......
...@@ -127,7 +127,7 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -127,7 +127,7 @@ public class FileUploadServiceImpl implements FileUploadService {
log.info("文件:" + file); log.info("文件:" + file);
log.info("md5File" + md5File); log.info("md5File" + md5File);
log.info("当前分片" + chunk); log.info("当前分片" + chunk);
log.info("文件名称" + file.getName()); log.info("文件名称" + file.getOriginalFilename());
String chunkPath = fileAddress + "/" + md5File + "/";//分片存放目录 String chunkPath = fileAddress + "/" + md5File + "/";//分片存放目录
File dirFile = new File(chunkPath); File dirFile = new File(chunkPath);
if (!dirFile.exists()) {//目录不存在,创建目录 if (!dirFile.exists()) {//目录不存在,创建目录
......
...@@ -29,19 +29,19 @@ public class UnionApplication { ...@@ -29,19 +29,19 @@ public class UnionApplication {
SpringApplication.run(UnionApplication.class, args); SpringApplication.run(UnionApplication.class, args);
} }
@Bean // @Bean
public ServletWebServerFactory servletContainer() { // public ServletWebServerFactory servletContainer() {
TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); // TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
tomcat.addAdditionalTomcatConnectors(createHTTPConnector()); // tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
return tomcat; // return tomcat;
} // }
//
private Connector createHTTPConnector() { // private Connector createHTTPConnector() {
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); // Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
connector.setScheme("http"); // connector.setScheme("http");
connector.setPort(8081); // connector.setPort(8081);
connector.setSecure(false); // connector.setSecure(false);
connector.setRedirectPort(8082); // connector.setRedirectPort(8082);
return connector; // return connector;
} // }
} }
...@@ -22,15 +22,15 @@ spring.servlet.multipart.max-file-size=100MB ...@@ -22,15 +22,15 @@ spring.servlet.multipart.max-file-size=100MB
spring.servlet.multipart.max-request-size=100MB spring.servlet.multipart.max-request-size=100MB
#100MB #100MB
server.tomcat.max-http-form-post-size=0 server.tomcat.max-http-form-post-size=-1
file.address=/Users/ljj/software/ftp 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=classpath:3725333_filetransfer.products.zjtys.com.cn.pfx
# 证书密码,请修改为您自己证书的密码. ## 证书密码,请修改为您自己证书的密码.
server.ssl.key-store-password=lR4072XF #server.ssl.key-store-password=lR4072XF
# 秘钥库类型 ## 秘钥库类型
server.ssl.keyStoreType=PKCS12 #server.ssl.keyStoreType=PKCS12
# 证书别名 ## 证书别名
server.ssl.keyAlias= alias #server.ssl.keyAlias= alias
\ No newline at end of file \ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论