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 a5d1799..4e47101 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
@@ -103,7 +103,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         String strJson = JwtUtil.getInfo(refreshToken);
         Long userId = JwtUtil.getUserId(refreshToken);
         String accessToken = JwtUtil.sign(userId,strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret());
-        String newRefreshToken = JwtUtil.sign(userId,strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret());
+        String newRefreshToken = JwtUtil.sign(userId,strJson,jwtProperties.getRefreshTokenExpireIn(),jwtProperties.getRefreshTokenSecret());
         LoginVO vo =new LoginVO();
         vo.setAccessToken(accessToken);
         vo.setAccessTokenExpiresIn(jwtProperties.getAccessTokenExpireIn());
diff --git a/im-server/src/main/java/com/bx/imserver/netty/tcp/TcpSocketServer.java b/im-server/src/main/java/com/bx/imserver/netty/tcp/TcpSocketServer.java
index 6143e4d..1e89d73 100644
--- a/im-server/src/main/java/com/bx/imserver/netty/tcp/TcpSocketServer.java
+++ b/im-server/src/main/java/com/bx/imserver/netty/tcp/TcpSocketServer.java
@@ -59,7 +59,7 @@ public class TcpSocketServer implements IMServer {
                     protected void initChannel(Channel ch) throws Exception {
                         // 获取职责链
                         ChannelPipeline pipeline = ch.pipeline();
-                        pipeline.addLast(new IdleStateHandler(15, 0, 0, TimeUnit.SECONDS));
+                        pipeline.addLast(new IdleStateHandler(30, 0, 0, TimeUnit.SECONDS));
                         pipeline.addLast("encode",new MessageProtocolEncoder());
                         pipeline.addLast("decode",new MessageProtocolDecoder());
                         pipeline.addLast("handler", new IMChannelHandler());
diff --git a/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java b/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java
index 2d51ab8..efd4d6e 100644
--- a/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java
+++ b/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java
@@ -63,7 +63,7 @@ public class WebSocketServer  implements IMServer {
                     protected void initChannel(Channel ch) throws Exception {
                         // 获取职责链
                         ChannelPipeline pipeline = ch.pipeline();
-                        pipeline.addLast(new IdleStateHandler(15, 0, 0, TimeUnit.SECONDS));
+                        pipeline.addLast(new IdleStateHandler(30, 0, 0, TimeUnit.SECONDS));
                         pipeline.addLast("http-codec", new HttpServerCodec());
                         pipeline.addLast("aggregator", new HttpObjectAggregator(65535));
                         pipeline.addLast("http-chunked", new ChunkedWriteHandler());
diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue
index 99047e6..4918033 100644
--- a/im-ui/src/components/chat/ChatBox.vue
+++ b/im-ui/src/components/chat/ChatBox.vue
@@ -134,7 +134,7 @@
 					loadStatus: "loading"
 				}
 				// 填充对方id
-				this.setTargetId(msgInfo, this.chat.targetId);
+				this.fillTargetId(msgInfo, this.chat.targetId);
 				// 插入消息
 				this.$store.commit("insertMessage", msgInfo);
 				// 滚动到底部
@@ -182,7 +182,7 @@
 					loadStatus: "loading"
 				}
 				// 填充对方id
-				this.setTargetId(msgInfo, this.chat.targetId);
+				this.fillTargetId(msgInfo, this.chat.targetId);
 				// 插入消息
 				this.$store.commit("insertMessage", msgInfo);
 				// 滚动到底部
@@ -232,7 +232,7 @@
 					type: 3
 				}
 				// 填充对方id
-				this.setTargetId(msgInfo, this.chat.targetId);
+				this.fillTargetId(msgInfo, this.chat.targetId);
 				this.$http({
 					url: this.messageAction,
 					method: 'post',
@@ -252,7 +252,7 @@
 					this.showVoice = false;
 				})
 			},
