From fb0ef19158b6b035cf80fb1ac9564b0bdf2f3cc9 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Tue, 5 Sep 2023 15:03:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BC=9A=E8=AE=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7id=E6=81=A2=E5=A4=8D=E4=B8=BA=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E5=8D=A0=E4=BD=8D=E6=95=B0=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?php=E6=9B=B4=E6=96=B0=E4=BA=86=EF=BC=8Capp=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E6=B2=A1=E6=9B=B4=E6=96=B0=E4=BF=A1=E6=81=AF=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php                  | 2 +-
 resources/assets/js/App.vue                                   | 2 +-
 resources/assets/js/pages/manage/components/MeetingPlayer.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 7cb25c3ec..a88459e54 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1180,7 +1180,7 @@ class UsersController extends AbstractController
         }
         $uid = intval(str_pad(Base::generatePassword(4,1), 9, 8, STR_PAD_LEFT));
         if($user){
-            $uid = intval(str_pad(Base::generatePassword(4,1), 5, 9, STR_PAD_LEFT).$user->userid);
+            $uid = intval(str_pad(Base::generatePassword(5,1), 6, 9, STR_PAD_LEFT).$user->userid);
         }
         try {
             $service = new AgoraTokenGenerator($meetingSetting['appid'], $meetingSetting['app_certificate'], $meeting->channel, $uid);
diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index b63917b53..54001ff3c 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -338,7 +338,7 @@ export default {
                         this.$store.dispatch("call", {
                             url: isTourist ? 'users/meeting/tourist' : 'users/basic',
                             data: {
-                                userid: uuid,
+                                userid: isTourist ? uuid : (uuid+'').substring(6),
                                 tourist_id: uuid,
                             }
                         }).then(({data}) => {
diff --git a/resources/assets/js/pages/manage/components/MeetingPlayer.vue b/resources/assets/js/pages/manage/components/MeetingPlayer.vue
index bafe17200..1e000bdba 100644
--- a/resources/assets/js/pages/manage/components/MeetingPlayer.vue
+++ b/resources/assets/js/pages/manage/components/MeetingPlayer.vue
@@ -67,7 +67,7 @@ export default {
                     this.getTouristInfo();
                     return 0;
                 }
-                return parseInt( (this.player.uid+"").substring(5) ) || 0
+                return parseInt( (this.player.uid+"").substring(6) ) || 0
             }
             return 0
         },