diff --git a/src/main/java/com/casic/controller/DataForwardingController.java b/src/main/java/com/casic/controller/DataForwardingController.java index e97ab9c..79080e3 100644 --- a/src/main/java/com/casic/controller/DataForwardingController.java +++ b/src/main/java/com/casic/controller/DataForwardingController.java @@ -23,15 +23,16 @@ @RequestMapping("/data/forwarding") public String dataForwarding(@RequestBody Map map) { - log.info("----------"+JSONObject.toJSONString(map)); + JSONObject retObj = new JSONObject(); + log.info(JSONObject.toJSONString(map)); try { - HttpClientUtil.doPostJson(JSONObject.toJSONString(map),url); - serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); + HttpClientUtil.doPostJson("##" + JSONObject.toJSONString(map) + "**", url); +// serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); } catch (Exception ex) { log.error("错误"); } - return "200"; + retObj.put("code", 200); + retObj.put("success", true); + return retObj.toJSONString(); } - - } diff --git a/src/main/java/com/casic/controller/DataForwardingController.java b/src/main/java/com/casic/controller/DataForwardingController.java index e97ab9c..79080e3 100644 --- a/src/main/java/com/casic/controller/DataForwardingController.java +++ b/src/main/java/com/casic/controller/DataForwardingController.java @@ -23,15 +23,16 @@ @RequestMapping("/data/forwarding") public String dataForwarding(@RequestBody Map map) { - log.info("----------"+JSONObject.toJSONString(map)); + JSONObject retObj = new JSONObject(); + log.info(JSONObject.toJSONString(map)); try { - HttpClientUtil.doPostJson(JSONObject.toJSONString(map),url); - serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); + HttpClientUtil.doPostJson("##" + JSONObject.toJSONString(map) + "**", url); +// serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); } catch (Exception ex) { log.error("错误"); } - return "200"; + retObj.put("code", 200); + retObj.put("success", true); + return retObj.toJSONString(); } - - } diff --git a/src/main/java/com/casic/util/HttpClientUtil.java b/src/main/java/com/casic/util/HttpClientUtil.java index 9981414..16101b3 100644 --- a/src/main/java/com/casic/util/HttpClientUtil.java +++ b/src/main/java/com/casic/util/HttpClientUtil.java @@ -123,6 +123,7 @@ } finally { try { response.close(); + httpClient.close(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/java/com/casic/controller/DataForwardingController.java b/src/main/java/com/casic/controller/DataForwardingController.java index e97ab9c..79080e3 100644 --- a/src/main/java/com/casic/controller/DataForwardingController.java +++ b/src/main/java/com/casic/controller/DataForwardingController.java @@ -23,15 +23,16 @@ @RequestMapping("/data/forwarding") public String dataForwarding(@RequestBody Map map) { - log.info("----------"+JSONObject.toJSONString(map)); + JSONObject retObj = new JSONObject(); + log.info(JSONObject.toJSONString(map)); try { - HttpClientUtil.doPostJson(JSONObject.toJSONString(map),url); - serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); + HttpClientUtil.doPostJson("##" + JSONObject.toJSONString(map) + "**", url); +// serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); } catch (Exception ex) { log.error("错误"); } - return "200"; + retObj.put("code", 200); + retObj.put("success", true); + return retObj.toJSONString(); } - - } diff --git a/src/main/java/com/casic/util/HttpClientUtil.java b/src/main/java/com/casic/util/HttpClientUtil.java index 9981414..16101b3 100644 --- a/src/main/java/com/casic/util/HttpClientUtil.java +++ b/src/main/java/com/casic/util/HttpClientUtil.java @@ -123,6 +123,7 @@ } finally { try { response.close(); + httpClient.close(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2f12836..2c70fdc 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 11316 + port: 11642 ################### spring配置 ################### spring: datasource: diff --git a/src/main/java/com/casic/controller/DataForwardingController.java b/src/main/java/com/casic/controller/DataForwardingController.java index e97ab9c..79080e3 100644 --- a/src/main/java/com/casic/controller/DataForwardingController.java +++ b/src/main/java/com/casic/controller/DataForwardingController.java @@ -23,15 +23,16 @@ @RequestMapping("/data/forwarding") public String dataForwarding(@RequestBody Map map) { - log.info("----------"+JSONObject.toJSONString(map)); + JSONObject retObj = new JSONObject(); + log.info(JSONObject.toJSONString(map)); try { - HttpClientUtil.doPostJson(JSONObject.toJSONString(map),url); - serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); + HttpClientUtil.doPostJson("##" + JSONObject.toJSONString(map) + "**", url); +// serverSocketUtil.sendMsg(JSONObject.toJSONString(map)); } catch (Exception ex) { log.error("错误"); } - return "200"; + retObj.put("code", 200); + retObj.put("success", true); + return retObj.toJSONString(); } - - } diff --git a/src/main/java/com/casic/util/HttpClientUtil.java b/src/main/java/com/casic/util/HttpClientUtil.java index 9981414..16101b3 100644 --- a/src/main/java/com/casic/util/HttpClientUtil.java +++ b/src/main/java/com/casic/util/HttpClientUtil.java @@ -123,6 +123,7 @@ } finally { try { response.close(); + httpClient.close(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2f12836..2c70fdc 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 11316 + port: 11642 ################### spring配置 ################### spring: datasource: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6f17b78..fc90f52 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -27,7 +27,7 @@ enable-local: false host: 127.0.0.1 port: 11320 - url: http://127.0.0.1:11320/test + url: http://127.0.0.1:1164/test # type 可燃气体的设备类型 # minutes: 燃气外协设备上传数据的分钟数 \ No newline at end of file