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 c4d8944d7eb7ae60397c393a716ff353bedfbf47..e3f7407ec792c2c102fb5828c83201ae688c01eb 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) {