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

update to version 2.5.5 (buid 422)

Browse Source
This commit is contained in:
crazywhalecc
2021-10-06 18:01:40 +08:00
parent 7dbd21bdf4
commit beaf7be606
6 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZM/ConsoleApplication.php
View File

@@ -28,8 +28,8 @@ class ConsoleApplication extends Application
{
private static $obj = null;
const VERSION_ID = 421;
const VERSION = "2.5.4";
const VERSION_ID = 422;
const VERSION = "2.5.5";
/**
* @throws InitException

2
src/ZM/Framework.php
View File

@@ -156,7 +156,7 @@ class Framework
if (isset($this->server_set["task_worker_num"])) {
$out["task_worker"] = $this->server_set["task_worker_num"];
}
if (ZMConfig::get("global", "sql_config")["sql_host"] !== "") {
if ((ZMConfig::get("global", "sql_config")["sql_host"] ?? "") !== "") {
$conf = ZMConfig::get("global", "sql_config");
$out["mysql_pool"] = $conf["sql_database"] . "@" . $conf["sql_host"] . ":" . $conf["sql_port"];
}

2
src/ZM/Utils/ZMUtil.php
View File

@@ -86,7 +86,7 @@ class ZMUtil
if (($pathinfo['extension'] ?? '') == 'php') {
if ($rule === null) { //规则未设置回调时候，使用默认的识别过滤规则
if (substr(file_get_contents($dir . '/' . $v), 6, 6) == '#plain') continue;
elseif (mb_substr($v, 0, 7) == 'global_' || mb_substr($v, 0, 7) == 'script_') continue;
elseif (mb_substr($pathinfo["basename"], 0, 7) == 'global_' || mb_substr($pathinfo["basename"], 0, 7) == 'script_') continue;
foreach (($composer['autoload']['files'] ?? []) as $fi) {
if (md5_file(DataProvider::getSourceRootDir().'/'.$fi) == md5_file($dir.'/'.$v)) continue 2;
}