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

Browse Source
This commit is contained in:
Redkale
2017-05-30 14:57:58 +08:00
parent 0aed26652d
commit 40b46f9c7f
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,12 +100,16 @@ public final class MultiContext {
*/ */
public byte[] partsFirstBytes(final long max, final String filenameReg, final String contentTypeReg) throws IOException { public byte[] partsFirstBytes(final long max, final String filenameReg, final String contentTypeReg) throws IOException {
if (!isMultipart()) return null; if (!isMultipart()) return null;
byte[] tmpfile = null;
boolean has = false;
for (MultiPart part : parts()) { for (MultiPart part : parts()) {
if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) return null; if (has) continue;//不遍历完后面getParameter可能获取不到值
if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) return null; has = true;
return part.getContentBytes(max < 1 ? Long.MAX_VALUE : max); if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) continue;
if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) continue;
tmpfile = part.getContentBytes(max < 1 ? Long.MAX_VALUE : max);
} }
return null; return tmpfile;
} }
//或被 REST 用到 //或被 REST 用到
@@ -122,9 +126,13 @@ public final class MultiContext {
*/ */
public File partsFirstFile(final File home, final long max, final String filenameReg, final String contentTypeReg) throws IOException { public File partsFirstFile(final File home, final long max, final String filenameReg, final String contentTypeReg) throws IOException {
if (!isMultipart()) return null; if (!isMultipart()) return null;
File tmpfile = null;
boolean has = false;
for (MultiPart part : parts()) { for (MultiPart part : parts()) {
if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) return null; if (has) continue; //不遍历完后面getParameter可能获取不到值
if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) return null; has = true;
if (filenameReg != null && !filenameReg.isEmpty() && !part.getFilename().matches(filenameReg)) continue;
if (contentTypeReg != null && !contentTypeReg.isEmpty() && !part.getContentType().matches(contentTypeReg)) continue;
String name = part.getFilename(); String name = part.getFilename();
int pos = name.lastIndexOf('.'); int pos = name.lastIndexOf('.');
if (pos > 0) { if (pos > 0) {
@@ -136,11 +144,11 @@ public final class MultiContext {
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();
return null; } else {
tmpfile = file;
} }
return file;
} }
return null; return tmpfile;
} }
//或被 REST 用到 //或被 REST 用到