diff --git a/niucloud/app/install/controller/Index.php b/niucloud/app/install/controller/Index.php index cbaa584fa..cc49b4c6a 100644 --- a/niucloud/app/install/controller/Index.php +++ b/niucloud/app/install/controller/Index.php @@ -113,14 +113,6 @@ class Index extends BaseInstall } } - public function build() - { - $install_user = Cache::get('install_user'); - $token = ( new LoginService() )->login($install_user[ 'username' ], $install_user[ 'password' ]); - $this->assign('token', $token[ 'token' ]); - return $this->fetch('index/step-4'); - } - /** * 安装成功 * @return string @@ -130,7 +122,7 @@ class Index extends BaseInstall Cache::delete('install_data'); Cache::delete('install_status'); $this->assign('is_build', request()->get('is_build', 1)); - return $this->fetch('index/step-5'); + return $this->fetch('index/step-4'); } /** @@ -381,9 +373,6 @@ class Index extends BaseInstall ]); } - // 安装插件 - $this->installAddon(); - $fp = fopen($this->lock_file, 'wb'); if (!$fp) { $this->setSuccessLog([ "写入失败,请检查目录" . dirname(__FILE__, 2) . "是否可写入!'", 'error' ]); @@ -404,42 +393,6 @@ class Index extends BaseInstall } } - /** - * 安装插件 - * @return true - */ - public function installAddon() - { - $root_path = str_replace("\\", DIRECTORY_SEPARATOR, dirname(__FILE__, 4)); - $root_path = str_replace("../", DIRECTORY_SEPARATOR, $root_path); - $addon_path = $root_path . DIRECTORY_SEPARATOR . 'addon'; - - $files = get_files_by_dir($addon_path); - if (!empty($files)) { - $addon = []; - foreach ($files as $path) { - $data = ( new CoreAddonService() )->getAddonConfig($path); - if (isset($data[ 'key' ])) { - if ($data[ 'type' ] == 'app') { - $install_service = ( new CoreAddonInstallService($data[ 'key' ]) ); - $install_service->installCheck(); - $install_service->install(); - } else { - $addon[] = $data; - } - } - } - if (!empty($addon)) { - foreach ($addon as $k => $v) { - $install_service = ( new CoreAddonInstallService($v[ 'key' ]) ); - $install_service->installCheck(); - $install_service->install(); - } - } - } - return true; - } - /** * 安装sql * @param array $data diff --git a/niucloud/app/install/view/base.html b/niucloud/app/install/view/base.html index 33d2856af..18e92fb86 100644 --- a/niucloud/app/install/view/base.html +++ b/niucloud/app/install/view/base.html @@ -59,14 +59,8 @@
-
-
4.代码编译
-
-
-
-
-
5.安装完成
+
4.安装完成
diff --git a/niucloud/app/install/view/index/step-3.html b/niucloud/app/install/view/index/step-3.html index edb5dfabc..4ae53cf3c 100644 --- a/niucloud/app/install/view/index/step-3.html +++ b/niucloud/app/install/view/index/step-3.html @@ -326,7 +326,7 @@ success : function(data) { if(data.code == 1){ installAfterData(function(){ - window.location.href = '{$root_url}/install.php/index/build'; + window.location.href = '{$root_url}/install.php/index/installSuccess'; }) } } diff --git a/niucloud/app/install/view/index/step-4.html b/niucloud/app/install/view/index/step-4.html index 6fc71007c..41f5a02df 100644 --- a/niucloud/app/install/view/index/step-4.html +++ b/niucloud/app/install/view/index/step-4.html @@ -1,376 +1,143 @@ {extend name="base"/} {block name="resources"} {/block} {block name="main"} -
-
-
-
- > - -
-
+
+
+
+ +
+
+ {if $is_build == 1} +

恭喜您!已成功安装{$install_config.website_name}。

+ {/if} + {if $is_build == 0} +

安装过程已结束,您还需要手动编译,才能正常使用!

+

如何手动编译请参考如下链接 {$install_config.build_manual}

+ {/if} +

建议删除安装目录install后使用

+
+
+
+ - - - {/block} {block name="script"} {/block} diff --git a/niucloud/app/install/view/index/step-5.html b/niucloud/app/install/view/index/step-5.html deleted file mode 100644 index 41f5a02df..000000000 --- a/niucloud/app/install/view/index/step-5.html +++ /dev/null @@ -1,143 +0,0 @@ -{extend name="base"/} -{block name="resources"} - -{/block} -{block name="main"} -
-
-
- -
-
- {if $is_build == 1} -

恭喜您!已成功安装{$install_config.website_name}。

- {/if} - {if $is_build == 0} -

安装过程已结束,您还需要手动编译,才能正常使用!

-

如何手动编译请参考如下链接 {$install_config.build_manual}

- {/if} -

建议删除安装目录install后使用

-
-
-
- -{/block} - -{block name="script"} - -{/block}