diff --git a/src/main/java/com/objecteye/controller/BackGroundController.java b/src/main/java/com/objecteye/controller/BackGroundController.java index a86d6a2..221c92d 100644 --- a/src/main/java/com/objecteye/controller/BackGroundController.java +++ b/src/main/java/com/objecteye/controller/BackGroundController.java @@ -88,9 +88,9 @@ public class BackGroundController extends BasicController { @ApiOperation("根据配置明细项id获取请求http的返回值信息") @RequestMapping(value = "getServiceHttpResponse", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public CommonResult getServiceHttpResponse(@RequestParam Integer configId, @RequestParam Integer interfaceMouldId, - @RequestParam(required = false) String params, - @RequestParam(required = false) MultipartFile multipartFile) { + public CommonResult getServiceHttpResponse(@RequestParam Integer configId, @RequestParam Integer interfaceMouldId, + @RequestParam(required = false) String params, + @RequestParam(required = false) MultipartFile multipartFile) { return CommonResult.success(iBackGroundService.getServiceHttpResponse(configId, interfaceMouldId, params, multipartFile)); } diff --git a/src/main/java/com/objecteye/service/IBackGroundService.java b/src/main/java/com/objecteye/service/IBackGroundService.java index 5e18419..84cfadf 100644 --- a/src/main/java/com/objecteye/service/IBackGroundService.java +++ b/src/main/java/com/objecteye/service/IBackGroundService.java @@ -116,7 +116,7 @@ public interface IBackGroundService { * @param multipartFile 请求文件 * @return http请求返回信息 */ - String getServiceHttpResponse(Integer configId, Integer interfaceMouldId, String paramsStr, MultipartFile multipartFile); + JSONObject getServiceHttpResponse(Integer configId, Integer interfaceMouldId, String paramsStr, MultipartFile multipartFile); /** * 获取配置服务支持的所有接口信息(固定对应的itemName为 serviceInterface, interfaceMould) diff --git a/src/main/java/com/objecteye/service/impl/BackGroundServiceImpl.java b/src/main/java/com/objecteye/service/impl/BackGroundServiceImpl.java index 1492a81..c5afc9a 100644 --- a/src/main/java/com/objecteye/service/impl/BackGroundServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/BackGroundServiceImpl.java @@ -596,7 +596,7 @@ public class BackGroundServiceImpl implements IBackGroundService { * @return http请求返回信息 */ @Override - public String getServiceHttpResponse(Integer configId, Integer interfaceMouldId, String paramsStr, MultipartFile multipartFile) { + public JSONObject getServiceHttpResponse(Integer configId, Integer interfaceMouldId, String paramsStr, MultipartFile multipartFile) { List syServiceConfigItems = syServiceConfigItemMapper.selectByExample(SyServiceConfigItemExample.newAndCreateCriteria().andConfigIdEqualTo(configId) .andItemNameIn(Arrays.asList("http", "port")).example()); String ip = null; @@ -667,9 +667,11 @@ public class BackGroundServiceImpl implements IBackGroundService { } if ("post".equals(syServiceInterfaceMould.getMethodType().toLowerCase())) { - return resultString; + return JSON.parseObject(resultString); } else { - return "其他请求方式暂不支持"; + JSONObject resultObj = new JSONObject(); + resultObj.put("error", "其他请求方式暂不支持"); + return resultObj; } }