Spider/spider-flow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复日志下载bug

Browse Source
This commit is contained in:
mxd 2020-04-05 13:11:56 +08:00
parent 5e7b6afd0b
commit 08819163aa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spider-flow-web/src/main/java/org/spiderflow/controller/SpiderFlowController.java
View File

@ -3,6 +3,7 @@ package org.spiderflow.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.spiderflow.Grammerable; import org.spiderflow.Grammerable;
@ -164,7 +165,7 @@ public class SpiderFlowController {
@RequestMapping("/log/download") @RequestMapping("/log/download")
public ResponseEntity<FileSystemResource> download(String id, String taskId) { public ResponseEntity<FileSystemResource> download(String id, String taskId) {
if (StringUtils.isBlank(taskId)) { if (StringUtils.isBlank(taskId) || NumberUtils.toInt(taskId,0) == 0) {
Integer maxId = spiderFlowService.getFlowMaxTaskId(id); Integer maxId = spiderFlowService.getFlowMaxTaskId(id);
taskId = maxId == null ? "" : maxId.toString(); taskId = maxId == null ? "" : maxId.toString();
} }

2
spider-flow-web/src/main/resources/static/log.html
View File

@ -243,7 +243,7 @@
viewer.setOptions('reversed',true); viewer.setOptions('reversed',true);
viewer.init(); viewer.init();
}).on('click','.btn-download',function(){ }).on('click','.btn-download',function(){
window.open('spider/log/download?id=' + logId + "&taskId=" + taskId); window.open('spider/log/download?id=' + logId + "&taskId=" + (taskId || ''));
}); });
}); });
</script> </script>