Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -21,7 +21,7 @@ class FileController extends BaseController
      */
      */
     public function upload(Request $request){
     public function upload(Request $request){
         // 上传文件
         // 上传文件
-        $files = Upload::puts('files', $this->param['config']);
+        $files = Upload::puts('files', $this->param['config'] ?? 'default');
         foreach ($files as &$file){
         foreach ($files as &$file){
             $file = Upload::path2url($file);
             $file = Upload::path2url($file);
         }
         }
@@ -36,7 +36,7 @@ class FileController extends BaseController
      * @date 2023/4/20
      * @date 2023/4/20
      */
      */
     public function download(Request $request){
     public function download(Request $request){
-        $path = Upload::url2path($this->param['url']);
+        $path = Upload::url2path($this->param['url'] ?? '');
         return Storage::disk('upload')->download($path);
         return Storage::disk('upload')->download($path);
     }
     }
 }
 }

@@ -7,6 +7,7 @@ use App\Http\Middleware\Aside\BlackListMiddleware as AsideBlackListMiddleware;
 use App\Http\Middleware\Aside\ManageLogMiddleware;
 use App\Http\Middleware\Aside\ManageLogMiddleware;
 use App\Http\Middleware\Aside\ParamMiddleware as AsideParamMiddleware;
 use App\Http\Middleware\Aside\ParamMiddleware as AsideParamMiddleware;
 use App\Http\Middleware\Bside\BlackListMiddleware as BsideBlackListMiddleware;
 use App\Http\Middleware\Bside\BlackListMiddleware as BsideBlackListMiddleware;
+use App\Http\Middleware\Bside\EnableCrossRequestMiddleware;
 use App\Http\Middleware\Bside\ParamMiddleware as BsideParamMiddleware;
 use App\Http\Middleware\Bside\ParamMiddleware as BsideParamMiddleware;
 use App\Http\Middleware\Aside\LoginAuthMiddleware as AsideLoginAuthMiddleware;
 use App\Http\Middleware\Aside\LoginAuthMiddleware as AsideLoginAuthMiddleware;
 use App\Http\Middleware\Bside\LoginAuthMiddleware as BsideLoginAuthMiddleware;
 use App\Http\Middleware\Bside\LoginAuthMiddleware as BsideLoginAuthMiddleware;
@@ -71,7 +72,9 @@ class Kernel extends HttpKernel
             //黑名单处理中间件
             //黑名单处理中间件
             BsideBlackListMiddleware::class,
             BsideBlackListMiddleware::class,
             //防重复调用接口
             //防重复调用接口
-            PreventRepeatQuitCallMiddleware::class
+            PreventRepeatQuitCallMiddleware::class,
+            //允许跨域请求
+            EnableCrossRequestMiddleware::class
         ]
         ]
     ];
     ];
 
 

+<?php
+
+namespace App\Http\Middleware\Bside;
+
+use Closure;
+
+class EnableCrossRequestMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $response = $next($request);
+        $origin = $request->server('HTTP_ORIGIN') ?: '';
+//        $allow_origin = [
+//            'http://localhost:8080',
+//        ];
+//        if (in_array($origin, $allow_origin)) {
+            $header = [
+//                'Access-Control-Allow-Origin' => $origin,
+                'Access-Control-Allow-Origin' => '*',
+                'Access-Control-Allow-Headers' => '*',
+                'Access-Control-Expose-Headers' => '*',
+                'Access-Control-Allow-Methods' => 'POST, GET, OPTIONS',
+                'Access-Control-Allow-Credentials' => 'true',
+            ];
+            $response->headers->add($header);
+//        }
+        return $response;
+    }
+}