0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:更新项目安装，增加项目domain配置

Browse Source
This commit is contained in:
JaguarJack 2020-09-08 14:34:03 +08:00
parent 14b5b3ce3a
commit 04e2b1ffe5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/filesystem.php
View File

@ -10,7 +10,7 @@ return [
'local' => [ 'local' => [
'type' => 'local', 'type' => 'local',
'root' => app()->getRootPath() . 'public'.DIRECTORY_SEPARATOR.'images', 'root' => app()->getRootPath() . 'public'.DIRECTORY_SEPARATOR.'images',
'domain' => env('app.api_url'), 'domain' => env('app.domain'),
], ],
'public' => [ 'public' => [
// 磁盘类型 // 磁盘类型

12
extend/catcher/command/install/InstallProjectCommand.php
View File

@ -113,6 +113,12 @@ class InstallProjectCommand extends Command
return false; return false;
} }
// 设置 app domain
$appDomain = strtolower($this->output->ask($this->input, '👉 first, you should set app domain: '));
if (strpos('http://', $appDomain) === false || strpos('https://', $appDomain) === false) {
$appDomain = 'http://' . $appDomain;
}
$answer = strtolower($this->output->ask($this->input, '🤔️ Did You Need to Set Database information? (Y/N): ')); $answer = strtolower($this->output->ask($this->input, '🤔️ Did You Need to Set Database information? (Y/N): '));
if ($answer === 'y' || $answer === 'yes') { if ($answer === 'y' || $answer === 'yes') {
@ -144,7 +150,7 @@ class InstallProjectCommand extends Command
$this->databaseLink = [$host, $database, $username, $password, $port, $charset, $prefix]; $this->databaseLink = [$host, $database, $username, $password, $port, $charset, $prefix];
$this->generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix); $this->generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix, $appDomain);
} }
} }
@ -263,13 +269,15 @@ class InstallProjectCommand extends Command
* @param $port * @param $port
* @param $charset * @param $charset
* @param $prefix * @param $prefix
* @param $appDomain
* @return void * @return void
*/ */
protected function generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix): void protected function generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix, $appDomain): void
{ {
try { try {
$env = \parse_ini_file(root_path() . '.example.env', true); $env = \parse_ini_file(root_path() . '.example.env', true);
$env['APP']['DOMAIN'] = $appDomain;
$env['DATABASE']['HOSTNAME'] = $host; $env['DATABASE']['HOSTNAME'] = $host;
$env['DATABASE']['DATABASE'] = $database; $env['DATABASE']['DATABASE'] = $database;
$env['DATABASE']['USERNAME'] = $username; $env['DATABASE']['USERNAME'] = $username;