diff --git a/src/helper.php b/src/helper.php index 6d3a708..a014fe9 100644 --- a/src/helper.php +++ b/src/helper.php @@ -97,7 +97,7 @@ function download($url, $cookies='', $useragent='', $method = 'GET') /** * @brief 文件大小格式化为MB - * @param string $from 文件大小 + * @param string $from 文件大小(如:100GB) * @return int 单位MB */ function convertToMB($from) @@ -327,20 +327,6 @@ function wlog($data='', $name = '', $path = '') return $worldsnum; } -//PHP stdClass Object转array -function object_array($array) -{ - if (is_object($array)) { - $array = (array)$array; - } - if (is_array($array)) { - foreach ($array as $key=>$value) { - $array[$key] = object_array($value); - } - } - return $array; -} - /** * 显示支持的站点列表 * @param string $dir diff --git a/windows_start.cmd b/windows_start.cmd index 847fdc4..f51ff60 100644 --- a/windows_start.cmd +++ b/windows_start.cmd @@ -34,7 +34,7 @@ cd IYUUPlus goto :checkPHP :installError -cls + echo "当前运行环境未检测到GIT程序,源码安装失败!请手动下载" echo "Docker: https://hub.docker.com/r/iyuucn/iyuuplus" echo "Gitee: https://gitee.com/ledc/iyuuplus" @@ -45,7 +45,7 @@ goto :end :checkGit echo "检查GIT程序,尝试自动更新源码..." git --version|find "git version">nul&&goto :pull -cls + echo "当前IYUUPlus运行环境未检测到git程序,不支持自动更新。" echo "推荐您使用git来下载代码库!" echo "您可以在安装git程序后,在命令行内输入:" @@ -69,7 +69,7 @@ goto :checkPHP if exist "%~dp0php\php.exe" (set PHP_BINARY=%~dp0php\php.exe) else (set PHP_BINARY=php.exe) echo "PHP二进制程序:"%PHP_BINARY% %PHP_BINARY% -v|find "PHP Group">nul&&goto :start -cls + echo "没有检测到PHP执行程序!!!" echo "如果您已下载过php程序,请在解压缩后,把php文件夹添加进系统的环境变量。" echo "或者把php执行程序,解压缩到当前目录下的php文件夹。"