|
|
@ -1,5 +1,6 @@
|
|
|
|
package cn.jlw.Interceptor;
|
|
|
|
package cn.jlw.Interceptor;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import cn.jlw.util.ChunkUploadUtil;
|
|
|
|
import cn.jlw.util.ChunkUploadUtil;
|
|
|
|
import cn.jlw.util.ConvertM3U8;
|
|
|
|
import cn.jlw.util.ConvertM3U8;
|
|
|
|
import cn.jlw.util.SpringContextUtil;
|
|
|
|
import cn.jlw.util.SpringContextUtil;
|
|
|
@ -175,6 +176,8 @@ public class GetFile implements HandlerMethodArgumentResolver {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
|
|
|
|
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
|
|
|
|
|
|
|
|
long startTime = System.currentTimeMillis();
|
|
|
|
|
|
|
|
|
|
|
|
RFile rFile = parameter.getParameterAnnotation(RFile.class);
|
|
|
|
RFile rFile = parameter.getParameterAnnotation(RFile.class);
|
|
|
|
Boolean isList = parameter.getParameterType().equals(List.class);
|
|
|
|
Boolean isList = parameter.getParameterType().equals(List.class);
|
|
|
|
|
|
|
|
|
|
|
@ -313,7 +316,7 @@ public class GetFile implements HandlerMethodArgumentResolver {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fileEntity.setSlicingList(slicingList);
|
|
|
|
fileEntity.setSlicingList(slicingList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
log.info("文件上传成功,文件名:"+ ObjectUtil.defaultIfNull(fileEntity.getName(),"")+" 耗时:"+(System.currentTimeMillis()-startTime)+"ms");
|
|
|
|
return fileEntity;
|
|
|
|
return fileEntity;
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
FileEntity f = new FileEntity();
|
|
|
|
FileEntity f = new FileEntity();
|
|
|
@ -330,6 +333,7 @@ public class GetFile implements HandlerMethodArgumentResolver {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
f.setSlicingList(slicingList);
|
|
|
|
f.setSlicingList(slicingList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
log.info("文件上传成功,文件名:"+ ObjectUtil.defaultIfNull(f.getName(),"")+" 耗时:"+(System.currentTimeMillis()-startTime)+"ms");
|
|
|
|
return f;
|
|
|
|
return f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
@ -435,8 +439,10 @@ public class GetFile implements HandlerMethodArgumentResolver {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(fileEntityList.size() > 0 && !isList){
|
|
|
|
if(fileEntityList.size() > 0 && !isList){
|
|
|
|
|
|
|
|
log.info("文件上传成功,文件名:"+ ObjectUtil.defaultIfNull(fileEntityList.get(0).getName(),"")+" 耗时:"+(System.currentTimeMillis()-startTime)+"ms");
|
|
|
|
return fileEntityList.get(0);
|
|
|
|
return fileEntityList.get(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
log.info("文件上传成功,文件名:"+ ObjectUtil.defaultIfNull(fileEntityList.get(0).getName(),"")+" 耗时:"+(System.currentTimeMillis()-startTime)+"ms");
|
|
|
|
return fileEntityList;
|
|
|
|
return fileEntityList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|