From 1768e460a83c781e5e7b1ee27061a6211991b301 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Sat, 20 Apr 2024 16:10:09 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=BF=81=E7=A7=BBwx=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=AF=84=E5=AE=A1=E4=BB=A3=E7=A0=81=E5=88=B0=E7=8B=AC?=
 =?UTF-8?q?=E7=AB=8B=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/App.vue                             |  17 +++
 .../components/user-search/user-search.vue    | 118 ++++++++++++++++++
 im-uniapp/pages.json                          |   2 +-
 im-uniapp/pages/group/group.vue               |   6 +-
 4 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 im-uniapp/components/user-search/user-search.vue

diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 4274b60..06e58a0 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -15,6 +15,8 @@
 			init() {
 				// 加载数据
 				store.dispatch("load").then(() => {
+					// 审核
+					this.initAudit();
 					// 初始化websocket
 					this.initWebSocket();
 				}).catch((e) => {
@@ -239,6 +241,21 @@
 				// this.audioTip = uni.createInnerAudioContext();
 				// this.audioTip.src =  "/static/audio/tip.wav";
 				// this.audioTip.play();
+			},
+			initAudit() {
+				if (store.state.userStore.userInfo.type == 1) {
+					// 显示群组功能
+					uni.setTabBarItem({
+						index: 2,
+						text: "群聊"
+					})
+				} else {
+					// 隐藏群组功能
+					uni.setTabBarItem({
+						index: 2,
+						text: "搜索"
+					})
+				}
 			}
 		},
 		onLaunch() {
diff --git a/im-uniapp/components/user-search/user-search.vue b/im-uniapp/components/user-search/user-search.vue
new file mode 100644
index 0000000..fadd7f6
--- /dev/null
+++ b/im-uniapp/components/user-search/user-search.vue
@@ -0,0 +1,118 @@
+<template>
+	<!-- for wx audit -->
+	<view class="page user-search">
+		<view class="search-bar">
+			<uni-search-bar v-model="searchText" :focus="true" @confirm="onSearch()" can
+				cancelButton="none" ceholder="用户名/昵称"></uni-search-bar>
+		</view>
+		<view class="user-items">
+			<scroll-view class="scroll-bar" scroll-with-animation="true" scroll-y="true">
+				<view v-for="(user) in users" :key="user.id" v-show="user.id != $store.state.userStore.userInfo.id">
+					<view class="user-item">
+						<head-image :id="user.id" :name="user.nickName" 
+							:online="user.online" :url="user.headImage"
+							:size="100"></head-image>
+						<view class="user-name">{{ user.nickName}}</view>
+						<view class="user-btns">
+							<button type="primary" v-show="!isFriend(user.id)" size="mini"
+								@click.stop="onAddFriend(user)">加为好友</button>
+							<button type="default" v-show="isFriend(user.id)" size="mini" disabled>已添加</button>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				searchText: "",
+				users: []
+			}
+		},
+		methods: {
+			onSearch() {
+				this.$http({
+					url: "/user/findByName?name=" + this.searchText,
+					method: "GET"
+				}).then((data) => {
+					this.users = data;
+				})
+			},
+			onAddFriend(user) {
+				this.$http({
+					url: "/friend/add?friendId=" + user.id,
+					method: "POST"
+				}).then((data) => {
+					let friend = {
+						id: user.id,
+						nickName: user.nickName,
+						headImage: user.headImage,
+						online: user.online
+					}
+					this.$store.commit("addFriend", friend);
+					uni.showToast({
+						title: "添加成功，对方已成为您的好友",
+						icon: "none"
+					})
+				})
+			},
+			onShowUserInfo(user) {
+				uni.navigateTo({
+					url: "/pages/common/user-info?id=" + user.id
+				})
+			},
+			isFriend(userId) {
+				let friends = this.$store.state.friendStore.friends;
+				let friend = friends.find((f) => f.id == userId);
+				return friend&&!friend.delete;
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.user-search {
+		position: relative;
+		border: #dddddd solid 1px;
+		display: flex;
+		flex-direction: column;
+
+		.search-bar {
+			background: white;
+		}
+		.user-items{
+			position: relative;
+			flex: 1;
+			overflow: hidden;
+			.user-item {
+				height: 120rpx;
+				display: flex;
+				margin-bottom: 1rpx;
+				position: relative;
+				padding: 0 30rpx ;
+				align-items: center;
+				background-color: white;
+				white-space: nowrap;
+			
+				.user-name {
+					flex:1;	
+					padding-left: 20rpx;
+					font-size: 30rpx;
+					font-weight: 600;
+					line-height: 60rpx;
+					white-space: nowrap;
+					overflow: hidden;
+				}
+			}
+			
+			.scroll-bar {
+				height: 100%;
+			}
+		}
+		
+	}
+</style>
\ No newline at end of file
diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json
index 6949536..520b23c 100644
--- a/im-uniapp/pages.json
+++ b/im-uniapp/pages.json
@@ -61,7 +61,7 @@
 				"pagePath": "pages/group/group",
 				"iconPath": "static/tarbar/group.png",
 				"selectedIconPath": "static/tarbar/group_active.png",
-				"text": "群聊"
+				"text": "搜索"
 			},
 			{
 				"pagePath": "pages/mine/mine",
diff --git a/im-uniapp/pages/group/group.vue b/im-uniapp/pages/group/group.vue
index 537b283..a215665 100644
--- a/im-uniapp/pages/group/group.vue
+++ b/im-uniapp/pages/group/group.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="tab-page group">
+	<view v-if="$store.state.userStore.userInfo.type == 1" class="tab-page group">
 		<view class="nav-bar">
 			<view class="nav-search">
 				<uni-search-bar @focus="onFocusSearch" cancelButton="none" placeholder="点击搜索群聊"></uni-search-bar>
@@ -19,6 +19,10 @@
 			</scroll-view>
 		</view>
 	</view>
+	<!-- wx audit -->
+	<view v-else>
+		<user-search></user-search>
+	</view>
 </template>
 
 <script>

From f845c31d705cc413eb4b19bbc0b36d1462510590 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Tue, 30 Apr 2024 13:37:00 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20app=E7=82=B9=E5=BC=80=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=90=8E=E6=B6=88=E6=81=AF=E4=BC=9A=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=88=B0=E5=BA=95=E9=83=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-client/im-client.iml           | 70 +++++++++++++++++++++++++++++++
 im-uniapp/pages/chat/chat-box.vue |  9 ++--
 2 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 im-client/im-client.iml

diff --git a/im-client/im-client.iml b/im-client/im-client.iml
new file mode 100644
index 0000000..00ac649
--- /dev/null
+++ b/im-client/im-client.iml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="im-commom" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.40" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.13.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-codec:commons-codec:1.15" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.17" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.30" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.100.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.100.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.100.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.100.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.100.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.100.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.100.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.33" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index b031a6c..5a9c741 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -72,7 +72,7 @@
 					<view class="tool-name">文件</view>
 				</view>
 				<!-- #endif -->
-				<view class="chat-tools-item" @click="onVoiceInput()">
+				<view class="chat-tools-item" @click="onRecorderInput()">
 					<view class="tool-icon iconfont icon-microphone"></view>
 					<view class="tool-name">语音消息</view>
 				</view>
@@ -542,8 +542,6 @@
 			},
 			readedMessage() {
 				if(this.unreadCount == 0){
-					
-					console.log("0000000000")
 					return;
 				}
 				let url = ""
@@ -675,12 +673,11 @@
 			this.$store.commit("activeChat", options.chatIdx);
 			// 复位回执消息
 			this.isReceipt = false;
-		},
-		onShow() {
-			// 页面滚到底部
+			// 滚动至底部
 			this.scrollToBottom();
 		},
 		onUnload() {
+			
 			this.$store.commit("activeChat", -1);
 		}
 	}

