From ff9a0c7b2186d1321927242743aba5c701fdd842 Mon Sep 17 00:00:00 2001 From: mymanner <171451259@qq.com> Date: Thu, 4 Jul 2024 10:35:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmock=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/mock/MockjsController.java | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java b/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java index c4d8944d..e5a0ccf8 100644 --- a/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java +++ b/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java @@ -1,7 +1,6 @@ package cn.torna.web.controller.mock; import cn.torna.common.annotation.NoLogin; -import cn.torna.common.util.IdUtil; import cn.torna.common.util.ResponseUtil; import cn.torna.dao.entity.MockConfig; import cn.torna.service.MockConfigService; @@ -35,21 +34,14 @@ public class MockjsController { public void mock( HttpServletRequest request, HttpServletResponse response) { - MockConfig mockConfig; - String mockId = getMockId(request); - String dataId = buildDataId(request); - mockConfig = mockConfigService.getByDataId(dataId); - if (mockConfig == null) { - Long id = IdUtil.decode(mockId); - mockConfig = mockConfigService.getById(id); - } + MockConfig mockConfig = getMockConfig(request); if (mockConfig == null) { response.setStatus(HttpStatus.SERVICE_UNAVAILABLE.value()); ResponseUtil.writeText(response, "script not found"); return; } - String mockScript = mockConfig.getMockScript(); - ResponseUtil.writeText(response, mockScript); + String mockResult = mockConfig.getMockResult(); + ResponseUtil.writeText(response, mockResult); } private String getPath(HttpServletRequest request) { @@ -57,14 +49,14 @@ public class MockjsController { return servletPath.substring(PREFIX.length()); } - private String getMockId(HttpServletRequest request) { + private MockConfig getMockConfig(HttpServletRequest request) { String queryString = request.getQueryString(); String servletPath = request.getServletPath(); - String mockId = servletPath.substring(PREFIX.length()); + String path = servletPath.substring(PREFIX.length()); if (StringUtils.hasText(queryString)) { - mockId = mockId + "?" + queryString; + path = path + "?" + queryString; } - return mockId; + return mockConfigService.get("path", path); } private String buildDataId(HttpServletRequest request) { -- Gitee From cddae3c64a378aee6c64074c31e5d37c1d076a06 Mon Sep 17 00:00:00 2001 From: mymanner <171451259@qq.com> Date: Thu, 4 Jul 2024 14:09:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8Dmock=E8=AF=B7?= =?UTF-8?q?=E6=B1=82"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ff9a0c7b2186d1321927242743aba5c701fdd842. --- .../web/controller/mock/MockjsController.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java b/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java index e5a0ccf8..c4d8944d 100644 --- a/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java +++ b/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java @@ -1,6 +1,7 @@ package cn.torna.web.controller.mock; import cn.torna.common.annotation.NoLogin; +import cn.torna.common.util.IdUtil; import cn.torna.common.util.ResponseUtil; import cn.torna.dao.entity.MockConfig; import cn.torna.service.MockConfigService; @@ -34,14 +35,21 @@ public class MockjsController { public void mock( HttpServletRequest request, HttpServletResponse response) { - MockConfig mockConfig = getMockConfig(request); + MockConfig mockConfig; + String mockId = getMockId(request); + String dataId = buildDataId(request); + mockConfig = mockConfigService.getByDataId(dataId); + if (mockConfig == null) { + Long id = IdUtil.decode(mockId); + mockConfig = mockConfigService.getById(id); + } if (mockConfig == null) { response.setStatus(HttpStatus.SERVICE_UNAVAILABLE.value()); ResponseUtil.writeText(response, "script not found"); return; } - String mockResult = mockConfig.getMockResult(); - ResponseUtil.writeText(response, mockResult); + String mockScript = mockConfig.getMockScript(); + ResponseUtil.writeText(response, mockScript); } private String getPath(HttpServletRequest request) { @@ -49,14 +57,14 @@ public class MockjsController { return servletPath.substring(PREFIX.length()); } - private MockConfig getMockConfig(HttpServletRequest request) { + private String getMockId(HttpServletRequest request) { String queryString = request.getQueryString(); String servletPath = request.getServletPath(); - String path = servletPath.substring(PREFIX.length()); + String mockId = servletPath.substring(PREFIX.length()); if (StringUtils.hasText(queryString)) { - path = path + "?" + queryString; + mockId = mockId + "?" + queryString; } - return mockConfigService.get("path", path); + return mockId; } private String buildDataId(HttpServletRequest request) { -- Gitee From a79101dc89fe143fb93aa320d75cd1873a31a61c Mon Sep 17 00:00:00 2001 From: mymanner <171451259@qq.com> Date: Thu, 4 Jul 2024 14:23:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmock=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../torna/web/controller/mock/MockjsController.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java b/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java index c4d8944d..e3f7407e 100644 --- a/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java +++ b/server/server-web/src/main/java/cn/torna/web/controller/mock/MockjsController.java @@ -1,7 +1,6 @@ package cn.torna.web.controller.mock; import cn.torna.common.annotation.NoLogin; -import cn.torna.common.util.IdUtil; import cn.torna.common.util.ResponseUtil; import cn.torna.dao.entity.MockConfig; import cn.torna.service.MockConfigService; @@ -35,21 +34,14 @@ public class MockjsController { public void mock( HttpServletRequest request, HttpServletResponse response) { - MockConfig mockConfig; - String mockId = getMockId(request); String dataId = buildDataId(request); - mockConfig = mockConfigService.getByDataId(dataId); - if (mockConfig == null) { - Long id = IdUtil.decode(mockId); - mockConfig = mockConfigService.getById(id); - } + MockConfig mockConfig = mockConfigService.getByDataId(dataId); if (mockConfig == null) { response.setStatus(HttpStatus.SERVICE_UNAVAILABLE.value()); ResponseUtil.writeText(response, "script not found"); return; } - String mockScript = mockConfig.getMockScript(); - ResponseUtil.writeText(response, mockScript); + ResponseUtil.writeText(response, mockConfig.getMockResult()); } private String getPath(HttpServletRequest request) { -- Gitee