Merge branch 'test' into 'master'

Test

See merge request !15

app/Exceptions/Handler.php

@@ -56,6 +56,11 @@ class Handler extends ExceptionHandler
 
         $path = $request->path();
 
+        var_dump($exception->getMessage());
+        var_dump($exception->getFile());
+        var_dump($exception->getLine());die;
+
+
         #检测当前请求是否是api路由
         if (stripos($path,'api/') === 0
                 && ($exception instanceof  \Symfony\Component\HttpKernel\Exception\NotFoundHttpException) ) {

app/Http/Controllers/Api/Client/MediaController.php

@@ -121,19 +121,13 @@ class MediaController extends Controller
             SrsHookValidate::srsHookCallback($request,[
                 'media_name'    => 'required',
                 'media_type'    => 'required',
-                'media_id'      => 'required',
+//                'media_id'      => 'required',
                 'access_key'    => '',
                 'secret_key'    => '',
                 'media_url'     => 'required',
                 'description' => '',
-                'start_time'  => 'required|date',
-                'end_time'    => 'required|date|after_or_equal:start_time',
-            ],null,[
-                'start_time.date'    => '开始时间格式错误',
-                'start_time.required'=> '开始时间不能为空',
-                'end_time.required'  => '结束时间不能为空',
-                'end_time.date'      => '结束时间格式错误',
-                'end_time.after_or_equal' => '结束时间不能小于开始时间'
+//                'start_time'  => 'required|date',
+//                'end_time'    => 'required|date|after_or_equal:start_time',
             ]);
 
             MediaModel::updatehookMedia($request,$id);

app/Model/MediaModel.php

@@ -225,36 +225,36 @@ class MediaModel extends Eloquent
             if (count($media_info)>=2){
 
                 $data = [
-                    '_id'           => $id,
+//                    '_id'           => $id,
                     'media_name'    => $request->media_name,
                     'media_type'    => $mediaCatg['name'],
                     'media_type_id' => $mediaCatg['_id'],
                     'book_num'      => $media_info[0],
                     'book_name'     => $media_info[1],
                     'media_url'     => $request->media_url,
-                    'access_key'    => $request->access_key,
-                    'secret_key'    => $request->secret_key,
-                    'create_time'   => date('Y-m-d H:i:s',time()),
+//                    'access_key'    => $request->access_key,
+//                    'secret_key'    => $request->secret_key,
+//                    'create_time'   => $media['create_time'],
                     'description'   => $request->description,
-                    'start_time'    => $request->start_time??'',
-                    'end_time'      => $request->end_time??'',
+//                    'start_time'    => $request->start_time??'',
+//                    'end_time'      => $request->end_time??'',
                 ];
 
             }else{
                 $data = [
-                    '_id'           => $id,
+//                    '_id'           => $id,
                     'media_name'    => $request->media_name,
                     'media_type'    => $mediaCatg['name'],
                     'media_type_id' => $mediaCatg['_id'],
                     'book_num'      => '',
                     'book_name'     => $request->media_name,
                     'media_url'     => $request->media_url,
-                    'access_key'    => $request->access_key,
-                    'secret_key'    => $request->secret_key,
-                    'create_time'   => date('Y-m-d H:i:s',time()),
+//                    'access_key'    => $request->access_key,
+//                    'secret_key'    => $request->secret_key,
+//                    'create_time'   => date('Y-m-d H:i:s',time()),
                     'description'   => $request->description,
-                    'start_time'    => $request->start_time??'',
-                    'end_time'      => $request->end_time??'',
+//                    'start_time'    => $request->start_time??'',
+//                    'end_time'      => $request->end_time??'',
                 ];
             }
 

config/database.php

@@ -85,11 +85,11 @@ return [
 
         'mongodb' => [
             'driver'   => 'mongodb',
-            'host'     => env('mg_host'),
-            'port'     => env('mg_port'),
+            'host'     => env('mg_host')??'mongo.eoffcn.com',
+            'port'     => env('mg_port')??'28017',
             'database' => 'video_media',
-            'username' => env('mg_username'),
-            'password' => env("mg_password"),
+            'username' => env('mg_username')??'root',
+            'password' => env("mg_password")??'FHHTH98AWAPoyweEasdfadfaaf',
             'options'  => [
                 'database' => 'admin', // sets the authentication database required by mongo 3
             ]
@@ -126,10 +126,24 @@ return [
         'client' => 'predis',
 
         'default' => [
-            'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
-            'database' => env('REDIS_DB', 0),
+//            'host' => env('rd_host', 'offcn-redis-svc'),
+//            'password' => env('REDIS_PASSWORD', 'test.eoffcn.com'),
+//            'port' => env('REDIS_PORT', 6379),
+//            'database' => env('REDIS_DB', 2),
+
+            'host' => 'offcn-redis-svc',
+            'password' => 'test.eoffcn.com',
+            'port' => 6379,
+            'database' => 1,
+
+        ],
+
+        'session' => [
+            'host' => 'offcn-redis-svc',
+            'password' => 'test.eoffcn.com',
+            'port' => 6379,
+            'database' => 2,
+
         ],
 
         'cache' => [

config/session.php

@@ -18,7 +18,8 @@ return [
     |
     */
 
-    'driver' => env('SESSION_DRIVER', 'file'),
+//    'driver' => env('SESSION_DRIVER', 'file'),
+    'driver' => 'redis',
 
     /*
     |--------------------------------------------------------------------------
@@ -31,7 +32,8 @@ return [
     |
     */
 
-    'lifetime' => env('SESSION_LIFETIME', 120),
+//    'lifetime' => env('SESSION_LIFETIME', 120),
+    'lifetime' => '30',
 
     'expire_on_close' => false,