update laravels 3.7.0

lisgroup · lisgroup · commit c52ea5489fe5 · 2020-06-15T17:41:42.000+08:00
Adjust the handling of custom asynchronous events
diff --git a/laravel/.env.example b/laravel/.env.example
@@ -75,4 +75,5 @@ LARAVELS_LISTEN_IP=0.0.0.0
 LARAVELS_LISTEN_PORT=5200
 LARAVELS_INOTIFY_RELOAD=false
 LARAVELS_DAEMONIZE=false
+LARAVELS_TIMER=true
 # laravels 配置
diff --git a/laravel/app/Events/ApiExcelSwooleEvent.php b/laravel/app/Events/ApiExcelSwooleEvent.php
@@ -10,10 +10,15 @@
 
 namespace App\Events;
 
+use App\Listeners\ApiExcelSwooleListener;
 use Hhxsv5\LaravelS\Swoole\Task\Event;
 
 class ApiExcelSwooleEvent extends Event
 {
+    protected $listeners = [
+        ApiExcelSwooleListener::class,
+    ];
+
     private $data;
 
     public function __construct($data)
diff --git a/laravel/app/Events/LoginSwooleEvent.php b/laravel/app/Events/LoginSwooleEvent.php
@@ -3,6 +3,7 @@
 namespace App\Events;
 
 
+use App\Listeners\LoginSwooleListener;
 use Hhxsv5\LaravelS\Swoole\Task\Event;
 // use Illuminate\Queue\SerializesModels;
 // use Illuminate\Foundation\Events\Dispatchable;
@@ -13,7 +14,9 @@
 
 class LoginSwooleEvent extends Event
 {
-    // use Dispatchable, InteractsWithSockets, SerializesModels;
+    protected $listeners = [
+        LoginSwooleListener::class,
+    ];
 
     /**
      * @var User 用户模型
diff --git a/laravel/app/Events/TestEvent.php b/laravel/app/Events/TestEvent.php
@@ -10,10 +10,16 @@
 
 namespace App\Events;
 
+use App\Listeners\TestListener;
 use Hhxsv5\LaravelS\Swoole\Task\Event;
 
 class TestEvent extends Event
 {
+    protected $listeners = [
+        // Listener list
+        TestListener::class,
+    ];
+
     private $data;
 
     public function __construct($data)
@@ -25,4 +31,4 @@ public function getData()
     {
         return $this->data;
     }
-}
+}
diff --git a/laravel/app/Http/Controllers/Api/ApiExcelController.php b/laravel/app/Http/Controllers/Api/ApiExcelController.php
@@ -144,6 +144,7 @@ public function startTask(Request $request)
         // 如果是 cli 模式使用 laravels Task 异步事件
         if (PHP_SAPI == 'cli' && extension_loaded('swoole')) {
             // 触发事件--实例化并通过fire触发，此操作是异步的，触发后立即返回，由Task进程继续处理监听器中的handle逻辑
+            // \Log::info(__CLASS__.': start task', $data);
             $event = new ApiExcelSwooleEvent($data);
             // $event = new TestEvent('event data');
             // $event->delay(10); // 延迟10秒触发
diff --git a/laravel/app/Listeners/ApiExcelSwooleListener.php b/laravel/app/Listeners/ApiExcelSwooleListener.php
@@ -10,24 +10,25 @@
 namespace App\Listeners;
 
 
+use App\Events\ApiExcelSwooleEvent;
 use App\Http\Repository\MultithreadingRepository;
 use App\Models\ApiExcel;
-use Hhxsv5\LaravelS\Swoole\Task\Event;
 use Hhxsv5\LaravelS\Swoole\Task\Listener;
 
 class ApiExcelSwooleListener extends Listener
 {
-    // 声明没有参数的构造函数
-    public function __construct()
-    {
-    }
+    /**
+     * @var ApiExcelSwooleEvent
+     */
+    protected $event;
 
-    public function handle(Event $event)
+    public function handle()
     {
-        \Log::info(__CLASS__.':handle start', [$event->getData()]);
+        $data = $this->event->getData();
+        \Log::info(__CLASS__.': handle start', [$data]);
         // 获取事件中保存的数据
         // $data = ['id' => 6, 'state' => 1, 'upload_url' => '/storage/20190318_103542_5c8f03fe14d89.xlsx'];
-        $data = $event->getData();
+        // $data = $event->getData();
         // 根据状态处理数据
         switch ($data['state']) {
             case 1:
@@ -53,7 +54,9 @@ public function handle(Event $event)
                             // 更新任务失败
                             $apiExcel->state = 5;
                             $apiExcel->save();
-                            throw new \Exception(date('Y-m-d H:i:s').' 任务失败： 第三方请求错误～！'.$param['url']);
+                            \Log::error(__CLASS__.': Line '.__LINE__.' - error'.date('Y-m-d H:i:s').' 任务失败： 第三方请求错误～！'.$param['url'], []);
+                            return;
+                            // throw new \Exception(date('Y-m-d H:i:s').' 任务失败： 第三方请求错误～！'.$param['url']);
                         }
 
                         /************************* 2. 写入 Excel 文件 ******************************/
@@ -62,7 +65,9 @@ public function handle(Event $event)
                         if (!$fileName) {
                             $apiExcel->state = 5;
                             $apiExcel->save();
-                            throw new \Exception(date('Y-m-d H:i:s').' 任务失败： Writer\Exception～！');
+                            \Log::error(__CLASS__.': Line '.__LINE__.' - error'.date('Y-m-d H:i:s').' 任务失败： Writer\Exception～！', []);
+                            return;
+                            // throw new \Exception(date('Y-m-d H:i:s').' 任务失败： Writer\Exception～！');
                         }
 
                         // 更新任务状态
@@ -71,7 +76,7 @@ public function handle(Event $event)
                         $apiExcel->save();
                     }
                 } else {
-                    \Log::info(__CLASS__.':handle out', [$event->getData()]);
+                    \Log::info(__CLASS__.': No Task Work, Line '.__LINE__, [$data]);
                 }
                 break;
             default:
diff --git a/laravel/app/Listeners/LoginSwooleListener.php b/laravel/app/Listeners/LoginSwooleListener.php
@@ -3,17 +3,17 @@
 namespace App\Listeners;
 
 
-use Hhxsv5\LaravelS\Swoole\Task\Event;
+use App\Events\LoginSwooleEvent;
 use Hhxsv5\LaravelS\Swoole\Task\Listener;
 use Illuminate\Support\Facades\DB;
 use Zhuzhichao\IpLocationZh\Ip;
 
 class LoginSwooleListener extends Listener
 {
-    // 声明没有参数的构造函数
-    public function __construct()
-    {
-    }
+    /**
+     * @var LoginSwooleEvent
+     */
+    protected $event;
 
     /**
      * 失败重试次数
@@ -24,11 +24,10 @@ public function __construct()
 
     /**
      * handle 方法中处理事件
-     *
-     * @param Event $event
      */
-    public function handle(Event $event)
+    public function handle()
     {
+        $event = $this->event;
         // 获取事件中保存的信息
         $user = $event->getUser();
         $agent = $event->getAgent();
diff --git a/laravel/app/Listeners/TestListener.php b/laravel/app/Listeners/TestListener.php
@@ -9,28 +9,26 @@
 
 namespace App\Listeners;
 
+use App\Events\TestEvent;
 use App\Tasks\TestTask;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
-use Hhxsv5\LaravelS\Swoole\Task\Event;
 use Hhxsv5\LaravelS\Swoole\Task\Listener;
 
 class TestListener extends Listener
 {
-    // 声明没有参数的构造函数
-    public function __construct()
-    {
-    }
+    /**
+     * @var TestEvent
+     */
+    protected $event;
 
-    public function handle(Event $event)
+    public function handle()
     {
-        \Log::info(__CLASS__.':handle start', [$event->getData()]);
+        \Log::info(__CLASS__.':handle start', [$this->event->getData()]);
         sleep(2);// 模拟一些慢速的事件处理
         // 监听器中也可以投递Task，但不支持Task的finish()回调。
-        // 注意：
-        // 1.参数2需传true
-        // 2.config/laravels.php中修改配置 task_ipc_mode 为1或2，参考 https://wiki.swoole.com/wiki/page/296.html
-        // $ret = Task::deliver(new TaskEvent('task data'), true);
-        // var_dump($ret);
+        // 注意：config/laravels.php中修改配置task_ipc_mode为1或2，参考 https://wiki.swoole.com/#/server/setting?id=task_ipc_mode
+        $ret = Task::deliver(new TestTask('task data'));
+        var_dump($ret);
         // throw new \Exception('an exception');// handle时抛出的异常上层会忽略，并记录到Swoole日志，需要开发者try/catch捕获处理
     }
-}
+}
diff --git a/laravel/app/User.php b/laravel/app/User.php
@@ -30,6 +30,15 @@ class User extends Authenticatable implements JWTSubject
         'password', 'remember_token',
     ];
 
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+
     /**
      * @return mixed|string
      */
@@ -109,9 +118,36 @@ public function hasPermissionMy($permissionName)
      * @param $permissions []
      * @param $option [] valid_all 是否判断全部权限
      *
-     * @var array
+     * @return array|bool|null
      */
-    protected $casts = [
-        'email_verified_at' => 'datetime',
-    ];
+    function hasPermission($permissions, $option = [])
+    {
+        $option = array_merge(['valid_all' => false,], $option);
+        if (!is_array($permissions)) $permissions = [$permissions];
+        $gates = cacheUserRolesAndPermissions(\Auth::id(), false);
+
+        foreach ($permissions as $permission) {
+            if (in_array($permission, $gates['permissions'])) {
+                if (!$option['valid_all']) {
+                    return true;
+                }
+            } else {
+                if ($option['valid_all']) {
+                    return false;
+                }
+            }
+        }
+        if ($option['valid_all'])
+            return true;
+        else
+            return false;
+    }
+
+    // 给用户分配角色
+    public function assignRole($role)
+    {
+        return $this->roles()->save(
+            Role::whereName($role)->firstOrFail()
+        );
+    }
 }
