From 48acf02dbb0b3422a083dfb0604462dbe7c58656 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sat, 5 Oct 2024 16:45:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AF=9D=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=A2=E5=A4=B1=E7=9A=84bug=202.app=E7=AB=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E5=A4=8D=E5=88=B6=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=203.=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BA=BA=E9=80=9A?= =?UTF-8?q?=E8=AF=9D=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 16 ++- im-uniapp/.env.js | 4 +- im-uniapp/App.vue | 2 +- .../chat-message-item/chat-message-item.vue | 21 ++-- im-uniapp/components/pop-menu/pop-menu.vue | 6 +- im-uniapp/hybrid/html/rtc-group/index.html | 12 ++- im-uniapp/hybrid/html/rtc-private/index.html | 12 ++- im-uniapp/pages/chat/chat-box.vue | 98 +++++++++--------- im-uniapp/static/logo/logo.png | Bin 63432 -> 165499 bytes im-uniapp/store/chatStore.js | 9 +- im-web/src/components/chat/ChatBox.vue | 19 +--- im-web/src/components/rtc/RtcGroupVideo.vue | 2 +- im-web/src/store/chatStore.js | 7 +- 13 files changed, 115 insertions(+), 93 deletions(-) diff --git a/.gitignore b/.gitignore index 10f5a2f..4c041af 100644 --- a/.gitignore +++ b/.gitignore @@ -3,16 +3,12 @@ /im-server/im-server.iml /im-platform/im-platform.iml /im-client/im-client.iml -/im-platform/src/main/resources/application-prod.yml -/im-platform/src/main/resources/logback-prod.xml -/im-server/src/main/resources/application-prod.yml -/im-server/src/main/resources/logback-prod.xml /im-common/im-common.iml +/im-server/target/ +/im-platform/target/ +/im-client/target/ +/im-common/itarget/ +/im-web/node_modules/ /im-uniapp/node_modules/ -/im-web/package-lock.json -/im-uniapp/unpackage/ -/im-uniapp/hybrid/ /im-uniapp/package-lock.json -/im-web/src/components/rtc/LocalVideo.vue -/im-web/src/components/rtc/RemoteVideo.vue -/im-web/src/components/rtc/RtcGroupAcceptor.vue +/im-uniapp/unpackage/ diff --git a/im-uniapp/.env.js b/im-uniapp/.env.js index b6b9ff4..9c7c778 100644 --- a/im-uniapp/.env.js +++ b/im-uniapp/.env.js @@ -2,8 +2,8 @@ const ENV = "DEV"; const UNI_APP = {} if(ENV=="DEV"){ - UNI_APP.BASE_URL = "http://127.0.0.1:8888"; - UNI_APP.WS_URL = "ws://127.0.0.1:8878/im"; + UNI_APP.BASE_URL = "http://192.168.43.199:8888"; + UNI_APP.WS_URL = "ws://192.168.43.199:8878/im"; // H5 走本地代理解决跨域问题 // #ifdef H5 UNI_APP.BASE_URL = "/api"; diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue index a30cd85..1fc215b 100644 --- a/im-uniapp/App.vue +++ b/im-uniapp/App.vue @@ -1,5 +1,5 @@