From 1949b56181a69a99397593a9d3c1f58566dad49f Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Mon, 30 Sep 2024 16:29:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=95=86=E4=B8=9A=E7=89=88=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++++++-- im-web/src/components/rtc/RtcGroupVideo.vue | 4 ++-- im-web/src/view/Login.vue | 3 +-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d757844..d7dc508 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,14 @@ 说明: 1.由于微信小程序每次发布审核过于严苛和繁琐,暂时不再提供体验环境,但uniapp端依然会继续兼容小程序 -2.体验环境部署的是商业版本,与开源版本功能存在一定差异,具体请参考: -https://www.yuque.com/u1475064/imk5n2/qtezcg32q1d0dr29 +2.体验环境部署的是商业版本,与开源版本功能存在一定差异,具体请参考: +https://www.yuque.com/u1475064/imk5n2/qtezcg32q1d0dr29#SbvXq + +#### 付费服务 +商业版源码: https://www.yuque.com/u1475064/imk5n2/qtezcg32q1d0dr29 +远程协助: https://www.yuque.com/u1475064/imk5n2/fettd57rvzc29s5r +环境搭建: https://www.yuque.com/u1475064/imk5n2/qgq5cvgmavallqnl + #### 项目结构 | 模块 | 功能 | @@ -122,9 +128,11 @@ https://www.yuque.com/u1475064/mufu2a/vn5u10ephxh9sau8 欢迎进群与小伙们一起交流, **申请加群前请务必先star哦** + #### 点下star吧 如果项目对您有帮助,请点亮右上方的star,支持一下作者吧! + #### 说明几点 1. 本系统允许用于商业用途,且不收费(自愿投币)。**但切记不要用于任何非法用途** ,本软件作者不会为此承担任何责任 diff --git a/im-web/src/components/rtc/RtcGroupVideo.vue b/im-web/src/components/rtc/RtcGroupVideo.vue index 952bc70..ee8aef8 100644 --- a/im-web/src/components/rtc/RtcGroupVideo.vue +++ b/im-web/src/components/rtc/RtcGroupVideo.vue @@ -9,8 +9,8 @@ 点击下方文档了解详细信息:
- - 盒子IM商业版说明 + + 盒子IM商业版付费说明
diff --git a/im-web/src/view/Login.vue b/im-web/src/view/Login.vue index 35f7585..6ffd0d6 100644 --- a/im-web/src/view/Login.vue +++ b/im-web/src/view/Login.vue @@ -9,7 +9,7 @@ 详细介绍文档
  • - 商业版付费说明 + 商业版付费说明
  • @@ -27,7 +27,6 @@ - Date: Tue, 1 Oct 2024 16:54:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-uniapp/store/chatStore.js | 1 - 1 file changed, 1 deletion(-) diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js index cbd54bd..6273a29 100644 --- a/im-uniapp/store/chatStore.js +++ b/im-uniapp/store/chatStore.js @@ -23,7 +23,6 @@ export default defineStore('chatStore', { cacheChats.push(JSON.parse(JSON.stringify(chat))); // 加载期间显示只前15个会话做做样子,一切都为了加快初始化时间 if (this.chats.length < 15) { - chat.messages = []; this.chats.push(chat); } } 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 3/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=A2=E5=A4=B1=E7=9A=84bug=202.app?= =?UTF-8?q?=E7=AB=AF=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=203.=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BA=BA?= =?UTF-8?q?=E9=80=9A=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 @@