test

app/Http/Controllers/Api/MediaController.php

@@ -5,10 +5,12 @@ namespace App\Http\Controllers\Api;
 use App\Exceptions\FormException;
 use App\Model\MediaModel;
 use App\Model\QiniuModel;
+use App\Tool\Constant;
 use App\Tool\SrsHookValidate;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\DB;
 use MongoBinData;
 
 use MongoDB\BSON\UTCDateTime;
@@ -73,19 +75,64 @@ class MediaController extends Controller
                 'page_size'     => 'integer',
                 'start_time'    => 'date',
                 'end_time'      => 'date',
+                'category_id'   => ''
             ]);
 
-            if (!isset($request->media_type_id)){
-                $request->replace(array_merge($request->all(),['media_type_id'=>'5efa9cb5d16f5a214671fd86']));
+            if (!isset($request->category_id)){
+                $request->replace(array_merge($request->all(),['category_id'=>'5efa9cb5d16f5a214671fd86']));
             }
 
             return MediaModel::mediaList($request);
 
         });
+
+        return success($res);
+    }
+
+
+    public function test(Request $request){
+
+        $res = [];
+
+        for ($i = 0;$i<=5;$i++){
+
+            $url = "http://eoffcn.com/api/user/media_list_once?page=".$i.'&page_size=1000';
+            $result = http_request_code($url,null,'GET');
+
+            $medias = json_decode($result,true);
+
+            if (isset($medias['data']['data']) && !empty($medias['data']['data'])){
+
+                $data = $medias['data']['data'];
+
+
+                if (!empty($data)){
+
+                    foreach ($data as $media){
+                        $tmp_arr = MediaModel::where("media_name",$media['media_name'])->where("media_type_id","5efa9ca25b742508e81f2d55")->get();
+                        if (count($tmp_arr)>=2){
+
+                            var_dump($media);
+                            MediaModel::deleteMediaById($request,$media["_id"]);
+
+                        }
+
+                    }
+                }
+
+            }
+            echo "sleep";
+
+        }
+
         return success($res);
+
     }
 
 
+
+
+
     /**
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
@@ -168,8 +215,21 @@ class MediaController extends Controller
         $id = handler_drive(function () use ($request,$media_id) {
 
             SrsHookValidate::srsHookCallback($request,[
-                'status'    => ''
-            ]);
+                'status'    => '',
+                'secret_key'  => '',
+                'media_url'   => '',
+            ],function ($items){
+
+                $request = $items;
+
+                if ($request->status){
+
+                    if (!$request->media_url || !$request->secret_key){
+                        throw new FormException("参数缺失");
+                    }
+                }
+
+            });
 
             $id = MediaModel::updateMediaStatus($request,$media_id);
 

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/Controllers/Web/LoginController.php

@@ -27,7 +27,6 @@ use Illuminate\Support\Facades\DB;
 
 class LoginController extends Controller
 {
-
     /**
      * @param Request $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\JsonResponse|\Illuminate\View\View

app/Http/Kernel.php

@@ -31,16 +31,17 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-             \Illuminate\Session\Middleware\AuthenticateSession::class,
+//             \Illuminate\Session\Middleware\AuthenticateSession::class,
             \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 = [
             'web/login',

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

app/Model/MediaModel.php

@@ -601,10 +601,18 @@ class MediaModel extends Eloquent
             }
 
             $data = [
-                'status'        => $request->status??""
-//                'description'   => $request->description,
+                'status'        => $request->status??"",
             ];
 
+            if ($request->status == 1){
+                LogModel::addlog(["media重新转码"=>json_encode($media)]);
+
+                if ($request->media_secret != $media['secret_key']){
+                    $data['secret_key'] = $request->secret_key;
+                    $data['media_url']  = $request->media_url;
+                }
+            }
+
             $flag = MediaModel::where("_id",$media_id)->update($data);
             if (!$flag){
                 throw new \Exception("Status更新失败");