From c16099a936a6c3061150be810c4d6015974af5cd Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 9 Feb 2025 15:16:09 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=A9=E8=89=B2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/components/bar/arrow-bar.vue |  32 +++++++++++++++++++++----
 im-uniapp/pages/mine/mine.vue          |   2 +-
 im-uniapp/static/icon/iconfont.css     |  30 ++++++++++++++++++++++-
 im-uniapp/static/icon/iconfont.ttf     | Bin 7176 -> 9308 bytes
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/im-uniapp/components/bar/arrow-bar.vue b/im-uniapp/components/bar/arrow-bar.vue
index 97e6dfb..6ecf189 100644
--- a/im-uniapp/components/bar/arrow-bar.vue
+++ b/im-uniapp/components/bar/arrow-bar.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="arrow-bar">
+		<text class="icon iconfont" :class="icon" :style="{color: textColor}"></text>
 		<text class="title">{{ title }}</text>
 		<uni-icons class="arrow" type="right" size="16"></uni-icons>
 	</view>
@@ -12,8 +13,27 @@ export default {
 		title: {
 			type: String,
 			required: true
+		},
+		icon: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			colors: ["#5daa31", "#c7515a", "#e03697", "#85029b",
+				"#c9b455", "#326eb6"]
 		}
 	},
+	computed:{
+		textColor() {
+			let hash = 0;
+			for (var i = 0; i < this.title.length; i++) {
+				hash += this.title.charCodeAt(i);
+			}
+			return this.colors[hash % this.colors.length];
+		}
+	}
 }
 </script>
 
