Merge pull request #2355 from xinnan-tech/py_fix_uuid

update:暂时恢复先前的随机生成uuid

main/manager-mobile/src/pages/forgot-password/index.vue

@@ -114,9 +114,18 @@ 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 = crypto.randomUUID();
+  const uuid = generateUUID();
   formData.value.captchaId = uuid;
   captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }

main/manager-mobile/src/pages/login/index.vue

@@ -123,6 +123,15 @@ 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 // 全局或组件作用域
 
 //跳转至服务端设置页面
@@ -134,7 +143,7 @@ function goToServerSetting() {
 
 // 获取验证码
 async function refreshCaptcha() {
-  const uuid = crypto.randomUUID();
+  const uuid = generateUUID();
   formData.value.captchaId = uuid;
   captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }

main/manager-mobile/src/pages/register/index.vue

@@ -124,9 +124,18 @@ 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 = crypto.randomUUID();
+  const uuid = generateUUID();
   formData.value.captchaId = uuid;
   captchaImage.value = `${getEnvBaseUrl()}/user/captcha?uuid=${uuid}&t=${Date.now()}`;
 }

main/manager-web/src/utils/index.js

@@ -126,6 +126,17 @@ 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 手机号

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 { goToPage, showDanger, showSuccess, sm2Encrypt, validateMobile } from "@/utils";
+import { getUUID, 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 = crypto.randomUUID();
+        this.captchaUuid = getUUID();
 
         Api.user.getCaptcha(this.captchaUuid, (res) => {
           if (res.status === 200) {

main/manager-web/src/views/register.vue

@@ -125,7 +125,7 @@
 <script>
 import Api from '@/apis/api';
 import VersionFooter from '@/components/VersionFooter.vue';
-import { goToPage, showDanger, showSuccess, sm2Encrypt, validateMobile } from '@/utils';
+import { getUUID, goToPage, showDanger, showSuccess, sm2Encrypt, validateMobile } from '@/utils';
 import { mapState } from 'vuex';
 
 // 导入语言切换功能
@@ -177,7 +177,7 @@ export default {
   methods: {
     // 复用验证码获取方法
     fetchCaptcha() {
-      this.form.captchaId = crypto.randomUUID();
+      this.form.captchaId = getUUID();
       Api.user.getCaptcha(this.form.captchaId, (res) => {
         if (res.status === 200) {
           const blob = new Blob([res.data], { type: res.data.type });

main/manager-web/src/views/retrievePassword.vue

@@ -101,7 +101,7 @@
 <script>
 import Api from '@/apis/api';
 import VersionFooter from '@/components/VersionFooter.vue';
-import { goToPage, showDanger, showSuccess, validateMobile, sm2Encrypt } from '@/utils';
+import { getUUID, goToPage, showDanger, showSuccess, validateMobile, sm2Encrypt } from '@/utils';
 import { mapState } from 'vuex';
 
 // 导入语言切换功能
@@ -144,7 +144,7 @@ export default {
   methods: {
     // 复用验证码获取方法
     fetchCaptcha() {
-      this.form.captchaId = crypto.randomUUID();
+      this.form.captchaId = getUUID();
       Api.user.getCaptcha(this.form.captchaId, (res) => {
         if (res.status === 200) {
           const blob = new Blob([res.data], { type: res.data.type });