diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index fa811e6a1..c0a179ea1 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -1151,7 +1151,7 @@ class ProjectController extends AbstractController } try { Madzipper::make($zipPath)->add($xlsPath)->close(); - } catch (\Exception) { + } catch (\Throwable) { } // if (file_exists($zipPath)) { @@ -1386,7 +1386,7 @@ class ProjectController extends AbstractController // try { ProjectTask::userTask($file->task_id, null); - } catch (\Exception $e) { + } catch (\Throwable $e) { abort(403, $e->getMessage() ?: "This file not support download."); } // diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index b7bcf7d7e..f71b71a05 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -661,7 +661,7 @@ class SystemController extends AbstractController ->html('
收到此电子邮件意味着您的邮箱配置正确。
Receiving this email means that your mailbox is configured correctly.
')) ->send(); return Base::retSuccess('成功发送'); - } catch (\Exception $e) { + } catch (\Throwable $e) { // 一般是请求超时 if (str_contains($e->getMessage(), "Timed Out")) { return Base::retError("language.TimedOut"); diff --git a/app/Models/AbstractModel.php b/app/Models/AbstractModel.php index 7174ffe97..03b6a614a 100644 --- a/app/Models/AbstractModel.php +++ b/app/Models/AbstractModel.php @@ -46,7 +46,7 @@ class AbstractModel extends Model { try { return $this->save(); - } catch (\Exception $e) { + } catch (\Throwable) { return false; } } diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 8f514bbb2..bf8bad66b 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -7,12 +7,9 @@ use App\Module\Base; use App\Tasks\PushTask; use Arr; use Carbon\Carbon; -use Config; use DB; -use Exception; use Hhxsv5\LaravelS\Swoole\Task\Task; use Illuminate\Database\Eloquent\SoftDeletes; -use Mail; use Request; /** @@ -1245,7 +1242,7 @@ class ProjectTask extends AbstractModel // try { $project = Project::userProject($task->project_id); - } catch (Exception $e) { + } catch (\Throwable $e) { if ($task->owner === null) { throw new ApiException($e->getMessage(), [ 'task_id' => $task_id ], -4002); } diff --git a/app/Module/Base.php b/app/Module/Base.php index baab10657..14e658fce 100755 --- a/app/Module/Base.php +++ b/app/Module/Base.php @@ -6,7 +6,6 @@ use App\Exceptions\ApiException; use App\Models\Setting; use App\Models\Tmp; use Cache; -use Exception; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Config; use Redirect; @@ -285,7 +284,7 @@ class Base { try { Storage::makeDirectory($path); - } catch (Exception $e) { + } catch (\Throwable $e) { } if (!file_exists($path)) { self::makeDir(dirname($path)); @@ -486,7 +485,7 @@ class Base try { $array = json_decode($string, true); return is_array($array) ? $array : []; - } catch (Exception $e) { + } catch (\Throwable) { return []; } } @@ -504,7 +503,7 @@ class Base } try { return json_encode($array, $options); - } catch (Exception $e) { + } catch (\Throwable) { return ''; } } @@ -2356,7 +2355,7 @@ class Base if ($param['size'] > 0 && $fileSize > $param['size'] * 1024) { return Base::retError('文件大小超限,最大限制:' . $param['size'] . 'KB'); } - } catch (Exception $e) { + } catch (\Throwable) { $fileSize = 0; } $scaleName = ""; @@ -2613,7 +2612,7 @@ class Base try { $white = imagecolorallocate($dst, 255, 255, 255); imagefill($dst, 0, 0, $white); - } catch (Exception $e) { + } catch (\Throwable) { } if (function_exists('imagecopyresampled')) { diff --git a/app/Module/Ihttp.php b/app/Module/Ihttp.php index bacefe32b..587f35a53 100755 --- a/app/Module/Ihttp.php +++ b/app/Module/Ihttp.php @@ -2,8 +2,6 @@ namespace App\Module; -use Exception; - @error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING); class Ihttp @@ -88,7 +86,7 @@ class Ihttp return Base::retError($error); } else { if ($isGb2312) { - try { $data = iconv('GB2312', 'UTF-8', $data); }catch (Exception $e) { } + try { $data = iconv('GB2312', 'UTF-8', $data); }catch (\Throwable) { } } $response = self::ihttp_response_parse($data); Base::addLog([ @@ -148,7 +146,7 @@ class Ihttp $content .= fgets($fp, 512); fclose($fp); if ($isGb2312) { - try { $content = iconv('GB2312', 'UTF-8', $content); }catch (Exception $e) { } + try { $content = iconv('GB2312', 'UTF-8', $content); }catch (\Throwable) { } } $response = self::ihttp_response_parse($content, true); Base::addLog([ diff --git a/app/Tasks/AbstractTask.php b/app/Tasks/AbstractTask.php index 38351e6d5..ec5bb1338 100644 --- a/app/Tasks/AbstractTask.php +++ b/app/Tasks/AbstractTask.php @@ -27,7 +27,7 @@ abstract class AbstractTask extends Task { try { $this->start(); - } catch (\Exception $e) { + } catch (\Throwable $e) { $this->info($e); $this->failed($e); } diff --git a/app/Tasks/PushTask.php b/app/Tasks/PushTask.php index 1f0fe71ca..bc781a03b 100644 --- a/app/Tasks/PushTask.php +++ b/app/Tasks/PushTask.php @@ -172,7 +172,7 @@ class PushTask extends AbstractTask try { $swoole->push($fid, Base::array2json($msg)); $tmpMsgId > 0 && WebSocketTmpMsg::whereId($tmpMsgId)->update(['send' => 1]); - } catch (\Exception $e) { + } catch (\Throwable) { } }