|
|
|
@@ -192,6 +192,7 @@ public class DmResourcesController extends BaseController<DmResourcesQuery, DmRe |
|
|
|
content[i] = new File(folder + fileName + "_" + i + ".part"); |
|
|
|
} |
|
|
|
File destFile = new File(folder + fileName); |
|
|
|
logger.info("合并文件:{},文件数:{}",destFile.getAbsolutePath(), content.length); |
|
|
|
FileUtil.mergeFile(content, destFile); |
|
|
|
// 删除分片文件 |
|
|
|
for (int i = 0; i < chunks; i++) { |
|
|
|
@@ -282,6 +283,7 @@ public class DmResourcesController extends BaseController<DmResourcesQuery, DmRe |
|
|
|
AjaxResult ajax = success(); |
|
|
|
ajax.put(AjaxResult.RESULT_TAG, ja); |
|
|
|
RedisUtil.setVal("saas:upload:callbackExec:"+uploadUuid, ja.toJSONString()); |
|
|
|
|
|
|
|
logger.info("上传文件成功,返回数据:" + ajax.toJson().toJSONString()); |
|
|
|
|
|
|
|
return ajax; |
|
|
|
|