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

@RestUploadFile标记的File对象可以获取到用户上传的文件名

Browse Source
This commit is contained in:
Redkale
2017-10-20 09:41:34 +08:00
parent f6b407aa44
commit cc150a2cc6
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,17 +133,13 @@ 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;
String name = part.getFilename(); File file = new File(home, "tmp/redkale_" + System.nanoTime() + "/" + part.getFilename());
int pos = name.lastIndexOf('.'); File parent = file.getParentFile();
if (pos > 0) { parent.mkdirs();
int pos2 = name.lastIndexOf('.', pos - 1);
if (pos2 >= 0) pos = pos2;
}
File file = new File(home, "tmp/redkale_" + System.nanoTime() + (pos > 0 ? name.substring(pos) : name));
file.getParentFile().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();
parent.delete();
} else { } else {
tmpfile = file; tmpfile = file;
} }
@@ -169,17 +165,13 @@ 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;
String name = part.getFilename(); File file = new File(home, "tmp/redkale_" + System.nanoTime() + "/" + part.getFilename());
int pos = name.lastIndexOf('.'); File parent = file.getParentFile();
if (pos > 0) { parent.mkdirs();
int pos2 = name.lastIndexOf('.', pos - 1);
if (pos2 >= 0) pos = pos2;
}
File file = new File(home, "tmp/redkale_" + System.nanoTime() + (pos > 0 ? name.substring(pos) : name));
file.getParentFile().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();
parent.delete();
continue; continue;
} }
if (files == null) files = new ArrayList<>(); if (files == null) files = new ArrayList<>();