zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-22 16:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to 2.3.1 version (build 388)

Browse Source 
cleanup code and fix a bug
This commit is contained in:
crazywhalecc
2021-03-18 14:56:35 +08:00
parent 456b102c15
commit e77b9d4970
57 changed files with 179 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZM/Command/BuildCommand.php
View File

@@ -26,7 +26,7 @@ class BuildCommand extends Command
// ...
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
$this->output = $output;
$target_dir = $input->getOption("target") ?? (__DIR__ . '/../../../resources/');
if (mb_strpos($target_dir, "../")) $target_dir = realpath($target_dir);

2
src/ZM/Command/DaemonCommand.php
View File

@@ -13,7 +13,7 @@ abstract class DaemonCommand extends Command
{
protected $daemon_file = null;
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
$pid_path = DataProvider::getWorkingDir() . "/.daemon_pid";
if (!file_exists($pid_path)) {
$output->writeln("<comment>没有检测到正在运行的守护进程！</comment>");

2
src/ZM/Command/DaemonReloadCommand.php
View File

@@ -15,7 +15,7 @@ class DaemonReloadCommand extends DaemonCommand
$this->setDescription("重载守护进程下的用户代码（仅限--daemon模式可用）");
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
parent::execute($input, $output);
system("kill -USR1 " . intval($this->daemon_file["pid"]));
$output->writeln("<info>成功重载！</info>");

2
src/ZM/Command/DaemonStatusCommand.php
View File

@@ -15,7 +15,7 @@ class DaemonStatusCommand extends DaemonCommand
$this->setDescription("查看守护进程框架的运行状态（仅限--daemon模式可用）");
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
parent::execute($input, $output);
$output->writeln("<info>框架运行中，pid：" . $this->daemon_file["pid"] . "</info>");
$output->writeln("<comment>----- 以下是stdout内容 -----</comment>");

2
src/ZM/Command/DaemonStopCommand.php
View File

@@ -16,7 +16,7 @@ class DaemonStopCommand extends DaemonCommand
$this->setDescription("停止守护进程下运行的框架（仅限--daemon模式可用）");
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
parent::execute($input, $output);
system("kill -TERM " . intval($this->daemon_file["pid"]));
unlink(DataProvider::getWorkingDir() . "/.daemon_pid");

4
src/ZM/Command/InitCommand.php
View File

@@ -30,7 +30,7 @@ class InitCommand extends Command
// ...
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
if (LOAD_MODE === 1) { // 从composer依赖而来的项目模式，最基本的需要初始化的模式
$output->writeln("<comment>Initializing files</comment>");
$base_path = LOAD_MODE_COMPOSER_PATH;
@@ -96,7 +96,7 @@ class InitCommand extends Command
return Command::FAILURE;
}
private function getExtractFiles() {
private function getExtractFiles(): array {
return $this->extract_files;
}
}

3
src/ZM/Command/PureHttpCommand.php
View File

@@ -5,7 +5,6 @@ namespace ZM\Command;
use Swoole\Atomic;
use Swoole\Coroutine;
use Swoole\Http\Request;
use Swoole\Http\Response;
use Swoole\Http\Server;
@@ -36,7 +35,7 @@ class PureHttpCommand extends Command
// ...
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
$tty_width = explode(" ", trim(exec("stty size")))[1];
if (realpath($input->getArgument('dir') ?? '.') === false) {
$output->writeln("<error>Directory error(" . ($input->getArgument('dir') ?? '.') . "): no such file or directory.</error>");

2
src/ZM/Command/RunServerCommand.php
View File

@@ -33,7 +33,7 @@ class RunServerCommand extends Command
$this->setHelp("直接运行可以启动");
}
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
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>");

2
src/ZM/Command/SystemdCommand.php
View File

@@ -13,7 +13,7 @@ class SystemdCommand extends Command
// the name of the command (the part after "bin/console")
protected static $defaultName = 'systemd:generate';
protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
//TODO: 写一个生成systemd配置的功能，给2.0
return Command::SUCCESS;
}