update to build 406 version

This commit is contained in:
jerry
2021-04-06 01:19:56 +08:00
parent 60619dbffc
commit c2d3b5f92a
28 changed files with 207 additions and 83 deletions

View File

@@ -32,23 +32,23 @@ class BuildCommand extends Command
if (mb_strpos($target_dir, "../")) $target_dir = realpath($target_dir);
if ($target_dir === false) {
$output->writeln(TermColor::color8(31) . "Error: No such file or directory (" . __DIR__ . '/../../../resources/' . ")" . TermColor::RESET);
return Command::FAILURE;
return 1;
}
$output->writeln("Target: " . $target_dir . " , Version: " . ($version = json_decode(file_get_contents(__DIR__ . "/../../../composer.json"), true)["version"]));
if (mb_substr($target_dir, -1, 1) !== '/') $target_dir .= "/";
if (ini_get('phar.readonly') == 1) {
$output->writeln(TermColor::color8(31) . "You need to set \"phar.readonly\" to \"Off\"!");
$output->writeln(TermColor::color8(31) . "See: https://stackoverflow.com/questions/34667606/cant-enable-phar-writing");
return Command::FAILURE;
return 1;
}
if (!is_dir($target_dir)) {
$output->writeln(TermColor::color8(31) . "Error: No such file or directory ($target_dir)" . TermColor::RESET);
return Command::FAILURE;
return 1;
}
$filename = "server.phar";
$this->build($target_dir, $filename);
return Command::SUCCESS;
return 0;
}
private function build($target_dir, $filename) {

View File

@@ -20,7 +20,7 @@ class CheckConfigCommand extends Command
protected function execute(InputInterface $input, OutputInterface $output): int {
if (LOAD_MODE !== 1) {
$output->writeln("<error>仅限在Composer依赖模式中使用此命令</error>");
return Command::FAILURE;
return 1;
}
$current_cfg = getcwd() . "/config/";
$remote_cfg = include_once FRAMEWORK_ROOT_DIR . "/config/global.php";
@@ -42,7 +42,7 @@ class CheckConfigCommand extends Command
$output->writeln("<info>配置文件暂无更新!</info>");
}
return Command::SUCCESS;
return 0;
}
/**

View File

@@ -26,6 +26,6 @@ abstract class DaemonCommand extends Command
die();
}
$this->daemon_file = $file;
return Command::SUCCESS;
return 0;
}
}

View File

@@ -19,6 +19,6 @@ class DaemonReloadCommand extends DaemonCommand
parent::execute($input, $output);
system("kill -USR1 " . intval($this->daemon_file["pid"]));
$output->writeln("<info>成功重载!</info>");
return Command::SUCCESS;
return 0;
}
}

View File

@@ -25,6 +25,6 @@ class DaemonStatusCommand extends DaemonCommand
if (isset($stdout[count($stdout) - $i]))
echo $stdout[count($stdout) - $i] . PHP_EOL;
}
return Command::SUCCESS;
return 0;
}
}

View File

@@ -21,6 +21,6 @@ class DaemonStopCommand extends DaemonCommand
system("kill -INT " . intval($this->daemon_file["pid"]));
unlink(DataProvider::getWorkingDir() . "/.daemon_pid");
$output->writeln("<info>成功停止!</info>");
return Command::SUCCESS;
return 0;
}
}

View File

@@ -83,10 +83,10 @@ class InitCommand extends Command
echo PHP_EOL;
} else {
echo("Error occurred. Please check your updates.\n");
return Command::FAILURE;
return 1;
}
$output->writeln("<info>Done!</info>");
return Command::SUCCESS;
return 0;
} elseif (LOAD_MODE === 2) { //从phar启动的框架包初始化的模式
$phar_link = new Phar(__DIR__);
$current_dir = pathinfo($phar_link->getPath())["dirname"];
@@ -104,7 +104,7 @@ class InitCommand extends Command
}
}
$output->writeln("initialization must be started with composer-project mode!");
return Command::FAILURE;
return 1;
}
private function getExtractFiles(): array {

View File

@@ -89,10 +89,10 @@ class PureHttpCommand extends Command
$server->start();
// return this if there was no problem running the command
// (it's equivalent to returning int(0))
return Command::SUCCESS;
return 0;
// or return this if some error happened during the execution
// (it's equivalent to returning int(1))
// return Command::FAILURE;
// return 1;
}
}

View File

@@ -40,10 +40,10 @@ class RunServerCommand extends Command
if (($opt = $input->getOption("env")) !== null) {
if (!in_array($opt, ["production", "staging", "development", ""])) {
$output->writeln("<error> \"--env\" option only accept production, development, staging and [empty] ! </error>");
return Command::FAILURE;
return 1;
}
}
(new Framework($input->getOptions()))->start();
return Command::SUCCESS;
return 0;
}
}

View File

@@ -21,7 +21,7 @@ class SystemdCommand extends Command
$path = $this->generate();
$output->writeln("<info>成功生成 systemd 文件,位置:".$path."</info>");
$output->writeln("<info>有关如何使用 systemd 配置文件,请访问 `https://github.com/zhamao-robot/zhamao-framework/issues/36`</info>");
return Command::SUCCESS;
return 0;
}
private function generate() {