Merge branch 'v1.1'
This commit is contained in:
commit
ebefc9df76
|
@ -105,7 +105,7 @@ public class PerformanceReportController {
|
|||
|
||||
@GetMapping("log/{reportId}/{resourceId}/{goPage}")
|
||||
public Pager<List<LoadTestReportLog>> logs(@PathVariable String reportId, @PathVariable String resourceId, @PathVariable int goPage) {
|
||||
Page<Object> page = PageHelper.startPage(goPage, 10, true);
|
||||
Page<Object> page = PageHelper.startPage(goPage, 1, true);
|
||||
return PageUtils.setPageInfo(page, reportService.getReportLogs(reportId, resourceId));
|
||||
}
|
||||
|
||||
|
|
|
@ -231,8 +231,8 @@ public class ReportService {
|
|||
List<LoadTestReportLog> loadTestReportLogs = loadTestReportLogMapper.selectByExampleWithBLOBs(example);
|
||||
LoadTestReportLog content = loadTestReportLogs.get(0);
|
||||
outputStream.write(content.getContent().getBytes());
|
||||
outputStream.flush();
|
||||
}
|
||||
outputStream.flush();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -36,6 +36,8 @@
|
|||
getResource() {
|
||||
this.result = this.$get("/performance/report/log/resource/" + this.id, data => {
|
||||
this.resource = data.data;
|
||||
this.page = 1;
|
||||
this.logContent = [];
|
||||
})
|
||||
},
|
||||
load(resourceId) {
|
||||
|
|
Loading…
Reference in New Issue