|
@@ -43,10 +43,8 @@ public class SceneInterceptor implements HandlerInterceptor {
|
|
|
|
|
|
private static final Log log = LogFactory.getLog("programLog");
|
|
|
|
|
|
- @Autowired
|
|
|
- private IUserService userService;
|
|
|
- @Autowired
|
|
|
- private IFdkkUserService fdkkUserService;
|
|
|
+ @Value("${fdkk.hot-local-path}")
|
|
|
+ private String hotLocalPath;
|
|
|
@Resource
|
|
|
FdkkClient fdkkClient;
|
|
|
@Autowired
|
|
@@ -83,9 +81,16 @@ public class SceneInterceptor implements HandlerInterceptor {
|
|
|
if(request.getContentType().contains("application/json")){
|
|
|
send = fdkkClient.sendPostJson(requestURI, JSONObject.parseObject(ReadAsChars(request)), fdkkToken);
|
|
|
}else {
|
|
|
+ HashMap<String,String> map = new HashMap<>();
|
|
|
+ Enumeration<String> parameterNames = request.getParameterNames();
|
|
|
+ while (parameterNames.hasMoreElements()) {
|
|
|
+ String key = parameterNames.nextElement();
|
|
|
+ String value = request.getParameter(key);
|
|
|
+ map.put(key,value);
|
|
|
+ }
|
|
|
+
|
|
|
MultipartHttpServletRequest mRequest = (MultipartHttpServletRequest) request;
|
|
|
Map<String, MultipartFile> fileMap = mRequest.getFileMap();
|
|
|
- HashMap<String,String> map = new HashMap<>();
|
|
|
String path = null;
|
|
|
if(fileMap.size() >0){
|
|
|
for (Map.Entry<String, MultipartFile> next : fileMap.entrySet()) {
|
|
@@ -93,19 +98,15 @@ public class SceneInterceptor implements HandlerInterceptor {
|
|
|
if(file !=null && file.getSize() >0){
|
|
|
String fileName = file.getOriginalFilename();
|
|
|
assert fileName != null;
|
|
|
- String s = fileName.substring(fileName.lastIndexOf("."));
|
|
|
- File newFile = File.createTempFile(fileName,s);
|
|
|
+ String newFilePath = String.format(hotLocalPath,map.get("num")) + "/"+fileName ;
|
|
|
+
|
|
|
+ File newFile = new File(newFilePath);
|
|
|
file.transferTo(newFile);
|
|
|
path = newFile.getPath();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- Enumeration<String> parameterNames = request.getParameterNames();
|
|
|
- while (parameterNames.hasMoreElements()) {
|
|
|
- String key = parameterNames.nextElement();
|
|
|
- String value = request.getParameter(key);
|
|
|
- map.put(key,value);
|
|
|
- }
|
|
|
+
|
|
|
if(fileMap.size() >0){
|
|
|
send = fdkkClient.sendPostFile(requestURI, map, path,fdkkToken);
|
|
|
}else {
|