From b7eab7c2900deba35b56b5ddc237d692f0867456 Mon Sep 17 00:00:00 2001
From: wuzhihao <wuzhihao@finogeeks.com>
Date: Thu, 30 Jun 2022 14:58:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=20?=
 =?UTF-8?q?token=20=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js     | 24 ++++++++++++++++++++++--
 pages/meeting/meeting.js | 15 +++++----------
 utils/config.js          |  9 +++++++--
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 540ec62..76fb91d 100755
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,5 +1,5 @@
-const app = getApp()
 const Utils = require('../../utils/util.js')
+const { APPID, setToken } = require("../../utils/config.js");
 
 // pages/index/index.js.js
 Page({
@@ -29,6 +29,26 @@ Page({
         userInfo: userInfo
       });
     }
+
+    wx.request({
+      url: 'https://finogeeks-tools.finogeeks.club/test-report/agora/token',
+      method: 'post',
+      data: {
+        appId: APPID,
+        channel: 'finclip'
+      },
+      success(res) {
+        if (res.statusCode === 200 && res.data.token) {
+          setToken(res.data.token)
+        } else {
+          wx.showToast({
+            title: `获取 token 失败`,
+            icon: 'none',
+            duration: 5000
+          })
+        }
+      }
+    })
   },
 
   /**
@@ -134,4 +154,4 @@ Page({
     let value = e.detail.value;
     this.channel = value;
   }
-})
\ No newline at end of file
+})
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 49ea5db..a9b27a0 100755
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -4,11 +4,10 @@ const Utils = require('../../utils/util.js')
 // 微信平台 SDK
 // const AgoraMiniappSDK = require("../../lib/mini-app-sdk-production.js");
 // 凡泰平台 SDK
-const AgoraMiniappSDK = require("../../lib/finclip-agora-client-sdk.js");
+const AgoraMiniappSDK = require("../../lib/finclip-agora-client-sdk");
 const max_user = 10;
 const Layouter = require("../../utils/layout.js");
-const APPID = require("../../utils/config.js").APPID;
-const TOKEN = require("../../utils/config.js").TOKEN;
+const { APPID, getToken } = require("../../utils/config.js");
 
 /**
  * log relevant, remove these part and relevant code if not needed
@@ -558,13 +557,10 @@ Page({
       let client = {}
       if (this.testEnv) {
         client = new AgoraMiniappSDK.Client({
-          debug: true,
           servers: ["wss://miniapp.agoraio.cn/120-131-14-112/api"]
         });
       } else {
-        client = new AgoraMiniappSDK.Client({
-          debug: true
-        })
+        client = new AgoraMiniappSDK.Client()
       }
       //subscribe stream events
       this.subscribeEvents(client);
@@ -576,8 +572,7 @@ Page({
       this.client = client;
       client.init(APPID, () => {
         Utils.log(`client init success`);
-        // pass key instead of undefined if certificate is enabled
-        client.join(TOKEN, channel, uid, () => {
+        client.join(getToken(), channel, uid, () => {
           client.setRole(this.role);
           Utils.log(`client join channel success`);
           //and get my stream publish url
@@ -629,7 +624,7 @@ Page({
         Utils.log(`client init success`);
         // pass key instead of undefined if certificate is enabled
         Utils.log(`rejoin with uids: ${JSON.stringify(uids)}`);
-        client.rejoin(TOKEN, channel, uid, uids, () => {
+        client.rejoin(getToken(), channel, uid, uids, () => {
           Utils.log(`client join channel success`);
           if (this.isBroadcaster()) {
             client.publish(url => {
diff --git a/utils/config.js b/utils/config.js
index 8c34a75..c87efa4 100755
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,5 +1,5 @@
 const APPID = "1fa54c6d47074eea98833162a292497a";
-const TOKEN = "";
+let token = '';
 
 if(APPID === ""){
   wx.showToast({
@@ -11,5 +11,10 @@ if(APPID === ""){
 
 module.exports = {
   APPID: APPID,
-  TOKEN: TOKEN
+  getToken() {
+    return token;
+  },
+  setToken(val) {
+    token = val;
+  }
 }