diff --git a/laravel/config/laravels.php b/laravel/config/laravels.php
@@ -12,7 +12,7 @@
     'handle_static'            => env('LARAVELS_HANDLE_STATIC', false),
     'laravel_base_path'        => env('LARAVEL_BASE_PATH', base_path()),
     'inotify_reload'           => [
-        'enable'        => env('LARAVELS_INOTIFY_RELOAD', true),
+        'enable'        => env('LARAVELS_INOTIFY_RELOAD', false),
         'watch_path'    => base_path(),
         'file_types'    => ['.php'],
         'excluded_dirs' => [],
@@ -23,44 +23,42 @@
         'enable'  => true, // 看清楚，这里是true
         'handler' => \App\Services\WebSocketService::class,
     ],
-    'sockets'                  => [
-    ],
+    'sockets'                  => [],
     'processes'                => [
+        //[
+        //    'class'    => \App\Processes\TestProcess::class,
+        //    'redirect' => false, // Whether redirect stdin/stdout, true or false
+        //    'pipe'     => 0 // The type of pipeline, 0: no pipeline 1: SOCK_STREAM 2: SOCK_DGRAM
+        //    'enable'   => true // Whether to enable, default true
+        //],
     ],
     'timer'                    => [
-        'enable' => true, // 开启定时任务类
-        'jobs'   => [
-            // 启用LaravelScheduleJob来执行`php artisan schedule:run`，每分钟一次，替代Linux Crontab
+        'enable'        => env('LARAVELS_TIMER', true),
+        'jobs'          => [
+            // 启用LaravelScheduleJob来执行`php artisan schedule:run`，每分钟一次，替代 Linux Crontab
             // \Hhxsv5\LaravelS\Illuminate\LaravelScheduleJob::class,
             // 两种配置参数的方式：
             // [\App\Jobs\Timer\TestCronJob::class, [1000, true]], // 注册时传入参数
             // \App\Jobs\Timer\TestCronJob::class, // 重载对应的方法来返回参数
-            // App\Jobs\Timer\FiveMinutesCronJob::class,
-            // App\Jobs\Timer\HourlyCronJob::class,
-        ],
-        'pid_file'      => storage_path('laravels-timer.pid'),
-        'max_wait_time' => 5, // Reload 时最大等待时间
-    ],
-    // 绑定事件与监听器，一个事件可以有多个监听器，多个监听器按顺序执行
-    'events' => [
-        \App\Events\TestEvent::class => [
-            \App\Listeners\TestListener::class,
-        ],
-        \App\Events\ApiExcelSwooleEvent::class => [
-            \App\Listeners\ApiExcelSwooleListener::class,
-        ],
-        App\Events\LoginSwooleEvent::class => [
-            App\Listeners\LoginSwooleListener::class,
+            App\Jobs\Timer\FiveMinutesCronJob::class,
+            App\Jobs\Timer\HourlyCronJob::class,
         ],
+        'max_wait_time' => 5,
     ],
-    'swoole_tables'            => [
-    ],
-    'cleaners' => [
+    'swoole_tables'            => [],
+    'register_providers'       => [],
+    'cleaners'                 => [
+        // See LaravelS's built-in cleaners: https://github.com/hhxsv5/laravel-s/blob/master/Settings.md#cleaners
         Hhxsv5\LaravelS\Illuminate\Cleaners\SessionCleaner::class, // 如果你的项目中使用到了Session或Authentication，请解除这行注释
         Hhxsv5\LaravelS\Illuminate\Cleaners\AuthCleaner::class, // 如果你的项目中使用到了Authentication或Passport，请解除这行注释
         Hhxsv5\LaravelS\Illuminate\Cleaners\JWTCleaner::class, // 如果你的项目中使用到了包"tymon/jwt-auth"，请解除这行注释
         // Hhxsv5\LaravelS\Illuminate\Cleaners\RequestCleaner::class,
-        //...
+    ],
+    'destroy_controllers'      => [
+        'enable'        => false,
+        'excluded_list' => [
+            //\App\Http\Controllers\TestController::class,
+        ],
     ],
     'swoole'                   => [
         'daemonize'          => env('LARAVELS_DAEMONIZE', false),
@@ -70,9 +68,9 @@
         'worker_num'         => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8,
         'task_worker_num'    => function_exists('swoole_cpu_num') ? swoole_cpu_num() * 2 : 8,
         'task_ipc_mode'      => 1,
-        'task_max_request'   => 8000,
+        'task_max_request'   => env('LARAVELS_TASK_MAX_REQUEST', 8000),
         'task_tmpdir'        => @is_writable('/dev/shm/') ? '/dev/shm' : '/tmp',
-        'max_request'        => 8000,
+        'max_request'        => env('LARAVELS_MAX_REQUEST', 8000),
         'open_tcp_nodelay'   => true,
         'pid_file'           => storage_path('laravels.pid'),
         'log_file'           => storage_path(sprintf('logs/swoole-%s.log', date('Y-m'))),
@@ -87,9 +85,14 @@
         'enable_coroutine'   => false,
         'http_compression'   => false,
 
+        // Slow log
+        // 'request_slowlog_timeout' => 2,
+        // 'request_slowlog_file'    => storage_path(sprintf('logs/slow-%s.log', date('Y-m'))),
+        // 'trace_event_worker'      => true,
+
         /**
          * More settings of Swoole
-         * @see https://wiki.swoole.com/wiki/page/274.html  Chinese
+         * @see https://wiki.swoole.com/#/server/setting  Chinese
          * @see https://www.swoole.co.uk/docs/modules/swoole-server/configuration  English
          */
     ],

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,16 @@`
`10`	`10`
`11`	`11`	`namespace App\Events;`
`12`	`12`
	`13`	`+use App\Listeners\TestListener;`
`13`	`14`	`use Hhxsv5\LaravelS\Swoole\Task\Event;`
`14`	`15`
`15`	`16`	`class TestEvent extends Event`
`16`	`17`	`{`
	`18`	`+ protected $listeners = [`
	`19`	`+ // Listener list`
	`20`	`+ TestListener::class,`
	`21`	`+ ];`
	`22`	`+`
`17`	`23`	`private $data;`
`18`	`24`
`19`	`25`	`public function __construct($data)`
`@@ -25,4 +31,4 @@ public function getData()`
`25`	`31`	`{`
`26`	`32`	`return $this->data;`
`27`	`33`	`}`
`28`		`-}`
	`34`	`+}`