From dfe0de7db5826b6a0c3fb3fd9f492a24a62bcb04 Mon Sep 17 00:00:00 2001 From: zhouyl <583641232@qq.com> Date: Mon, 17 Jun 2024 14:07:02 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=AD=98=E5=82=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=A3=80=E6=9F=A5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FuncCarApiController.java | 13 ++++++++-- .../functional/domain/FuncCarApi.java | 2 +- .../service/IFuncCarApiService.java | 2 +- .../service/impl/FuncCarApiServiceImpl.java | 24 +++++++++++++------ 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java b/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java index 5f03356..f4bdc60 100644 --- a/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java +++ b/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java @@ -45,6 +45,7 @@ public class FuncCarApiController extends BaseController { @GetMapping("/list") public TableDataInfo list(FuncCarApi bo, PageQuery pageQuery) { + bo.setType("compatibility"); return iFuncCarApiService.queryPageList(bo, pageQuery); } @@ -69,13 +70,21 @@ public class FuncCarApiController extends BaseController { /** * 检查API接口参数的正确性、完整性和有效性 */ - @RepeatSubmit() @PostMapping("/checkApi") - public R checkApi(@Validated(AddGroup.class) @RequestBody FuncCarApiDto bo) { + public R checkApi(@Validated(AddGroup.class) @RequestBody FuncCarApi bo) { return R.ok(iFuncCarApiService.checkApi(bo)); } + /** + * 检查API接口参数的正确性、完整性和有效性-结果列表 + */ + @GetMapping("/checkApiResultList") + public TableDataInfo checkApiResultList(FuncCarApi bo, PageQuery pageQuery) { + bo.setType("checkApi"); + return iFuncCarApiService.queryPageList(bo, pageQuery); + } + /** * API接口协议（如REST、SOAP、XML-RPC等），测试工具可提供对应的协议测试工具下载 */ diff --git a/tp-functional/src/main/java/com/inscloudtech/functional/domain/FuncCarApi.java b/tp-functional/src/main/java/com/inscloudtech/functional/domain/FuncCarApi.java index 70df237..b31647b 100644 --- a/tp-functional/src/main/java/com/inscloudtech/functional/domain/FuncCarApi.java +++ b/tp-functional/src/main/java/com/inscloudtech/functional/domain/FuncCarApi.java @@ -81,5 +81,5 @@ public class FuncCarApi { private Long userId; - + private String type; } diff --git a/tp-functional/src/main/java/com/inscloudtech/functional/service/IFuncCarApiService.java b/tp-functional/src/main/java/com/inscloudtech/functional/service/IFuncCarApiService.java index f9d5239..d8d8765 100644 --- a/tp-functional/src/main/java/com/inscloudtech/functional/service/IFuncCarApiService.java +++ b/tp-functional/src/main/java/com/inscloudtech/functional/service/IFuncCarApiService.java @@ -47,5 +47,5 @@ public interface IFuncCarApiService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - String checkApi(FuncCarApiDto bo); + String checkApi(FuncCarApi bo); } diff --git a/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java b/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java index bbaa3e2..1895e7b 100644 --- a/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java +++ b/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java @@ -77,6 +77,7 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService { lqw.eq(bo.getResponseTime() != null, FuncCarApi::getResponseTime, bo.getResponseTime()); LoginUser loginUser = LoginHelper.getLoginUser(); lqw.eq(FuncCarApi::getUserId, loginUser.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getType()), FuncCarApi::getType, bo.getType()); return lqw; } @@ -127,6 +128,7 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService { HttpResponse httpResponse = request.execute(); bo.setResponseTime(System.currentTimeMillis() - start); bo.setJsonResult(httpResponse.body()); + bo.setType("compatibility"); } /** @@ -158,23 +160,24 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService { } @Override - public String checkApi(FuncCarApiDto bo) { + public String checkApi(FuncCarApi add) { HttpRequest request; - if(StringUtils.isEmpty(bo.getRequestMethod())){ - request = HttpUtil.createRequest(Method.GET, bo.getApiUrl()); + if(StringUtils.isEmpty(add.getRequestMethod())){ + request = HttpUtil.createRequest(Method.GET, add.getApiUrl()); }else { - if(bo.getRequestMethod().toLowerCase().contains("post")){ - request = HttpUtil.createRequest(Method.POST, bo.getApiUrl()); + if(add.getRequestMethod().toLowerCase().contains("post")){ + request = HttpUtil.createRequest(Method.POST, add.getApiUrl()); }else { - request = HttpUtil.createRequest(Method.GET, bo.getApiUrl()); + request = HttpUtil.createRequest(Method.GET, add.getApiUrl()); } } + request.header(Header.CONNECTION,"keep-alive"); request.header(Header.ACCEPT,"*/*"); request.header(Header.CONTENT_TYPE,"application/json; charset=UTF-8"); request.header(Header.CACHE_CONTROL,"max-age=0"); request.header(Header.USER_AGENT,"Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) "); - + request.body(add.getOperParam()); String body = ""; try { body = request.execute().body(); @@ -193,6 +196,13 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService { }catch (Exception e){ body = "api接口调用异常："+ e.getMessage(); } + + add.setOperTime(new Date()); + LoginUser loginUser = LoginHelper.getLoginUser(); + add.setUserId(loginUser.getUserId()); + add.setJsonResult(body); + add.setType("checkApi"); + baseMapper.insert(add); return body; }