From 0bed2167358d945c71140b6d7aa239a50894097d Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 16 Mar 2024 21:07:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=B6=88=E6=81=AF=E6=8E=A7=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/AccountSettingSite.vue |  2 ++
 src/views/system/MessageView.vue         | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/views/setting/AccountSettingSite.vue b/src/views/setting/AccountSettingSite.vue
index b1b1c61a..a357ac97 100644
--- a/src/views/setting/AccountSettingSite.vue
+++ b/src/views/setting/AccountSettingSite.vue
@@ -162,6 +162,8 @@ onMounted(() => {
               <VCol cols="12" md="6">
                 <VCheckbox v-model="cookieCloudSetting.COOKIECLOUD_ENABLE_LOCAL" label="启用本地CookieCloud服务器" />
               </VCol>
+            </VRow>
+            <VRow>
               <VCol cols="12" md="6">
                 <VTextField
                   v-model="cookieCloudSetting.COOKIECLOUD_HOST"
diff --git a/src/views/system/MessageView.vue b/src/views/system/MessageView.vue
index 222e5411..a6edda4f 100644
--- a/src/views/system/MessageView.vue
+++ b/src/views/system/MessageView.vue
@@ -21,6 +21,9 @@ const loading = ref(false)
 // 当前页码
 const page = ref(1)
 
+// 存量消息最新时间
+const lastTime = ref('')
+
 // SSE持续获取消息
 function startSSEMessager() {
   const token = store.state.auth.token
@@ -33,6 +36,8 @@ function startSSEMessager() {
       const message = event.data
       if (message) {
         const object = JSON.parse(message)
+        if (compareTime(object.date, lastTime.value) <= 0)
+          return
         messages.value.push(object)
         emit('scroll')
       }
@@ -61,6 +66,8 @@ async function loadMessages({ done }: { done: any }) {
       },
     })
     if (currData.value.length > 0) {
+      // 取最后一条时间为存量消息最新时间
+      lastTime.value = currData.value[currData.value.length - 1].reg_time
       // 合并数据
       messages.value = [...currData.value, ...messages.value]
       // 加载完成
@@ -83,6 +90,15 @@ async function loadMessages({ done }: { done: any }) {
   }
 }
 
+// 比较yyyy-MM-dd HH:mm:ss时间大小
+function compareTime(time1: string, time2: string) {
+  if (!time1)
+    return -1
+  if (!time2)
+    return 1
+  return new Date(time1).getTime() - new Date(time2).getTime()
+}
+
 onMounted(() => {
   // 监听新消息
   startSSEMessager()