From 89677f0ccd0402de8a213ccc1808fea94a7184b1 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Tue, 30 Apr 2024 13:37:31 +0800
Subject: [PATCH 3/7] =?UTF-8?q?Revert=20"fix:=20app=E7=82=B9=E5=BC=80?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E6=B6=88=E6=81=AF=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=BB=9A=E5=88=B0=E5=BA=95=E9=83=A8=E7=9A=84bug"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f845c31d
---
 im-uniapp/pages/chat/chat-box.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index 5a9c741..b031a6c 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -72,7 +72,7 @@
 					<view class="tool-name">文件</view>
 				</view>
 				<!-- #endif -->
-				<view class="chat-tools-item" @click="onRecorderInput()">
+				<view class="chat-tools-item" @click="onVoiceInput()">
 					<view class="tool-icon iconfont icon-microphone"></view>
 					<view class="tool-name">语音消息</view>
 				</view>
@@ -542,6 +542,8 @@
 			},
 			readedMessage() {
 				if(this.unreadCount == 0){
+					
+					console.log("0000000000")
 					return;
 				}
 				let url = ""
@@ -673,11 +675,12 @@
 			this.$store.commit("activeChat", options.chatIdx);
 			// 复位回执消息
 			this.isReceipt = false;
-			// 滚动至底部
+		},
+		onShow() {
+			// 页面滚到底部
 			this.scrollToBottom();
 		},
 		onUnload() {
-			
 			this.$store.commit("activeChat", -1);
 		}
 	}

