提交 dbf41ecb authored 作者: 黄夏豪's avatar 黄夏豪

fix(base): 修复了静态资源无法读取的问题

上级 e64c2b35
...@@ -93,7 +93,7 @@ public class CaseActuator implements Actuator { ...@@ -93,7 +93,7 @@ public class CaseActuator implements Actuator {
testCaseBto.getTestData()); testCaseBto.getTestData());
//执行中置动作 //执行中置动作
executeMove(testCaseBto.getTestCase().getMoveAfterTest() executeMove(testCaseBto.getTestCase().getMoveAfterTest()
, envId, projectId, baseTestCaseResponseDetail.getResponseBody(), MoveStrategy.MID_MOVE); , envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.MID_MOVE);
//进行检验 //进行检验
CheckPointResult checkPointResult = getCheckPointResult(testCaseBto.getTestCase(), CheckPointResult checkPointResult = getCheckPointResult(testCaseBto.getTestCase(),
testCaseBto.getTestData(), testCaseBto.getTestData(),
...@@ -102,7 +102,7 @@ public class CaseActuator implements Actuator { ...@@ -102,7 +102,7 @@ public class CaseActuator implements Actuator {
baseTestCaseResponseDetail); baseTestCaseResponseDetail);
//执行后置动作 //执行后置动作
executeMove(testCaseBto.getTestCase().getMoveAfterTest() executeMove(testCaseBto.getTestCase().getMoveAfterTest()
, envId, projectId, baseTestCaseResponseDetail.getResponseBody(), MoveStrategy.AFT_MOVE); , envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.AFT_MOVE);
TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult( TestDataExecuteResult testDataExecuteResult = new TestDataExecuteResult(
dataStartTime, dataStartTime,
LocalDateTime.now(), LocalDateTime.now(),
...@@ -150,7 +150,7 @@ public class CaseActuator implements Actuator { ...@@ -150,7 +150,7 @@ public class CaseActuator implements Actuator {
LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "[用例执行器] 即将开始执行中置动作"); LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "[用例执行器] 即将开始执行中置动作");
//执行中置动作 //执行中置动作
executeMove(testCaseBto.getTestCase().getMoveAfterTest() executeMove(testCaseBto.getTestCase().getMoveAfterTest()
, envId, projectId, baseTestCaseResponseDetail.getResponseBody(), MoveStrategy.MID_MOVE); , envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.MID_MOVE);
CheckPointResult checkPointResult = getCheckPointResult(testCaseBto.getTestCase(), CheckPointResult checkPointResult = getCheckPointResult(testCaseBto.getTestCase(),
testData, testData,
envId, envId,
...@@ -169,7 +169,7 @@ public class CaseActuator implements Actuator { ...@@ -169,7 +169,7 @@ public class CaseActuator implements Actuator {
LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "用例执行结果:" + JSON.toJSONString(testDataExecuteResult)); LogQueueRuntime.addNewLog(this.getClass(), CASE_ACTUATOR, "用例执行结果:" + JSON.toJSONString(testDataExecuteResult));
//执行后置动作 //执行后置动作
executeMove(testCaseBto.getTestCase().getMoveAfterTest() executeMove(testCaseBto.getTestCase().getMoveAfterTest()
, envId, projectId, baseTestCaseResponseDetail.getResponseBody(), MoveStrategy.AFT_MOVE); , envId, projectId, baseTestCaseResponseDetail!=null?baseTestCaseResponseDetail.getResponseBody():null, MoveStrategy.AFT_MOVE);
changeExecutionHistoryStatus(ExecutionHistoryStatus.FINISH); changeExecutionHistoryStatus(ExecutionHistoryStatus.FINISH);
} catch (Exception e) { } catch (Exception e) {
dataSourceService.switchMainDataSource(); dataSourceService.switchMainDataSource();
......
...@@ -15,6 +15,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; ...@@ -15,6 +15,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
public class ResourcesConfig implements WebMvcConfigurer { public class ResourcesConfig implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/reports/**").addResourceLocations("classpath:/reports/"); String fileUrl = "file:" + System.getProperty("user.dir") + "/htmls/";
registry.addResourceHandler("/**").addResourceLocations(fileUrl);
} }
} }
...@@ -6,10 +6,7 @@ import org.springframework.core.io.UrlResource; ...@@ -6,10 +6,7 @@ import org.springframework.core.io.UrlResource;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
...@@ -26,9 +23,9 @@ import java.io.IOException; ...@@ -26,9 +23,9 @@ import java.io.IOException;
@RequestMapping @RequestMapping
public class FileSysController { public class FileSysController {
@GetMapping("/report/{fileName}") @GetMapping("/report")
public ResponseEntity downloadAlertWeb(HttpServletRequest request, public ResponseEntity downloadAlertWeb(HttpServletRequest request,
@PathVariable String fileName) { @RequestParam String fileName) {
//1.拼接 - > url //1.拼接 - > url
String fileUrl = "file:" + System.getProperty("user.dir") + "/htmls/" +fileName; String fileUrl = "file:" + System.getProperty("user.dir") + "/htmls/" +fileName;
try { try {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论