From 18c6bc740966dad07c060a6d9ba6d08376c30ccb Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Mon, 30 Jan 2023 12:30:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-ui/src/components/chat/ChatItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/im-ui/src/components/chat/ChatItem.vue b/im-ui/src/components/chat/ChatItem.vue index ad3e6a2..b5726b8 100644 --- a/im-ui/src/components/chat/ChatItem.vue +++ b/im-ui/src/components/chat/ChatItem.vue @@ -103,7 +103,7 @@ .mid { margin-left: 15px; - flex: 3; + flex: 2; display: flex; flex-direction: column; height: 100%; From 6622a5936bdfb76aa98ece98c6dc8efd99e43696 Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Wed, 24 May 2023 22:50:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?id>128=E6=97=B6,=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-platform/pom.xml | 8 +------- .../com/bx/implatform/service/impl/GroupServiceImpl.java | 4 ++-- .../com/bx/implatform/service/impl/UserServiceImpl.java | 2 +- im-server/pom.xml | 8 +------- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/im-platform/pom.xml b/im-platform/pom.xml index de6c24e..5a8225a 100644 --- a/im-platform/pom.xml +++ b/im-platform/pom.xml @@ -114,13 +114,7 @@ org.springframework.boot spring-boot-maven-plugin - - - - repackage - - - + 2.0.3.RELEASE 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 b8dd66c..00c6b34 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 @@ -230,7 +230,7 @@ public class GroupServiceImpl extends ServiceImpl implements if(groupMembers.isEmpty()){ return Collections.EMPTY_LIST; } - // 拉取群信息 + // 拉取群列表 List ids = groupMembers.stream().map((gm -> gm.getGroupId())).collect(Collectors.toList()); QueryWrapper groupWrapper = new QueryWrapper(); groupWrapper.lambda().in(Group::getId, ids); @@ -238,7 +238,7 @@ public class GroupServiceImpl extends ServiceImpl implements // 转vo List vos = groups.stream().map(g -> { GroupVO vo = BeanUtils.copyProperties(g, GroupVO.class); - GroupMember member = groupMembers.stream().filter(m -> g.getId() == m.getGroupId()).findFirst().get(); + GroupMember member = groupMembers.stream().filter(m -> g.getId().equals(m.getGroupId())).findFirst().get(); vo.setAliasName(member.getAliasName()); vo.setRemark(member.getRemark()); return vo; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 1fafcd2..644b80b 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -86,7 +86,7 @@ public class UserServiceImpl extends ServiceImpl implements IU @Override public void update(UserVO vo) { UserSession session = SessionContext.getSession(); - if(session.getId() != vo.getId()){ + if(!session.getId().equals(vo.getId()) ){ throw new GlobalException(ResultCode.PROGRAM_ERROR,"不允许修改其他用户的信息!"); } User user = this.getById(vo.getId()); diff --git a/im-server/pom.xml b/im-server/pom.xml index 397264a..41b4624 100644 --- a/im-server/pom.xml +++ b/im-server/pom.xml @@ -44,13 +44,7 @@ org.springframework.boot spring-boot-maven-plugin - - - - repackage - - - + 2.0.3.RELEASE From 46e9012c510c3bf5330bc697a2dcc8c650bae2de Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Wed, 24 May 2023 22:57:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8C=87=E5=AE=9Aspring-boot-maven-plugin?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-platform/pom.xml | 7 +++++++ im-server/pom.xml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/im-platform/pom.xml b/im-platform/pom.xml index 5a8225a..c8309c9 100644 --- a/im-platform/pom.xml +++ b/im-platform/pom.xml @@ -115,6 +115,13 @@ org.springframework.boot spring-boot-maven-plugin 2.0.3.RELEASE + + + + repackage + + + diff --git a/im-server/pom.xml b/im-server/pom.xml index 41b4624..18c3adf 100644 --- a/im-server/pom.xml +++ b/im-server/pom.xml @@ -45,6 +45,13 @@ org.springframework.boot spring-boot-maven-plugin 2.0.3.RELEASE + + + + repackage + + +