diff --git a/app/common/model/VirtualModel.php b/app/common/model/VirtualModel.php new file mode 100644 index 0000000..f453ad5 --- /dev/null +++ b/app/common/model/VirtualModel.php @@ -0,0 +1,9 @@ + 'normal', + + // 目前仅对多进程模式生效，暂不支持设置为0（不限制） + 'max_conn_per_addr' => 128, // 每个域名最多维持多少并发连接 + 'keepalive_timeout' => 86400, // 连接多长时间不通讯就关闭 + 'connect_timeout' => 86400, // 连接超时时间 + 'timeout' => 86400, // 请求发出后等待响应的超时时间 +]; + +return $config; diff --git a/extend/base/common/command/TimerBase.php b/extend/base/common/command/TimerBase.php index 84ee468..1e3391b 100644 --- a/extend/base/common/command/TimerBase.php +++ b/extend/base/common/command/TimerBase.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace base\common\command; +use app\common\model\VirtualModel; use GuzzleHttp\Client; use GuzzleHttp\Promise\Utils; use think\console\Command; @@ -11,10 +12,19 @@ use think\console\Input; use think\console\input\Option; use think\console\Output; use think\facade\Cache; +use think\facade\Config; use think\facade\Log; +use Workerman\Http\Client as HttpClient; +use Workerman\Timer; +use Workerman\Worker; class TimerBase extends Command { + protected $host; + protected $siteDomain; + protected $siteHost; + protected $requestList; + protected function configure() { // 指令配置 @@ -22,7 +32,7 @@ class TimerBase extends Command ->addOption('temp', null, Option::VALUE_NONE) ->addOption('quit', null, Option::VALUE_NONE) ->addOption('local', null, Option::VALUE_NONE) - ->addOption('local-host', null, Option::VALUE_OPTIONAL, '本地域名','http://localhost') + ->addOption('local-host', null, Option::VALUE_OPTIONAL, '本地域名', 'http://localhost') ->addOption('local-port', null, Option::VALUE_OPTIONAL, '本地端口', '80') ->setDescription('内置秒级定时器'); } @@ -38,6 +48,7 @@ class TimerBase extends Command return; } + $site_host = parse_url($site_domain, PHP_URL_HOST); $output->writeln('站点域名：' . $site_domain); $host = $site_domain; @@ -45,41 +56,154 @@ class TimerBase extends Command $host = $input->getOption('local-host') . ':' . $input->getOption('local-port'); } + $config_list = include app_file_path('common/command/timer/config.php'); + + $request_list = []; + foreach ($config_list as $config_item) { + $config_item = static::initConfigItem($config_item); + + if ($config_item['name'] == 'http_demo' && !env('adminsystem.is_demo', false)) { + continue; + } + + $concurrency = $config_item['concurrency']; + + for ($i = 0; $i < $concurrency; $i++) { + $target = $config_item['target']; + $params = [ + 'concurrency_id' => $i, + 'concurrency_count' => $concurrency, + ]; + $target_info = parse_url($target); + $query_params = []; + if (isset($target_info['query'])) { + parse_str($target_info['query'], $query_params); + } + $query_params = array_merge($query_params, $params); + $target_info['query'] = http_build_query($query_params); + $target = unparse_url($target_info); + + $config_item['target'] = $target; + $config_item['concurrency_id'] = $i; + + $request_list[] = clone $config_item; + } + } + + $this->host = $host; + $this->siteDomain = $site_domain; + $this->siteHost = $site_host; + $this->requestList = $request_list; + + $timer_mode = Config::get('timer.mode', 'normal'); + if ($timer_mode == 'normal') { + $this->runNormal(); + } else { + $this->runParallel(); + } + } + + public function runParallel() + { + $host = $this->host; + $site_host = $this->siteHost; + $output = $this->output; + $input = $this->input; + + $worker = new Worker(); + $worker->count = 1; + $worker->name = 'start_timer_parallel'; + $worker->timerRequestList = $this->requestList; + + $worker->onWorkerStart = function () use ($worker, $host, $site_host, $output, $input) { + Timer::add(1, function () use ($worker, $host, $site_host, $output, $input) { + $request_list = $worker->timerRequestList; + foreach ($request_list as $request_item) { + if (!isset($request_item['is_running'])) { + $request_item['is_running'] = false; + } + + if (!isset($request_item['last_run_time'])) { + $request_item['last_run_time'] = 0; + } + + if (time() - $request_item['last_run_time'] < $request_item['frequency']) { + continue; + } + + $request_item['is_running'] = true; + $request_item['last_run_time'] = time(); + + $output->writeln(date('Y-m-d H:i:s') . ': build site request async:' . $request_item['target']); + + // + + $options = [ + 'max_conn_per_addr' => Config::get('timer.max_conn_per_addr', 1000), + 'keepalive_timeout' => Config::get('timer.keepalive_timeout', 86400), + 'connect_timeout' => Config::get('timer.connect_timeout', 86400), + 'timeout' => Config::get('timer.timeout', 86400), + ]; + $http = new HttpClient($options); + + $http->request($host . $request_item['target'], [ + 'headers' => [ + 'Host' => $site_host, + 'Accept' => 'application/json,text/plain', + ], + 'success' => function ($response) use ($request_item) { + $request_item['is_running'] = false; + echo $response->getBody(); + }, + 'error' => function ($exception) use ($request_item) { + $request_item['is_running'] = false; + echo $exception; + }, + ]); + } + }); + }; + + Worker::runAll(); + } + + public function runNormal() + { + $host = $this->host; + $site_host = $this->siteHost; + $request_list = $this->requestList; + $output = $this->output; + $input = $this->input; + $client = new Client([ 'base_uri' => $host, 'headers' => [ - 'Host' => $site_domain, + 'Host' => $site_host, + 'Accept' => 'application/json,text/plain', ], 'verify' => false, ]); while (true) { try { - $config_list = include app_file_path('common/command/timer/config.php'); - $list_promises = []; - foreach ($config_list as $config_item) { - $config_item = static::initConfigItem($config_item); + foreach ($request_list as $request_item) { + $name = $request_item['name']; - $name = $config_item['name']; - if ($name == 'http_demo' && !env('adminsystem.is_demo', false)) { - continue; - } - - $cache_key = 'timer_' . $name; + $cache_key = 'timer_' . $name . '_' . $request_item['concurrency_id']; $cache_tag = 'system_timer'; $last_exec_time = Cache::get($cache_key, 0); - if ($last_exec_time >= time() - $config_item['frequency']) { + if ($last_exec_time >= time() - $request_item['frequency']) { continue; } Cache::tag($cache_tag)->set($cache_key, time()); - $type = $config_item['type']; + $type = $request_item['type']; switch ($type) { case 'site': - $output->writeln(date('Y-m-d H:i:s') . ': build site request async:' . $config_item['target']); - $list_promises[$config_item['name']] = $client->getAsync($config_item['target']); + $output->writeln(date('Y-m-d H:i:s') . ': build site request async:' . $request_item['target']); + $list_promises[$request_item['name']] = $client->getAsync($request_item['target']); break; @@ -118,6 +242,7 @@ class TimerBase extends Command 'type' => 'site', 'target' => '', 'frequency' => 600, + 'concurrency' => 1, ]; $data = array_merge($default, $config); @@ -125,7 +250,8 @@ class TimerBase extends Command if ($data['frequency'] < 0) { $data['frequency'] = 0; } + $model_timer = new VirtualModel($data); - return $data; + return $model_timer; } } diff --git a/extend/base/common/command/timer/config.php b/extend/base/common/command/timer/config.php index 32202e4..b0c2cfa 100644 --- a/extend/base/common/command/timer/config.php +++ b/extend/base/common/command/timer/config.php @@ -5,12 +5,13 @@ return [ 'name' => 'http_demo', // 定时任务的名称,不能重复 'type' => 'site', // 定时任务的类型，默认只支持site，你也可以重写定时器命令行以支持其他命令 'target' => '/tools/timer.ResetPassword/do', // 要访问的地址，如果不是以https开头，那么以后台的系统配置中读取相关配置，如果没有配置则不执行 - 'frequency' => 600 // 执行频率，单位：秒，填写10，则每10秒过后执行一次 + 'frequency' => 600, // 执行频率，单位：秒，填写10，则每10秒过后执行一次 ], [ - 'name' => 'clear_log', // 定时任务的名称,不能重复 - 'type' => 'site', // 定时任务的类型，默认只支持site，你也可以重写定时器命令行以支持其他命令 - 'target' => '/tools/timer.ClearLog/do', // 要访问的地址，如果不是以https开头，那么以后台的系统配置中读取相关配置，如果没有配置则不执行 - 'frequency' => 600 // 执行频率，单位：秒，填写10，则每10秒过后执行一次 + 'name' => 'clear_log', + 'type' => 'site', + 'target' => '/tools/timer.ClearLog/do', + 'frequency' => 600, + 'concurrency' => 1, ], ]; diff --git a/extend/base/common/controller/TimerControllerBase.php b/extend/base/common/controller/TimerControllerBase.php index 1a6283f..b9ac60b 100644 --- a/extend/base/common/controller/TimerControllerBase.php +++ b/extend/base/common/controller/TimerControllerBase.php @@ -9,10 +9,25 @@ class TimerControllerBase extends ToolsController { protected $frequency = null; + protected $concurrency = 1; + + protected $concurrencyId = 0; + public function initialize() { parent::initialize(); + $concurrency_id = $this->request->param('concurrency_id', 0); + if ($concurrency_id > $this->concurrency) { + $this->error('concurrency id error'); + } + $this->concurrencyId = $concurrency_id; + + $concurrency_count = $this->request->param('concurrency_count', 1); + if ($concurrency_count > $this->concurrency) { + $this->error('concurrency count error'); + } + if (is_int($this->frequency)) { $this->protectVisit($this->frequency); } diff --git a/extend/base/common/model/VirtualModelBase.php b/extend/base/common/model/VirtualModelBase.php new file mode 100644 index 0000000..4b7ac2f --- /dev/null +++ b/extend/base/common/model/VirtualModelBase.php @@ -0,0 +1,11 @@ +