diff --git a/test-test/src/main/java/com/test/test/controller/TestApiController.java b/test-test/src/main/java/com/test/test/controller/TestApiController.java index 25bce50..b5c5f2b 100644 --- a/test-test/src/main/java/com/test/test/controller/TestApiController.java +++ b/test-test/src/main/java/com/test/test/controller/TestApiController.java @@ -2,9 +2,9 @@ package com.test.test.controller; import java.util.List; +import com.test.test.domain.qo.IDQO; import com.test.test.domain.qo.TestApiListQO; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -18,7 +18,6 @@ import com.test.common.core.domain.AjaxResult; import com.test.common.enums.BusinessType; import com.test.test.domain.TestApi; import com.test.test.service.ITestApiService; -import com.test.common.utils.poi.ExcelUtil; import com.test.common.core.page.TableDataInfo; /** @@ -36,29 +35,18 @@ public class TestApiController extends BaseController { * 查询接口列表 */ @GetMapping("/list") - public TableDataInfo list(@Validated TestApiListQO testApi) { + public TableDataInfo list(@Validated TestApiListQO qo) { startPage(); - List list = testApiService.selectTestApiList(testApi); + List list = testApiService.selectTestApiList(qo); return getDataTable(list); } - /** - * 导出接口列表 - */ - @Log(title = "接口", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, TestApiListQO testApi) { - List list = testApiService.selectTestApiList(testApi); - ExcelUtil util = new ExcelUtil(TestApi.class); - util.exportExcel(response, list, "接口数据"); - } - /** * 获取接口详细信息 */ - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(testApiService.selectTestApiById(id)); + @PostMapping(value = "/detail") + public AjaxResult getInfo(@RequestBody IDQO qo) { + return success(testApiService.selectTestApiById(qo.getId())); } /** @@ -83,8 +71,8 @@ public class TestApiController extends BaseController { * 删除接口 */ @Log(title = "接口", businessType = BusinessType.DELETE) - @PostMapping("/del/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(testApiService.deleteTestApiByIds(ids)); + @PostMapping("/del") + public AjaxResult remove(@RequestBody IDQO qo) { + return toAjax(testApiService.deleteTestApiById(qo.getId())); } } diff --git a/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java b/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java index 103b3cf..95d20b8 100644 --- a/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java +++ b/test-test/src/main/java/com/test/test/controller/TestApiGroupController.java @@ -2,6 +2,7 @@ package com.test.test.controller; import java.util.List; +import com.test.test.domain.qo.IDQO; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -58,8 +59,8 @@ public class TestApiGroupController extends BaseController { * 删除接口节点 */ @Log(title = "接口节点", businessType = BusinessType.DELETE) - @PostMapping("/del/{id}") - public AjaxResult remove(@PathVariable Long id) { - return toAjax(testApiGroupService.deleteTestApiGroupById(id)); + @PostMapping("/del") + public AjaxResult remove(@RequestBody IDQO qo) { + return toAjax(testApiGroupService.deleteTestApiGroupById(qo.getId())); } } diff --git a/test-test/src/main/java/com/test/test/domain/qo/IDQO.java b/test-test/src/main/java/com/test/test/domain/qo/IDQO.java new file mode 100644 index 0000000..e45ab5b --- /dev/null +++ b/test-test/src/main/java/com/test/test/domain/qo/IDQO.java @@ -0,0 +1,8 @@ +package com.test.test.domain.qo; + +import lombok.Data; + +@Data +public class IDQO { + private Long id; +} diff --git a/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java b/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java index 172ba24..303ce5a 100644 --- a/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java +++ b/test-test/src/main/java/com/test/test/mapper/TestApiMapper.java @@ -22,10 +22,10 @@ public interface TestApiMapper { /** * 查询接口列表 * - * @param testApi 接口 + * @param qo 接口 * @return 接口集合 */ - public List selectTestApiList(TestApiListQO testApi); + public List selectTestApiList(TestApiListQO qo); /** * 新增接口 diff --git a/test-test/src/main/java/com/test/test/service/ITestApiService.java b/test-test/src/main/java/com/test/test/service/ITestApiService.java index 54e8c79..2d302d8 100644 --- a/test-test/src/main/java/com/test/test/service/ITestApiService.java +++ b/test-test/src/main/java/com/test/test/service/ITestApiService.java @@ -22,10 +22,10 @@ public interface ITestApiService { /** * 查询接口列表 * - * @param testApi 接口 + * @param qo 接口 * @return 接口集合 */ - public List selectTestApiList(TestApiListQO testApi); + public List selectTestApiList(TestApiListQO qo); /** * 新增接口 diff --git a/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java index 20349a9..69310d7 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestApiServiceImpl.java @@ -34,12 +34,12 @@ public class TestApiServiceImpl implements ITestApiService { /** * 查询接口列表 * - * @param testApi 接口 + * @param qo 接口 * @return 接口 */ @Override - public List selectTestApiList(TestApiListQO testApi) { - return testApiMapper.selectTestApiList(testApi); + public List selectTestApiList(TestApiListQO qo) { + return testApiMapper.selectTestApiList(qo); } /** diff --git a/test-test/src/main/resources/mapper/test/TestApiMapper.xml b/test-test/src/main/resources/mapper/test/TestApiMapper.xml index 6221c10..89f4987 100644 --- a/test-test/src/main/resources/mapper/test/TestApiMapper.xml +++ b/test-test/src/main/resources/mapper/test/TestApiMapper.xml @@ -24,16 +24,13 @@ select id, group_id, name, method, uri, header, param, body, del_flag, create_by, create_time, update_by, update_time from test_api - and group_id = #{groupId} and name like concat('%', #{name}, '%') and method = #{method} and uri like concat('%', #{uri}, '%') - and header = #{header} - and param = #{param} - and body = #{body} diff --git a/test-ui/src/api/test/api.js b/test-ui/src/api/test/api.js index e38bc9e..72c3be9 100644 --- a/test-ui/src/api/test/api.js +++ b/test-ui/src/api/test/api.js @@ -12,8 +12,9 @@ export function listApi(query) { // 查询接口详细 export function getApi(id) { return request({ - url: '/test/api/detail/' + id, - method: 'get' + url: '/test/api/detail', + method: 'post', + params: {id} }) } @@ -38,8 +39,9 @@ export function updateApi(data) { // 删除接口 export function delApi(id) { return request({ - url: '/test/api/del/' + id, - method: 'post' + url: '/test/api/del/', + method: 'post', + params: {id} }) } @@ -55,7 +57,7 @@ export function listGroup() { // 新增接口节点 export function addGroup(data) { return request({ - url: '/test/group', + url: '/test/group/add', method: 'post', data: data }) @@ -64,8 +66,8 @@ export function addGroup(data) { // 修改接口节点 export function updateGroup(data) { return request({ - url: '/test/group', - method: 'put', + url: '/test/group/edit', + method: 'post', data: data }) } @@ -73,7 +75,8 @@ export function updateGroup(data) { // 删除接口节点 export function delGroup(id) { return request({ - url: '/test/group/' + id, - method: 'delete' + url: '/test/group/del', + method: 'post', + params: {id} }) } diff --git a/test-ui/src/assets/styles/index.scss b/test-ui/src/assets/styles/index.scss index 2f3b9ef..5fe0087 100644 --- a/test-ui/src/assets/styles/index.scss +++ b/test-ui/src/assets/styles/index.scss @@ -122,6 +122,7 @@ aside { //main-container全局样式 .app-container { padding: 20px; + min-height: calc(100vh - 84px); } .components-container { @@ -180,3 +181,13 @@ aside { margin-bottom: 10px; } } + +aside { + background: unset !important; +} + +.el-form-item__content { + .el-select { + width: 100%; + } +} diff --git a/test-ui/src/router/index.js b/test-ui/src/router/index.js index 71907b6..8289a72 100644 --- a/test-ui/src/router/index.js +++ b/test-ui/src/router/index.js @@ -87,6 +87,20 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] + }, + { + path: '/api/add', + component: Layout, + hidden: true, + children: [ + { + path: '', + component: () => import('@/views/test/api/add'), + name: 'ApiAdd', + noCache: true, + meta: { title: '添加接口', activeMenu: '/api' } + } + ] } ] diff --git a/test-ui/src/views/test/api/add.vue b/test-ui/src/views/test/api/add.vue new file mode 100644 index 0000000..61a0cf7 --- /dev/null +++ b/test-ui/src/views/test/api/add.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/test-ui/src/views/test/api/index.vue b/test-ui/src/views/test/api/index.vue index a9aeaa2..c821451 100644 --- a/test-ui/src/views/test/api/index.vue +++ b/test-ui/src/views/test/api/index.vue @@ -1,135 +1,66 @@