From cc556a9f6f0bc47b559afa6f66f468fd68726f08 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Fri, 6 Oct 2023 23:42:16 +0800 Subject: [PATCH] =?UTF-8?q?uniapp=20=E7=BE=A4=E8=81=8A=E5=8A=9F=E8=83=BD(?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GroupServiceImpl.java | 4 +- im-uniapp/package.json | 8 +- im-uniapp/pages.json | 4 + im-uniapp/pages/friend/friend-add.vue | 97 ++++++ im-uniapp/pages/group/group-edit.vue | 146 +++++++++ im-uniapp/pages/group/group-info.vue | 283 ++++++++++++++++++ im-uniapp/pages/group/group-invite.vue | 130 ++++++++ im-uniapp/pages/group/group-member.vue | 105 +++++++ 8 files changed, 771 insertions(+), 6 deletions(-) create mode 100644 im-uniapp/pages/friend/friend-add.vue create mode 100644 im-uniapp/pages/group/group-edit.vue create mode 100644 im-uniapp/pages/group/group-info.vue create mode 100644 im-uniapp/pages/group/group-invite.vue create mode 100644 im-uniapp/pages/group/group-member.vue diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java index 9c31a59..04ad639 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java @@ -130,7 +130,7 @@ public class GroupServiceImpl extends ServiceImpl implements public void deleteGroup(Long groupId) { UserSession session = SessionContext.getSession(); Group group = this.getById(groupId); - if(group.getOwnerId().equals(session.getUserId())){ + if(!group.getOwnerId().equals(session.getUserId())){ throw new GlobalException(ResultCode.PROGRAM_ERROR,"只有群主才有权限解除群聊"); } // 逻辑删除群数据 @@ -170,7 +170,7 @@ public class GroupServiceImpl extends ServiceImpl implements public void kickGroup(Long groupId, Long userId) { UserSession session = SessionContext.getSession(); Group group = this.getById(groupId); - if(group.getOwnerId().equals(session.getUserId()) ){ + if(!group.getOwnerId().equals(session.getUserId()) ){ throw new GlobalException(ResultCode.PROGRAM_ERROR,"您不是群主,没有权限踢人"); } if(userId.equals(session.getUserId())){ diff --git a/im-uniapp/package.json b/im-uniapp/package.json index 7ce1fa1..2d6061b 100644 --- a/im-uniapp/package.json +++ b/im-uniapp/package.json @@ -6,16 +6,16 @@ "browser":"chrome", "env": { "UNI_PLATFORM": "h5", - "BASE_URL": "http://192.168.43.6:8888", - "WS_URL": "ws://192.168.43.6:8878/im" + "BASE_URL": "http://127.0.0.1:8888", + "WS_URL": "ws://127.0.0.1:8878/im" } }, "dev-wx-mini": { "title": "开发环境-微信小程序", "env": { "UNI_PLATFORM": "mp-weixin", - "BASE_URL": "http://192.168.43.6:8888", - "WS_URL": "ws://192.168.43.6:8878/im" + "BASE_URL": "http://127.0.0.1:8888", + "WS_URL": "ws://127.0.0.1:8878/im" } }, "prod-h5": { diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json index 4589049..fdc1564 100644 --- a/im-uniapp/pages.json +++ b/im-uniapp/pages.json @@ -40,6 +40,10 @@ "path": "pages/group/group-info" }, { "path": "pages/group/group-edit" + }, { + "path": "pages/group/group-invite" + }, { + "path": "pages/group/group-member" }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/im-uniapp/pages/friend/friend-add.vue b/im-uniapp/pages/friend/friend-add.vue new file mode 100644 index 0000000..46c406b --- /dev/null +++ b/im-uniapp/pages/friend/friend-add.vue @@ -0,0 +1,97 @@ + + + + + \ No newline at end of file diff --git a/im-uniapp/pages/group/group-edit.vue b/im-uniapp/pages/group/group-edit.vue new file mode 100644 index 0000000..aaf075e --- /dev/null +++ b/im-uniapp/pages/group/group-edit.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/im-uniapp/pages/group/group-info.vue b/im-uniapp/pages/group/group-info.vue new file mode 100644 index 0000000..be2bdb5 --- /dev/null +++ b/im-uniapp/pages/group/group-info.vue @@ -0,0 +1,283 @@ + + + + + \ No newline at end of file diff --git a/im-uniapp/pages/group/group-invite.vue b/im-uniapp/pages/group/group-invite.vue new file mode 100644 index 0000000..0bdf78c --- /dev/null +++ b/im-uniapp/pages/group/group-invite.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/im-uniapp/pages/group/group-member.vue b/im-uniapp/pages/group/group-member.vue new file mode 100644 index 0000000..d75c024 --- /dev/null +++ b/im-uniapp/pages/group/group-member.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file