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 },