From 5362554a5a6a91563921e1137afaa21cf867b341 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Tue, 30 Apr 2024 13:38:20 +0800
Subject: [PATCH 4/7] 1

---
 im-client/im-client.iml | 70 -----------------------------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 im-client/im-client.iml

diff --git a/im-client/im-client.iml b/im-client/im-client.iml
deleted file mode 100644
index 00ac649..0000000
--- a/im-client/im-client.iml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="im-commom" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.16" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.40" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.13.5" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.30" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.100.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.100.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.100.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.100.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.100.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.100.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.100.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.33" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
-  </component>
-</module>
\ No newline at end of file

From cd742aa4456162f1ec92e80eb9a3168d963e1ff6 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Tue, 30 Apr 2024 13:44:33 +0800
Subject: [PATCH 5/7] 1

---
 .gitignore | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5371118..2b4b40c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,14 @@
 /box-im.iml
 /im-server/im-server.iml
 /im-platform/im-platform.iml
+/im-client/im-client.iml
 /im-platform/src/main/resources/application-prod.yml
 /im-platform/src/main/resources/logback-prod.xml
 /im-server/src/main/resources/application-prod.yml
 /im-server/src/main/resources/logback-prod.xml
 /im-commom/im-commom.iml
 /im-uniapp/node_modules/
-/im-ui/jsconfig.json
-/package-lock.json
+/im-ui/package-lock.json
+/im-uniapp/unpackage/
+/im-uniapp/hybrid/
+/im-uniapp/package-lock.json

From 2dda705fcce3a577b5e8e749c2f12e529babb600 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Tue, 30 Apr 2024 13:59:51 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix=EF=BC=9A=20=E7=82=B9=E5=87=BB=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E6=B6=88=E6=81=AF=E6=97=A0=E5=8F=8D=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/pages/chat/chat-box.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index b031a6c..08702a6 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -72,7 +72,7 @@
 					<view class="tool-name">文件</view>
 				</view>
 				<!-- #endif -->
-				<view class="chat-tools-item" @click="onVoiceInput()">
+				<view class="chat-tools-item" @click="onRecorderInput()">
 					<view class="tool-icon iconfont icon-microphone"></view>
 					<view class="tool-name">语音消息</view>
 				</view>
@@ -542,8 +542,6 @@
 			},
 			readedMessage() {
 				if(this.unreadCount == 0){
-					
-					console.log("0000000000")
 					return;
 				}
 				let url = ""
@@ -675,8 +673,6 @@
 			this.$store.commit("activeChat", options.chatIdx);
 			// 复位回执消息
 			this.isReceipt = false;
-		},
-		onShow() {
 			// 页面滚到底部
 			this.scrollToBottom();
 		},

From 8af1e6b933f71b06643e135046bd2de5f5bbcd1d Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Tue, 30 Apr 2024 15:44:55 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0,=E6=B8=85=E7=90=86=E6=97=A0=E6=95=88=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 -
 .../controller/GroupMessageController.java    |  7 ---
 .../controller/PrivateMessageController.java  |  7 ---
 .../service/IGroupMessageService.java         |  8 ---
 .../service/IPrivateMessageService.java       |  8 ---
 .../service/impl/GroupMessageServiceImpl.java | 53 -------------------
 .../impl/PrivateMessageServiceImpl.java       | 40 --------------
 7 files changed, 125 deletions(-)

diff --git a/README.md b/README.md
index be2d811..00b9bab 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,6 @@
 
 ![输入图片说明](%E6%88%AA%E5%9B%BE/wx%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E7%BB%B4%E7%A0%81.jpg)
 
-注:由于每次发布小程序都需要经过严格且繁琐的审核，当前线上微信小程序并非最新版本，最后一次更新时间是2023年12月
-
 
 #### 相关项目
 
diff --git a/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java
index 9a0f959..c9df96c 100644
--- a/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java
+++ b/im-platform/src/main/java/com/bx/implatform/controller/GroupMessageController.java
@@ -35,13 +35,6 @@ public class GroupMessageController {
         return ResultUtils.success();
     }
 
