From 9e08919ce0c1e5b7f4fc08aaab0f1029e6bd6659 Mon Sep 17 00:00:00 2001
From: sunxyw <git@sunxyw.xyz>
Date: Sun, 10 Apr 2022 01:44:54 +0800
Subject: [PATCH] fix read config before loaded

---
 src/ZM/Framework.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ZM/Framework.php b/src/ZM/Framework.php
index b8127140..18e45078 100644
--- a/src/ZM/Framework.php
+++ b/src/ZM/Framework.php
@@ -97,7 +97,7 @@ class Framework
         $this->registerBaseBindings();
 
         // 初始化配置
-        ZMConfig::setDirectory($this->container->get('path.config'));
+        ZMConfig::setDirectory(app('path.config'));
         ZMConfig::setEnv($args['env'] ?? '');
         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";
@@ -624,7 +624,9 @@ class Framework
         $this->container->instance('path.source', DataProvider::getSourceRootDir());
         $this->container->alias('path.source', 'path.base');
         $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 () {
             return DataProvider::getDataFolder();
         });