fix(web): 修复了controller中参数默认值,以及吞异常问题

kt-base/src/main/resources/templates/overview.ftl

@@ -69,7 +69,7 @@
                         <td>${failCase.type!}</td>
                         <td>${failCase.detail!}</td>
                         <td>${failCase.description!}</td>
-                        <td>${failCase.result?c}</td>
+                        <td style="color: red">${failCase.result?c}</td>
                         <td>${failCase.duration!}</td>
                         <td class="clickClass" data-message="${failCase.resultMessage!}">查看结果</td>
                     </tr>
@@ -88,7 +88,7 @@
                         <td>${passCase.type!}</td>
                         <td>${passCase.detail!}</td>
                         <td>${passCase.description!}</td>
-                        <td>${passCase.result?c}</td>
+                        <td style="color: green">${passCase.result?c}</td>
                         <td>${passCase.duration!}</td>
                         <td class="clickClass" data-message="${passCase.resultMessage!}">查看结果</td>
                     </tr>

kt-web/src/main/java/org/matrix/autotest/controller/ConnectController.java

@@ -78,7 +78,7 @@ public class ConnectController {
     public ResponseEntity<CommonResultObj<Page<Connect>>> findPageConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name) {
+            @RequestParam(required = false,defaultValue = "") String name) {
         Page<Connect> results = Optional.ofNullable(connectService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(Connect.class)
                         .like(StringUtils.hasLength(name)
@@ -100,7 +100,7 @@ public class ConnectController {
     public ResponseEntity<CommonResultObj<Page<Connect>>> findConditionConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name) {
+            @RequestParam(required = false,defaultValue = "") String name) {
         Page<Connect> results = Optional.ofNullable(connectService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(Connect.class)
                         .like(StringUtils.hasLength(name)

kt-web/src/main/java/org/matrix/autotest/controller/DynamicVariableController.java

@@ -49,7 +49,8 @@ public class DynamicVariableController {
     public ResponseEntity<CommonResultObj<Page<DynamicVariable>>> findPageConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
         Page<DynamicVariable> results = Optional.ofNullable(dynamicVariableService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(DynamicVariable.class).eq(DynamicVariable::getProjectId, projectId)
                         .like(StringUtils.hasLength(name)
@@ -72,7 +73,8 @@ public class DynamicVariableController {
     public ResponseEntity<CommonResultObj<Page<DynamicVariable>>> findConditionConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
         Page<DynamicVariable> results = Optional.ofNullable(dynamicVariableService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(DynamicVariable.class).eq(DynamicVariable::getProjectId, projectId)
                         .like(StringUtils.hasLength(name)

kt-web/src/main/java/org/matrix/autotest/controller/EnvironmentController.java

@@ -49,7 +49,8 @@ public class EnvironmentController {
     public ResponseEntity<CommonResultObj<Page<Environment>>> findPageConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
         Page<Environment> results = Optional.ofNullable(environmentService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(Environment.class).eq(Environment::getProjectId, projectId)
                         .like(StringUtils.hasLength(name)
@@ -72,7 +73,8 @@ public class EnvironmentController {
     public ResponseEntity<CommonResultObj<Page<Environment>>> findConditionConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
         Page<Environment> results = Optional.ofNullable(environmentService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(Environment.class).eq(Environment::getProjectId, projectId)
                         .like(StringUtils.hasLength(name)

kt-web/src/main/java/org/matrix/autotest/controller/MoveController.java

@@ -73,7 +73,8 @@ public class MoveController {
     public ResponseEntity<CommonResultObj<Page<Move>>> findPageConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
         Page<Move> results = Optional.ofNullable(moveService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(Move.class).eq(Move::getProjectId, projectId)
                         .like(StringUtils.hasLength(name)
@@ -96,7 +97,8 @@ public class MoveController {
     public ResponseEntity<CommonResultObj<Page<Move>>> findConditionConnects(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
         Page<Move> results = Optional.ofNullable(moveService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(Move.class).eq(Move::getProjectId, projectId)
                         .like(StringUtils.hasLength(name)

kt-web/src/main/java/org/matrix/autotest/controller/SwaggerController.java

@@ -62,6 +62,7 @@ public class SwaggerController {
             }
             reader.close();
         } catch (IOException e) {
+            e.printStackTrace();
             throw new GlobalException(String.format("请求swagger数据失败,您读的swagger地址ip为 %s", url));
         }
         return json.toString();
@@ -169,7 +170,7 @@ public class SwaggerController {
      * @param swaggerUrl 查询条件: 方法的url
      * @return Swagger中的数据
      */
-    @PostMapping
+    @GetMapping
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation(value = "快速添加接口")
     public CommonPage<List<InterfaceInformation>> parameter(
@@ -177,8 +178,8 @@ public class SwaggerController {
             Long id,
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name,
-            String swaggerUrl) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @RequestParam(required = false,defaultValue = "")String swaggerUrl) {
         //将所有的默认选项置为false
         environmentService.setIsDefaultByWrapper(false,
                 Wrappers.lambdaQuery(Environment.class).eq(Environment::getProjectId, projectId));

kt-web/src/main/java/org/matrix/autotest/controller/TestCaseController.java

@@ -70,7 +70,8 @@ public class TestCaseController {
     public ResponseEntity<CommonResultObj<Page<TestCase>>> findPageTestCase(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
 
         Page<TestCase> results = Optional.ofNullable(testCaseService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(TestCase.class)
@@ -99,7 +100,8 @@ public class TestCaseController {
     public ResponseEntity<CommonResultObj<Page<TestCase>>> findConditionTestCase(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name, @PathVariable Long projectId) {
+            @RequestParam(required = false,defaultValue = "")String name,
+            @PathVariable Long projectId) {
 
         Page<TestCase> results = Optional.ofNullable(testCaseService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(TestCase.class).eq(TestCase::getProjectId, projectId)

kt-web/src/main/java/org/matrix/autotest/controller/TestJobController.java

@@ -55,7 +55,7 @@ public class TestJobController {
     public ResponseEntity<CommonResultObj<IPage<TestJobVo>>> findPageTestTasks(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            String name) {
+            @RequestParam(required = false,defaultValue = "")String name) {
         IPage<TestJobVo> result = testJobService.pageTestJob(name, pageSize, pageNum);
         return CommonResult.success(result, "查询成功");
     }
@@ -73,10 +73,6 @@ public class TestJobController {
                 , "添加成功", "添加失败");
     }
 
-//    public ResponseEntity<CommonResultObj<TestJob>> insertByFilter(){
-//
-//    }
-
     /**
      * 修改测试任务
      *