diff --git a/.gitignore b/.gitignore index 5b4a716e..824488d8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ composer.lock .daemon_pid /runtime/ /tmp/ +/temp/ /ext/go-cqhttp/data/ /ext/go-cqhttp/logs/ /ext/go-cqhttp/config.hjson diff --git a/.run/Reload Zhamao Server.run.xml b/.run/Reload Zhamao Server.run.xml new file mode 100644 index 00000000..06f86990 --- /dev/null +++ b/.run/Reload Zhamao Server.run.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/.run/Run Zhamao Server.run.xml b/.run/Run Zhamao Server.run.xml new file mode 100644 index 00000000..a78a357a --- /dev/null +++ b/.run/Run Zhamao Server.run.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/.run/Stop Zhamao Server.run.xml b/.run/Stop Zhamao Server.run.xml new file mode 100644 index 00000000..00a55197 --- /dev/null +++ b/.run/Stop Zhamao Server.run.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/docs/update/build-update.md b/docs/update/build-update.md index 4fbcccf3..9ec1ef99 100644 --- a/docs/update/build-update.md +++ b/docs/update/build-update.md @@ -4,6 +4,11 @@ 同时此处将只使用 build 版本号进行区分。 +## build 431 (2021-12-22) + +- 修复 Issue #50 +- 新增 PhpStorm IDE 直接运行框架的脚本 + ## build 430 (2021-12-8) - 删除调试信息 diff --git a/install-runtime.sh b/install-runtime.sh old mode 100644 new mode 100755 index f934af1b..63679e64 --- a/install-runtime.sh +++ b/install-runtime.sh @@ -55,4 +55,4 @@ if [ $? -ne 0 ]; then fi echo "成功下载!" && \ echo -e "PHP使用:\truntime/php -v" && \ - echo -e "Composer使用:\truntime/composer" \ No newline at end of file + echo -e "Composer使用:\truntime/composer" diff --git a/src/ZM/ConsoleApplication.php b/src/ZM/ConsoleApplication.php index cbe88ba4..93fa732a 100644 --- a/src/ZM/ConsoleApplication.php +++ b/src/ZM/ConsoleApplication.php @@ -30,8 +30,8 @@ class ConsoleApplication extends Application { private static $obj = null; - const VERSION_ID = 430; - const VERSION = "2.6.3"; + const VERSION_ID = 431; + const VERSION = "2.6.4"; /** * @throws InitException diff --git a/src/ZM/Framework.php b/src/ZM/Framework.php index fa17a294..fe3a471b 100644 --- a/src/ZM/Framework.php +++ b/src/ZM/Framework.php @@ -440,6 +440,7 @@ class Framework $coroutine_mode = false; break; case 'debug-mode': + self::$argv["disable-safe-exit"] = true; $coroutine_mode = false; $terminal_id = null; self::$argv["watch"] = true;