From f3a95b7a6f377fb2ccc9ea3e9600e6ec834350e6 Mon Sep 17 00:00:00 2001 From: mzl Date: Tue, 30 Sep 2025 09:13:57 +0800 Subject: [PATCH] Merge branch 'master' into develop # Conflicts: # app/process/CheckWeb.php --- app/common/controller/UploadController.php | 2 ++ app/process/CheckWeb.php | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/common/controller/UploadController.php b/app/common/controller/UploadController.php index 678034b..d90c84a 100644 --- a/app/common/controller/UploadController.php +++ b/app/common/controller/UploadController.php @@ -170,6 +170,8 @@ class UploadController 'original_name' => $file->getUploadName(), ]; + $partition = !empty($partition)?$partition:'other'; + $category = !empty($category)?$category:'other'; $recordResult = $uploadedFilesService->recordFileInfo($fileInfo, $request, $partition, $category); $data = []; $data['file_id'] = $recordResult['id']; diff --git a/app/process/CheckWeb.php b/app/process/CheckWeb.php index a7749fe..8baf5b8 100644 --- a/app/process/CheckWeb.php +++ b/app/process/CheckWeb.php @@ -11,7 +11,11 @@ class CheckWeb { if (getenv('ENVIRONMENT') === 'master') { new Crontab('0 */10 * * * *', function(){ - $this->check(); + $result = $this->tocurl('https://magicbridgeauto.com'); + if (!preg_match('/magicbridgeauto/', $result['body'])) { + flg("【magicbridgeauto】疑似被篡改"); + } + return true; }); } } @@ -25,6 +29,7 @@ class CheckWeb // } else { flg("【magicbridgeauto】疑似被篡改"); } + return true; }