Merge remote-tracking branch 'origin/v_2.0.0' into v_2.0.0

im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java

@@ -67,6 +67,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> 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);

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'

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}`,

im-ui/src/components/common/Icp.vue

@@ -0,0 +1,26 @@
+<template>
+	<div class="icp">
+		<img class="icp-icon" src="../../assets/image/icp_logo.png">
+		<a target="_blank"  href="https://beian.miit.gov.cn/">粤ICP备2022140558号-1</a>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.icp {
+		position: fixed;
+		text-align: center;
+		bottom: 20px;
+		margin: 0 auto;
+		width: 100%;
+		color: #5c6b77;
+		
+		.icp-icon {
+			width: 20px;
+			height: 20px;
+			vertical-align: bottom;
+		}
+	}
+</style>

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']">
 					<img v-if="userInfo.headImage" :src="userInfo.headImage" class="avatar">
 					<i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -38,13 +37,11 @@
 </template>
 
 <script>
-	import HeadImage from "../common/HeadImage.vue";
 	import FileUpload from "../common/FileUpload.vue";
 	
 	export default {
 		name: "setting",
 		components: {
-			HeadImage,
 			FileUpload
 		},
 		data() {
@@ -84,9 +81,9 @@
 					})	
 				});
 			},
-			onUploadSuccess(res, file) {
+			onUploadSuccess(data, file) {
-				this.userInfo.headImage = res.data.originUrl;
+				this.userInfo.headImage = data.originUrl;
-				this.userInfo.headImageThumb = res.data.thumbUrl;
+				this.userInfo.headImageThumb = data.thumbUrl;
 			}
 		},
 		props: {

im-ui/src/store/chatStore.js

@@ -151,7 +151,8 @@ export default {
 				chat.unreadCount++;
 			}
 			// 是否有人@我
-			if(!msgInfo.selfSend && chat.type=="GROUP" && msgInfo.atUserIds){
+			if(!msgInfo.selfSend && chat.type=="GROUP" && msgInfo.atUserIds
+				&& msgInfo.status != MESSAGE_STATUS.READED){
 				let userId = userStore.state.userInfo.id;
 				if(msgInfo.atUserIds.indexOf(userId)>=0){
 					chat.atMe = true;

im-ui/src/view/Group.vue

@@ -158,9 +158,9 @@
 			onCloseAddGroupMember() {
 				this.showAddGroupMember = false;
 			},
-			onUploadSuccess(res) {
+			onUploadSuccess(data) {
-				this.activeGroup.headImage = res.data.originUrl;
+				this.activeGroup.headImage =data.originUrl;
-				this.activeGroup.headImageThumb = res.data.thumbUrl;
+				this.activeGroup.headImageThumb = data.thumbUrl;
 			},
 			onSaveGroup() {
 				this.$refs['groupForm'].validate((valid) => {

im-ui/src/view/Login.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="login-view">
+		<div class="login-content">
 			<div class="login-intro">
 				<div>
 					<h3>盒子IM 2.0版本正式发布：</h3>
@@ -44,14 +45,16 @@
 				@keyup.enter.native="submitForm('loginForm')">
 				<div class="login-brand">登陆盒子IM</div>
 				<el-form-item label="终端" prop="userName" v-show="false">
-				<el-input type="terminal" v-model="loginForm.terminal" autocomplete="off" ></el-input>
+					<el-input type="terminal" v-model="loginForm.terminal" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="用户名" prop="userName">
-				<el-input type="userName" v-model="loginForm.userName" autocomplete="off" placeholder="用户名"></el-input>
+					<el-input type="userName" v-model="loginForm.userName" autocomplete="off"
+						placeholder="用户名"></el-input>
 
 				</el-form-item>
 				<el-form-item label="密码" prop="password">
-				<el-input type="password" v-model="loginForm.password" autocomplete="off" placeholder="密码"></el-input>
+					<el-input type="password" v-model="loginForm.password" autocomplete="off"
+						placeholder="密码"></el-input>
 				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="submitForm('loginForm')">登陆</el-button>
@@ -61,13 +64,19 @@
 					<router-link to="/register">没有账号,前往注册</router-link>
 				</div>
 			</el-form>
-
 		</div>
+		<icp></icp>
+	</div>
+
 </template>
 
 <script>
+	import Icp from '../components/common/Icp.vue'
 	export default {
 		name: "login",
+		components: {
+			Icp
+		},
 		data() {
 			var checkUsername = (rule, value, callback) => {
 				if (!value) {
@@ -162,21 +171,25 @@
 
 <style scoped lang="scss">
 	.login-view {
-		position: relative;
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
 		width: 100%;
 		height: 100%;
 		background: rgb(232, 242, 255);
 		background-size: cover;
 		box-sizing: border-box;
+
+
+		.login-content {
+			position: relative;
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
 			padding: 10%;
 
 			.login-intro {
 				flex: 1;
 				padding: 40px;
 				max-width: 600px;
+
 				.login-title {
 					text-align: center;
 					font-weight: 600;
@@ -223,4 +236,5 @@
 				}
 			}
 		}
+	}
 </style>

im-ui/src/view/Register.vue

@@ -1,7 +1,6 @@
 <template>
 	<el-container class="register-view">
 		<div>
-			
 			<el-form :model="registerForm" status-icon :rules="rules" ref="registerForm" label-width="80px" class="web-ruleForm">
 				<div class="register-brand">欢迎成为盒子IM的用户</div>
 				<el-form-item label="用户名" prop="userName">
@@ -25,12 +24,17 @@
 				</div>
 			</el-form>
 		</div>
+		<icp></icp>
 	</el-container>
 </template>
 
 <script>
+	import Icp from '../components/common/Icp.vue'
 	export default {
 		name: "login",
+		components: {
+			Icp
+		},
 		data() {
 			var checkUserName = (rule, value, callback) => {
 				if (!value) {

im-uniapp/components/chat-message-item/chat-message-item.vue

@@ -7,7 +7,7 @@
 
 		<view class="chat-msg-normal" v-if="msgInfo.type>=0 && msgInfo.type<10"
 			:class="{'chat-msg-mine':msgInfo.selfSend}">
-			<head-image class="avatar" @longpress="$emit('longPressHead')" :id="msgInfo.sendId" :url="headImage" :name="showName" :size="80"></head-image>
+			<head-image class="avatar" @longpress.prevent="$emit('longPressHead')" :id="msgInfo.sendId" :url="headImage" :name="showName" :size="80"></head-image>
 			<view class="chat-msg-content" @longpress="onShowMenu($event)">
 				<view v-if="msgInfo.groupId && !msgInfo.selfSend" class="chat-msg-top">
 					<text>{{showName}}</text>

im-uniapp/store/chatStore.js

@@ -143,13 +143,13 @@ export default {
 				chat.lastSendTime = msgInfo.sendTime;
 				chat.sendNickName = msgInfo.sendNickName;
 			}
-			
 			// 未读加1
 			if (!msgInfo.selfSend && msgInfo.status != MESSAGE_STATUS.READED) {
 				chat.unreadCount++;
 			}
 			// 是否有人@我
-			if(!msgInfo.selfSend && chat.type=="GROUP" && msgInfo.atUserIds){
+			if(!msgInfo.selfSend && chat.type=="GROUP" && msgInfo.atUserIds
+				&& msgInfo.status != MESSAGE_STATUS.READED){
 				let userId = userStore.state.userInfo.id;
 				if(msgInfo.atUserIds.indexOf(userId)>=0){
 					chat.atMe = true;