Commit a5d2752d by 杨昕

code format

parent b84d4533
Pipeline #10837 passed with stages
in 45 seconds
......@@ -23,6 +23,7 @@ class IndexController extends Controller
$data['catgs'] = $mediaCatgs;
return view('admin.index',$data);
}
}
\ No newline at end of file
......@@ -35,12 +35,13 @@ class Kernel extends HttpKernel
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\ApiMiddleware::class,
\App\Http\Middleware\AdminLogin::class
],
'auth' => [\App\Http\Middleware\Apprialisal::class],
'api' => [
'throttle:60,1',
'bindings',
\App\Http\Middleware\ApiMiddleware::class,
],
];
......@@ -62,7 +63,6 @@ class Kernel extends HttpKernel
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
// 'admin.login' => \App\Http\Middleware\AdminLogin::class
];
/**
......
......@@ -18,10 +18,12 @@ class AdminLogin
*/
public function handle($request, Closure $next)
{
if (!Auth::guard('web')->check()) {
return redirect('/web/login');
}
// if (!Auth::guard('web')->check()) {
// return redirect('/web/login');
// }
$user = Auth::user();
$request->replace(array_merge($request->all(),['mis_uid'=>$user->mis_uid]));
//
// if (request()->isMethod('DELETE') || request()->isMethod('PUT')) {
// self::getPutValueHandle($request);
......
......@@ -19,6 +19,45 @@ class ApiMiddleware
*/
public function handle($request, Closure $next)
{
try {
$response = $next($request);
} catch (\App\Exceptions\FormException $e) {
list($code, $message) = [Response::HTTP_BAD_REQUEST, json_decode($e->getMessage(), true)];
} catch (\App\Exceptions\DatabaseException $e) {
list($code, $message) = [Response::HTTP_INTERNAL_SERVER_ERROR, json_decode($e->getMessage(), true)];
} catch (\App\Exceptions\ControllerException $e) {
list($code, $message) = [Response::HTTP_INTERNAL_SERVER_ERROR, json_decode($e->getMessage(), true)];
}
if (isset($code)) {
if (count($message) == 1) {
$message = $message[0];
} else if (count($message) == 2) {
list($code, $message) = $message;
} else if (count($message) == 3) {
list($client_info, $code, $message) = $message;
}
// Log::error('\\' . implode(CustomLog::getRoute()), $client_info, $code, $message, $request->all());
// Log::flush();
return error($message, $code);
}
return $response;
$url = $request->path();
$except_url = [
......
......@@ -49,8 +49,6 @@ class MediaCategoryModel extends Eloquent
throw new \Exception("获取商店列表失败");
}
$catgList = MediaCategoryModel::get()->toArray();
$appids = array_column($catgs['data'],"appid");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment