From 0a26361724438accaaf1a86bc16a15fe88d307a9 Mon Sep 17 00:00:00 2001 From: Pang Date: Thu, 4 Apr 2024 07:40:38 +0800 Subject: [PATCH] no message --- .../Controllers/Api/ProjectController.php | 4 ++-- app/Http/Controllers/Api/UsersController.php | 22 +++++++++---------- app/Models/Meeting.php | 16 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index b4df6c1ae..2b85a19d3 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -2301,7 +2301,7 @@ class ProjectController extends AbstractController $project = Project::userProject($task->project_id); ProjectPermission::userTaskPermission($project, ProjectPermission::TASK_MOVE, $task); // - if( $task->project_id == $project_id && $task->column_id == $column_id){ + if ($task->project_id == $project_id && $task->column_id == $column_id) { return Base::retSuccess('移动成功', ['id' => $task_id]); } // @@ -2310,7 +2310,7 @@ class ProjectController extends AbstractController if (empty($column)) { return Base::retError('列表不存在'); } - if($flow_item_id){ + if ($flow_item_id) { $flowItem = projectFlowItem::whereProjectId($project->id)->whereId($flow_item_id)->first(); if (empty($flowItem)) { return Base::retError('任务状态不存在'); diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 6cc56223a..a43c391a7 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -615,7 +615,7 @@ class UsersController extends AbstractController public function basic() { $sharekey = Request::header('sharekey'); - if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){ + if (empty($sharekey) || !Meeting::getShareInfo($sharekey)) { User::auth(); } // @@ -768,7 +768,7 @@ class UsersController extends AbstractController // if ($getCheckinMac) { $list->transform(function (User $user) use ($getCheckinMac) { - if($getCheckinMac){ + if ($getCheckinMac) { $user->checkin_macs = UserCheckinMac::select(['id', 'mac', 'remark'])->whereUserid($user->userid)->orderBy('id')->get(); } return $user; @@ -1149,11 +1149,11 @@ class UsersController extends AbstractController $sharekey = trim(Request::input('sharekey')); $username = trim(Request::input('username')); $user = null; - if(!empty($sharekey) && $type === 'join'){ - if(!Meeting::getShareInfo($sharekey)){ + if (!empty($sharekey) && $type === 'join') { + if (!Meeting::getShareInfo($sharekey)) { return Base::retError('分享链接已过期'); } - }else{ + } else { $user = User::auth(); } $isCreate = false; @@ -1187,9 +1187,9 @@ class UsersController extends AbstractController if (empty($meetingSetting['appid']) || empty($meetingSetting['app_certificate'])) { return Base::retError('会议功能配置错误，请联系管理员'); } - $uid = intval(str_pad(Base::generatePassword(4,1), 9, 8, STR_PAD_LEFT)); - if($user){ - $uid = intval(str_pad(Base::generatePassword(5,1), 6, 9, STR_PAD_LEFT).$user->userid); + $uid = intval(str_pad(Base::generatePassword(4, 1), 9, 8, STR_PAD_LEFT)); + if ($user) { + $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); @@ -1220,7 +1220,7 @@ class UsersController extends AbstractController // $data['appid'] = $meetingSetting['appid']; $data['uid'] = $uid; - $data['userimg'] = $sharekey ? Base::fillUrl('avatar/'.$username.'.png') : $user?->userimg; + $data['userimg'] = $sharekey ? Base::fillUrl('avatar/' . $username . '.png') : $user?->userimg; $data['nickname'] = $sharekey ? $username : $user?->nickname; $data['token'] = $token; $data['msgs'] = $msgs; @@ -1249,7 +1249,7 @@ class UsersController extends AbstractController { $meetingid = trim(Request::input('meetingid')); $sharekey = trim(Request::input('sharekey')); - if(empty($sharekey) || !Meeting::getShareInfo($sharekey)){ + if (empty($sharekey) || !Meeting::getShareInfo($sharekey)) { User::auth(); } $meeting = Meeting::whereMeetingid($meetingid)->first(); @@ -1970,7 +1970,7 @@ class UsersController extends AbstractController } } } else { - if($type == 'file'){ + if ($type == 'file') { $lists[] = [ 'type' => 'children', 'url' => Base::fillUrl("api/users/share/list") . "?pid=0", diff --git a/app/Models/Meeting.php b/app/Models/Meeting.php index 22e9a83f4..d922bb924 100644 --- a/app/Models/Meeting.php +++ b/app/Models/Meeting.php @@ -44,12 +44,12 @@ class Meeting extends AbstractModel public function getShareLink() { $code = base64_encode("{$this->meetingid}" . Base::generatePassword()); - Cache::put(self::CACHE_KEY.'_'.$code, [ + Cache::put(self::CACHE_KEY . '_' . $code, [ 'id' => $this->id, 'meetingid' => $this->meetingid, 'channel' => $this->channel, ], Carbon::now()->addHours(self::CACHE_EXPIRED_TIME)); - return Base::fillUrl("meeting/{$this->meetingid}/".$code); + return Base::fillUrl("meeting/{$this->meetingid}/" . $code); } /** @@ -58,19 +58,19 @@ class Meeting extends AbstractModel */ public static function getShareInfo($code) { - if(Cache::has(self::CACHE_KEY.'_'.$code)){ - return Cache::get(self::CACHE_KEY.'_'.$code); + if (Cache::has(self::CACHE_KEY . '_' . $code)) { + return Cache::get(self::CACHE_KEY . '_' . $code); } return null; } /** * 保存访客信息 - * @return mixed + * @return void */ public static function setTouristInfo($data) { - Cache::put(Meeting::CACHE_KEY.'_'.$data['uid'], [ + Cache::put(Meeting::CACHE_KEY . '_' . $data['uid'], [ 'uid' => $data['uid'], 'userimg' => $data['userimg'], 'nickname' => $data['nickname'], @@ -83,8 +83,8 @@ class Meeting extends AbstractModel */ public static function getTouristInfo($touristId) { - if(Cache::has(Meeting::CACHE_KEY.'_'.$touristId)){ - return Cache::get(Meeting::CACHE_KEY.'_'.$touristId); + if (Cache::has(Meeting::CACHE_KEY . '_' . $touristId)) { + return Cache::get(Meeting::CACHE_KEY . '_' . $touristId); } return null; }