diff --git a/app/Http/Middleware/QueryFilter.php b/app/Http/Middleware/QueryFilter.php index 4452c13..5328e64 100644 --- a/app/Http/Middleware/QueryFilter.php +++ b/app/Http/Middleware/QueryFilter.php @@ -3,6 +3,7 @@ namespace App\Http\Middleware; use Closure; +use Illuminate\Support\Facades\Session; class QueryFilter { @@ -19,7 +20,16 @@ public function handle($request, Closure $next) $route_name = data_get($action, 'as'); if ($route_name && ends_with($route_name, '.index') && $request->isMethod('get')) { $session_key = QueryFilter::getKey($route_name); - session([$session_key => $request->all()]); + + $filters = array_merge(Session::get($session_key, []), $request->all()); + if (count($filters) > 0) { + Session::put($session_key, $filters); + foreach ($filters as $key => $value) { + $request->offsetSet($key, $value); + } + } else { + Session::forget($session_key); + } } return $next($request); } diff --git a/app/Services/AliOssAdapter.php b/app/Services/AliOssAdapter.php index 5606597..bf14f99 100644 --- a/app/Services/AliOssAdapter.php +++ b/app/Services/AliOssAdapter.php @@ -14,7 +14,6 @@ class AliOssAdapter extends BaseAliOssAdapter */ public function getUrl( $path ) { - if (!$this->has($path)) throw new FileNotFoundException($filePath.' not found'); return ( $this->ssl ? 'https://' : 'http://' ) . $this->endPoint . '/' . ltrim($path, '/'); } }