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 42c290e..5f05e10 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 @@ -67,6 +67,7 @@ public class GroupServiceImpl extends ServiceImpl implements GroupMember groupMember = new GroupMember(); groupMember.setGroupId(group.getId()); groupMember.setUserId(user.getId()); + groupMember.setHeadImage(user.getHeadImageThumb()); groupMember.setAliasName(StringUtils.isEmpty(vo.getAliasName())?session.getNickName():vo.getAliasName()); groupMember.setRemark(StringUtils.isEmpty(vo.getRemark())?group.getName():vo.getRemark()); groupMemberService.save(groupMember); @@ -80,7 +81,7 @@ public class GroupServiceImpl extends ServiceImpl implements /** * 修改群聊信息 - * + * * @param vo 群聊信息 * @return 群聊信息 **/ diff --git a/im-ui/.env.development b/im-ui/.env.development index 4eee0c7..9762bd8 100644 --- a/im-ui/.env.development +++ b/im-ui/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # app名称 VUE_APP_NAME = "盒子IM" -// 接口请求地址 +# 接口请求地址 VUE_APP_BASE_API = '/api' # ws地址 VUE_APP_WS_URL = 'ws://localhost:8878/im' \ No newline at end of file diff --git a/im-ui/src/assets/image/icp_logo.png b/im-ui/src/assets/image/icp_logo.png new file mode 100644 index 0000000..6fe667f Binary files /dev/null and b/im-ui/src/assets/image/icp_logo.png differ diff --git a/im-ui/src/components/common/HeadImage.vue b/im-ui/src/components/common/HeadImage.vue index 72ea6e0..084ab50 100644 --- a/im-ui/src/components/common/HeadImage.vue +++ b/im-ui/src/components/common/HeadImage.vue @@ -41,7 +41,6 @@ }, methods:{ showUserInfo(e){ - console.log(this.id) if(this.id && this.id>0){ this.$http({ url: `/user/find/${this.id}`, diff --git a/im-ui/src/components/common/Icp.vue b/im-ui/src/components/common/Icp.vue new file mode 100644 index 0000000..f06e07f --- /dev/null +++ b/im-ui/src/components/common/Icp.vue @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/im-ui/src/components/setting/Setting.vue b/im-ui/src/components/setting/Setting.vue index beff208..366d7c6 100644 --- a/im-ui/src/components/setting/Setting.vue +++ b/im-ui/src/components/setting/Setting.vue @@ -7,7 +7,6 @@ :showLoading="true" :maxSize="maxSize" @success="onUploadSuccess" - :fileTypes="['image/jpeg', 'image/png', 'image/jpg','image/webp']"> @@ -38,13 +37,11 @@