优化代码

we7coreteam · Feb 25, 2021 · 45e67ba · 45e67ba
1 parent 5c05ec8
commit 45e67ba
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/Src/App.php b/Src/App.php
@@ -102,6 +102,14 @@ public function getConfigCachePath() {
 		return $this->bootstrapCachePath('config/');
 	}
 
+	public function configurationIsCached() {
+		return is_dir($this->getConfigCachePath());
+	}
+
+	public function routeIsCached() {
+		return is_dir($this->getRouteCachePath());
+	}
+
 	public function exit() {
 		$this->container->clear();
 	}

diff --git a/Src/Core/Bootstrap/LoadConfigBootstrap.php b/Src/Core/Bootstrap/LoadConfigBootstrap.php
@@ -25,10 +25,11 @@ public function getBuiltInConfigPath() {
 	}
 
 	public function bootstrap(App $app) {
-		$loadDir = $app->getConfigCachePath();
-		if (!file_exists($loadDir)) {
+		if (!$app->configurationIsCached()) {
 			$loadDir = BASE_PATH . '/config';
 			(new Env(BASE_PATH))->load();
+		} else {
+			$loadDir = $app->getConfigCachePath();
 		}
 
 		$this->loadConfigFile($this->getBuiltInConfigPath());

diff --git a/Src/Core/Provider/ProviderAbstract.php b/Src/Core/Provider/ProviderAbstract.php
@@ -13,6 +13,7 @@
 namespace W7\Core\Provider;
 
 use Illuminate\Filesystem\Filesystem;
+use W7\App;
 use W7\Console\Application;
 use W7\Contract\Config\RepositoryInterface;
 use W7\Contract\Logger\LoggerFactoryInterface;
@@ -109,6 +110,9 @@ protected function registerLogger($channel, $config = []) {
 	}
 
 	protected function registerRoute($fileName, $options = []) {
+		if (App::getApp()->routeIsCached()) {
+			return true;
+		}
 		$routeConfig = [
 			'namespace' => $this->packageNamespace,
 			'module' => $this->name,
@@ -188,6 +192,9 @@ protected function setRootPath($path) {
 	 * @param $key
 	 */
 	protected function mergeConfigFrom($path, $key) {
+		if (App::getApp()->configurationIsCached()) {
+			return true;
+		}
 		$config = $this->getConfig()->get($key, []);
 		$this->getConfig()->set($key, array_merge(require $path, $config));
 	}
@@ -198,6 +205,9 @@ protected function mergeConfigFrom($path, $key) {
 	 * @param $path
 	 */
 	protected function loadRouteFrom($path) {
+		if (App::getApp()->routeIsCached()) {
+			return true;
+		}
 		include $path;
 	}
 

diff --git a/Src/Core/Route/RouteDispatcher.php b/Src/Core/Route/RouteDispatcher.php
@@ -22,8 +22,8 @@ class RouteDispatcher extends GroupCountBased {
 	public static $routeCacheFileName = 'route.php';
 
 	public static function getDispatcherWithRouteMapping(string $routeMapping, $routeCacheGroup = ServerEnum::TYPE_HTTP) {
-		$routeCacheFile = App::getApp()->getRouteCachePath() . $routeCacheGroup . '.' . self::$routeCacheFileName;
-		if (file_exists($routeCacheFile)) {
+		if (App::getApp()->routeIsCached()) {
+			$routeCacheFile = App::getApp()->getRouteCachePath() . $routeCacheGroup . '.' . self::$routeCacheFileName;
 			$routeDefinitions = require $routeCacheFile;
 			if (!is_array($routeDefinitions)) {
 				throw new \RuntimeException('Invalid cache file "' . $routeCacheFile . '"');