From cc168142564b966e9c898fbd3f0b09238e6fedab Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 26 Nov 2024 14:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/form/index.ts   |  4 ++++
 pages/form/index.ts | 26 ++++++--------------------
 utils/utils.ts      | 12 ------------
 3 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/api/form/index.ts b/api/form/index.ts
index 6ee1e23..684604b 100644
--- a/api/form/index.ts
+++ b/api/form/index.ts
@@ -17,3 +17,7 @@ export const GetRoomRtcToken = (roomNum: string) => Request({
   url: `/room/tk/rtc?roomNum=${roomNum}`,
   method: 'get',
 })
+export const GetOpenId = (code: string) => Request({
+  url: `/pub/mini-openid?js_code=${code}`,
+  method: 'get',
+})
diff --git a/pages/form/index.ts b/pages/form/index.ts
index e6234ba..e0974d9 100644
--- a/pages/form/index.ts
+++ b/pages/form/index.ts
@@ -1,4 +1,4 @@
-import { GetCheckoutRoomNum, PostAnonLogin, GetAgoraConf, GetRoomRtcToken } from '../../api/form/index'
+import { GetCheckoutRoomNum, PostAnonLogin, GetAgoraConf, GetRoomRtcToken, GetOpenId } from '../../api/form/index'
 import { getUUID } from '../../utils/utils'
 import { Message } from 'tdesign-miniprogram';
 import { startSignalr, onStop } from '../../utils/singlr';
@@ -15,14 +15,6 @@ Page({
     historicalList: [],
   },
   onShow() {
-    // wx.login({
-    //   //成功放回
-    //   success: (res) => {
-    //     const { code } = res
-    //     // appid=wx99885b1c181cda72&secret=edd9cdb04c3f59fe70f2a70c396e5b0d
-
-    //   }
-    // })
     const that = this;
     wx.getStorage({
       key: 'isConnected',
@@ -150,18 +142,12 @@ Page({
     GetCheckoutRoomNum(this.data.meetingForm.roomNum).then(res => {
       if (res.code === 200) {
         if (res.data) {
-          wx.getStorage({
-            key: "deviceId",
-            success(res: any) {
-              navigateToMeeting(res.data)
-            },
-            fail() {
-              const uuid = getUUID()
-              wx.setStorage({
-                key: "deviceId",
-                data: uuid
+          wx.login({
+            success: (res) => {
+              const { code } = res
+              GetOpenId(code).then(res => {
+                navigateToMeeting(res.data)
               })
-              navigateToMeeting(uuid)
             }
           })
         } else {
diff --git a/utils/utils.ts b/utils/utils.ts
index b9970e2..c2ae392 100644
--- a/utils/utils.ts
+++ b/utils/utils.ts
@@ -2,18 +2,6 @@ export const role = {
   ID: ['1', '3']
 }
 
-export const getUUID = (): string => {
-  var s = [] as any;
-  var hexDigits = "0123456789abcdef";
-  for (var i = 0; i < 36; i++) {
-    s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-  }
-  s[14] = "4";
-  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
-  s[8] = s[13] = s[18] = s[23] = "-";
-  return s.join("")
-}
-
 export const getStorage = async (key: string): Promise<void> => {
   return new Promise((resolve, reject) => {
     wx.getStorage({