From 4a702750d81f86bf7eaabfa9cf13d22e39b1c42d Mon Sep 17 00:00:00 2001 From: rowger Date: Thu, 30 Nov 2023 15:26:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hd-glasses-app/src/pages/hd_map.vue | 30 +++++++++---------- .../call/service/ImCallHistoryService.java | 19 ++++++------ .../im-tcp/src/main/resources/web.html | 2 +- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/hd-glasses-app/src/pages/hd_map.vue b/hd-glasses-app/src/pages/hd_map.vue index 9a25074..19d5663 100644 --- a/hd-glasses-app/src/pages/hd_map.vue +++ b/hd-glasses-app/src/pages/hd_map.vue @@ -397,7 +397,7 @@ export default { _url = _url + this.navigationStartPoint[1] + ";" _url = _url + this.navigationEndPoint[0] + "," _url = _url + this.navigationEndPoint[1] - _url = _url + "?" + "overview=false&alternatives=true&steps=true"; + _url = _url + "?" + "alternatives=true&steps=true&geometries=geojson"; axios({ @@ -409,25 +409,23 @@ export default { }).then(res => { console.log("================================获取到了导航结果") - res=res.data; + res = res.data; - /* - console.log(res) - if (res.code != "OK") { - return false; - }else { - console.log("================================获取到了导航结果,开始步行导航") - } - */ + /* + console.log(res) + if (res.code != "OK") { + return false; + }else { + console.log("================================获取到了导航结果,开始步行导航") + } + */ let pathList = [startPoint]; - const steps=res.routes[0].legs[0].steps + const coordinates = res.routes[0].geometry.coordinates - steps.map(item0=>{ - item0.intersections.map(item1=>{ - const _point = ol.proj.transform(item1.location,'EPSG:4326', 'EPSG:3857'); - pathList.push(_point) - }) + coordinates.map(item1 => { + const _point = ol.proj.transform(item1, 'EPSG:4326', 'EPSG:3857'); + pathList.push(_point) }) // let _list=res.route[0].legs[0].steps[0].intersections diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java index d1706ce..a46382c 100644 --- a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java @@ -18,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.Duration; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.concurrent.TimeUnit; @Slf4j @@ -65,11 +63,6 @@ public class ImCallHistoryService { Integer i = Long.valueOf(seconds).intValue(); imCallHistory.setContinueSecond(i); - log.error("===================结束之后通知客户端"); - log.error("===================结束之后通知客户端"); - log.error("===================结束之后通知客户端"); - - //TODO 结束之后通知客户端 SendMessageReq req= new SendMessageReq(); @@ -78,11 +71,19 @@ public class ImCallHistoryService { req.setToId(imCallHistory.getPassiveId()); req.setMessageTime(System.currentTimeMillis()); // req.setMessageRandom(); - req.setMessageBody(JSONObject.toJSONString(imCallHistory)); + req.setMessageId(UUID.randomUUID().toString().replace("-", "")); req.setImei("uniapp"); req.setClientType(1); + + Map data = new HashMap(); + data.put("userId", imCallHistory.getInviteId()); + data.put("msgType", "CALL_"+imCallHistory.getType()); + data.put("content", JSONObject.toJSONString(imCallHistory)); + + req.setMessageBody(JSONObject.toJSONString(data)); + p2PMessageService.send(req); diff --git a/hs-im-server/im-tcp/src/main/resources/web.html b/hs-im-server/im-tcp/src/main/resources/web.html index 8c86711..8f544fe 100644 --- a/hs-im-server/im-tcp/src/main/resources/web.html +++ b/hs-im-server/im-tcp/src/main/resources/web.html @@ -410,7 +410,7 @@ //如果浏览器支持WebSocket if (window.WebSocket) { //参数就是与服务器连接的地址 - socket = new WebSocket("ws://192.168.1.117:19000/ws"); + socket = new WebSocket("ws://119.45.242.222:29001/ws"); //客户端收到服务器消息的时候就会执行这个回调方法 socket.onmessage = function (event) { From 7fb6ed29d0dfcdb92bf1f1ce494eab8d4ce0625c Mon Sep 17 00:00:00 2001 From: luojie Date: Thu, 30 Nov 2023 20:17:49 +0800 Subject: [PATCH 2/3] local --- hs-im-server/im-common/im-common.iml | 68 ++++++++++++- hs-im-server/im-service/im-service.iml | 136 ++++++++++++++++++++++++- hs-im-server/im-system.iml | 53 ++++++++++ hs-im-server/im-tcp/im-tcp.iml | 90 +++++++++++++++- 4 files changed, 343 insertions(+), 4 deletions(-) create mode 100644 hs-im-server/im-system.iml diff --git a/hs-im-server/im-common/im-common.iml b/hs-im-server/im-common/im-common.iml index 1daccae..2de4d92 100644 --- a/hs-im-server/im-common/im-common.iml +++ b/hs-im-server/im-common/im-common.iml @@ -1,8 +1,74 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hs-im-server/im-service/im-service.iml b/hs-im-server/im-service/im-service.iml index 40defed..d1a4a5f 100644 --- a/hs-im-server/im-service/im-service.iml +++ b/hs-im-server/im-service/im-service.iml @@ -1,5 +1,5 @@ - + @@ -7,7 +7,6 @@ - @@ -15,4 +14,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hs-im-server/im-system.iml b/hs-im-server/im-system.iml new file mode 100644 index 0000000..ea4ee2e --- /dev/null +++ b/hs-im-server/im-system.iml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hs-im-server/im-tcp/im-tcp.iml b/hs-im-server/im-tcp/im-tcp.iml index 6cf5908..b0433bb 100644 --- a/hs-im-server/im-tcp/im-tcp.iml +++ b/hs-im-server/im-tcp/im-tcp.iml @@ -1,5 +1,5 @@ - + @@ -14,4 +14,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8a40bbc5e1dc695b06850315d187d40be22d683e Mon Sep 17 00:00:00 2001 From: luojie Date: Thu, 30 Nov 2023 22:50:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + hd-glasses-app/.env.hd | 10 +++++----- hd-glasses-app/.env.prod | 10 +++++----- hd-glasses-app/deployHD.js | 2 +- hd-glasses-app/public/srs/srs.sdk.js | 2 +- hd-glasses-app/src/pages/hd_map.vue | 2 +- .../java/com/lld/im/service/file/FileController.java | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 3394905..b3b1599 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ **/node_modules/** hs-im-server/.vs/ hs-im-server/hs-im-server.7z +im-uniapp/ diff --git a/hd-glasses-app/.env.hd b/hd-glasses-app/.env.hd index 7519225..39913dd 100644 --- a/hd-glasses-app/.env.hd +++ b/hd-glasses-app/.env.hd @@ -1,6 +1,6 @@ -VUE_APP_MAP_URL='https://172.16.3.19/geoserver' +VUE_APP_MAP_URL='https://172.16.3.18/geoserver' VUE_APP_MAP_AUTHKEY='30efbafe-d218-4d77-8200-0207246924be' -VUE_APP_API="https://172.16.3.19/znzq" -VUE_APP_STATIC_FILE_Prefix='//172.16.3.19/static_file' -VUE_APP_SRS_URL='webrtc://172.16.3.19/' -VUE_APP_IM_API_URL='https://172.16.3.19/im_api/v1' +VUE_APP_API="https://172.16.3.18/znzq" +VUE_APP_STATIC_FILE_Prefix='//172.16.3.18/static_file' +VUE_APP_SRS_URL='webrtc://172.16.3.18/' +VUE_APP_IM_API_URL='https://172.16.3.18/im_api/v1' diff --git a/hd-glasses-app/.env.prod b/hd-glasses-app/.env.prod index 7519225..39913dd 100644 --- a/hd-glasses-app/.env.prod +++ b/hd-glasses-app/.env.prod @@ -1,6 +1,6 @@ -VUE_APP_MAP_URL='https://172.16.3.19/geoserver' +VUE_APP_MAP_URL='https://172.16.3.18/geoserver' VUE_APP_MAP_AUTHKEY='30efbafe-d218-4d77-8200-0207246924be' -VUE_APP_API="https://172.16.3.19/znzq" -VUE_APP_STATIC_FILE_Prefix='//172.16.3.19/static_file' -VUE_APP_SRS_URL='webrtc://172.16.3.19/' -VUE_APP_IM_API_URL='https://172.16.3.19/im_api/v1' +VUE_APP_API="https://172.16.3.18/znzq" +VUE_APP_STATIC_FILE_Prefix='//172.16.3.18/static_file' +VUE_APP_SRS_URL='webrtc://172.16.3.18/' +VUE_APP_IM_API_URL='https://172.16.3.18/im_api/v1' diff --git a/hd-glasses-app/deployHD.js b/hd-glasses-app/deployHD.js index ce86d52..987d825 100644 --- a/hd-glasses-app/deployHD.js +++ b/hd-glasses-app/deployHD.js @@ -5,7 +5,7 @@ const spinner = ora(chalk.green('正在发布到服务器...')); spinner.start(); client.scp('./dist/', { // 本地打包文件的位置 - "host": '172.16.3.19', // IP地址 + "host": '172.16.3.18', // IP地址 "port": '22', // 服务器端口 "username": 'root', // 用户名 "password": 'Huawei@123', // 密码 diff --git a/hd-glasses-app/public/srs/srs.sdk.js b/hd-glasses-app/public/srs/srs.sdk.js index ebe04fb..c495b0b 100644 --- a/hd-glasses-app/public/srs/srs.sdk.js +++ b/hd-glasses-app/public/srs/srs.sdk.js @@ -36,7 +36,7 @@ function SrsRtcPublisherAsync() { self.turn = { iceServers: [{ - urls: 'turns:172.16.3.19:3478', 'credential': 'huashiai', + urls: 'turns:172.16.3.18:3478', 'credential': 'huashiai', 'username': 'huashiai' }] }; diff --git a/hd-glasses-app/src/pages/hd_map.vue b/hd-glasses-app/src/pages/hd_map.vue index 19d5663..e37b273 100644 --- a/hd-glasses-app/src/pages/hd_map.vue +++ b/hd-glasses-app/src/pages/hd_map.vue @@ -392,7 +392,7 @@ export default { planningPathFoot() { const startPoint = ol.proj.transform(this.navigationStartPoint, 'EPSG:4326', 'EPSG:3857'); const endPoint = ol.proj.transform(this.navigationEndPoint, 'EPSG:4326', 'EPSG:3857'); - let _url = "https://172.16.3.19/route/v1/driving/" + let _url = "https://172.16.3.18/route/v1/driving/" _url = _url + this.navigationStartPoint[0] + "," _url = _url + this.navigationStartPoint[1] + ";" _url = _url + this.navigationEndPoint[0] + "," diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java index 14de227..185d4b2 100644 --- a/hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/file/FileController.java @@ -35,7 +35,7 @@ public class FileController { log.info("====================Upload=================="); log.info("====================Upload=================="); - upload = upload.replaceAll("http://172.16.2.1:9000","https://172.16.2.3:19443"); + upload = upload.replaceAll("http://172.16.2.1:9000","https://172.16.3.18"); return ResponseVO.successResponse(upload); }