Merge branch 'develop' into feature/mzl_dev

# Conflicts:
#	composer.json
#	composer.lock

config/route.php

@@ -24,7 +24,7 @@ use Webman\Route;
 Route::any('/login', [app\controller\UserController::class, 'login'])->middleware([app\middleware\CrossDomain::class]);
 
 // 文件上传接口
-Route::post('/upload', [app\controller\UploadController::class, 'uploadImage']);
+Route::any('/upload', [app\controller\UploadController::class, 'uploadImage'])->middleware([app\middleware\CrossDomain::class]);