blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-25 10:56:38 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-05-15 15:42:49 +08:00
parent ddd5d2a31e
commit 4e036d0736
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -915,12 +915,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74" "reference": "8faeb22f7b2f9a279911b6497de1c6856b368eba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/093c05394e9310edfa1b0d4d5d7ccda5f919ad74", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8faeb22f7b2f9a279911b6497de1c6856b368eba",
"reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74", "reference": "8faeb22f7b2f9a279911b6497de1c6856b368eba",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -964,7 +964,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2020-05-15T06:47:21+00:00" "time": "2020-05-15T07:37:07+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

8
vendor/composer/installed.json vendored
View File

@ -941,12 +941,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74" "reference": "8faeb22f7b2f9a279911b6497de1c6856b368eba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/093c05394e9310edfa1b0d4d5d7ccda5f919ad74", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8faeb22f7b2f9a279911b6497de1c6856b368eba",
"reference": "093c05394e9310edfa1b0d4d5d7ccda5f919ad74", "reference": "8faeb22f7b2f9a279911b6497de1c6856b368eba",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -962,7 +962,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-05-15T06:47:21+00:00", "time": "2020-05-15T07:37:07+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-05-15 14:56:28 // This file is automatically generated at:2020-05-15 15:40:43
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

17
vendor/zoujingli/think-library/src/command/Queue.php vendored
View File

@ -76,12 +76,12 @@ class Queue extends Command
*/ */
protected function webStopAction() protected function webStopAction()
{ {
$keyword = $this->process->think('run -p'); $root = "{$this->app->getRootPath()}public" . DIRECTORY_SEPARATOR;
if (count($result = $this->process->query($keyword)) < 1) { if (count($result = $this->process->query("-t {$root} {$root}router.php")) < 1) {
$this->output->warning("There is no WebServer process to finish"); $this->output->warning("There is no WebServer process to finish");
} else foreach ($result as $item) { } else foreach ($result as $item) {
$this->process->close($item['pid']); $this->process->close($item['pid']);
$this->output->info("Sending end process {$item['pid']} signal succeeded"); $this->output->writeln("Sending end process {$item['pid']} signal succeeded");
} }
} }
@ -92,14 +92,15 @@ class Queue extends Command
{ {
$port = $this->input->getOption('port') ?: '80'; $port = $this->input->getOption('port') ?: '80';
$host = $this->input->getOption('host') ?: '127.0.0.1'; $host = $this->input->getOption('host') ?: '127.0.0.1';
$command = $this->process->think("run -p {$port} -H {$host}"); $root = "{$this->app->getRootPath()}public" . DIRECTORY_SEPARATOR;
$command = "php -S {$host}:{$port} -t {$root} {$root}router.php";
if (count($result = $this->process->query($command)) > 0) { if (count($result = $this->process->query($command)) > 0) {
if ($this->process->iswin()) { if ($this->process->iswin()) {
$this->process->exec("start http://{$host}:{$port}"); $this->process->exec("start http://{$host}:{$port}");
} }
$this->output->info("WebServer process {$result['0']['pid']} has started"); $this->output->info("WebServer process {$result['0']['pid']} has started");
} else { } else {
[$this->process->create($command), usleep(1000)]; [$this->process->create($command), usleep(2000)];
if (count($result = $this->process->query($command)) > 0) { if (count($result = $this->process->query($command)) > 0) {
$this->output->info("WebServer process {$result['0']['pid']} started successfully"); $this->output->info("WebServer process {$result['0']['pid']} started successfully");
if ($this->process->iswin()) { if ($this->process->iswin()) {
@ -116,8 +117,8 @@ class Queue extends Command
*/ */
protected function webStatusAction() protected function webStatusAction()
{ {
$command = $this->process->think("run -p"); $root = "{$this->app->getRootPath()}public" . DIRECTORY_SEPARATOR;
if (count($result = $this->process->query($command)) > 0) { if (count($result = $this->process->query("-t {$root} {$root}router.php")) > 0) {
$this->output->info("WebServer process {$result[0]['pid']} running"); $this->output->info("WebServer process {$result[0]['pid']} running");
$this->output->write("># {$result[0]['cmd']}"); $this->output->write("># {$result[0]['cmd']}");
} else { } else {
@ -135,7 +136,7 @@ class Queue extends Command
$this->output->warning("There is no task process to finish"); $this->output->warning("There is no task process to finish");
} else foreach ($result as $item) { } else foreach ($result as $item) {
$this->process->close($item['pid']); $this->process->close($item['pid']);
$this->output->info("Sending end process {$item['pid']} signal succeeded"); $this->output->writeln("Sending end process {$item['pid']} signal succeeded");
} }
} }