From fe3bb22311ab53469a3c188405181a31d9022b4a Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Mon, 22 Aug 2022 13:35:07 +0800 Subject: [PATCH] add windows development support --- src/ZM/Framework.php | 6 +++++- src/ZM/Store/FileSystem.php | 2 +- zhamao-server.bat | 2 ++ zhamao.bat | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 zhamao-server.bat create mode 100644 zhamao.bat diff --git a/src/ZM/Framework.php b/src/ZM/Framework.php index d0c9de5c..733ef31f 100644 --- a/src/ZM/Framework.php +++ b/src/ZM/Framework.php @@ -44,7 +44,7 @@ class Framework public const VERSION_ID = 614; /** @var string 版本名称 */ - public const VERSION = '3.0.0-alpha2'; + public const VERSION = '3.0.0-alpha3'; /** @var array 传入的参数 */ protected $argv; @@ -253,6 +253,10 @@ class Framework { switch ($driver = ZMConfig::get('global.driver')) { case 'swoole': + if (DIRECTORY_SEPARATOR === '\\') { + logger()->emergency('Windows does not support swoole driver!'); + exit(1); + } ZMConfig::$config['global']['swoole_options']['driver_init_policy'] = DriverInitPolicy::MULTI_PROCESS_INIT_IN_MASTER; $this->driver = new SwooleDriver(ZMConfig::get('global.swoole_options')); $this->driver->initDriverProtocols(ZMConfig::get('global.servers')); diff --git a/src/ZM/Store/FileSystem.php b/src/ZM/Store/FileSystem.php index bedf3a66..9972aa51 100644 --- a/src/ZM/Store/FileSystem.php +++ b/src/ZM/Store/FileSystem.php @@ -52,7 +52,7 @@ class FileSystem } elseif (is_file($sub_file) || is_dir($sub_file) && !$recursive && $include_dir) { # 如果是 文件 或 (是 目录 且 不递推 且 包含目录) if (is_string($relative) && mb_strpos($sub_file, $relative) === 0) { - $list[] = ltrim(mb_substr($sub_file, mb_strlen($relative)), '/'); + $list[] = ltrim(mb_substr($sub_file, mb_strlen($relative)), '/\\'); } elseif ($relative === false) { $list[] = $sub_file; } diff --git a/zhamao-server.bat b/zhamao-server.bat new file mode 100644 index 00000000..a209c486 --- /dev/null +++ b/zhamao-server.bat @@ -0,0 +1,2 @@ +@echo off +php .\src\entry.php server --driver=workerman diff --git a/zhamao.bat b/zhamao.bat new file mode 100644 index 00000000..133708c8 --- /dev/null +++ b/zhamao.bat @@ -0,0 +1,2 @@ +@echo off +php .\src\entry.php %1 %2 %3 %4 %5 %6 %7 %8 %9