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 afeedb8..6050d6a 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-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-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); } 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 40defed..3ffa41a 100644 --- a/hs-im-server/im-tcp/im-tcp.iml +++ b/hs-im-server/im-tcp/im-tcp.iml @@ -1,5 +1,5 @@ - + @@ -15,4 +15,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file