Merge branch 'master' into 'test'

# Conflicts:
#   app/Http/Controllers/Api/MediaController.php
#   app/Model/MediaModel.php

app/Model/MediaModel.php

@@ -663,6 +663,7 @@ class MediaModel extends Eloquent
                 LogModel::addlog(["添加媒资信息" => $data, ['媒资ID为：=> ' . $id]]);
 
                 return $id;
+
             }
 
 

config/laravels.php

@@ -59,8 +59,8 @@ return [
     'swoole'                   => [
         'daemonize'          => env('LARAVELS_DAEMONIZE', false),
         'dispatch_mode'      => 2,
-        'reactor_num'        => env('LARAVELS_REACTOR_NUM', function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 4),
-        'worker_num'         => env('LARAVELS_WORKER_NUM', function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8),
+        'reactor_num'        => env('LARAVELS_REACTOR_NUM', function_exists('swoole_cpu_num') ? swoole_cpu_num() * 1 : 2),
+        'worker_num'         => env('LARAVELS_WORKER_NUM', function_exists('swoole_cpu_num') ? swoole_cpu_num() * 1 : 4),
         //'task_worker_num'    => env('LARAVELS_TASK_WORKER_NUM', function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8),
         'task_ipc_mode'      => 1,
         'task_max_request'   => env('LARAVELS_TASK_MAX_REQUEST', 8000),

public/healthcheck.php

+<?php
+echo "heal ok";
+?>
\ No newline at end of file