From 08b077ce7825345d4b172f75bb29c8b24dfd81dc Mon Sep 17 00:00:00 2001
From: Tianyi Pu <44583944+putianyi889@users.noreply.github.com>
Date: Sat, 16 Nov 2024 08:54:47 +0000
Subject: [PATCH 1/8] =?UTF-8?q?=E6=94=B9=E5=89=8D=E7=AB=AF=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=90=8E=E7=AB=AF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/backend.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 25d3c0f7..c2f41760 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - main  # Adjust the branch name as needed
   pull_request:
+    paths:
+      - 'backend/saolei/**'
 
 jobs:
   check_flag:

From 67b24490f38880e97676f096f119ef05fbe58269 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <44583944+putianyi889@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:00:17 +0000
Subject: [PATCH 2/8] Update AccountLinkManager.vue (#159)

---
 front_end/src/components/AccountLinkManager.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/front_end/src/components/AccountLinkManager.vue b/front_end/src/components/AccountLinkManager.vue
index 4b4619b3..4504167b 100644
--- a/front_end/src/components/AccountLinkManager.vue
+++ b/front_end/src/components/AccountLinkManager.vue
@@ -22,7 +22,7 @@
                     scope.row.identifier }}</el-link>
             </template>
         </el-table-column>
-        <el-table-column v-if="store.player.id == store.user.id" :label="$t('common.prop.status')">
+        <el-table-column v-if="store.player.id == store.user.id || store.user.is_staff" :label="$t('common.prop.status')">
             <template #default="scope">
                 <el-tooltip v-if="scope.row.verified" :content="$t('accountlink.verified')">
                     <el-text type="success"><el-icon>
@@ -80,10 +80,10 @@
 
 <script setup lang="ts">
 
-import { computed, onMounted, reactive, ref, watch } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import useCurrentInstance from '@/utils/common/useCurrentInstance';
 import { store, local } from '@/store';
-import { ElMessageBox } from 'element-plus';
+import { ElNotification } from 'element-plus';
 import { Platform, platformlist } from '@/utils/common/accountLinkPlatforms'
 import PlatformIcon from './widgets/PlatformIcon.vue';
 import AccountLinkGuide from './dialogs/AccountLinkGuide.vue'

