lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改临时文件生成的目录结构

Browse Source
This commit is contained in:
Redkale
2018-02-09 09:20:01 +08:00
parent 38bd9fb204
commit 4b9cb3716b
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/redkale/net/http/MultiContext.java
View File

@@ -112,6 +112,19 @@ public final class MultiContext {
return tmpfile; return tmpfile;
} }
/**
* 根据临时文件获取上传时的文件名
*
* @param file 临时文件
*
* @return 上传的文件名
*/
public static String getFileName(File file) {
if (file == null) return null;
String name = file.getName();
return name.startsWith("redkale-") ? name.substring(name.indexOf('_') + 1) : name;
}
//或被 REST 用到 //或被 REST 用到
/** /**
* 获取第一个文件 * 获取第一个文件
@@ -133,9 +146,9 @@ public final class MultiContext {
has = true; has = true;
if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) continue; if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) continue;
if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) continue; if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) continue;
File file = new File(home, "tmp/redkale_" + System.nanoTime() + "/" + part.getFilename()); File file = new File(home, "tmp/redkale-" + System.nanoTime() + "_" + part.getFilename());
File parent = file.getParentFile(); File parent = file.getParentFile();
parent.mkdirs(); if (!parent.isDirectory()) parent.mkdirs();
boolean rs = part.save(max < 1 ? Long.MAX_VALUE : max, file); boolean rs = part.save(max < 1 ? Long.MAX_VALUE : max, file);
if (!rs) { if (!rs) {
file.delete(); file.delete();
@@ -165,9 +178,9 @@ public final class MultiContext {
for (MultiPart part : parts()) { for (MultiPart part : parts()) {
if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) continue; if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) continue;
if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) continue; if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) continue;
File file = new File(home, "tmp/redkale_" + System.nanoTime() + "/" + part.getFilename()); File file = new File(home, "tmp/redkale-" + System.nanoTime() + "_" + part.getFilename());
File parent = file.getParentFile(); File parent = file.getParentFile();
parent.mkdirs(); if (!parent.isDirectory()) parent.mkdirs();
boolean rs = part.save(max < 1 ? Long.MAX_VALUE : max, file); boolean rs = part.save(max < 1 ? Long.MAX_VALUE : max, file);
if (!rs) { if (!rs) {
file.delete(); file.delete();