From aeafdb1ce2530aa249661b1e7b00a66f1d26374c Mon Sep 17 00:00:00 2001 From: ZBrettonYe Date: Tue, 27 Oct 2020 20:04:16 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Jobs/VNet/addUser.php | 6 +++--- app/Jobs/VNet/delUser.php | 6 +++--- app/Jobs/VNet/editUser.php | 6 +++--- app/Jobs/VNet/reloadNode.php | 4 +++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/Jobs/VNet/addUser.php b/app/Jobs/VNet/addUser.php index 24137a53..d43937f2 100644 --- a/app/Jobs/VNet/addUser.php +++ b/app/Jobs/VNet/addUser.php @@ -55,9 +55,9 @@ class addUser implements ShouldQueue $message = $response->json(); if ($message && Arr::has($message, ['success', 'content']) && $response->ok()) { if ($message['success'] === 'false') { - Log::warning("【新增用户】推送失败(推送地址:".$host.",返回内容:".$message['content'].")"); + Log::warning('【新增用户】推送失败(推送地址:'.$host.',返回内容:'.$message['content'].')'); } else { - Log::info("【新增用户】推送成功(推送地址:".$host.",内容:".json_encode($this->data, true).")"); + Log::info('【新增用户】推送成功(推送地址:'.$host.',内容:'.json_encode($this->data, true).')'); } } } @@ -65,6 +65,6 @@ class addUser implements ShouldQueue // 队列失败处理 public function failed(Throwable $exception) { - Log::error("【新增用户】推送异常:".$exception->getMessage()); + Log::error('【新增用户】推送异常:'.$exception->getMessage()); } } diff --git a/app/Jobs/VNet/delUser.php b/app/Jobs/VNet/delUser.php index c2b60990..407e2435 100644 --- a/app/Jobs/VNet/delUser.php +++ b/app/Jobs/VNet/delUser.php @@ -48,9 +48,9 @@ class delUser implements ShouldQueue $message = $response->json(); if ($message && Arr::has($message, ['success', 'content']) && $response->ok()) { if ($message['success'] === 'false') { - Log::warning("【删除用户】推送失败(推送地址:".$host.",返回内容:".$message['content'].")"); + Log::warning('【删除用户】推送失败(推送地址:'.$host.',返回内容:'.$message['content'].')'); } else { - Log::info("【删除用户】推送成功(推送地址:".$host.",内容:".json_encode($this->userIds, true).")"); + Log::info('【删除用户】推送成功(推送地址:'.$host.',内容:'.json_encode($this->userIds, true).')'); } } } @@ -58,6 +58,6 @@ class delUser implements ShouldQueue // 队列失败处理 public function failed(Throwable $exception) { - Log::error("【删除用户】推送异常:".$exception->getMessage()); + Log::error('【删除用户】推送异常:'.$exception->getMessage()); } } diff --git a/app/Jobs/VNet/editUser.php b/app/Jobs/VNet/editUser.php index 03c24be6..ae689227 100644 --- a/app/Jobs/VNet/editUser.php +++ b/app/Jobs/VNet/editUser.php @@ -50,9 +50,9 @@ class editUser implements ShouldQueue $message = $response->json(); if ($message && Arr::has($message, ['success', 'content']) && $response->ok()) { if ($message['success'] === 'false') { - Log::warning("【编辑用户】推送失败(推送地址:".$host.",返回内容:".$message['content'].")"); + Log::warning('【编辑用户】推送失败(推送地址:'.$host.',返回内容:'.$message['content'].')'); } else { - Log::info("【编辑用户】推送成功(推送地址:".$host.",内容:".json_encode($this->data, true).")"); + Log::info('【编辑用户】推送成功(推送地址:'.$host.',内容:'.json_encode($this->data, true).')'); } } } @@ -60,6 +60,6 @@ class editUser implements ShouldQueue // 队列失败处理 public function failed(Throwable $exception) { - Log::warning("【编辑用户】推送异常:".$exception->getMessage()); + Log::warning('【编辑用户】推送异常:'.$exception->getMessage()); } } diff --git a/app/Jobs/VNet/reloadNode.php b/app/Jobs/VNet/reloadNode.php index b2566b59..f6f63fd4 100644 --- a/app/Jobs/VNet/reloadNode.php +++ b/app/Jobs/VNet/reloadNode.php @@ -65,10 +65,12 @@ class reloadNode implements ShouldQueue if ($message && Arr::has($message, ['success', 'content']) && $response->ok()) { if ($message['success'] === 'false') { Log::warning('【重载节点】失败:'.$host.' 反馈:'.$message['content']); + return false; } Log::info('【重载节点】成功:'.$host.' 反馈:'.$message['content']); + return true; } Log::warning('【重载节点】失败:'.$host); @@ -79,6 +81,6 @@ class reloadNode implements ShouldQueue // 队列失败处理 public function failed(Throwable $exception) { - Log::error("【重载节点】推送异常:".$exception); + Log::error('【重载节点】推送异常:'.$exception); } }