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

update to 2.0.0-b9 version

Browse Source 
fix a little bug
This commit is contained in:
jerry
2020-12-20 19:15:28 +08:00
parent bc0bb9b6b0
commit 619baf1691
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -29,8 +29,8 @@
"symfony/polyfill-mbstring": "^1.20", "symfony/polyfill-mbstring": "^1.20",
"symfony/console": "^5.1", "symfony/console": "^5.1",
"zhamao/connection-manager": "*@dev", "zhamao/connection-manager": "*@dev",
"zhamao/console": "*@dev", "zhamao/console": "^1.0",
"zhamao/config": "*@dev", "zhamao/config": "^1.0",
"zhamao/request": "*@dev", "zhamao/request": "*@dev",
"symfony/routing": "^5.1", "symfony/routing": "^5.1",
"symfony/polyfill-php80": "^1.20" "symfony/polyfill-php80": "^1.20"

2
src/ZM/Framework.php
View File

@@ -47,12 +47,12 @@ class Framework
//定义常量 //定义常量
include_once "global_defines.php"; include_once "global_defines.php";
ZMAtomic::init();
ZMConfig::setDirectory(DataProvider::getWorkingDir() . '/config'); ZMConfig::setDirectory(DataProvider::getWorkingDir() . '/config');
ZMConfig::setEnv($args["env"] ?? ""); ZMConfig::setEnv($args["env"] ?? "");
if (ZMConfig::get("global") === false) { if (ZMConfig::get("global") === false) {
die ("Global config load failed: " . ZMConfig::$last_error . "\nPlease init first!\n"); die ("Global config load failed: " . ZMConfig::$last_error . "\nPlease init first!\n");
} }
ZMAtomic::init();
try { try {
ManagerGM::init(ZMConfig::get("global", "swoole")["max_connection"] ?? 2048, 0.5, [ ManagerGM::init(ZMConfig::get("global", "swoole")["max_connection"] ?? 2048, 0.5, [
[ [