-
-    @GetMapping("/loadMessage")
-    @ApiOperation(value = "拉取消息(已废弃)", notes = "拉取消息,一次最多拉取100条")
-    public Result<List<GroupMessageVO>> loadMessage(@RequestParam Long minId) {
-        return ResultUtils.success(groupMessageService.loadMessage(minId));
-    }
-
     @GetMapping("/pullOfflineMessage")
     @ApiOperation(value = "拉取离线消息", notes = "拉取离线消息,消息将通过webscoket异步推送")
     public Result pullOfflineMessage(@RequestParam Long minId) {
diff --git a/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java
index 758c86f..9f99531 100644
--- a/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java
+++ b/im-platform/src/main/java/com/bx/implatform/controller/PrivateMessageController.java
@@ -36,13 +36,6 @@ public class PrivateMessageController {
         return ResultUtils.success();
     }
 
-
-    @GetMapping("/loadMessage")
-    @ApiOperation(value = "拉取消息(已废弃)", notes = "拉取消息,一次最多拉取100条")
-    public Result<List<PrivateMessageVO>> loadMessage(@RequestParam Long minId) {
-        return ResultUtils.success(privateMessageService.loadMessage(minId));
-    }
-
     @GetMapping("/pullOfflineMessage")
     @ApiOperation(value = "拉取离线消息", notes = "拉取离线消息,消息将通过webscoket异步推送")
     public Result pullOfflineMessage(@RequestParam Long minId) {
diff --git a/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java
index e67f809..54f9f5e 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/IGroupMessageService.java
@@ -24,14 +24,6 @@ public interface IGroupMessageService extends IService<GroupMessage> {
      */
     void recallMessage(Long id);
 
-    /**
-     * 拉取消息，只能拉取最近1个月的消息，一次拉取100条
-     *
-     * @param minId 消息起始id
-     * @return 聊天消息列表
-     */
-    List<GroupMessageVO> loadMessage(Long minId);
-
     /**
      * 拉取离线消息，只能拉取最近1个月的消息，最多拉取1000条
      *
diff --git a/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java b/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java
index 4a470d1..89669b8 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/IPrivateMessageService.java
@@ -36,14 +36,6 @@ public interface IPrivateMessageService extends IService<PrivateMessage> {
     List<PrivateMessageVO> findHistoryMessage(Long friendId, Long page, Long size);
 
 
-    /**
-     * 拉取消息，只能拉取最近1个月的消息，一次拉取100条
-     *
-     * @param minId 消息起始id
-     * @return 聊天消息列表
-     */
-    List<PrivateMessageVO> loadMessage(Long minId);
-
     /**
      * 拉取离线消息，只能拉取最近1个月的消息，最多拉取1000条
      *
diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
index 2faa946..1fb1795 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
@@ -147,59 +147,6 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
     }
 
 
-    @Override
-    public List<GroupMessageVO> loadMessage(Long minId) {
-        UserSession session = SessionContext.getSession();
-        List<GroupMember> members = groupMemberService.findByUserId(session.getUserId());
-        if (CollectionUtil.isEmpty(members)) {
-            return new ArrayList<>();
-        }
-        Map<Long, GroupMember> groupMemberMap = CollStreamUtil.toIdentityMap(members, GroupMember::getGroupId);
-        Set<Long> groupIds = groupMemberMap.keySet();
-        // 只能拉取最近1个月的
-        Date minDate = DateUtils.addMonths(new Date(), -1);
-        LambdaQueryWrapper<GroupMessage> wrapper = Wrappers.lambdaQuery();
-        wrapper.gt(GroupMessage::getId, minId).gt(GroupMessage::getSendTime, minDate).in(GroupMessage::getGroupId, groupIds)
-                .ne(GroupMessage::getStatus, MessageStatus.RECALL.code()).orderByAsc(GroupMessage::getId).last("limit 100");
-
-        List<GroupMessage> messages = this.list(wrapper);
-        // 转成vo
-        List<GroupMessageVO> vos = messages.stream()
-                .filter(m -> {
-                    //排除加群之前的消息
-                    GroupMember member = groupMemberMap.get(m.getGroupId());
-                    return Objects.nonNull(member) && DateUtil.compare(member.getCreatedTime(), m.getSendTime()) <= 0;
-                })
-                .map(m -> {
-                    GroupMessageVO vo = BeanUtils.copyProperties(m, GroupMessageVO.class);
-                    // 被@用户列表
-                    if (StringUtils.isNotBlank(m.getAtUserIds()) && Objects.nonNull(vo)) {
-                        List<String> atIds = Splitter.on(",").trimResults().splitToList(m.getAtUserIds());
-                        vo.setAtUserIds(atIds.stream().map(Long::parseLong).collect(Collectors.toList()));
-                    }
-                    return vo;
-                }).collect(Collectors.toList());
-        // 通过群聊对消息进行分组
-        Map<Long, List<GroupMessageVO>> messageGroupMap = vos.stream().collect(Collectors.groupingBy(GroupMessageVO::getGroupId));
-        messageGroupMap.forEach((groupId, messageVos) -> {
-            // 填充消息状态
-            String key = StrUtil.join(":", RedisKey.IM_GROUP_READED_POSITION, groupId);
-            Object o = redisTemplate.opsForHash().get(key, session.getUserId().toString());
-            long readedMaxId = Objects.isNull(o) ? -1 : Long.parseLong(o.toString());
-            messageVos.forEach(messageVo -> messageVo.setStatus(readedMaxId >= messageVo.getId() ? MessageStatus.READED.code() : MessageStatus.UNSEND.code()));
-            // 针对回执消息填充已读人数
-            List<GroupMessageVO> receiptMessageVos = messageVos.stream().filter(GroupMessageVO::getReceipt).collect(Collectors.toList());
-            if (!receiptMessageVos.isEmpty()) {
-                Map<Object, Object> maxIdMap = redisTemplate.opsForHash().entries(key);
-                receiptMessageVos.forEach(receiptMessageVo -> {
-                    int count = getReadedUserIds(maxIdMap, receiptMessageVo.getId(),receiptMessageVo.getSendId()).size();
-                    receiptMessageVo.setReadedCount(count);
-                });
-            }
-        });
-        return vos;
-    }
-
     @Override
     public void pullOfflineMessage(Long minId) {
         UserSession session = SessionContext.getSession();
diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
index 415e438..e97e0de 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
@@ -136,46 +136,6 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
         return messageInfos;
     }
 
-
-    @Override
-    public List<PrivateMessageVO> loadMessage(Long minId) {
-        UserSession session = SessionContext.getSession();
-        List<Friend> friends = friendService.findFriendByUserId(session.getUserId());
-        if (friends.isEmpty()) {
-            return new ArrayList<>();
-        }
-        List<Long> friendIds = friends.stream().map(Friend::getFriendId).collect(Collectors.toList());
-        // 获取当前用户的消息
-        LambdaQueryWrapper<PrivateMessage> queryWrapper = Wrappers.lambdaQuery();
-        // 只能拉取最近1个月的
-        Date minDate = DateUtils.addMonths(new Date(), -1);
-        queryWrapper.gt(PrivateMessage::getId, minId)
-                .ge(PrivateMessage::getSendTime, minDate)
-                .ne(PrivateMessage::getStatus, MessageStatus.RECALL.code())
-                .and(wrap -> wrap.and(
-                        wp -> wp.eq(PrivateMessage::getSendId, session.getUserId())
-                                .in(PrivateMessage::getRecvId, friendIds))
-                        .or(wp -> wp.eq(PrivateMessage::getRecvId, session.getUserId())
-                                .in(PrivateMessage::getSendId, friendIds)))
-                .orderByAsc(PrivateMessage::getId)
-                .last("limit 100");
-
-        List<PrivateMessage> messages = this.list(queryWrapper);
-        // 更新发送状态
-        List<Long> ids = messages.stream()
-                .filter(m -> !m.getSendId().equals(session.getUserId()) && m.getStatus().equals(MessageStatus.UNSEND.code()))
-                .map(PrivateMessage::getId)
-                .collect(Collectors.toList());
-        if (!ids.isEmpty()) {
-            LambdaUpdateWrapper<PrivateMessage> updateWrapper = Wrappers.lambdaUpdate();
-            updateWrapper.in(PrivateMessage::getId, ids)
-                    .set(PrivateMessage::getStatus, MessageStatus.SENDED.code());
-            this.update(updateWrapper);
-        }
-        log.info("拉取消息，用户id:{},数量:{}", session.getUserId(), messages.size());
-        return messages.stream().map(m -> BeanUtils.copyProperties(m, PrivateMessageVO.class)).collect(Collectors.toList());
-    }
-
     @Override
     public void pullOfflineMessage(Long minId) {
         UserSession session = SessionContext.getSession();