Merge branch 'master' into develop

# Conflicts:
#	app/process/CheckWeb.php

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'];

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