@@ -21,16 +41,20 @@ export default {
 .arrow-bar {
 	width: 100%;
 	height: 90rpx;
-	font-size: 30rpx;
-	color: black;
+	font-size: $im-font-size;
+	color: $im-text-color;
 	margin-top: 5rpx;
 	background-color: white;
 	line-height: 90rpx;
 	display: flex;
-
+	
+	.icon {
+		margin-left: 40rpx;
+	}
+	
 	.title {
 		flex: 1;
-		margin-left: 40rpx;
+		margin-left: 10rpx;
 	}
 
 	.arrow {
diff --git a/im-uniapp/pages/mine/mine.vue b/im-uniapp/pages/mine/mine.vue
index a2f6d4c..d6c2c2d 100644
--- a/im-uniapp/pages/mine/mine.vue
+++ b/im-uniapp/pages/mine/mine.vue
@@ -34,7 +34,7 @@
 			</view>
 		</uni-card>
 		<bar-group>
-			<arrow-bar title="修改密码" @tap="onModifyPassword()"></arrow-bar>
+			<arrow-bar title="修改密码" icon="icon-modify-pwd"  @tap="onModifyPassword()"></arrow-bar>
 		</bar-group>
 		<bar-group>
 			<btn-bar title="退出登录" type="danger" @tap="onQuit()"></btn-bar>
diff --git a/im-uniapp/static/icon/iconfont.css b/im-uniapp/static/icon/iconfont.css
index 4adf106..71a64f4 100644
--- a/im-uniapp/static/icon/iconfont.css
+++ b/im-uniapp/static/icon/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4272106 */
-  src: url('iconfont.ttf?t=1719727774055') format('truetype');
+  src: url('iconfont.ttf?t=1739084401359') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-privacy-protocol:before {
+  content: "\e70a";
+}
+
+.icon-un-register:before {
+  content: "\e656";
+}
+
+.icon-modify-pwd:before {
+  content: "\e63c";
+}
+
+.icon-user-protocol:before {
+  content: "\e61a";
+}
+
+.icon-film:before {
+  content: "\e66b";
+}
+
+.icon-chat:before {
+  content: "\e624";
+}
+
+.icon-delete:before {
+  content: "\e605";
+}
+
 .icon-receipt:before {
   content: "\e601";
 }
diff --git a/im-uniapp/static/icon/iconfont.ttf b/im-uniapp/static/icon/iconfont.ttf
index 926d0b1f1c450ea869e73169d5e65ea2a103ae6a..5d29d8ec7bc5c03a18f277a36d41e7a5e1b05840 100644
GIT binary patch
delta 2974
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
RNjxz<H@!4n-yQkwe*j;cM9KgF

delta 837
zcma))Pe@cz6vn^%{){u}{7Ic@CddZHg-D1wD$yumt04#iA!;COYRnO4a)uNfsAeSy
z&7yq!5`x;e2y7`XBwDx+0z;(583n0LNt>9yJD2v}$M4;H&b#lP?>p~(%dTE|Ib4rj
z*t-Z=w*WggSE@a#{`~R>a1Vg)jpA&+Fi>2Z0>BvKMJ77->^EF*k^W+Nak&s^{Q}f6
z<3efSVgB;R@#lPhgYjrNzg$s6_{`^V#>vO|@@(Yo#0MbWV9mM8!js_QROR>{a9$tM
z^J*(~Edj;7<iXvYn=|2w-{^Fh0KUI_-}irRowS}gKKlh@KP;W)(C;O@KK0ehSz+(5
z>h;E~8}-3<9;zR9dv%HP8CD;J13JYJl3azvl88hlAxTL~MzS(3IhmJ|RAotOQkNB3
zZ)TeNhuNdaRtpfEZoe0@(=&=yMoxVJ5i0FOFLm}%tq<LZ<6PTm5M5LoMGPG{3l{-|
z5Z>IjgQ`BPd%(d~3nvW^g0L+bZC=<a4G*V$1Is|72HhA*7+4yTG*AR2ZJ-=T#z0|^
ztfAg6Jk5YmEhJ~4Zpgere=8{&5ae7n&=q9KK!1>$fleWH13g1l40I1!H?R+AW{}r6
z{&@`c4Qvh$sZPT-;b_u;Fk?NgVimi}r|zg-D`HiwANF;-;e?#0&W;QBzT0q5d}|$}
c{sI4|Kv&@Q=0R{QsuEr-HKO3XPHijv167#G3IG5A


From c81ef0f2b5d3d79fbdca27e99e84ca8762544b74 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Mon, 10 Feb 2025 00:41:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=AF=86=E5=88=ABurl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/common/emotion.js                    |  6 +++++-
 im-uniapp/common/url.js                        | 15 +++++++++++++++
 .../chat-message-item/chat-message-item.vue    | 17 ++++++++++++-----
 im-uniapp/im.scss                              | 18 +++++++++---------
 im-uniapp/main.js                              |  2 ++
 im-web/src/api/url.js                          | 15 +++++++++++++++
 im-web/src/components/chat/ChatMessageItem.vue | 17 +++++++++++------
 im-web/src/main.js                             |  2 ++
 8 files changed, 71 insertions(+), 21 deletions(-)
 create mode 100644 im-uniapp/common/url.js
 create mode 100644 im-web/src/api/url.js

diff --git a/im-uniapp/common/emotion.js b/im-uniapp/common/emotion.js
index 7e301e0..cdacb8a 100644
--- a/im-uniapp/common/emotion.js
+++ b/im-uniapp/common/emotion.js
@@ -26,7 +26,11 @@ let transform = (content, extClass) => {
 let textToPath = (emoText) => {
 	let word = emoText.replace(/\#|\;/gi, '');
 	let idx = emoTextList.indexOf(word);
-	return `/static/emoji/${idx}.gif`;
+	let baseUrl = "/"
+	// #ifdef H5
+		baseUrl = window.location.pathname;
+	// #endif
+	return `${baseUrl}static/emoji/${idx}.gif`;
 }
 
 
diff --git a/im-uniapp/common/url.js b/im-uniapp/common/url.js
new file mode 100644
index 0000000..db2fb61
--- /dev/null
+++ b/im-uniapp/common/url.js
@@ -0,0 +1,15 @@
+let replaceURLWithHTMLLinks = (content, color) => {
+	// 使用正则表达式匹配更广泛的URL格式
+	const urlRegex = /(?:https?:\/\/[^\s]+|www\.[^\s]+)/g;
+	return content.replace(urlRegex, (url) => {
+	    // 如果URL不以http(s)://开头，则添加http://前缀
+	    if (!url.startsWith("http")) {
+	        url = "http://" + url;
+	    }
+	    return `<a href="${url}" target="_blank" style="color: ${color};text-decoration: underline;">${url}</a>`;
+	});
+}
+
+export default {
+	replaceURLWithHTMLLinks
+}
\ No newline at end of file
diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue
index 1b4a3dc..48632f4 100644
--- a/im-uniapp/components/chat-message-item/chat-message-item.vue
+++ b/im-uniapp/components/chat-message-item/chat-message-item.vue
@@ -17,7 +17,8 @@
 				<view class="chat-msg-bottom">
 					<view v-if="msgInfo.type == $enums.MESSAGE_TYPE.TEXT">
 						<long-press-menu :items="menuItems" @select="onSelectMenu">
-							<rich-text class="chat-msg-text" :nodes="$emo.transform(msgInfo.content,'emoji-normal')"></rich-text>
+							<up-parse class="chat-msg-text" :showImgMenu="false" :content="nodesText"></up-parse>
+							<!-- <rich-text class="chat-msg-text" :nodes="nodesText"></rich-text> -->
 						</long-press-menu>
 					</view>
 					<view class="chat-msg-image" v-if="msgInfo.type == $enums.MESSAGE_TYPE.IMAGE">
@@ -47,7 +48,8 @@
 						<text title="发送失败" v-if="loadFail" @click="onSendFail"
 							class="send-fail iconfont icon-warning-circle-fill"></text>
 					</view>
-					<long-press-menu v-if="msgInfo.type == $enums.MESSAGE_TYPE.AUDIO" :items="menuItems" @select="onSelectMenu">
+					<long-press-menu v-if="msgInfo.type == $enums.MESSAGE_TYPE.AUDIO" :items="menuItems"
+						@select="onSelectMenu">
 						<view class="chat-msg-audio chat-msg-text" @click="onPlayAudio()">
 							<text class="iconfont icon-voice-play"></text>
 							<text class="chat-audio-text">{{ JSON.parse(msgInfo.content).duration + '"' }}</text>
@@ -162,10 +164,10 @@ export default {
 		onShowReadedBox() {
 			this.$refs.chatGroupReaded.open();
 		},
-		emit(){
-			this.$emit("audioStateChange",this.audioPlayState,this.msgInfo);
+		emit() {
+			this.$emit("audioStateChange", this.audioPlayState, this.msgInfo);
 		},
-		stopPlayAudio(){
+		stopPlayAudio() {
 			if (this.innerAudioContext) {
 				this.innerAudioContext.stop();
 				this.innerAudioContext = null;
@@ -230,6 +232,11 @@ export default {
 		isNormal() {
 			const type = this.msgInfo.type;
 			return this.$msgType.isNormal(type) || this.$msgType.isAction(type)
+		},
+		nodesText() {
+			let color = this.msgInfo.selfSend ? 'white' : '';
+			let text = this.$url.replaceURLWithHTMLLinks(this.msgInfo.content, color)
+			return this.$emo.transform(text, 'emoji-normal')
 		}
 	}
 
diff --git a/im-uniapp/im.scss b/im-uniapp/im.scss
index f6d4dd6..4059c19 100644
--- a/im-uniapp/im.scss
+++ b/im-uniapp/im.scss
@@ -174,19 +174,19 @@ button[size='mini'] {
 }
 
 .emoji-large {
-	width: 64rpx;
-	height: 64rpx;
-	vertical-align: bottom;
+	width: 64rpx !important;
+	height: 64rpx !important;
+	vertical-align: bottom !important;
 }
 
 .emoji-normal {
-	width: 54rpx;
-	height: 54rpx;
-	vertical-align: bottom;
+	width: 54rpx !important;
+	height: 54rpx !important;
+	vertical-align: bottom !important;
 }
 
 .emoji-small {
-	width: 36rpx;
-	height: 36rpx; 
-	vertical-align: bottom;
+	width: 36rpx !important;
+	height: 36rpx !important;
+	vertical-align: bottom !important;
 }
\ No newline at end of file
diff --git a/im-uniapp/main.js b/im-uniapp/main.js
index be8e65b..608d78e 100644
--- a/im-uniapp/main.js
+++ b/im-uniapp/main.js
@@ -1,6 +1,7 @@
 import App from './App'
 import request from './common/request';
 import emotion from './common/emotion.js';
+import url from './common/url.js';
 import * as  enums from './common/enums.js';
 import * as date from './common/date';
 import * as socketApi from './common/wssocket';
@@ -39,6 +40,7 @@ export function createApp() {
   app.config.globalProperties.$wsApi = socketApi;
   app.config.globalProperties.$msgType = messageType;
   app.config.globalProperties.$emo = emotion;
+  app.config.globalProperties.$url = url;
   app.config.globalProperties.$enums = enums;
   app.config.globalProperties.$date = date;
   app.config.globalProperties.$rc = recorder;
diff --git a/im-web/src/api/url.js b/im-web/src/api/url.js
new file mode 100644
index 0000000..db2fb61
--- /dev/null
+++ b/im-web/src/api/url.js
@@ -0,0 +1,15 @@
+let replaceURLWithHTMLLinks = (content, color) => {
+	// 使用正则表达式匹配更广泛的URL格式
+	const urlRegex = /(?:https?:\/\/[^\s]+|www\.[^\s]+)/g;
+	return content.replace(urlRegex, (url) => {
+	    // 如果URL不以http(s)://开头，则添加http://前缀
+	    if (!url.startsWith("http")) {
+	        url = "http://" + url;
+	    }
+	    return `<a href="${url}" target="_blank" style="color: ${color};text-decoration: underline;">${url}</a>`;
+	});
+}
+
+export default {
+	replaceURLWithHTMLLinks
+}
\ No newline at end of file
diff --git a/im-web/src/components/chat/ChatMessageItem.vue b/im-web/src/components/chat/ChatMessageItem.vue
index 8ec04e9..f2a7582 100644
--- a/im-web/src/components/chat/ChatMessageItem.vue
+++ b/im-web/src/components/chat/ChatMessageItem.vue
@@ -22,7 +22,7 @@
 				<div class="chat-msg-bottom" @contextmenu.prevent="showRightMenu($event)">
 					<div ref="chatMsgBox">
 						<span class="chat-msg-text" v-if="msgInfo.type == $enums.MESSAGE_TYPE.TEXT"
-							v-html="$emo.transform(msgInfo.content)"></span>
+							v-html="htmlText"></span>
 						<div class="chat-msg-image" v-if="msgInfo.type == $enums.MESSAGE_TYPE.IMAGE">
 							<div class="img-load-box" v-loading="loading" element-loading-text="上传中.."
 								element-loading-background="rgba(0, 0, 0, 0.4)">
@@ -51,10 +51,10 @@
 						<audio controls :src="JSON.parse(msgInfo.content).url"></audio>
 					</div>
 					<div class="chat-action chat-msg-text" v-if="isAction">
-						<span v-if="msgInfo.type == $enums.MESSAGE_TYPE.ACT_RT_VOICE" title="重新呼叫" @click="$emit('call')"
-							class="iconfont icon-chat-voice"></span>
-						<span v-if="msgInfo.type == $enums.MESSAGE_TYPE.ACT_RT_VIDEO" title="重新呼叫" @click="$emit('call')"
-							class="iconfont icon-chat-video"></span>
+						<span v-if="msgInfo.type == $enums.MESSAGE_TYPE.ACT_RT_VOICE" title="重新呼叫"
+							@click="$emit('call')" class="iconfont icon-chat-voice"></span>
+						<span v-if="msgInfo.type == $enums.MESSAGE_TYPE.ACT_RT_VIDEO" title="重新呼叫"
+							@click="$emit('call')" class="iconfont icon-chat-video"></span>
 						<span>{{ msgInfo.content }}</span>
 					</div>
 					<div class="chat-msg-status" v-if="!isAction">
@@ -203,6 +203,11 @@ export default {
 		isNormal() {
 			const type = this.msgInfo.type;
 			return this.$msgType.isNormal(type) || this.$msgType.isAction(type)
+		},
+		htmlText() {
+			let color = this.msgInfo.selfSend ? 'white' : '';
+			let text = this.$url.replaceURLWithHTMLLinks(this.msgInfo.content, color)
+			return this.$emo.transform(text)
 		}
 	}
 }
@@ -472,4 +477,4 @@ export default {
 
 	}
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/im-web/src/main.js b/im-web/src/main.js
index 3039ea5..a2ed843 100644
--- a/im-web/src/main.js
+++ b/im-web/src/main.js
@@ -9,6 +9,7 @@ import httpRequest from './api/httpRequest';
 import * as socketApi from './api/wssocket';
 import * as messageType from './api/messageType';
 import emotion from './api/emotion.js';
+import url from './api/url.js';
 import element from './api/element.js';
 import store from './store';
 import * as  enums from './api/enums.js';
@@ -22,6 +23,7 @@ Vue.prototype.$msgType = messageType
 Vue.prototype.$date = date;
 Vue.prototype.$http = httpRequest // http请求方法
 Vue.prototype.$emo = emotion; // emo表情
+Vue.prototype.$url = url; // url转换
 Vue.prototype.$elm = element; // 元素操作
 Vue.prototype.$enums = enums; // 枚举
 Vue.prototype.$eventBus = new Vue(); // 全局事件

From abdc9e532997ee0821a731466125c1624baba40e Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Tue, 11 Feb 2025 18:12:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=86=E5=88=ABurl=20=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/common/url.js | 4 ++--
 im-web/src/api/url.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/im-uniapp/common/url.js b/im-uniapp/common/url.js
index db2fb61..ff04275 100644
--- a/im-uniapp/common/url.js
+++ b/im-uniapp/common/url.js
@@ -1,6 +1,6 @@
 let replaceURLWithHTMLLinks = (content, color) => {
-	// 使用正则表达式匹配更广泛的URL格式
-	const urlRegex = /(?:https?:\/\/[^\s]+|www\.[^\s]+)/g;
+	// 使用正则表达式匹配更广泛的URL格式(此正则由deepseek生成)
+	const urlRegex = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|]|\bwww\.[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
 	return content.replace(urlRegex, (url) => {
 	    // 如果URL不以http(s)://开头，则添加http://前缀
 	    if (!url.startsWith("http")) {
diff --git a/im-web/src/api/url.js b/im-web/src/api/url.js
index db2fb61..ff04275 100644
--- a/im-web/src/api/url.js
+++ b/im-web/src/api/url.js
@@ -1,6 +1,6 @@
 let replaceURLWithHTMLLinks = (content, color) => {
-	// 使用正则表达式匹配更广泛的URL格式
-	const urlRegex = /(?:https?:\/\/[^\s]+|www\.[^\s]+)/g;
+	// 使用正则表达式匹配更广泛的URL格式(此正则由deepseek生成)
+	const urlRegex = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|]|\bwww\.[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
 	return content.replace(urlRegex, (url) => {
 	    // 如果URL不以http(s)://开头，则添加http://前缀
 	    if (!url.startsWith("http")) {

From b535fe1bbd378ac1d6cf34d90483c60e3b352de5 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Thu, 13 Feb 2025 18:40:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A@=E6=88=90=E5=91=98=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/pages/chat/chat-box.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index d9d9878..82c313c 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -264,14 +264,12 @@ export default {
 				success: (e) => {
 					// 清空编辑框数据
 					this.editorCtx.clear();
-					this.atUserIds = [];
-					this.isReceipt = false;
 					// 检查是否被封禁
 					if (this.isBanned) {
 						this.showBannedTip();
 						return;
 					}
-					let sendText = this.isReceipt ? "【回执消息】" : "";
+					let sendText = "";
 					e.delta.ops.forEach((op) => {
 						if (op.insert.image) {
 							// emo表情
@@ -295,6 +293,9 @@ export default {
 						receipt: this.isReceipt,
 						type: 0
 					}
+					// 清空@成员和回执标记
+					this.atUserIds = [];
+					this.isReceipt = false;
 					// 填充对方id
 					this.fillTargetId(msgInfo, this.chat.targetId);
 					this.sendMessageRequest(msgInfo).then((m) => {