-			setTargetId(msgInfo, targetId) {
+			fillTargetId(msgInfo, targetId) {
 				if (this.chat.type == "GROUP") {
 					msgInfo.groupId = targetId;
 				} else {
@@ -269,7 +269,7 @@
 					type: 0
 				}
 				// 填充对方id
-				this.setTargetId(msgInfo, this.chat.targetId);
+				this.fillTargetId(msgInfo, this.chat.targetId);
 				this.lockMessage = true;
 				this.$http({
 					url: this.messageAction,
diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 23ee413..fc94f96 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -1,16 +1,18 @@
 <script>
 	export default {
-		onLaunch: function() {
-			console.log('App Launch')
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
+		onLaunch() {
+			// 跳转到登录页面
+				console.log("onLaunch")
+				// #ifdef H5
+				// 小程序不能跳转，否则会触发多次初始化
+				uni.navigateTo({
+					url:"/pages/login/login" 
+				})
+				// #endif
 		}
 	}
 </script>
 
 <style lang="scss">
+	@import url('./static/icon/iconfont.css');
 </style>
\ No newline at end of file
diff --git a/im-uniapp/common/request.js b/im-uniapp/common/request.js
index 0a652d8..ec8e148 100644
--- a/im-uniapp/common/request.js
+++ b/im-uniapp/common/request.js
@@ -1,14 +1,14 @@
-const BASE_URL = "http://192.168.43.6:8888"
+
+
 const request =  (options) => {
-	
 	const header = options.header||{};
-	const accessToken = uni.getStorageSync("accessToken");
-	if (accessToken) {
-		header.accessToken = accessToken;
+	const loginInfo = uni.getStorageSync("loginInfo");
+	if (loginInfo) {
+		header.accessToken = loginInfo.accessToken;
 	}
 	return new Promise(function(resolve, reject) {
 		uni.request({
-			url: BASE_URL + options.url,
+			url:  process.env.BASE_URL + options.url,
 			method: options.method || 'GET',
 			header: header,
 			data: options.data || {},
@@ -21,8 +21,7 @@ const request =  (options) => {
 					});
 				} else if (res.data.code == 401) {
 					console.log("token失效，尝试重新获取")
-					const refreshToken = uni.getStorageSync("refreshToken");
-					if (!refreshToken) {
+					if (!loginInfo) {
 						uni.navigateTo({
 							url: '/pages/login/login'
 						});
@@ -32,7 +31,7 @@ const request =  (options) => {
 						method: 'PUT',
 						url: '/refreshToken',
 						header: {
-							refreshToken: refreshToken
+							refreshToken: loginInfo.refreshToken
 						}
 					})
 					// 换取token失败，跳转至登录界面
@@ -42,10 +41,7 @@ const request =  (options) => {
 						});
 					}
 					// 保存token
-					uni.setStorageSync("accessToken", data.accessToken);
-					uni.setStorageSync("refreshToken", data.refreshToken);
-					// 这里需要把headers清掉，否则请求时会报错，原因暂不详...
-					//response.config.headers=undefined;
+					uni.setStorageSync("loginInfo", data);
 					// 重新发送刚才的请求
 					return request(options)
 				} else {
@@ -58,44 +54,6 @@ const request =  (options) => {
 				}
 			},
 			fail(error) {
-				switch (error.response.status) {
-					case 400:
-						uni.showToast({
-							title: error.response.data,
-							type: 'error',
-							duration: 1500,
-
-						})
-						break
-					case 401:
-						uni.navigateTo({
-							url: '/pages/login/login'
-						});
-						break
-					case 405:
-						uni.showToast({
-							title: 'http请求方式有误',
-							icon: 'error',
-							duration: 1500
-						})
-						break
-					case 404:
-					case 500:
-						uni.showToast({
-							title: '服务器出了点小差，请稍后再试',
-							icon: 'error',
-							duration: 1500
-						})
-						break
-					case 501:
-						uni.showToast({
-							title: '服务器不支持当前请求所需要的某个功能',
-							icon: 'error',
-							duration: 1500
-						})
-						break
-				}
-				
 				return reject(error)
 			}
 		});
diff --git a/im-uniapp/components/friend-item/friend-item.vue b/im-uniapp/components/friend-item/friend-item.vue
index 847abe1..2708a1d 100644
--- a/im-uniapp/components/friend-item/friend-item.vue
+++ b/im-uniapp/components/friend-item/friend-item.vue
@@ -12,13 +12,12 @@
 
 <script>
 	export default {
-		name: "frinedItem",
+		name: "frined-item",
 		data() {
 			return {}
 		},
 		methods:{
-			showFriendInfo(id){
-				console.log(id);
+			showFriendInfo(){
 				uni.navigateTo({
 					url: "/pages/common/user-info?id="+this.friend.id
 				})
@@ -42,7 +41,7 @@
 
 <style scope lang="scss">
 	.friend-item {
-		height: 100rpx;
+		height: 120rpx;
 		display: flex;
 		margin-bottom: 1rpx;
 		position: relative;
@@ -59,8 +58,8 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			width: 80rpx;
-			height: 80rpx;
+			width: 100rpx;
+			height: 100rpx;
 			
 			.head-image{
 				width: 100%;
@@ -70,7 +69,7 @@
 		}
 
 		.text {
-			font-size: 30rpx;
+			font-size: 36rpx;
 			margin-left: 30rpx;
 			flex: 1;
 			display: flex;
@@ -80,13 +79,9 @@
 			flex-shrink: 0;
 			overflow: hidden;
 
-			&>view {
-				display: flex;
-				justify-content: flex-start;
-			}
 
 			.online-status {
-				font-size: 22rpx;
+				font-size: 28rpx;
 				font-weight: 600;
 
 				&.online {
diff --git a/im-uniapp/main.js b/im-uniapp/main.js
index bbf83ab..ef96dea 100644
--- a/im-uniapp/main.js
+++ b/im-uniapp/main.js
@@ -1,12 +1,19 @@
 import App from './App'
 import request from './common/request';
+import emotion from './common/emotion.js';
+import * as  enums from './common/enums.js';
+import * as socketApi from './common/wssocket';
 import store from './store';
+
 import { createSSRApp } from 'vue'
 
 export function createApp() {
   const app = createSSRApp(App)
   app.use(store);
-  app.config.globalProperties.$http = request
+  app.config.globalProperties.$http = request;
+  app.config.globalProperties.$wsApi = socketApi;
+  app.config.globalProperties.$emo = emotion;
+  app.config.globalProperties.$enums = enums;
   return {
     app
   }
diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json
index 184aa5f..5a231c2 100644
--- a/im-uniapp/pages.json
+++ b/im-uniapp/pages.json
@@ -7,23 +7,7 @@
 	}, {
 		"path": "pages/chat/chat",
 		"style": {
-			"navigationBarTitleText": "聊天消息",
-
-			"app-plus": {
-				"titleNView": {
-					"buttons": [{
-							"text": "&#xe6e0;",
-							"fontSrc": "/static/iconfont/iconfont.ttf",
-							"fontSize": "40rpx"
-						},
-						{
-							"text": "&#xe648;",
-							"fontSrc": "/static/iconFont/iconfont.ttf",
-							"fontSize": "40rpx"
-						}
-					]
-				}
-			}
+			"navigationBarTitleText": "聊天消息"
 		}
 	}, {
 		"path": "pages/friend/friend",
@@ -34,13 +18,13 @@
 				"titleNView": {
 					"buttons": [{
 							"text": "&#xe6e0;",
-							"fontSrc": "/static/iconfont/iconfont.ttf",
+							"fontSrc": "/static/icon/iconfont.ttf",
 							"fontSize": "40rpx",
 							"width": "50rpx"
 						},
 						{
 							"text": "&#xe648;",
-							"fontSrc": "/static/iconFont/iconfont.ttf",
+							"fontSrc": "/static/icon/iconfont.ttf",
 							"fontSize": "30rpx",
 							"width": "50rpx"
 						}
@@ -48,7 +32,6 @@
 				}
 			}
 		}
-
 	}, {
 		"path": "pages/group/group",
 		"style": {
@@ -87,6 +70,8 @@
 		}
 	},{
 		"path": "pages/common/user-info"
+	},{
+		"path": "pages/chat/chat-box"
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/im-uniapp/pages/chat/chat.vue b/im-uniapp/pages/chat/chat.vue
index afa140c..bbe6b4f 100644
--- a/im-uniapp/pages/chat/chat.vue
+++ b/im-uniapp/pages/chat/chat.vue
@@ -1,6 +1,10 @@
 <template>
 	<view>
-		消息
+		<scroll-view class="scroll-bar" scroll-with-animation="true" scroll-y="true">
+			<view v-for="(chat,index) in $store.state.chatStore.chats" :key="index">
+				<chat-item :chat="chat" :index="index"></chat-item>
+			</view>
+		</scroll-view>
 	</view>
 </template>
 
diff --git a/im-uniapp/pages/common/user-info.vue b/im-uniapp/pages/common/user-info.vue
index c866b3b..e841ad7 100644
--- a/im-uniapp/pages/common/user-info.vue
+++ b/im-uniapp/pages/common/user-info.vue
@@ -2,17 +2,19 @@
 	<view class="user-info">
 		<view class="content">
 			<view class="avatar">
-				<image class="head-image" :src="userInfo.headImage" lazy-load="true"  mode="aspectFill"></image>
+				<image class="head-image" :src="userInfo.headImage" lazy-load="true" mode="aspectFill"></image>
 			</view>
 			<view class="info-item">
 				<view class="info-primary">
 					<text class="info-username">
 						{{userInfo.userName}}
 					</text>
-					<uni-icons v-show="userInfo.sex==0" class="sex-boy" type="person-filled" size="20" color="darkblue"  ></uni-icons>
-					<uni-icons v-show="userInfo.sex==1" class="sex-girl" type="person-filled" size="20" color="darkred"  ></uni-icons>
+					<uni-icons v-show="userInfo.sex==0" class="sex-boy" type="person-filled" size="20"
+						color="darkblue"></uni-icons>
+					<uni-icons v-show="userInfo.sex==1" class="sex-girl" type="person-filled" size="20"
+						color="darkred"></uni-icons>
 				</view>
-				<text >
+				<text>
 					昵称 ：{{userInfo.nickName}}
 				</text>
 				<text class="person-wx-name">
@@ -22,21 +24,53 @@
 		</view>
 		<view class="line"></view>
 		<view class="btn-group">
-			<button  v-show="isFriend" type="primary">发消息</button>
-			<button  v-show="!isFriend" type="primary">加为好友</button>
+			<button v-show="isFriend" type="primary" @click="sendMessage()">发消息</button>
+			<button v-show="!isFriend" type="primary" @click="addFriend()">加为好友</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
+	export default {
+		data() {
 			return {
-				userInfo:{}
+				userInfo: {}
+			}
+		},
+		methods: {
+			sendMessage() {
+				let chat = {
+					type: 'PRIVATE',
+					targetId: this.userInfo.id,
+					showName: this.userInfo.nickName,
+					headImage: this.userInfo.headImage,
+				};
+				this.$store.commit("openChat", chat);
+				uni.switchTab({
+					url:"/pages/chat/chat"
+				})
+			},
+			addFriend() {
+				this.$http({
+					url: "/friend/add?friendId=" + this.userInfo.id,
+					method: "POST"
+				}).then((data) => {
+					let friend = {
+						id: this.userInfo.id,
+						nickName: this.userInfo.nickName,
+						headImage: this.userInfo.headImageThumb,
+						online: this.userInfo.online
+					}
+					this.$store.commit("addFriend", friend);
+					uni.showToast({
+						title: '添加成功，对方已成为您的好友',
+						icon: 'none'
+					})
+				})
 			}
 		},
 		computed: {
-			isFriend(){
+			isFriend() {
 				let friends = this.$store.state.friendStore.friends;
 				let friend = friends.find((f) => f.id == this.userInfo.id);
 				return friend != undefined;
@@ -44,64 +78,63 @@
 		},
 		onLoad(options) {
 			// 查询好友信息
-			console.log(options.id)
 			const id = options.id;
 			this.$http({
-				url:"/user/find/"+id
-			}).then((userInfo)=>{
+				url: "/user/find/" + id
+			}).then((userInfo) => {
 				this.userInfo = userInfo;
 			})
 		}
 	}
-	
-	
 </script>
 
 <style lang="scss" scoped>
-	.user-info{
-		.content{
+	.user-info {
+		.content {
 			height: 200rpx;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			padding: 20rpx;
-			.avatar{
+
+			.avatar {
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				width: 160rpx;
 				height: 160rpx;
-				
-				.head-image{
+
+				.head-image {
 					width: 100%;
 					height: 100%;
 					border-radius: 10%;
 				}
 			}
-			
-			.info-item{
+
+			.info-item {
 				display: flex;
 				align-items: flex-start;
 				flex-direction: column;
 				padding-left: 40rpx;
 				flex: 1;
-				.info-primary{
-					
+
+				.info-primary {
 					display: flex;
-					.info-username{
+
+					.info-username {
 						font-size: 40rpx;
 						font-weight: 600;
 					}
 				}
-				
 			}
 		}
-		
-		.line{
+
+		.line {
 			margin: 20rpx;
-			border-bottom: 1px	solid #aaaaaa;
+			border-bottom: 1px solid #aaaaaa;
 		}
-		.btn-group{
+
+		.btn-group {
 			margin: 100rpx;
 		}
 	}
diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue
index c1133d2..b58a589 100644
--- a/im-uniapp/pages/login/login.vue
+++ b/im-uniapp/pages/login/login.vue
@@ -3,15 +3,14 @@
 		<view class="login-title">欢迎登录</view>
 		<uni-forms style="margin-top: 100px;" :modelValue="loginForm" :rules="rules" validate-trigger="bind">
 			<uni-forms-item name="userName">
-				<uni-easyinput type="text" v-model="loginForm.userName" prefix-icon="person" focus
-					placeholder="用户名" />
+				<uni-easyinput type="text" v-model="loginForm.userName" prefix-icon="person" focus placeholder="用户名" />
 			</uni-forms-item>
 			<uni-forms-item name="password">
 				<uni-easyinput type="password" v-model="loginForm.password" prefix-icon="locked" placeholder="密码" />
 			</uni-forms-item>
 			<button @click="submit" type="primary">登录</button>
 		</uni-forms>
-	
+
 	</view>
 </template>
 
@@ -39,9 +38,6 @@
 					}
 				}
 			}
-		},
-		onLoad() {
-
 		},
 		methods: {
 			submit() {
@@ -49,18 +45,170 @@
 					url: '/login',
 					data: this.loginForm,
 					method: 'POST'
-				}).then( data=>{
-					
-					uni.setStorageSync("accessToken", data.accessToken);
-					uni.setStorageSync("refreshToken", data.refreshToken);
-					this.$store.dispatch("initStore").then(()=>{
-						console.log("登录成功，准备跳转...")
-						uni.switchTab({
-							url:"/pages/chat/chat"
+				}).then(data => {
+					console.log("登录成功,自动跳转到聊天页面...")
+					uni.setStorageSync("loginInfo", data);
+					this.init(data);
+				})
+			},
+			init(loginInfo) {
+				// 加载数据
+				this.$store.dispatch("load").then(() => {
+					// 初始化websocket
+					this.initWebSocket(loginInfo);
+				}).catch((e) => {
+					console.log(e);
+					this.quit();
+				})
+				// 跳转到登录界面
+				uni.switchTab({
+					url: "/pages/chat/chat"
+				})
+			},
+			initWebSocket(loginInfo) {
+				let userId = this.$store.state.userStore.userInfo.id;
+				this.$wsApi.createWebSocket(process.env.WS_URL, loginInfo.accessToken);
+				this.$wsApi.onopen(() => {
+					this.pullUnreadMessage();
+				});
+				this.$wsApi.onmessage((cmd, msgInfo) => {
+					if (cmd == 2) {
+						// 异地登录，强制下线
+						uni.showModal({
+							content: '您已在其他地方登陆，将被强制下线',  
+							showCancel: false,
 						})
+						this.quit();
+					} else if (cmd == 3) {
+						// 标记这条消息是不是自己发的
+						msgInfo.selfSend = userId == msgInfo.sendId;
+						// 插入私聊消息
+						this.handlePrivateMessage(msgInfo);
+					} else if (cmd == 4) {
+						// 标记这条消息是不是自己发的
+						msgInfo.selfSend = userId == msgInfo.sendId;
+						// 插入群聊消息
+						this.handleGroupMessage(msgInfo);
+					}
+				})
+			},
+			pullUnreadMessage() {
+				// 拉取未读私聊消息
+				this.$http({
+					url: "/message/private/pullUnreadMessage",
+					method: 'POST'
+				});
+				// 拉取未读群聊消息
+				this.$http({
+					url: "/message/group/pullUnreadMessage",
+					method: 'POST'
+				});
+			},
+			handlePrivateMessage(msg) {
+				// 好友列表存在好友信息，直接插入私聊消息
+				let friendId = msg.selfSend ? msg.recvId : msg.sendId;
+				let friend = this.$store.state.friendStore.friends.find((f) => f.id == friendId);
+				if (!friend) {
+					// 好友列表不存在好友信息，则发请求获取好友信息
+					this.$http({
+						url: `/friend/find/${msg.sendId}`,
+						method: 'get'
+					}).then((friend) => {
+						this.insertPrivateMessage(friend, msg);
+						this.$store.commit("addFriend", friend);
 					})
-					
+				} else {
+					this.insertPrivateMessage(friend, msg);
+				}
+
+			},
+			insertPrivateMessage(friend, msg) {
+				// webrtc 信令
+				if (msg.type >= this.$enums.MESSAGE_TYPE.RTC_CALL &&
+					msg.type <= this.$enums.MESSAGE_TYPE.RTC_CANDIDATE) {
+
+					// // 呼叫
+					// if (msg.type == this.$enums.MESSAGE_TYPE.RTC_CALL ||
+					// 	msg.type == this.$enums.MESSAGE_TYPE.RTC_CANCEL) {
+					// 	this.$store.commit("showVideoAcceptorBox", friend);
+					// 	this.$refs.videoAcceptor.handleMessage(msg)
+					// } else {
+					// 	this.$refs.videoAcceptor.close()
+					// 	this.$refs.privateVideo.handleMessage(msg)
+					// }
+					// return;
+				}
+
+				let chatInfo = {
+					type: 'PRIVATE',
+					targetId: friend.id,
+					showName: friend.nickName,
+					headImage: friend.headImage
+				};
+				// 打开会话
+				this.$store.commit("openChat", chatInfo);
+				// 插入消息
+				this.$store.commit("insertMessage", msg);
+				// 播放提示音
+				!msg.selfSend && this.playAudioTip();
+
+			},
+			handleGroupMessage(msg) {
+				// 群聊缓存存在，直接插入群聊消息
+				let group = this.$store.state.groupStore.groups.find((g) => g.id == msg.groupId);
+				if (!group) {
+					// 群聊缓存存在，直接插入群聊消息
+					this.$http({
+						url: `/group/find/${msg.groupId}`,
+						method: 'get'
+					}).then((group) => {
+						this.insertGroupMessage(group, msg);
+						this.$store.commit("addGroup", group);
+					})
+				} else {
+					this.insertGroupMessage(group, msg);
+				}
+
+			},
+			insertGroupMessage(group, msg) {
+				let chatInfo = {
+					type: 'GROUP',
+					targetId: group.id,
+					showName: group.remark,
+					headImage: group.headImageThumb
+				};
+				// 打开会话
+				this.$store.commit("openChat", chatInfo);
+				// 插入消息
+				this.$store.commit("insertMessage", msg);
+				// 播放提示音
+				!msg.selfSend && this.playAudioTip();
+			},
+			quit() {
+				uni.showToast({
+					title: "退出登录"
 				})
+				console.log("退出登录")
+				this.$wsApi.closeWebSocket();
+				uni.removeStorageSync("loginInfo");
+				uni.navigateTo({
+					url:"/pages/login/login"
+				})
+			},
+			playAudioTip() {
+				let audio = new Audio();
+				let url = "/static/audio/tip.wav";
+				audio.src = url;
+				audio.play();
+			}
+		},
+		mounted() {
+			console.log("login  mounted")
+			let loginInfo = uni.getStorageSync("loginInfo");
+			if (loginInfo) {
+				// 已登录,加载数据后跳转
+				this.init(loginInfo);
+				
 			}
 		}
 	}
diff --git a/im-uniapp/static/iconfont/iconfont.ttf b/im-uniapp/static/iconfont/iconfont.ttf
deleted file mode 100644
index 94eaa3b..0000000
Binary files a/im-uniapp/static/iconfont/iconfont.ttf and /dev/null differ
diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index e40adba..5cb719f 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -1,15 +1,16 @@
 export default {
 
 	state: {
-		activeIndex: -1,
 		chats: []
 	},
 
 	mutations: {
-
+		setChats(state,chats){
+			console.log(chats);
+			state.chats = chats;
+		},
 		openChat(state, chatInfo) {
 			let chat = null;
-			let activeChat = state.activeIndex>=0?state.chats[state.activeIndex]:null;
 			for (let i in state.chats) {
 				if (state.chats[i].type == chatInfo.type &&
 					state.chats[i].targetId === chatInfo.targetId) {
@@ -34,25 +35,11 @@ export default {
 				};
 				state.chats.unshift(chat);
 			}
-			// 选中会话保持不变
-			if(activeChat){
-				state.chats.forEach((chat,idx)=>{
-					if(activeChat.type == chat.type
-					&& activeChat.targetId == chat.targetId){
-						state.activeIndex = idx;
-					}
-				})
-			}
-		},
-		activeChat(state, idx) {
-			state.activeIndex = idx;
-			state.chats[idx].unreadCount = 0;
+			uni.setStorageSync("chats",state.chats);
 		},
 		removeChat(state, idx) {
 			state.chats.splice(idx, 1);
-			if (state.activeIndex >= state.chats.length) {
-				state.activeIndex = state.chats.length - 1;
-			}
+			uni.setStorageSync("chats",state.chats);
 		},
 		removeGroupChat(state, groupId) {
 			for (let idx in state.chats) {
@@ -113,6 +100,7 @@ export default {
 			}
 			// 新的消息
 			chat.messages.push(msgInfo);
+			uni.setStorageSync("chats",state.chats);
 			
 		},
 		deleteMessage(state, msgInfo){
@@ -141,6 +129,7 @@ export default {
 					break;
 				}
 			}
+			uni.setStorageSync("chats",state.chats);
 		},
 		updateChatFromFriend(state, friend) {
 			for (let i in state.chats) {
@@ -151,6 +140,7 @@ export default {
 					break;
 				}
 			}
+			uni.setStorageSync("chats",state.chats);
 		},
 		updateChatFromGroup(state, group) {
 			for (let i in state.chats) {
@@ -161,11 +151,26 @@ export default {
 					break;
 				}
 			}
-		},
-		resetChatStore(state) {
-			state.activeIndex = -1;
-			state.chats = [];
+			uni.setStorageSync("chats",state.chats);
 		}
 	},
-
+	actions:{
+		loadChat(context) {
+			return new Promise((resolve, reject) => {
+				console.log(".....")
+				uni.getStorage({
+					key:"chats",
+					success(res) {
+						context.commit("setChats",res.data);
+						resolve()
+					},
+					fail() {
+						resolve();
+					}
+				});
+			})
+			
+			
+		}
+	}
 }
diff --git a/im-uniapp/store/friendStore.js b/im-uniapp/store/friendStore.js
index 01a682a..f95f992 100644
--- a/im-uniapp/store/friendStore.js
+++ b/im-uniapp/store/friendStore.js
@@ -62,7 +62,7 @@ export default {
 		}
 	},
 	actions: {
-		initFriendStore(context) {
+		loadFriend(context) {
 			return new Promise((resolve, reject) => {
 				request({
 					url: '/friend/list',
@@ -71,15 +71,12 @@ export default {
 					context.commit("setFriends", friends);
 					context.dispatch("refreshOnlineStatus");
 					resolve()
-					console.log("friendstore")
 				}).catch((res) => {
 					reject();
-					console.log("friendstore reject")
 				})
 			});
 		},
 		refreshOnlineStatus(context) {
-			console.log(context.state.friends)
 			if (context.state.friends.length > 0 ) {
 				let userIds = [];
 				context.state.friends.forEach((f) => {
diff --git a/im-uniapp/store/groupStore.js b/im-uniapp/store/groupStore.js
index 6abae22..7fac097 100644
--- a/im-uniapp/store/groupStore.js
+++ b/im-uniapp/store/groupStore.js
@@ -37,7 +37,7 @@ export default {
 		}
 	},
 	actions: {
-		initGroupStore(context) {
+		loadGroup(context) {
 			return new Promise((resolve, reject) => {
 				request({
 					url: '/group/list',
diff --git a/im-uniapp/store/index.js b/im-uniapp/store/index.js
index 838fe95..445e1e2 100644
--- a/im-uniapp/store/index.js
+++ b/im-uniapp/store/index.js
@@ -14,11 +14,12 @@ const store = createStore({
 	},
 	state: {},
 	actions: {
-		initStore(context) {
+		load(context) {
 			const promises = [];
-			promises.push(this.dispatch("initUserStore"));
-			promises.push(this.dispatch("initFriendStore"));
-			promises.push(this.dispatch("initGroupStore"));
+			promises.push(this.dispatch("loadUser"));
+			promises.push(this.dispatch("loadFriend"));
+			promises.push(this.dispatch("loadGroup"));
+			promises.push(this.dispatch("loadChat"));
 			return Promise.all(promises);
 		}
 	},
diff --git a/im-uniapp/store/userStore.js b/im-uniapp/store/userStore.js
index 38c1672..7c2470f 100644
--- a/im-uniapp/store/userStore.js
+++ b/im-uniapp/store/userStore.js
@@ -11,11 +11,6 @@ export default {
 
 	mutations: {
 		setUserInfo(state, userInfo) {
-			// 切换用户后，清理缓存
-			if(userInfo.id != state.userInfo.id){
-				console.log("用户切换")
-				this.commit("resetChatStore");
-			}
 			state.userInfo = userInfo;
 		},
 		setUserState(state, userState) {
@@ -23,7 +18,7 @@ export default {
 		},
 	},
 	actions:{
-		initUserStore(context){
+		loadUser(context){
 			return new Promise((resolve, reject) => {
 				request({
 					url: '/user/self',