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

fix read config before loaded

Browse Source
This commit is contained in:
sunxyw
2022-04-10 01:44:54 +08:00
parent a7324f6c49
commit 9e08919ce0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ZM/Framework.php
View File

@@ -97,7 +97,7 @@ class Framework
$this->registerBaseBindings(); $this->registerBaseBindings();
// 初始化配置 // 初始化配置
ZMConfig::setDirectory($this->container->get('path.config')); ZMConfig::setDirectory(app('path.config'));
ZMConfig::setEnv($args['env'] ?? ''); ZMConfig::setEnv($args['env'] ?? '');
if (ZMConfig::get('global') === false) { if (ZMConfig::get('global') === false) {
echo zm_internal_errcode('E00007') . 'Global config load failed: ' . ZMConfig::$last_error . "\nError path: " . DataProvider::getSourceRootDir() . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n"; echo zm_internal_errcode('E00007') . 'Global config load failed: ' . ZMConfig::$last_error . "\nError path: " . DataProvider::getSourceRootDir() . "\nPlease init first!\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/37\n";
@@ -624,7 +624,9 @@ class Framework
$this->container->instance('path.source', DataProvider::getSourceRootDir()); $this->container->instance('path.source', DataProvider::getSourceRootDir());
$this->container->alias('path.source', 'path.base'); $this->container->alias('path.source', 'path.base');
$this->container->instance('path.config', DataProvider::getSourceRootDir() . '/config'); $this->container->instance('path.config', DataProvider::getSourceRootDir() . '/config');
$this->container->instance('path.module_config', ZMConfig::get('global', 'config_dir')); $this->container->singleton('path.module_config', function () {
return ZMConfig::get('global', 'config_dir');
});
$this->container->singleton('path.data', function () { $this->container->singleton('path.data', function () {
return DataProvider::getDataFolder(); return DataProvider::getDataFolder();
}); });