Merge branch 'test' of https://gitlab.eoffcn.com/yf60144/media-resource into test

dflsj

app/Http/Controllers/Auth/LoginController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -36,4 +37,21 @@ class LoginController extends Controller
     {
         $this->middleware('guest')->except('logout');
     }
+
+
+    /**
+     * Log the user out of the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function logout(Request $request)
+    {
+        echo 444;
+//        $this->guard()->logout();
+//
+//        $request->session()->invalidate();
+//
+//        return $this->loggedOut($request) ?: redirect('/');
+    }
 }

app/Http/Controllers/Web/IndexController.php

@@ -23,6 +23,7 @@ class IndexController extends Controller
 
         $data['catgs'] = $mediaCatgs;
 
+
         return view('admin.index',$data);
     }
 }
\ No newline at end of file

app/Http/Kernel.php

@@ -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
     ];
 
     /**

app/Http/Middleware/AdminLogin.php

@@ -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);

app/Http/Middleware/ApiMiddleware.php

@@ -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 = [

app/Model/MediaCategoryModel.php

@@ -49,8 +49,6 @@ class MediaCategoryModel extends Eloquent
                 throw new \Exception("获取商店列表失败");
             }
 
-
-
             $catgList = MediaCategoryModel::get()->toArray();
 
             $appids = array_column($catgs['data'],"appid");