From 40f7ee82cd5a8f7ba555ab0f239c50bd498970a1 Mon Sep 17 00:00:00 2001 From: wolfcode <37436228+wolf-leo@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:21:02 +0800 Subject: [PATCH 1/3] refactor(install): update view path delimiter - Change the view path delimiter from '/' to '@' for the installation view - This modification ensures consistency with the naming convention used in other parts of the application --- app/index/controller/Install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index/controller/Install.php b/app/index/controller/Install.php index 0219d4e..4bf29eb 100644 --- a/app/index/controller/Install.php +++ b/app/index/controller/Install.php @@ -41,7 +41,7 @@ class Install extends BaseController ]; $currentHost = '://'; $result = compact('errorInfo', 'currentHost', 'isInstall', 'envInfo'); - return view('index/install/index', $result); + return view('index@install/index', $result); } if ($errorInfo) $this->error($errorInfo); $charset = 'utf8mb4'; From 5814fed0da905971afc83cb26d7a777740347725 Mon Sep 17 00:00:00 2001 From: wolfcode <37436228+wolf-leo@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:32:25 +0800 Subject: [PATCH 2/3] Update Install.php --- app/index/controller/Install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index/controller/Install.php b/app/index/controller/Install.php index 4bf29eb..0219d4e 100644 --- a/app/index/controller/Install.php +++ b/app/index/controller/Install.php @@ -41,7 +41,7 @@ class Install extends BaseController ]; $currentHost = '://'; $result = compact('errorInfo', 'currentHost', 'isInstall', 'envInfo'); - return view('index@install/index', $result); + return view('index/install/index', $result); } if ($errorInfo) $this->error($errorInfo); $charset = 'utf8mb4'; From 2e0cc8596650bea50d9ee0b07cb02bd0749a108a Mon Sep 17 00:00:00 2001 From: wolfcode <37436228+wolf-leo@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:48:38 +0800 Subject: [PATCH 3/3] build(deps): update topthink/think-view to 2.0.0 - Change topthink/think-view dependency from ^2.0 to 2.0.0 - This update specifies an exact version to ensure compatibility and stability --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6a2f660..80ca8a7 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "topthink/framework": "^8.0", "topthink/think-orm": "^3.0", "topthink/think-multi-app": "^1.1.0", - "topthink/think-view": "^2.0", + "topthink/think-view": "2.0.0", "topthink/think-captcha": "^3.0", "topthink/think-filesystem": "^2.0", "aliyuncs/oss-sdk-php": "^2.6",