From ef10661b6ea5e5e75e9ee7bee0322b2415fc494c Mon Sep 17 00:00:00 2001
From: Tianyi Pu <44583944+putianyi889@users.noreply.github.com>
Date: Sun, 17 Nov 2024 10:17:36 +0000
Subject: [PATCH 3/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E5=BD=95?=
 =?UTF-8?q?=E5=83=8F=E9=A1=B5=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BAstats=5Fc?=
 =?UTF-8?q?sv.csv=20(#160)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 用户的录像页可以导出stats_csv.csv

* 本地化

* Update PlayerVideosView.vue

* Update PlayerVideosView.vue

* 尝试解决单测不触发的问题

* Update backend.yml

* Update backend.yml
---
 .github/workflows/backend.yml            |  3 +-
 back_end/saolei/videomanager/views.py    |  2 +-
 front_end/src/components/VideoList.vue   | 16 ++++---
 front_end/src/i18n/locales/en.ts         |  2 +
 front_end/src/i18n/locales/zh-cn.ts      |  2 +
 front_end/src/views/PlayerVideosView.vue | 61 +++++++++++++++++++++++-
 6 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index c2f41760..028954de 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -5,8 +5,7 @@ on:
     branches:
       - main  # Adjust the branch name as needed
   pull_request:
-    paths:
-      - 'backend/saolei/**'
+    paths: 'backend/saolei/**'
 
 jobs:
   check_flag:
diff --git a/back_end/saolei/videomanager/views.py b/back_end/saolei/videomanager/views.py
index 9be73e25..ce17f0c5 100644
--- a/back_end/saolei/videomanager/views.py
+++ b/back_end/saolei/videomanager/views.py
@@ -152,7 +152,7 @@ def video_query_by_id(request):
     user = UserProfile.objects.filter(id=id).first()
     if not user:
         return HttpResponseNotFound()
-    videos = VideoModel.objects.filter(player=user).values('id', 'upload_time', "level", "mode", "timems", "bv", "bvs", "state", "video__identifier", "software")
+    videos = VideoModel.objects.filter(player=user).values('id', 'upload_time', "level", "mode", "timems", "bv", "bvs", "state", "video__identifier", "software", "video__flag", "video__cell0", "video__cell1", "video__cell2", "video__cell3", "video__cell4", "video__cell5", "video__cell6", "video__cell7", "video__cell8", "video__left", "video__right", "video__double", "video__op", "video__isl", "video__path")
     # print(list(videos))
 
     return JsonResponse(list(videos), safe=False)
diff --git a/front_end/src/components/VideoList.vue b/front_end/src/components/VideoList.vue
index 4f96889e..ef35a5d7 100644
--- a/front_end/src/components/VideoList.vue
+++ b/front_end/src/components/VideoList.vue
@@ -17,18 +17,22 @@
         </el-table-column>
         <el-table-column width="20">
             <template #default="scope">
-                <SoftwareIcon :software="scope.row.software"/>
+                <SoftwareIcon :software="scope.row.software" />
             </template>
         </el-table-column>
-        <el-table-column :filters="[{ text: $t('common.level.b'), value: 'b' }, { text: $t('common.level.i'), value: 'i' }, { text: $t('common.level.e'), value: 'e' }]"
-        :filter-method="defaultFilterMethod" :filter-multiple="false">
+        <el-table-column
+            :filters="[{ text: $t('common.level.b'), value: 'b' }, { text: $t('common.level.i'), value: 'i' }, { text: $t('common.level.e'), value: 'e' }]"
+            :filter-method="defaultFilterMethod" :filter-multiple="false">
             <template #default="scope">
                 <GameLevelIcon :level="scope.row.level" />
             </template>
         </el-table-column>
-        <el-table-column prop="mode" :formatter="simple_formatter((mode: string) => $t('common.mode.' + mode))" :filters="[{ text: $t('common.mode.std'), value: 'std' }, { text: $t('common.mode.nf'), value: 'nf' }, { text: $t('common.mode.ng'), value: 'ng' }, { text: $t('common.mode.dg'), value: 'dg' }]" :filter-method="defaultFilterMethod" :filter-multiple="false" />
-        <el-table-column prop="timems" :formatter="simple_formatter((timems: number) => (ms_to_s(timems) + 's'))" sortable/>
-        <el-table-column prop="bv" sortable/>
+        <el-table-column prop="mode" :formatter="simple_formatter((mode: string) => $t('common.mode.' + mode))"
+            :filters="[{ text: $t('common.mode.std'), value: 'std' }, { text: $t('common.mode.nf'), value: 'nf' }, { text: $t('common.mode.ng'), value: 'ng' }, { text: $t('common.mode.dg'), value: 'dg' }]"
+            :filter-method="defaultFilterMethod" :filter-multiple="false" />
+        <el-table-column prop="timems" :formatter="simple_formatter((timems: number) => (ms_to_s(timems) + 's'))"
+            sortable />
+        <el-table-column prop="bv" sortable />
         <!-- <el-table-column min-width="200">
             <template #default="scope">
                 <PreviewDownload :id="scope.row.key"></PreviewDownload>
diff --git a/front_end/src/i18n/locales/en.ts b/front_end/src/i18n/locales/en.ts
index 82df57ae..7a6081da 100644
--- a/front_end/src/i18n/locales/en.ts
+++ b/front_end/src/i18n/locales/en.ts
@@ -249,6 +249,8 @@ export default {
             modeRecord: ' mode record: '
         },
         videos: 'All videos',
+        exportArbiterCSV: 'Export as stats_csv.csv',
+        exportArbiterCSVTooltip: 'Compatible with the datasheet generated by Minesweeper Arbiter.<br/> Not supporting Leff, Reff, Deff, GZiNi and HZiNi at present.',
         upload: {
             title: 'Video Upload',
             dragOrClick: `Drag files here or <em>click here to select</em>`,
diff --git a/front_end/src/i18n/locales/zh-cn.ts b/front_end/src/i18n/locales/zh-cn.ts
index 531e6472..1ba127ee 100644
--- a/front_end/src/i18n/locales/zh-cn.ts
+++ b/front_end/src/i18n/locales/zh-cn.ts
@@ -249,6 +249,8 @@ export default {
             modeRecord: '模式纪录：'
         },
         videos: '全部录像',
+        exportArbiterCSV: '导出stats_csv.csv',
+        exportArbiterCSVTooltip: '兼容 Minesweeper Arbiter 生成的数据表。<br/> 目前不支持 Leff, Reff, Deff, GZiNi, HZiNi。',
         upload: {
             title: '上传录像',
             dragOrClick: `将录像拉到此处或 <em>点击此处选择</em>`,
diff --git a/front_end/src/views/PlayerVideosView.vue b/front_end/src/views/PlayerVideosView.vue
index 6559f295..350a1ba7 100644
--- a/front_end/src/views/PlayerVideosView.vue
+++ b/front_end/src/views/PlayerVideosView.vue
@@ -1,5 +1,13 @@
 <template>
-    <el-card class="box-card" body-style="" style="max-height: 800px; overflow: auto;">
+    <el-button @click="downloadCSV(generateArbiterCSV(videos_queue))" v-if="!loading">
+        {{ $t('profile.exportArbiterCSV') }}&nbsp;
+        <el-tooltip :content="$t('profile.exportArbiterCSVTooltip')" raw-content>
+            <el-icon v-if="local.tooltip_show">
+                <QuestionFilled />
+            </el-icon>
+        </el-tooltip>
+    </el-button>
+    <el-card class="box-card" body-style="" style="max-height: 800px; overflow: auto; margin-top:5px">
         <el-skeleton animated v-show="loading" :rows="8" />
         <VideoList :videos="videos_queue" :need_player_name="false" reverse></VideoList>
     </el-card>
@@ -13,7 +21,7 @@ const { proxy } = useCurrentInstance();
 // import { genFileId, ElMessage } from 'element-plus'
 import VideoList from '@/components/VideoList.vue';
 // import { fa } from 'element-plus/es/locale';
-import { store } from '../store'
+import { local, store } from '../store'
 
 const loading = ref(true)
 
@@ -41,6 +49,55 @@ onMounted(() => {
     })
 })
 
+function generateArbiterCSV(data: any) {
+    let csvdata = ['Day,Month,Year,Hour,Min,Sec,mode,Time,BBBV,BBBVs,style,cell0,cell1,cell2,cell3,cell4,cell5,cell6,cell7,cell8,Lcl,Rcl,Dcl,Leff,Reff,Deff,Openings,Islands,Path,GZiNi,HZiNi']
+    for (let v of data) {
+        if (v.mode != 'std' && v.mode != 'nf') continue;
+        let date = new Date(v.upload_time);
+        let row: any[] = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds()];
+        switch (v.level) {
+            case 'e': row.push(3); break;
+            case 'i': row.push(2); break;
+            case 'b': row.push(1); break;
+            default: console.error('未知级别');
+        }
+        row.push((v.timems / 1000).toFixed(2));
+        row.push(v.bv);
+        row.push(v.bvs.toFixed(2));
+
+        if (v.video__flag == 0) row.push('NF');
+        else row.push('Flag');
+
+        row.push(v.video__cell0, v.video__cell1, v.video__cell2, v.video__cell3, v.video__cell4, v.video__cell5, v.video__cell6, v.video__cell7, v.video__cell8)
+        row.push(v.video__left, v.video__right, v.video__double, 0, 0, 0)
+        row.push(v.video__op, v.video__isl)
+        row.push(Math.round(v.video__path))
+        row.push(0, 0)
+        csvdata.push(row.join())
+    }
+    return csvdata.join('\n');
+}
+
+// Credit: ChatGPT
+function downloadCSV(csv: string) {
+    // Create a Blob from the CSV data
+    const blob = new Blob([csv], { type: 'text/csv' });
+    const url = URL.createObjectURL(blob);
+
+    // Create a temporary anchor element
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = 'stats_csv.csv'; // Set the file name
+
+    // Append the anchor to the body
+    document.body.appendChild(a);
+    a.click(); // Trigger the download
+    document.body.removeChild(a); // Remove the anchor after download
+
+    // Release the object URL
+    URL.revokeObjectURL(url);
+}
+
 </script>
 
 

From f0064dda45dd8d05fe099ef7025209dd04b2dde2 Mon Sep 17 00:00:00 2001
From: LjingZhijoin Group <107012527+ljzloser@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:31:09 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0wom=E7=88=AC=E5=8F=96?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BF=A1=E6=81=AF=E3=80=82=20(#161)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 增加wom爬取视频信息。

* 增加websocket-client
---
 back_end/saolei/requirements.txt |   3 +-
 back_end/saolei/utils/test.py    |  53 ++++++++++++
 back_end/saolei/utils/wom.py     | 138 +++++++++++++++++++++++++++++++
 3 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 back_end/saolei/utils/test.py
 create mode 100644 back_end/saolei/utils/wom.py

diff --git a/back_end/saolei/requirements.txt b/back_end/saolei/requirements.txt
index a4ac2f08..d8c0b921 100644
--- a/back_end/saolei/requirements.txt
+++ b/back_end/saolei/requirements.txt
@@ -10,4 +10,5 @@ django-ratelimit==4.1.0
 requests==2.28.1
 ms_toollib==1.4.8
 psutil==5.9.1
-lxml==5.1.0
\ No newline at end of file
+lxml==5.1.0
+websocket-client==1.8.0
\ No newline at end of file
diff --git a/back_end/saolei/utils/test.py b/back_end/saolei/utils/test.py
new file mode 100644
index 00000000..dd8fc414
--- /dev/null
+++ b/back_end/saolei/utils/test.py
@@ -0,0 +1,53 @@
+import unittest
+from unittest.mock import MagicMock
+import time
+from wom import WOM
+import json
+
+
+class TestWOM(unittest.TestCase):
+
+    def test_insert_video_id(self):
+        self.count = 0
+        # 创建 WOM 实例并传入 mock_callback
+        wom = WOM(callback=self.callbackFunc, timeout=10, reConnectTime=60)
+        wom.start()  # 启动 WOM
+
+        wom.insertVideoId('3071736950')
+        wom.insertVideoId('3071736950')
+        time.sleep(5)
+        # 断言当前是连接状态
+        self.assertEqual(wom.isConnected(), True, "Connect")
+
+        # 等待 20 秒
+        time.sleep(20)
+        # 断言当前是断开状态
+        self.assertEqual(wom.isConnected(), False, "Disconnect")
+        wom.insertVideoId('3071736950')
+
+        # 再次等待 5 ，等待异步重连
+        time.sleep(5)
+        # 断言当前是连接状态
+        self.assertEqual(wom.isConnected(), True, "Connect")
+
+        time.sleep(20)
+        # 确保总共调用了6次 callback
+        self.assertEqual(self.count, 6, "Callback")
+        wom.stop()
+        time.sleep(5)
+        # 断言当前是断开状态
+        self.assertEqual(wom.isConnected(), False, "Disconnect")
+
+    def callbackFunc(self, message):
+        data = json.loads(message)
+        if data[0][1] == 203:
+            self.assertEqual(data[1][2][0]['id'],
+                             3071736950, "Insert video Info 203")
+        if data[0][1] == 214:
+            self.assertEqual(data[1][2][0], 3071736950,
+                             "Insert video Info 214")
+        self.count += 1
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/back_end/saolei/utils/wom.py b/back_end/saolei/utils/wom.py
new file mode 100644
index 00000000..91b0d888
--- /dev/null
+++ b/back_end/saolei/utils/wom.py
@@ -0,0 +1,138 @@
+from typing import Callable
+import websocket
+import threading
+import queue
+import requests
+import re
+import time
+
+
+class WOM:
+    def __init__(self, callback: Callable, timeout: int = 10, reConnectTime: int = 60):
+        self.__videoIdQueue = queue.Queue()
+        self.__videoInfoQueue = queue.Queue()
+        self.__callback = callback
+        self.__ws = None
+        self.__isOver = True
+        self.__lastTime = time.time()
+        self.__timeout = timeout
+        self.__lock = threading.Lock()
+        self.__reConnectTime = 60
+        self.__isConnected = False
+        self.__isConnectedLock = threading.Lock()
+        self.__wsThread = threading.Thread(target=self.__wsThreadFunc)
+        self.__callbackThread = threading.Thread(target=self.__callBackThreadFunc)
+        self.__stopFlag = threading.Event()
+
+    def __wsThreadFunc(self) -> None:
+        while not self.__stopFlag.is_set():
+            if self.__ws is None and self.__videoIdQueue.empty():
+                continue
+            if self.__ws and time.time() - self.__lastTime > self.__timeout and self.__videoIdQueue.empty() and self.__isOver:
+                self.__ws.close()
+                self.__ws = None
+                with self.__isConnectedLock:
+                    self.__isConnected = False
+                continue
+            try:
+                if self.__ws:
+                    code, message = self.parseMessage(self.__ws.recv())
+                    if code == '2':
+                        self.__ws.send('3')
+                    elif code == '42' and message == '["response",[1000,1,[]]]':
+                        self.__isOver = True
+                    elif code == '42':
+                        self.__videoInfoQueue.put(message)
+                    if self.__isOver:
+                        if not self.__videoIdQueue.empty():
+                            videoId = self.__videoIdQueue.get()
+                            message = self.formatMessage(
+                                '42', f'["request",["EnterGameController.enterGameWsAction",[{videoId}],1000,683]]')
+                            self.__ws.send(message)
+                            self.__isOver = False
+                            with self.__lock:
+                                self.__lastTime = time.time()
+                else:
+                    response = requests.get(
+                        'https://minesweeper.online/authorize?session=')
+                    data = response.json()
+                    wsUrl = f"wss://main{int(data['userId'])% 10 + 1}.minesweeper.online/mine-websocket/?authKey={data['authKey']}&session={data['session']}&userId={data['userId']}&EIO=4&transport=websocket"
+                    self.__ws = websocket.create_connection(wsUrl)
+                    isAuthenticated = False
+                    while not isAuthenticated:
+                        code, message = self.parseMessage(self.__ws.recv())
+                        if code == '2':
+                            self.__ws.send('3')
+                        if code == '0':
+                            self.__ws.send('40')
+                        if code == '40':
+                            pass
+                        if code == '42' and message == '["authorized",[]]':
+                            isAuthenticated = True
+                            with self.__isConnectedLock:
+                                self.__isConnected = True
+            except Exception as e:
+                self.__ws = None
+                time.sleep(self.__reConnectTime)
+
+    def __callBackThreadFunc(self):
+        while not self.__stopFlag.is_set() or not self.__videoInfoQueue.empty():
+            if not self.__videoInfoQueue.empty():
+                with self.__lock:
+                    self.__lastTime = time.time()
+                self.__callback(self.__videoInfoQueue.get())
+
+    @staticmethod
+    def formatMessage(code, message):
+        return f'{code}{message}'
+
+    @staticmethod
+    def parseMessage(message) -> tuple[str, str]:
+        if message == '':
+            return '', ''
+        reStr = r'^(\d+)(.*)$'
+        # 取出第一部分和第二部分
+        result = re.findall(reStr, message)[0]
+        if result:
+            return result[0], result[1]
+        else:
+            return '', ''
+
+    def start(self):
+        self.__stopFlag.clear()
+        self.__wsThread.start()
+        self.__callbackThread.start()
+
+    def insertVideoId(self, videoId):
+        self.__videoIdQueue.put(videoId)
+        
+    def insertVideoIds(self, videoIds):
+        for videoId in videoIds:
+            self.__videoIdQueue.put(videoId)
+
+    def stop(self):
+        self.__isOver = True
+        self.__stopFlag.set()
+        self.__wsThread.join()
+        self.__callbackThread.join()
+        with self.__isConnectedLock:
+            self.__isConnected = False
+
+    def isConnected(self):
+        with self.__isConnectedLock:
+            return self.__isConnected
+
+
+if __name__ == '__main__':
+    def callback(message):
+        print(message)
+    wom = WOM(callback)
+    wom.start()
+    wom.insertVideoId('3071736950')
+    wom.insertVideoId('3071736950')
+    import time
+    time.sleep(20)
+    wom.insertVideoId('3071736950')
+
+    print('over')
+    wom.stop()

From a8278c15bcead20bb191302e3afb0011f54da42e Mon Sep 17 00:00:00 2001
From: Tianyi Pu <44583944+putianyi889@users.noreply.github.com>
Date: Mon, 18 Nov 2024 16:01:00 +0000
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86api?=
 =?UTF-8?q?=E7=9A=84ratelimit=20(#162)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修改部分api的ratelimit

* Update backend.yml

* Update backend.yml

* fix
---
 .github/workflows/backend.yml        | 3 ++-
 back_end/saolei/identifier/views.py  | 3 +++
 back_end/saolei/msuser/views.py      | 5 +++--
 back_end/saolei/userprofile/views.py | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 028954de..26ae8403 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -5,7 +5,8 @@ on:
     branches:
       - main  # Adjust the branch name as needed
   pull_request:
-    paths: 'backend/saolei/**'
+    paths: 
+      - 'back_end/saolei/**'
 
 jobs:
   check_flag:
diff --git a/back_end/saolei/identifier/views.py b/back_end/saolei/identifier/views.py
index 5aeacf01..1fe52b4e 100644
--- a/back_end/saolei/identifier/views.py
+++ b/back_end/saolei/identifier/views.py
@@ -7,9 +7,11 @@
 from utils.response import HttpResponseConflict
 from videomanager.models import VideoModel
 from videomanager.view_utils import update_state, update_personal_record_stock
+from userprofile.decorators import login_required_error
 
 # 请求修改自己的标识
 @require_POST
+@login_required_error
 def add_identifier(request):
     user = UserProfile.objects.filter(id=request.user.id).first()
     if user == None:
@@ -41,6 +43,7 @@ def add_identifier(request):
 
 # 请求删除自己的标识
 @require_POST
+@login_required_error
 def del_identifier(request):
     user = UserProfile.objects.filter(id=request.user.id).first()
     if user == None:
diff --git a/back_end/saolei/msuser/views.py b/back_end/saolei/msuser/views.py
index 02c16799..02ef4289 100644
--- a/back_end/saolei/msuser/views.py
+++ b/back_end/saolei/msuser/views.py
@@ -38,7 +38,7 @@ def default(self, o):
 
 
 # 获取我的地盘里的头像、姓名、个性签名、过审标识
-@ratelimit(key='ip', rate='60/h')
+@ratelimit(key='ip', rate='20/m')
 @require_GET
 def get_info(request):
     user_id = request.GET.get('id')
@@ -71,7 +71,7 @@ def get_info(request):
 
 
 # 获取我的地盘里的姓名、全部纪录
-@ratelimit(key='ip', rate='60/h')
+@ratelimit(key='ip', rate='15/m')
 @require_GET
 def get_records(request):
     user_id = request.GET.get('id')
@@ -93,6 +93,7 @@ def get_records(request):
     
 
 # 鼠标移到人名上时，展现头像、姓名、id、记录
+@ratelimit(key='ip', rate='5/s')
 @require_GET
 def get_info_abstract(request):
     # 此处要防攻击
diff --git a/back_end/saolei/userprofile/views.py b/back_end/saolei/userprofile/views.py
index b8c92ff4..519fbf90 100644
--- a/back_end/saolei/userprofile/views.py
+++ b/back_end/saolei/userprofile/views.py
@@ -201,7 +201,7 @@ def refresh_captcha(request):
     return HttpResponse(json.dumps(c), content_type='application/json')
 
 # 验证验证码，若通过，发送email
-@ratelimit(key='ip', rate='20/h')
+@ratelimit(key='ip', rate='1/m')
 @require_POST
 def get_email_captcha(request):
     data = request.POST

From 7b1397c036534c7bf612684a492d38379b9b81ff Mon Sep 17 00:00:00 2001
From: LjingZhijoin Group <107012527+ljzloser@users.noreply.github.com>
Date: Tue, 19 Nov 2024 00:01:46 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20(#163)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 增加wom爬取视频信息。

* 增加websocket-client

* 增加几个sleep() 防止空循环，拉高cpu

* sleep时间修改为0.1

* 增加了一个异常的回调处理。内部不处理任何异常，只会在异常之后等待一段重新发起请求,并将出现异常的id重新加入请求队列。
---
 back_end/saolei/utils/test.py |  4 +-
 back_end/saolei/utils/wom.py  | 92 ++++++++++++++++++++++++++---------
 2 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/back_end/saolei/utils/test.py b/back_end/saolei/utils/test.py
index dd8fc414..54a38076 100644
--- a/back_end/saolei/utils/test.py
+++ b/back_end/saolei/utils/test.py
@@ -10,7 +10,7 @@ class TestWOM(unittest.TestCase):
     def test_insert_video_id(self):
         self.count = 0
         # 创建 WOM 实例并传入 mock_callback
-        wom = WOM(callback=self.callbackFunc, timeout=10, reConnectTime=60)
+        wom = WOM(videoInfoFunc=self.callbackFunc, disConnectTime=10, raiseReConnectTime=60,errorFunc=self.errorFunc)
         wom.start()  # 启动 WOM
 
         wom.insertVideoId('3071736950')
@@ -48,6 +48,8 @@ def callbackFunc(self, message):
                              "Insert video Info 214")
         self.count += 1
 
+    def errorFunc(self, e:Exception):
+        print(f"Error: {e}")
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/back_end/saolei/utils/wom.py b/back_end/saolei/utils/wom.py
index 91b0d888..d454fedb 100644
--- a/back_end/saolei/utils/wom.py
+++ b/back_end/saolei/utils/wom.py
@@ -8,31 +8,55 @@
 
 
 class WOM:
-    def __init__(self, callback: Callable, timeout: int = 10, reConnectTime: int = 60):
+    def __init__(self, videoInfoFunc: Callable[[str], None], disConnectTime: int = 10, raiseReConnectTime: int = 60, errorFunc: Callable[[Exception], None] = None):
+        """
+        初始化 WOM 类。
+
+        args:
+        - videoInfoFunc (Callable): 当接收到新的视频信息时调用的回调函数.
+        - disConnectTime (int): 最后一次回调函数后的等待时间.如果超过这个时间,将断开连接.
+        - raiseReConnectTime (int): 连接出现错误后重试的间隔.
+        - errorFunc (Callable): 错误回调函数.
+        Returns:
+        - None
+        """
+        if videoInfoFunc is None:
+            if not isinstance(videoInfoFunc,Callable):
+                raise ValueError("videoInfoFunc is not None and type is callable")
         self.__videoIdQueue = queue.Queue()
         self.__videoInfoQueue = queue.Queue()
-        self.__callback = callback
+        self.__callback = videoInfoFunc
         self.__ws = None
         self.__isOver = True
         self.__lastTime = time.time()
-        self.__timeout = timeout
+        self.__disConnectTime = disConnectTime
         self.__lock = threading.Lock()
-        self.__reConnectTime = 60
+        self.__raiseReConnectTime = raiseReConnectTime
         self.__isConnected = False
         self.__isConnectedLock = threading.Lock()
         self.__wsThread = threading.Thread(target=self.__wsThreadFunc)
-        self.__callbackThread = threading.Thread(target=self.__callBackThreadFunc)
+        self.__callbackThread = threading.Thread(
+            target=self.__callBackThreadFunc)
         self.__stopFlag = threading.Event()
+        self.__errorCallback = errorFunc
+
+    def registerErrorCallback(self, callback: Callable[[Exception], None]):
+        """
+        注册错误回调函数,不是必须的，但是推荐使用
+        """
+        self.__errorCallback = callback
 
     def __wsThreadFunc(self) -> None:
         while not self.__stopFlag.is_set():
             if self.__ws is None and self.__videoIdQueue.empty():
+                time.sleep(0.1)
                 continue
-            if self.__ws and time.time() - self.__lastTime > self.__timeout and self.__videoIdQueue.empty() and self.__isOver:
+            if self.__ws and time.time() - self.__lastTime > self.__disConnectTime and self.__videoIdQueue.empty() and self.__isOver:
                 self.__ws.close()
                 self.__ws = None
                 with self.__isConnectedLock:
                     self.__isConnected = False
+                time.sleep(0.1)
                 continue
             try:
                 if self.__ws:
@@ -45,13 +69,20 @@ def __wsThreadFunc(self) -> None:
                         self.__videoInfoQueue.put(message)
                     if self.__isOver:
                         if not self.__videoIdQueue.empty():
-                            videoId = self.__videoIdQueue.get()
-                            message = self.formatMessage(
-                                '42', f'["request",["EnterGameController.enterGameWsAction",[{videoId}],1000,683]]')
-                            self.__ws.send(message)
-                            self.__isOver = False
-                            with self.__lock:
-                                self.__lastTime = time.time()
+                            try:
+                                videoId: int|str = self.__videoIdQueue.get()
+                                message = self.formatMessage(
+                                    '42', f'["request",["EnterGameController.enterGameWsAction",[{videoId}],1000,683]]')
+                                self.__ws.send(message)
+                                self.__isOver = False
+                                with self.__lock:
+                                    self.__lastTime = time.time()
+                            except Exception as e:
+                                self.__ws = None
+                                self.insertVideoId(videoId)
+                                if self.__errorCallback:
+                                    self.__errorCallback(e)
+                                time.sleep(self.__raiseReconnectTime)
                 else:
                     response = requests.get(
                         'https://minesweeper.online/authorize?session=')
@@ -63,17 +94,19 @@ def __wsThreadFunc(self) -> None:
                         code, message = self.parseMessage(self.__ws.recv())
                         if code == '2':
                             self.__ws.send('3')
-                        if code == '0':
+                        elif code == '0':
                             self.__ws.send('40')
-                        if code == '40':
+                        elif code == '40':
                             pass
-                        if code == '42' and message == '["authorized",[]]':
+                        elif code == '42' and message == '["authorized",[]]':
                             isAuthenticated = True
                             with self.__isConnectedLock:
                                 self.__isConnected = True
             except Exception as e:
                 self.__ws = None
-                time.sleep(self.__reConnectTime)
+                if self.__errorCallback:
+                    self.__errorCallback(e)
+                time.sleep(self.__raiseReConnectTime)
 
     def __callBackThreadFunc(self):
         while not self.__stopFlag.is_set() or not self.__videoInfoQueue.empty():
@@ -81,6 +114,8 @@ def __callBackThreadFunc(self):
                 with self.__lock:
                     self.__lastTime = time.time()
                 self.__callback(self.__videoInfoQueue.get())
+            else:
+                time.sleep(1)
 
     @staticmethod
     def formatMessage(code, message):
@@ -99,18 +134,28 @@ def parseMessage(message) -> tuple[str, str]:
             return '', ''
 
     def start(self):
+        """启动"""
         self.__stopFlag.clear()
         self.__wsThread.start()
         self.__callbackThread.start()
 
-    def insertVideoId(self, videoId):
+    def insertVideoId(self, videoId: str | int):
+        """插入一个请求的视频ID"""
+        if videoId is None:
+            raise ValueError("videoId is None")
         self.__videoIdQueue.put(videoId)
-        
-    def insertVideoIds(self, videoIds):
+
+    def insertVideoIds(self, videoIds: list[str | int]):
+        """插入多个请求的视频ID"""
+        if videoIds is None:
+            raise ValueError("videoIds is None")
+        elif not isinstance(videoIds, list):
+            raise ValueError("videoIds is not a list")
         for videoId in videoIds:
             self.__videoIdQueue.put(videoId)
 
     def stop(self):
+        """停止，但是会等待已经接收到的数据全部回调完成"""
         self.__isOver = True
         self.__stopFlag.set()
         self.__wsThread.join()
@@ -119,6 +164,7 @@ def stop(self):
             self.__isConnected = False
 
     def isConnected(self):
+        """检查是否已连接,请求视频信息时，无需判断是否已连接"""
         with self.__isConnectedLock:
             return self.__isConnected
 
@@ -128,11 +174,11 @@ def callback(message):
         print(message)
     wom = WOM(callback)
     wom.start()
-    wom.insertVideoId('3071736950')
-    wom.insertVideoId('3071736950')
+    wom.insertVideoId('1')
+    wom.insertVideoId('1')
     import time
     time.sleep(20)
-    wom.insertVideoId('3071736950')
+    wom.insertVideoId('1')
 
     print('over')
     wom.stop()

From d23ac422711315fb087a42c6d41ca6f09967ff57 Mon Sep 17 00:00:00 2001
From: Tianyi Pu <44583944+putianyi889@users.noreply.github.com>
Date: Sat, 23 Nov 2024 14:04:57 +0000
Subject: [PATCH 7/8] =?UTF-8?q?IdentifierManager=E4=BB=8E=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E7=A7=BB=E5=88=B0=E4=B8=AA=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=20(#164)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* IdentifierManager从设置页移到个人主页

- 登录/访问个人主页时一个request拿到所有数据（技术原因，账号关联和纪录除外）
- IdentifierManager增加复制标识功能
- IdentifierManager排版从标签改成表格
- 移除个人主页左边栏的标识显示

* 本地化

* 屏蔽csv导出功能

* 修复csv导出功能

* 格式化
---
 back_end/saolei/msuser/views.py               |  28 +---
 back_end/saolei/userprofile/utils.py          |  28 ++++
 back_end/saolei/userprofile/views.py          |  14 +-
 front_end/src/App.vue                         |   2 +-
 front_end/src/components/Login.vue            |   6 +-
 .../src/components/dialogs/RegisterDialog.vue |   2 +-
 .../src/components/widgets/CopyToClipboard.ts |  22 +++
 .../components/widgets/IdentifierManager.vue  |  64 ++++++---
 .../src/components/widgets/UserArbiterCSV.vue | 136 ++++++++++++++++++
 front_end/src/i18n/locales/en.ts              |   8 +-
 front_end/src/i18n/locales/zh-cn.ts           |   8 +-
 front_end/src/store/index.ts                  |  13 +-
 front_end/src/views/PlayerProfileView.vue     |   8 ++
 front_end/src/views/PlayerVideosView.vue      | 106 +-------------
 front_end/src/views/PlayerView.vue            |  20 ++-
 front_end/src/views/SettingView.vue           |   8 +-
 16 files changed, 292 insertions(+), 181 deletions(-)
 create mode 100644 front_end/src/components/widgets/CopyToClipboard.ts
 create mode 100644 front_end/src/components/widgets/UserArbiterCSV.vue

diff --git a/back_end/saolei/msuser/views.py b/back_end/saolei/msuser/views.py
index 02ef4289..baa21169 100644
--- a/back_end/saolei/msuser/views.py
+++ b/back_end/saolei/msuser/views.py
@@ -1,15 +1,13 @@
 import logging
 logger = logging.getLogger('userprofile')
-from django.shortcuts import render, redirect
 from django.contrib.auth.decorators import login_required
 from .forms import UserUpdateRealnameForm, UserUpdateAvatarForm, UserUpdateSignatureForm
 # from .models import VideoModel, ExpandVideoModel
-from django.http import HttpResponse, JsonResponse, HttpResponseNotAllowed, HttpResponseBadRequest, HttpResponseNotFound
+from django.http import JsonResponse, HttpResponseBadRequest, HttpResponseNotFound
 # from asgiref.sync import sync_to_async
 import json
 from utils import ComplexEncoder
 # from django.core.paginator import Paginator
-from msuser.models import UserMS
 from userprofile.models import UserProfile
 import base64
 import decimal
@@ -18,11 +16,9 @@
 cache = get_redis_connection("saolei_website")
 from django.conf import settings
 import os
-from django.utils import timezone
-from datetime import datetime, timedelta
-from utils import verify_text
 from django_ratelimit.decorators import ratelimit
 from django.views.decorators.http import require_GET, require_POST
+from userprofile.utils import user_metadata
 
 from config.global_settings import *
 
@@ -50,24 +46,8 @@ def get_info(request):
 
     user.popularity += 1
     user.save(update_fields=["popularity"])
-        
-    if user.avatar:
-        avatar_path = os.path.join(settings.MEDIA_ROOT, urllib.parse.unquote(user.avatar.url)[7:])
-        image_data = open(avatar_path, "rb").read()
-        image_data = base64.b64encode(image_data).decode()
-    else:
-        image_data = None
-    response = {"id": user_id,
-                "username": user.username,
-                "realname": user.realname,
-                "avatar": image_data,
-                "signature": user.signature,
-                "popularity": user.popularity,
-                "identifiers": user.userms.identifiers,
-                "is_banned": user.is_banned,
-                "country": user.country
-                }
-    return JsonResponse(response)
+
+    return JsonResponse(user_metadata(user))
 
 
 # 获取我的地盘里的姓名、全部纪录
diff --git a/back_end/saolei/userprofile/utils.py b/back_end/saolei/userprofile/utils.py
index 79d2d7d7..8932a054 100644
--- a/back_end/saolei/userprofile/utils.py
+++ b/back_end/saolei/userprofile/utils.py
@@ -1,6 +1,12 @@
 from captcha.models import CaptchaStore
 from django.utils import timezone
 from .models import EmailVerifyRecord
+from .models import UserProfile
+from videomanager.models import VideoModel
+import os
+from django.conf import settings
+import urllib.parse
+import base64
 
 # 验证验证码
 def judge_captcha(captchaStr, captchaHashkey):
@@ -25,3 +31,25 @@ def judge_email_verification(email, email_captcha, emailHashkey):
         EmailVerifyRecord.objects.filter(hashkey=emailHashkey).delete()
         return False
     return get_email_captcha.code == email_captcha and get_email_captcha.email == email
+
+def user_metadata(user: UserProfile):
+    if user.avatar:
+        avatar_path = os.path.join(settings.MEDIA_ROOT, urllib.parse.unquote(user.avatar.url)[7:])
+        image_data = open(avatar_path, "rb").read()
+        image_data = base64.b64encode(image_data).decode()
+    else:
+        image_data = None
+
+    videos = VideoModel.objects.filter(player=user).values('id', 'upload_time', "level", "mode", "timems", "bv", "state", "software")
+    return {"id": user.id,
+                "username": user.username,
+                "realname": user.realname,
+                "avatar": image_data,
+                "signature": user.signature,
+                "popularity": user.popularity,
+                "identifiers": user.userms.identifiers,
+                "is_banned": user.is_banned,
+                "is_staff": user.is_staff,
+                "country": user.country,
+                "videos": list(videos),
+                }
\ No newline at end of file
diff --git a/back_end/saolei/userprofile/views.py b/back_end/saolei/userprofile/views.py
index 519fbf90..f4014104 100644
--- a/back_end/saolei/userprofile/views.py
+++ b/back_end/saolei/userprofile/views.py
@@ -14,7 +14,7 @@
 from .decorators import staff_required
 from django.utils import timezone
 from config.flags import EMAIL_SKIP
-from .utils import judge_captcha, judge_email_verification
+from .utils import judge_captcha, judge_email_verification, user_metadata
 
 # Create your views here.
 
@@ -42,11 +42,10 @@ def user_login(request):
         return JsonResponse({'type': 'error', 'object': 'login', 'category': 'password'})
     # 将用户数据保存在 session 中，即实现了登录动作
     login(request, user)
-    userdata = {"id": user.id, "username": user.username, "realname": user.realname, "is_banned": user.is_banned, "is_staff": user.is_staff}
     if 'user_id' in data and data['user_id'] != str(user.id):
         # 检测到小号
         logger.warning(f'{data["user_id"][:50]} is different from {str(user.id)}.')
-    return JsonResponse({'type': 'success', 'user': userdata})
+    return JsonResponse({'type': 'success', 'user': user_metadata(user)})
         
 
 @require_GET
@@ -83,8 +82,7 @@ def user_retrieve(request):
     login(request, user)
     logger.info(f'用户 {user.username}#{user.id} 邮箱找回密码')
     EmailVerifyRecord.objects.filter(hashkey=emailHashkey).delete()
-    userdata = {"id": user.id, "username": user.username, "realname": user.realname, "is_banned": user.is_banned, "is_staff": user.is_staff}
-    return JsonResponse({'type': 'success', 'user': userdata})
+    return JsonResponse({'type': 'success', 'user': user_metadata(user)})
 
 
 # 用户注册
@@ -113,10 +111,7 @@ def user_register(request):
             logger.info(f'用户 {new_user.username}#{new_user.id} 注册')
             # 顺手把过期的验证码删了
             EmailVerifyRecord.objects.filter(hashkey=emailHashkey).delete()
-            return JsonResponse({'type': 'success', 'user': {
-                "id": new_user.id, "username": new_user.username,
-                "realname": new_user.realname, "is_banned": new_user.is_banned, "is_staff": new_user.is_staff}
-                })
+            return JsonResponse({'type': 'success', 'user': user_metadata(new_user)})
         else:
             return JsonResponse({'type': 'error', 'object': 'emailcode'})
     else:
@@ -134,7 +129,6 @@ def user_register(request):
 def check_collision(request):
     user = None
     if request.GET.get('username'):
-        print(request.GET.get('username'))
         user = UserProfile.objects.filter(username=request.GET.get('username')).first()
     elif request.GET.get('email'):
         user = UserProfile.objects.filter(email=request.GET.get('email')).first()
diff --git a/front_end/src/App.vue b/front_end/src/App.vue
index d2b2dc57..bcdfc32d 100644
--- a/front_end/src/App.vue
+++ b/front_end/src/App.vue
@@ -16,7 +16,7 @@
                         <IconMenuItem :text="store.user.username" icon="User" />
                     </el-menu-item>
                     <el-menu-item index="/settings" style="padding-left: 8px; padding-right: 5px">
-                        <el-badge is-dot :hidden="!store.new_identifier" :offset="[0,15]">
+                        <el-badge is-dot :hidden="true" :offset="[0,15]">
                             <IconMenuItem :text="$t('menu.setting')" icon="Setting" />
                         </el-badge>
                     </el-menu-item>
diff --git a/front_end/src/components/Login.vue b/front_end/src/components/Login.vue
index d11e6c39..4639b1b3 100644
--- a/front_end/src/components/Login.vue
+++ b/front_end/src/components/Login.vue
@@ -101,7 +101,11 @@ const logout = async () => {
             realname: "",
             is_banned: false,
             is_staff: false,
-            country: ""
+            country: "",
+            accountlink: [],
+            identifiers: [],
+            videos: [],
+            loading: true,
         };
         emit('logout'); // 向父组件发送消息
         ElMessage.success({ message: t.t('common.msg.logoutSuccess'), offset: 68 });
diff --git a/front_end/src/components/dialogs/RegisterDialog.vue b/front_end/src/components/dialogs/RegisterDialog.vue
index afd8b292..bdc72e17 100644
--- a/front_end/src/components/dialogs/RegisterDialog.vue
+++ b/front_end/src/components/dialogs/RegisterDialog.vue
@@ -18,7 +18,7 @@
             <el-form-item prop="agreeTAC">
                 <el-checkbox v-if="true" v-model="agree_TAC" name="checkoutSecret">{{
                     $t('login.agreeTAC1')
-                    }}
+                }}
                     <a target="_blank" :href="AXIOS_BASE_URL + '/agreement.html'">{{ $t('login.agreeTAC2')
                         }}</a>
                 </el-checkbox>
diff --git a/front_end/src/components/widgets/CopyToClipboard.ts b/front_end/src/components/widgets/CopyToClipboard.ts
new file mode 100644
index 00000000..5a90b584
--- /dev/null
+++ b/front_end/src/components/widgets/CopyToClipboard.ts
@@ -0,0 +1,22 @@
+import { ElNotification } from "element-plus";
+import { local } from "@/store";
+import i18n from "@/i18n";
+// @ts-ignore
+const { t } = i18n.global;
+
+export const copyToClipboard = async (str: string) => {
+    try {
+        await navigator.clipboard.writeText(str);
+        ElNotification({
+            title: t('msg.copyToClipboardSuccess'),
+            type: 'success',
+            duration: local.notification_duration,
+        });
+    } catch(err) {
+        ElNotification({
+            title: t('msg.copyToClipboardFail'),
+            type: 'error',
+            duration: local.notification_duration,
+        })
+    }
+}
diff --git a/front_end/src/components/widgets/IdentifierManager.vue b/front_end/src/components/widgets/IdentifierManager.vue
index e1967f2c..91bb6070 100644
--- a/front_end/src/components/widgets/IdentifierManager.vue
+++ b/front_end/src/components/widgets/IdentifierManager.vue
@@ -1,37 +1,57 @@
 <template>
     <div class="flex gap-2">
-    <el-tag v-for="identifier of identifiers" closable @close="delIdentifier(identifier)">{{ identifier }}</el-tag>
-    <el-input size="small" style="width: 200px" v-model="new_identifiers"></el-input>
-    <el-link :underline="false" @click="addIdentifier(new_identifiers)"><el-icon><Plus/></el-icon></el-link>
-</div>
+        <el-table :data="identifierdata">
+            <el-table-column prop="data" sortable>
+                <template #default="scope">
+                    <el-input v-if="scope.row.data === ''" size="small" style="width: 200px"
+                        v-model="new_identifiers"></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column>
+                <template #default="scope">
+                    <el-link v-if="scope.row.data === ''" :underline="false"
+                        @click="addIdentifier(new_identifiers)"><el-icon>
+                            <Plus />
+                        </el-icon></el-link>
+                    <el-link v-else :underline="false" @click="copyToClipboard(scope.row.data)">
+                        <el-icon>
+                            <CopyDocument />
+                        </el-icon>
+                    </el-link>
+                    &nbsp;
+                    <el-link v-if="scope.row.data !== ''" :underline="false" type="danger"
+                        @click="delIdentifier(scope.row.data)">
+                        <el-icon>
+                            <Delete />
+                        </el-icon>
+                    </el-link>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
 </template>
 
 <script setup lang="ts">
 
 import { store } from '@/store';
 import useCurrentInstance from '@/utils/common/useCurrentInstance';
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 import { removeItem } from '@/utils/system/tools';
 import { Plus } from '@element-plus/icons-vue';
 import { ElNotification } from 'element-plus';
 import { httpErrorNotification, unknownErrorNotification } from '@/components/Notifications';
 import { useI18n } from 'vue-i18n';
+import { computed } from 'vue';
+import { copyToClipboard } from './CopyToClipboard';
 
 const { proxy } = useCurrentInstance();
-const identifiers = ref<string[]>([]);
 const new_identifiers = ref("")
 const t = useI18n();
 
-onMounted(() => {
-    proxy.$axios.get('msuser/identifiers/',
-        {
-            params: {
-                id: store.user.id
-            }
-        }
-    ).then(function (response) {
-        identifiers.value = response.data;
-    })
+const identifierdata = computed(() => {
+    let data = store.player.identifiers ? store.player.identifiers.map(value => ({ data: value })) : [];
+    data.push({ data: "" })
+    return data
 })
 
 function delIdentifier(identifier: string) {
@@ -40,7 +60,7 @@ function delIdentifier(identifier: string) {
             identifier: identifier
         }
     ).then(function (response) {
-        identifiers.value = removeItem(identifiers.value, identifier);
+        store.player.identifiers = removeItem(store.player.identifiers, identifier);
         ElNotification({
             title: t.t('identifierManager.delIdentifierSuccess'),
             message: t.t('identifierManager.processedNVideos', [response.data.value]),
@@ -56,7 +76,7 @@ function addIdentifier(identifier: string) {
         }
     ).then(function (response) {
         if (response.data.type === 'success') {
-            identifiers.value.push(new_identifiers.value);
+            store.player.identifiers.push(new_identifiers.value);
             ElNotification({
                 title: t.t('identifierManager.addIdentifierSuccess'),
                 message: t.t('identifierManager.processedNVideos', [response.data.value]),
@@ -82,3 +102,11 @@ function addIdentifier(identifier: string) {
 }
 
 </script>
+
+<style lang="less" scoped>
+::v-deep(.el-table .el-table__cell) {
+    font-family: 'Courier New', Courier, monospace;
+    padding: 0;
+    margin: 0;
+}
+</style>
\ No newline at end of file
diff --git a/front_end/src/components/widgets/UserArbiterCSV.vue b/front_end/src/components/widgets/UserArbiterCSV.vue
new file mode 100644
index 00000000..4e52a445
--- /dev/null
+++ b/front_end/src/components/widgets/UserArbiterCSV.vue
@@ -0,0 +1,136 @@
+<template>
+    <el-button :disabled="id == 0" @click="clickExportJSON">
+        {{ $t('profile.exportJSON') }}&nbsp;
+        <el-tooltip :content="$t('profile.exportJSONTooltip')" raw-content>
+            <el-icon v-if="local.tooltip_show">
+                <QuestionFilled />
+            </el-icon>
+        </el-tooltip>
+    </el-button>
+    <el-button @click="clickExportCSV" :disabled="id == 0">
+        {{ $t('profile.exportArbiterCSV') }}&nbsp;
+        <el-tooltip :content="$t('profile.exportArbiterCSVTooltip')" raw-content>
+            <el-icon v-if="local.tooltip_show">
+                <QuestionFilled />
+            </el-icon>
+        </el-tooltip>
+    </el-button>
+</template>
+
+<script setup lang="ts">
+import { local } from '@/store';
+import useCurrentInstance from '@/utils/common/useCurrentInstance';
+import { ref, watch } from 'vue';
+import { httpErrorNotification } from '../Notifications';
+
+const { proxy } = useCurrentInstance();
+
+const data = ref([] as any[]);
+const progress = ref(0);
+const status = ref("");
+const text = ref("")
+
+const prop = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+})
+
+watch(prop, () => { data.value = [] });
+
+async function fetchData(id: number) {
+    await proxy.$axios.get('video/query_by_id',
+        {
+            params: {
+                id: id,
+            }
+        }
+    ).then(function (response) {
+        data.value = response.data
+    }).catch(httpErrorNotification)
+}
+
+function generateArbiterCSV(data: any) {
+    if (!data) return "";
+    let csvdata = ['Day,Month,Year,Hour,Min,Sec,mode,Time,BBBV,BBBVs,style,cell0,cell1,cell2,cell3,cell4,cell5,cell6,cell7,cell8,Lcl,Rcl,Dcl,Leff,Reff,Deff,Openings,Islands,Path,GZiNi,HZiNi']
+    for (let v of data) {
+        if (v.mode != 'std' && v.mode != 'nf') continue;
+        let date = new Date(v.upload_time);
+        let row: any[] = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds()];
+        switch (v.level) {
+            case 'e': row.push(3); break;
+            case 'i': row.push(2); break;
+            case 'b': row.push(1); break;
+            default: console.error('未知级别');
+        }
+        row.push((v.timems / 1000).toFixed(2));
+        row.push(v.bv);
+        row.push(v.bvs.toFixed(2));
+
+        if (v.video__flag == 0) row.push('NF');
+        else row.push('Flag');
+
+        row.push(v.video__cell0, v.video__cell1, v.video__cell2, v.video__cell3, v.video__cell4, v.video__cell5, v.video__cell6, v.video__cell7, v.video__cell8)
+        row.push(v.video__left, v.video__right, v.video__double, 0, 0, 0)
+        row.push(v.video__op, v.video__isl)
+        row.push(Math.round(v.video__path))
+        row.push(0, 0)
+        csvdata.push(row.join())
+    }
+    return csvdata.join('\n');
+}
+
+// Credit: ChatGPT
+function downloadCSV(csv: string) {
+    if (csv === "") return;
+    // Create a Blob from the CSV data
+    const blob = new Blob([csv], { type: 'text/csv' });
+    const url = URL.createObjectURL(blob);
+
+    // Create a temporary anchor element
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = 'stats_csv.csv'; // Set the file name
+
+    // Append the anchor to the body
+    document.body.appendChild(a);
+    a.click(); // Trigger the download
+    document.body.removeChild(a); // Remove the anchor after download
+
+    // Release the object URL
+    URL.revokeObjectURL(url);
+}
+
+function downloadJSON(json: string) {
+    if (json === "") return;
+    // Create a Blob from the CSV data
+    const blob = new Blob([json], { type: 'text/json' });
+    const url = URL.createObjectURL(blob);
+
+    // Create a temporary anchor element
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = 'stats_json.json'; // Set the file name
+
+    // Append the anchor to the body
+    document.body.appendChild(a);
+    a.click(); // Trigger the download
+    document.body.removeChild(a); // Remove the anchor after download
+
+    // Release the object URL
+    URL.revokeObjectURL(url);
+}
+
+async function clickExportCSV() {
+    if (data.value.length === 0) await fetchData(prop.id);
+    if (data.value.length === 0) return;
+    downloadCSV(generateArbiterCSV(data.value));
+}
+
+async function clickExportJSON() {
+    if (data.value.length === 0) await fetchData(prop.id);
+    if (data.value.length === 0) return;
+    downloadJSON(JSON.stringify(data.value))
+}
+</script>
\ No newline at end of file
diff --git a/front_end/src/i18n/locales/en.ts b/front_end/src/i18n/locales/en.ts
index 7a6081da..d790b06e 100644
--- a/front_end/src/i18n/locales/en.ts
+++ b/front_end/src/i18n/locales/en.ts
@@ -196,6 +196,8 @@ export default {
         captchaRequired: 'Captcha required',
         confirmPasswordMismatch: 'Mismatches password',
         connectionFail: 'Connection failed. Please try again',
+        copyToClipboardFail: 'Failed to copy.',
+        copyToClipboardSuccess: 'Text copied.',
         emailCodeInvalid: 'Email code is invalid or expired',
         emailCodeRequired: 'Email code required',
         emailCollision: 'Email already exists',
@@ -249,8 +251,10 @@ export default {
             modeRecord: ' mode record: '
         },
         videos: 'All videos',
-        exportArbiterCSV: 'Export as stats_csv.csv',
-        exportArbiterCSVTooltip: 'Compatible with the datasheet generated by Minesweeper Arbiter.<br/> Not supporting Leff, Reff, Deff, GZiNi and HZiNi at present.',
+        exportJSON: 'Export as JSON',
+        exportJSONTooltip: 'Raw data fetched from the server.',
+        exportArbiterCSV: 'Export as CSV',
+        exportArbiterCSVTooltip: 'Compatible with <span style="font-family: \'Courier New\', Courier, monospace;">stats_csv.csv</span> generated by Minesweeper Arbiter.<br/> Not supporting Leff, Reff, Deff, GZiNi and HZiNi at present.',
         upload: {
             title: 'Video Upload',
             dragOrClick: `Drag files here or <em>click here to select</em>`,
diff --git a/front_end/src/i18n/locales/zh-cn.ts b/front_end/src/i18n/locales/zh-cn.ts
index 1ba127ee..5b53e008 100644
--- a/front_end/src/i18n/locales/zh-cn.ts
+++ b/front_end/src/i18n/locales/zh-cn.ts
@@ -196,6 +196,8 @@ export default {
         captchaRequired: '请输入图形验证码',
         confirmPasswordMismatch: '密码和确认密码不一致',
         connectionFail: '无法连接到服务器，请重试',
+        copyToClipboardFail: '复制失败',
+        copyToClipboardSuccess: '复制成功',
         emailCodeInvalid: '邮箱验证码过期或不正确',
         emailCodeRequired: '请输入邮箱验证码',
         emailCollision: '邮箱已存在',
@@ -249,8 +251,10 @@ export default {
             modeRecord: '模式纪录：'
         },
         videos: '全部录像',
-        exportArbiterCSV: '导出stats_csv.csv',
-        exportArbiterCSVTooltip: '兼容 Minesweeper Arbiter 生成的数据表。<br/> 目前不支持 Leff, Reff, Deff, GZiNi, HZiNi。',
+        exportJSON: '导出JSON',
+        exportJSONTooltip: '从服务器获取的源数据',
+        exportArbiterCSV: '导出CSV',
+        exportArbiterCSVTooltip: '兼容 Minesweeper Arbiter 生成的 <span style="font-family: \'Courier New\', Courier, monospace;">stats_csv.csv</span>。<br/> 目前不支持 Leff, Reff, Deff, GZiNi, HZiNi。',
         upload: {
             title: '上传录像',
             dragOrClick: `将录像拉到此处或 <em>点击此处选择</em>`,
diff --git a/front_end/src/store/index.ts b/front_end/src/store/index.ts
index 91183b99..531a409b 100644
--- a/front_end/src/store/index.ts
+++ b/front_end/src/store/index.ts
@@ -11,7 +11,11 @@ export const store = defineStore('user', {
             realname: "",
             is_banned: false,
             is_staff: false,
-            country: ""
+            country: "",
+            accountlink: [],
+            identifiers: [],
+            videos: [],
+            loading: true,
         },   // 真正的用户
         // 访问谁的地盘不再具有记忆性。即点“我的地盘”，将永远是“我”的地盘
         // 想要访问特定用户，可以用url
@@ -22,7 +26,12 @@ export const store = defineStore('user', {
             username: "",
             realname: "",
             is_banned: false,
-            country: ""
+            is_staff: false,
+            country: "",
+            accountlink: [] as any[],
+            identifiers: [] as string[],
+            videos: [] as any[],
+            loading: true,
         },
         login_status: LoginStatus.Undefined, // 登录状态，全局维护
         new_identifier: false, // 是否有新标识录像
diff --git a/front_end/src/views/PlayerProfileView.vue b/front_end/src/views/PlayerProfileView.vue
index 05957a00..6a0f78ef 100644
--- a/front_end/src/views/PlayerProfileView.vue
+++ b/front_end/src/views/PlayerProfileView.vue
@@ -1,8 +1,16 @@
 <template>
     <el-text tag="b" size="large">{{ $t('accountlink.title') }}</el-text>
     <AccountLinkManager />
+    <el-divider/>
+    <el-badge is-dot :hidden="!store.new_identifier">
+        <el-descriptions v-if="store.login_status == LoginStatus.IsLogin" :title="$t('identifierManager.title')"></el-descriptions>
+    </el-badge>
+    <IdentifierManager v-if="store.login_status == LoginStatus.IsLogin"/>
 </template>
 
 <script setup lang="ts">
 import AccountLinkManager from '@/components/AccountLinkManager.vue';
+import IdentifierManager from '@/components/widgets/IdentifierManager.vue';
+import { LoginStatus } from '@/utils/common/structInterface';
+import { store } from '@/store';
 </script>
\ No newline at end of file
diff --git a/front_end/src/views/PlayerVideosView.vue b/front_end/src/views/PlayerVideosView.vue
index 350a1ba7..6913cc9a 100644
--- a/front_end/src/views/PlayerVideosView.vue
+++ b/front_end/src/views/PlayerVideosView.vue
@@ -1,111 +1,15 @@
 <template>
-    <el-button @click="downloadCSV(generateArbiterCSV(videos_queue))" v-if="!loading">
-        {{ $t('profile.exportArbiterCSV') }}&nbsp;
-        <el-tooltip :content="$t('profile.exportArbiterCSVTooltip')" raw-content>
-            <el-icon v-if="local.tooltip_show">
-                <QuestionFilled />
-            </el-icon>
-        </el-tooltip>
-    </el-button>
+    <UserArbiterCSV :id="store.player.id" />
     <el-card class="box-card" body-style="" style="max-height: 800px; overflow: auto; margin-top:5px">
-        <el-skeleton animated v-show="loading" :rows="8" />
-        <VideoList :videos="videos_queue" :need_player_name="false" reverse></VideoList>
+        <el-skeleton animated v-show="store.player.loading" :rows="8" />
+        <VideoList :videos="store.player.videos" :need_player_name="false" reverse></VideoList>
     </el-card>
 </template>
 
 <script lang="ts" setup>
 // 个人主页的个人所有录像部分
-import { onMounted, ref, Ref } from 'vue'
-import useCurrentInstance from "@/utils/common/useCurrentInstance";
-const { proxy } = useCurrentInstance();
-// import { genFileId, ElMessage } from 'element-plus'
 import VideoList from '@/components/VideoList.vue';
-// import { fa } from 'element-plus/es/locale';
-import { local, store } from '../store'
-
-const loading = ref(true)
-
-const videos_queue = ref<any[]>([]);
-
-
-onMounted(() => {
-    // const player = proxy.$store.state.player;
-    // const player = JSON.parse(localStorage.getItem("player") as string);
-    const player = store.player;
-    proxy.$axios.get('/video/query_by_id/',
-        {
-            params: { id: player.id }
-        }
-    ).then(function (response) {
-        let videos = response.data;
-        for (let key in videos) {
-            videos[key].key = videos[key].id;
-            videos_queue.value.push(videos[key]);
-            if (videos[key].state == 'd' && player.id == store.user.id) {
-                store.new_identifier = true;
-            }
-        }
-        loading.value = false;
-    })
-})
-
-function generateArbiterCSV(data: any) {
-    let csvdata = ['Day,Month,Year,Hour,Min,Sec,mode,Time,BBBV,BBBVs,style,cell0,cell1,cell2,cell3,cell4,cell5,cell6,cell7,cell8,Lcl,Rcl,Dcl,Leff,Reff,Deff,Openings,Islands,Path,GZiNi,HZiNi']
-    for (let v of data) {
-        if (v.mode != 'std' && v.mode != 'nf') continue;
-        let date = new Date(v.upload_time);
-        let row: any[] = [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds()];
-        switch (v.level) {
-            case 'e': row.push(3); break;
-            case 'i': row.push(2); break;
-            case 'b': row.push(1); break;
-            default: console.error('未知级别');
-        }
-        row.push((v.timems / 1000).toFixed(2));
-        row.push(v.bv);
-        row.push(v.bvs.toFixed(2));
-
-        if (v.video__flag == 0) row.push('NF');
-        else row.push('Flag');
-
-        row.push(v.video__cell0, v.video__cell1, v.video__cell2, v.video__cell3, v.video__cell4, v.video__cell5, v.video__cell6, v.video__cell7, v.video__cell8)
-        row.push(v.video__left, v.video__right, v.video__double, 0, 0, 0)
-        row.push(v.video__op, v.video__isl)
-        row.push(Math.round(v.video__path))
-        row.push(0, 0)
-        csvdata.push(row.join())
-    }
-    return csvdata.join('\n');
-}
-
-// Credit: ChatGPT
-function downloadCSV(csv: string) {
-    // Create a Blob from the CSV data
-    const blob = new Blob([csv], { type: 'text/csv' });
-    const url = URL.createObjectURL(blob);
-
-    // Create a temporary anchor element
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = 'stats_csv.csv'; // Set the file name
-
-    // Append the anchor to the body
-    document.body.appendChild(a);
-    a.click(); // Trigger the download
-    document.body.removeChild(a); // Remove the anchor after download
-
-    // Release the object URL
-    URL.revokeObjectURL(url);
-}
+import { store } from '../store'
+import UserArbiterCSV from '@/components/widgets/UserArbiterCSV.vue';
 
 </script>
-
-
-<style>
-.avatar-uploader {
-    margin: auto;
-    text-align: center;
-    margin-top: 30px;
-
-}
-</style>
diff --git a/front_end/src/views/PlayerView.vue b/front_end/src/views/PlayerView.vue
index 963b3b3d..34d20053 100644
--- a/front_end/src/views/PlayerView.vue
+++ b/front_end/src/views/PlayerView.vue
@@ -46,14 +46,13 @@
                     </div>
                     <div style="font-size: 16px;margin-bottom: 12px;color: #555;">
                         <!-- <span class="flag-icon flag-icon-cn"/> -->
-                        {{ realname }}</div>
+                        {{ realname }}
+                    </div>
                     <div style="overflow: auto ;font-size: 16px;margin-bottom: 12px;text-align: justify;">
                         {{ signature }}</div>
                     <button class="edit_button" v-show="show_edit_button" @click="is_editing = true; visible = true;">{{
-                    $t('profile.change') }}</button>
+                        $t('profile.change') }}</button>
                     <!-- <div style="overflow: auto ;">人气：{{ popularity }}</div> -->
-                    <div style="overflow: auto ;text-align: justify;"><strong>{{ $t('profile.identifier') }}</strong>{{
-                    identifiers.join(", ") }}</div>
                 </div>
             </el-aside>
 
@@ -70,7 +69,7 @@
                     </el-tab-pane>
                     <el-tab-pane v-if="store.user.id + '' == userid" :label="$t('profile.upload.title')" name="upload"
                         :lazy="true">
-                        <UploadView :identifiers="identifiers"></UploadView>
+                        <UploadView :identifiers="store.user.identifiers"></UploadView>
                     </el-tab-pane>
                 </el-tabs>
 
@@ -106,15 +105,12 @@ import { useRoute } from 'vue-router';
 const t = useI18n();
 const route = useRoute()
 
-const loading = ref(true)
-
 //编辑前的
 const userid = ref("");
 const username = ref("");
 const realname = ref("");
 const signature = ref("");
 const popularity = ref("");
-const identifiers = ref<String[]>([]); // 通过审核的标识
 
 //编辑状态时的
 const realname_edit = ref("");
@@ -164,7 +160,9 @@ function refresh() {
         store.player.username = data.username;
         store.player.is_banned = data.is_banned;
         store.player.country = data.country;
-        
+        store.player.is_staff = data.is_staff;
+        store.player.identifiers = data.identifiers;
+        store.player.videos = data.videos;
 
         userid.value = data.id;
         realname.value = data.realname;
@@ -174,15 +172,13 @@ function refresh() {
         popularity.value = data.popularity;
         realname_edit.value = data.realname;
         signature_edit.value = data.signature;
-        identifiers.value.length = 0;
-        identifiers.value.push(...data.identifiers);
         // console.log(imageUrl);
         if (data.avatar) {
             imageUrl.value = "data:image/;base64," + data.avatar;
             imageUrlOld = "data:image/;base64," + data.avatar;
         }
         // console.log(imageUrl);
-        loading.value = false;
+        store.player.loading = false;
 
     })
 }
diff --git a/front_end/src/views/SettingView.vue b/front_end/src/views/SettingView.vue
index c41dab05..4f0f370e 100644
--- a/front_end/src/views/SettingView.vue
+++ b/front_end/src/views/SettingView.vue
@@ -38,21 +38,15 @@
         <el-descriptions-item label="属地">{{ $t('common.toDo') }}</el-descriptions-item>
         <el-descriptions-item label="出生年份">{{ $t('common.toDo') }}</el-descriptions-item>
     </el-descriptions>
-    <el-divider />
-    <el-badge is-dot :hidden="!store.new_identifier">
-        <el-descriptions v-if="store.login_status == LoginStatus.IsLogin" :title="$t('identifierManager.title')"></el-descriptions>
-    </el-badge>
-    <IdentifierManager v-if="store.login_status == LoginStatus.IsLogin"/>
 </template>
 
 <script lang="ts" setup name="UserSettings">
-
 import { store, local } from '@/store';
 import { LoginStatus } from '@/utils/common/structInterface';
 import { useI18n } from 'vue-i18n';
 const t = useI18n()
 
 import DarkMode from '@/components/widgets/DarkMode.vue'
-import IdentifierManager from '@/components/widgets/IdentifierManager.vue';
+
 
 </script>
\ No newline at end of file

From 74a2a81772d8b233db60a0ecf3b1728c911ded18 Mon Sep 17 00:00:00 2001
From: eee555 <2234208506@qq.com>
Date: Sat, 23 Nov 2024 22:09:25 +0800
Subject: [PATCH 8/8] Update views.py

---
 back_end/saolei/userprofile/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/back_end/saolei/userprofile/views.py b/back_end/saolei/userprofile/views.py
index f4014104..07c4231f 100644
--- a/back_end/saolei/userprofile/views.py
+++ b/back_end/saolei/userprofile/views.py
@@ -128,10 +128,10 @@ def user_register(request):
 @require_GET
 def check_collision(request):
     user = None
-    if request.GET.get('username'):
-        user = UserProfile.objects.filter(username=request.GET.get('username')).first()
-    elif request.GET.get('email'):
-        user = UserProfile.objects.filter(email=request.GET.get('email')).first()
+    if username := request.GET.get('username'):
+        user = UserProfile.objects.filter(username=username).first()
+    elif email := request.GET.get('email'):
+        user = UserProfile.objects.filter(email=email).first()
     else:
         return HttpResponseBadRequest()
     if not user: