From 374f2a92aaae6685aadb39b9f703d49ae4e41087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=B0=8F=E4=B8=98?= <admin@yuxiaoqiu.cn>
Date: Mon, 13 Oct 2025 09:26:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8uuid=E5=8C=85=E6=9D=A5?=
 =?UTF-8?q?=E7=94=9F=E6=88=90uuidv4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/forgot-password/index.vue       | 12 ++------
 main/manager-mobile/src/pages/login/index.vue | 28 +++++++----------
 .../src/pages/register/index.vue              | 30 +++++++------------
 main/manager-web/package-lock.json            | 25 ++++++++++++----
 main/manager-web/package.json                 |  1 +
 5 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/main/manager-mobile/src/pages/forgot-password/index.vue b/main/manager-mobile/src/pages/forgot-password/index.vue
index f574d0e9..fb5ac0fe 100644
--- a/main/manager-mobile/src/pages/forgot-password/index.vue
+++ b/main/manager-mobile/src/pages/forgot-password/index.vue
@@ -11,6 +11,7 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
+import { v4 as uuidv4 } from 'uuid';
 import { useConfigStore } from "@/store";
 import { getEnvBaseUrl, sm2Encrypt } from "@/utils";
 import { toast } from "@/utils/toast";
@@ -114,18 +115,9 @@ function closeAreaCodeSheet() {
   showAreaCodeSheet.value = false;
 }
 
-// 生成UUID
-function generateUUID() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-    const r = (Math.random() * 16) | 0;
-    const v = c === "x" ? r : (r & 0x3) | 0x8;
-    return v.toString(16);
-  });
-}
-
 // 获取图形验证码
 async function refreshCaptcha() {
-  const uuid = generateUUID();
+  const uuid = uuidv4();
   formData.value.captchaId = uuid;
   captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }
diff --git a/main/manager-mobile/src/pages/login/index.vue b/main/manager-mobile/src/pages/login/index.vue
index ffb8e740..0d8ca78b 100644
--- a/main/manager-mobile/src/pages/login/index.vue
+++ b/main/manager-mobile/src/pages/login/index.vue
@@ -9,15 +9,16 @@
 </route>
 
 <script lang="ts" setup>
-import type { LoginData } from '@/api/auth'
-import { computed, onMounted, ref } from 'vue'
-import { login } from '@/api/auth'
-import { useConfigStore } from '@/store'
-import { getEnvBaseUrl } from '@/utils'
-import { toast } from '@/utils/toast'
+import type { LoginData } from '@/api/auth';
+import { computed, onMounted, ref } from 'vue';
+import { v4 as uuidv4 } from 'uuid';
+import { login } from '@/api/auth';
+import { useConfigStore } from '@/store';
+import { getEnvBaseUrl } from '@/utils';
+import { toast } from '@/utils/toast';
 // 导入国际化相关功能
-import { t, changeLanguage, getSupportedLanguages, initI18n } from '@/i18n'
-import type { Language } from '@/store/lang'
+import { t, changeLanguage, getSupportedLanguages, initI18n } from '@/i18n';
+import type { Language } from '@/store/lang';
 // 导入SM2加密工具
 import { sm2Encrypt } from '@/utils'
 
@@ -123,15 +124,6 @@ function goToForgotPassword() {
   })
 }
 
-// 生成UUID
-function generateUUID() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
-    const r = Math.random() * 16 | 0
-    const v = c === 'x' ? r : (r & 0x3 | 0x8)
-    return v.toString(16)
-  })
-}
-
 let skipReLaunch = false // 全局或组件作用域
 
 //跳转至服务端设置页面
@@ -143,7 +135,7 @@ function goToServerSetting() {
 
 // 获取验证码
 async function refreshCaptcha() {
-  const uuid = generateUUID()
+  const uuid = uuidv4();
   formData.value.captchaId = uuid
   captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`
 }
diff --git a/main/manager-mobile/src/pages/register/index.vue b/main/manager-mobile/src/pages/register/index.vue
index e70cf75c..16980b6f 100644
--- a/main/manager-mobile/src/pages/register/index.vue
+++ b/main/manager-mobile/src/pages/register/index.vue
@@ -9,15 +9,16 @@
 </route>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
-import { register, sendSmsCode } from '@/api/auth'
-import { useConfigStore } from '@/store'
-import { getEnvBaseUrl } from '@/utils'
-import { toast } from '@/utils/toast'
+import { computed, onMounted, ref } from 'vue';
+import { register, sendSmsCode } from '@/api/auth';
+import { v4 as uuidv4 } from 'uuid';
+import { useConfigStore } from '@/store';
+import { getEnvBaseUrl } from '@/utils';
+import { toast } from '@/utils/toast';
 // 导入国际化相关功能
-import { t, initI18n } from '@/i18n'
+import { t, initI18n } from '@/i18n';
 // 导入SM2加密工具
-import { sm2Encrypt } from '@/utils'
+import { sm2Encrypt } from '@/utils';
 
 // 获取屏幕边界到安全区域距离
 let safeAreaInsets
@@ -124,20 +125,11 @@ function closeAreaCodeSheet() {
   showAreaCodeSheet.value = false
 }
 
-// 生成UUID
-function generateUUID() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
-    const r = (Math.random() * 16) | 0
-    const v = c === 'x' ? r : (r & 0x3) | 0x8
-    return v.toString(16)
-  })
-}
-
 // 获取验证码
 async function refreshCaptcha() {
-  const uuid = generateUUID()
-  formData.value.captchaId = uuid
-  captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`
+  const uuid = uuidv4();
+  formData.value.captchaId = uuid;
+  captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }
 
 // 发送短信验证码
diff --git a/main/manager-web/package-lock.json b/main/manager-web/package-lock.json
index 1b0c1a6e..910782e5 100644
--- a/main/manager-web/package-lock.json
+++ b/main/manager-web/package-lock.json
@@ -17,6 +17,7 @@
         "opus-decoder": "^0.7.7",
         "opus-recorder": "^8.0.5",
         "sm-crypto": "^0.3.13",
+        "uuid": "^13.0.0",
         "vue": "^2.6.14",
         "vue-axios": "^3.5.2",
         "vue-i18n": "^8.28.2",
@@ -9404,6 +9405,16 @@
         "node": ">= 0.12"
       }
     },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "license": "MIT",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
@@ -11097,12 +11108,16 @@
       }
     },
     "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-13.0.0.tgz",
+      "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist-node/bin/uuid"
       }
     },
     "node_modules/validate-npm-package-license": {
diff --git a/main/manager-web/package.json b/main/manager-web/package.json
index e9f0d65c..ee3d4eed 100644
--- a/main/manager-web/package.json
+++ b/main/manager-web/package.json
@@ -17,6 +17,7 @@
     "opus-decoder": "^0.7.7",
     "opus-recorder": "^8.0.5",
     "sm-crypto": "^0.3.13",
+    "uuid": "^13.0.0",
     "vue": "^2.6.14",
     "vue-axios": "^3.5.2",
     "vue-i18n": "^8.28.2",

From 432a5d01f838ec810b6f93615d1a1c4dca833dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=B0=8F=E4=B8=98?= <admin@yuxiaoqiu.cn>
Date: Mon, 13 Oct 2025 09:35:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=B9=E6=88=90=20`crypto.randomUUID();`?=
 =?UTF-8?q?=20=E7=94=9F=E6=88=90uuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-mobile/src/pages/forgot-password/index.vue | 3 +--
 main/manager-mobile/src/pages/login/index.vue           | 7 +++----
 main/manager-mobile/src/pages/register/index.vue        | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/main/manager-mobile/src/pages/forgot-password/index.vue b/main/manager-mobile/src/pages/forgot-password/index.vue
index fb5ac0fe..eb4ad50a 100644
--- a/main/manager-mobile/src/pages/forgot-password/index.vue
+++ b/main/manager-mobile/src/pages/forgot-password/index.vue
@@ -11,7 +11,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
-import { v4 as uuidv4 } from 'uuid';
 import { useConfigStore } from "@/store";
 import { getEnvBaseUrl, sm2Encrypt } from "@/utils";
 import { toast } from "@/utils/toast";
@@ -117,7 +116,7 @@ function closeAreaCodeSheet() {
 
 // 获取图形验证码
 async function refreshCaptcha() {
-  const uuid = uuidv4();
+  const uuid = crypto.randomUUID();
   formData.value.captchaId = uuid;
   captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }
diff --git a/main/manager-mobile/src/pages/login/index.vue b/main/manager-mobile/src/pages/login/index.vue
index 0d8ca78b..e3cea6ca 100644
--- a/main/manager-mobile/src/pages/login/index.vue
+++ b/main/manager-mobile/src/pages/login/index.vue
@@ -11,7 +11,6 @@
 <script lang="ts" setup>
 import type { LoginData } from '@/api/auth';
 import { computed, onMounted, ref } from 'vue';
-import { v4 as uuidv4 } from 'uuid';
 import { login } from '@/api/auth';
 import { useConfigStore } from '@/store';
 import { getEnvBaseUrl } from '@/utils';
@@ -135,9 +134,9 @@ function goToServerSetting() {
 
 // 获取验证码
 async function refreshCaptcha() {
-  const uuid = uuidv4();
-  formData.value.captchaId = uuid
-  captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`
+  const uuid = crypto.randomUUID();
+  formData.value.captchaId = uuid;
+  captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }
 
 // 登录
diff --git a/main/manager-mobile/src/pages/register/index.vue b/main/manager-mobile/src/pages/register/index.vue
index 16980b6f..0f0dad3e 100644
--- a/main/manager-mobile/src/pages/register/index.vue
+++ b/main/manager-mobile/src/pages/register/index.vue
@@ -11,7 +11,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue';
 import { register, sendSmsCode } from '@/api/auth';
-import { v4 as uuidv4 } from 'uuid';
 import { useConfigStore } from '@/store';
 import { getEnvBaseUrl } from '@/utils';
 import { toast } from '@/utils/toast';
@@ -127,7 +126,7 @@ function closeAreaCodeSheet() {
 
 // 获取验证码
 async function refreshCaptcha() {
-  const uuid = uuidv4();
+  const uuid = crypto.randomUUID();
   formData.value.captchaId = uuid;
   captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }

From e790b668efac524244286d924ffe00ff1ec69ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=B0=8F=E4=B8=98?= <admin@yuxiaoqiu.cn>
Date: Mon, 13 Oct 2025 09:42:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9Fuuid=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/package-lock.json | 26 +-------------------------
 main/manager-web/package.json      |  1 -
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/main/manager-web/package-lock.json b/main/manager-web/package-lock.json
index 910782e5..acc4aec2 100644
--- a/main/manager-web/package-lock.json
+++ b/main/manager-web/package-lock.json
@@ -17,7 +17,6 @@
         "opus-decoder": "^0.7.7",
         "opus-recorder": "^8.0.5",
         "sm-crypto": "^0.3.13",
-        "uuid": "^13.0.0",
         "vue": "^2.6.14",
         "vue-axios": "^3.5.2",
         "vue-i18n": "^8.28.2",
@@ -9405,16 +9404,6 @@
         "node": ">= 0.12"
       }
     },
-    "node_modules/request/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "license": "MIT",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
@@ -10179,7 +10168,7 @@
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
       "bin": {
-        "uuid": "dist/bin/uuid"
+        "uuid": "bin/uuid"
       }
     },
     "node_modules/source-list-map": {
@@ -11107,19 +11096,6 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/uuid": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-13.0.0.tgz",
-      "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist-node/bin/uuid"
-      }
-    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
diff --git a/main/manager-web/package.json b/main/manager-web/package.json
index ee3d4eed..e9f0d65c 100644
--- a/main/manager-web/package.json
+++ b/main/manager-web/package.json
@@ -17,7 +17,6 @@
     "opus-decoder": "^0.7.7",
     "opus-recorder": "^8.0.5",
     "sm-crypto": "^0.3.13",
-    "uuid": "^13.0.0",
     "vue": "^2.6.14",
     "vue-axios": "^3.5.2",
     "vue-i18n": "^8.28.2",

From acee7e27c6e1009b4b98b18184cfc40f175d03bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=B0=8F=E4=B8=98?= <admin@yuxiaoqiu.cn>
Date: Mon, 13 Oct 2025 09:49:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=9C=A8=E7=AE=A1=E7=90=86=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E4=B9=9F=E4=BF=AE=E6=94=B9uuid=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/utils/index.js             | 10 ----------
 main/manager-web/src/views/login.vue            |  4 ++--
 main/manager-web/src/views/register.vue         |  4 ++--
 main/manager-web/src/views/retrievePassword.vue |  4 ++--
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/main/manager-web/src/utils/index.js b/main/manager-web/src/utils/index.js
index 1f4915f2..55849f17 100755
--- a/main/manager-web/src/utils/index.js
+++ b/main/manager-web/src/utils/index.js
@@ -126,16 +126,6 @@ export function randomNum(min, max) {
     return Math.round(Math.random() * (max - min) + min)
 }
 
-
-/**
- * 获取uuid
- */
-export function getUUID() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-        return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
-    })
-}
-
 /**
  * 验证手机号格式
  * @param {string} mobile 手机号
diff --git a/main/manager-web/src/views/login.vue b/main/manager-web/src/views/login.vue
index fc9c271e..ba4c9994 100644
--- a/main/manager-web/src/views/login.vue
+++ b/main/manager-web/src/views/login.vue
@@ -148,7 +148,7 @@
 import Api from "@/apis/api";
 import VersionFooter from "@/components/VersionFooter.vue";
 import i18n, { changeLanguage } from "@/i18n";
-import { getUUID, goToPage, showDanger, showSuccess, sm2Encrypt, validateMobile } from "@/utils";
+import { goToPage, showDanger, showSuccess, sm2Encrypt, validateMobile } from "@/utils";
 import { mapState } from "vuex";
 
 export default {
@@ -213,7 +213,7 @@ export default {
           this.$router.push("/home");
         }
       } else {
-        this.captchaUuid = getUUID();
+        this.captchaUuid = crypto.randomUUID();
 
         Api.user.getCaptcha(this.captchaUuid, (res) => {
           if (res.status === 200) {
diff --git a/main/manager-web/src/views/register.vue b/main/manager-web/src/views/register.vue
index de54011e..57748144 100644
--- a/main/manager-web/src/views/register.vue
+++ b/main/manager-web/src/views/register.vue
@@ -125,7 +125,7 @@
 <script>
 import Api from '@/apis/api';
 import VersionFooter from '@/components/VersionFooter.vue';
-import { getUUID, goToPage, showDanger, showSuccess, sm2Encrypt, validateMobile } from '@/utils';
+import { goToPage, showDanger, showSuccess, sm2Encrypt, validateMobile } from '@/utils';
 import { mapState } from 'vuex';
 
 // 导入语言切换功能
@@ -177,7 +177,7 @@ export default {
   methods: {
     // 复用验证码获取方法
     fetchCaptcha() {
-      this.form.captchaId = getUUID();
+      this.form.captchaId = crypto.randomUUID();
       Api.user.getCaptcha(this.form.captchaId, (res) => {
         if (res.status === 200) {
           const blob = new Blob([res.data], { type: res.data.type });
diff --git a/main/manager-web/src/views/retrievePassword.vue b/main/manager-web/src/views/retrievePassword.vue
index 62a1118e..c30c5a33 100644
--- a/main/manager-web/src/views/retrievePassword.vue
+++ b/main/manager-web/src/views/retrievePassword.vue
@@ -101,7 +101,7 @@
 <script>
 import Api from '@/apis/api';
 import VersionFooter from '@/components/VersionFooter.vue';
-import { getUUID, goToPage, showDanger, showSuccess, validateMobile, sm2Encrypt } from '@/utils';
+import { goToPage, showDanger, showSuccess, validateMobile, sm2Encrypt } from '@/utils';
 import { mapState } from 'vuex';
 
 // 导入语言切换功能
@@ -144,7 +144,7 @@ export default {
   methods: {
     // 复用验证码获取方法
     fetchCaptcha() {
-      this.form.captchaId = getUUID();
+      this.form.captchaId = crypto.randomUUID();
       Api.user.getCaptcha(this.form.captchaId, (res) => {
         if (res.status === 200) {
           const blob = new Blob([res.data], { type: res.data.type });