mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!66 修复执行install命令主机不是127.0.0.1的时候安装失败问题 

Merge pull request !66 from 小埋酱/master
pull/765110/MERGE
幻灵姬风 2018-06-24 23:39:29 +08:00 committed by Karson
parent 3920be0f2b 03f6ba62d6
commit d54583e946
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
application/admin/command/Install.php
View File

@ -20,15 +20,15 @@ class Install extends Command
{ {
$config = Config::get('database'); $config = Config::get('database');
$this $this
->setName('install') ->setName('install')
->addOption('hostname', 'a', Option::VALUE_OPTIONAL, 'mysql hostname', $config['hostname']) ->addOption('hostname', 'a', Option::VALUE_OPTIONAL, 'mysql hostname', $config['hostname'])
->addOption('hostport', 'o', Option::VALUE_OPTIONAL, 'mysql hostport', $config['hostport']) ->addOption('hostport', 'o', Option::VALUE_OPTIONAL, 'mysql hostport', $config['hostport'])
->addOption('database', 'd', Option::VALUE_OPTIONAL, 'mysql database', $config['database']) ->addOption('database', 'd', Option::VALUE_OPTIONAL, 'mysql database', $config['database'])
->addOption('prefix', 'r', Option::VALUE_OPTIONAL, 'table prefix', $config['prefix']) ->addOption('prefix', 'r', Option::VALUE_OPTIONAL, 'table prefix', $config['prefix'])
->addOption('username', 'u', Option::VALUE_OPTIONAL, 'mysql username', $config['username']) ->addOption('username', 'u', Option::VALUE_OPTIONAL, 'mysql username', $config['username'])
->addOption('password', 'p', Option::VALUE_OPTIONAL, 'mysql password', $config['password']) ->addOption('password', 'p', Option::VALUE_OPTIONAL, 'mysql password', $config['password'])
->addOption('force', 'f', Option::VALUE_OPTIONAL, 'force override', FALSE) ->addOption('force', 'f', Option::VALUE_OPTIONAL, 'force override', FALSE)
->setDescription('New installation of FastAdmin'); ->setDescription('New installation of FastAdmin');
} }
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
@ -43,8 +43,7 @@ class Install extends Command
$password = $input->getOption('password'); $password = $input->getOption('password');
$installLockFile = __DIR__ . "/Install/install.lock"; $installLockFile = __DIR__ . "/Install/install.lock";
if (is_file($installLockFile) && !$force) if (is_file($installLockFile) && !$force) {
{
throw new Exception("\nFastAdmin already installed!\nIf you need to reinstall again, use the parameter --force=true "); throw new Exception("\nFastAdmin already installed!\nIf you need to reinstall again, use the parameter --force=true ");
} }
@ -58,21 +57,30 @@ class Install extends Command
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$pdo->query("CREATE DATABASE IF NOT EXISTS `{$database}` CHARACTER SET utf8 COLLATE utf8_general_ci;"); $pdo->query("CREATE DATABASE IF NOT EXISTS `{$database}` CHARACTER SET utf8 COLLATE utf8_general_ci;");
// 连接install命令中指定的数据库
$instance = Db::connect([
'type' => "{$config['type']}",
'hostname' => "{$hostname}",
'hostport' => "{$hostport}",
'database' => "{$database}",
'username' => "{$username}",
'password' => "{$password}",
]);
// 查询一次SQL,判断连接是否正常 // 查询一次SQL,判断连接是否正常
Db::execute("SELECT 1"); $instance->execute("SELECT 1");
// 调用原生PDO对象进行批量查询 // 调用原生PDO对象进行批量查询
Db::getPdo()->exec($sql); $instance->getPdo()->exec($sql);
file_put_contents($installLockFile, 1); file_put_contents($installLockFile, 1);
$dbConfigFile = APP_PATH . 'database.php'; $dbConfigFile = APP_PATH . 'database.php';
$config = @file_get_contents($dbConfigFile); $config = @file_get_contents($dbConfigFile);
$callback = function($matches) use($hostname, $hostport, $username, $password, $database, $prefix) { $callback = function ($matches) use ($hostname, $hostport, $username, $password, $database, $prefix) {
$field = $matches[1]; $field = $matches[1];
$replace = $$field; $replace = $$field;
if ($matches[1] == 'hostport' && $hostport == 3306) if ($matches[1] == 'hostport' && $hostport == 3306) {
{
$replace = ''; $replace = '';
} }
return "'{$matches[1]}'{$matches[2]}=>{$matches[3]}Env::get('database.{$matches[1]}', '{$replace}'),"; return "'{$matches[1]}'{$matches[2]}=>{$matches[3]}Env::get('database.{$matches[1]}', '{$replace}'),";
@ -80,7 +88,7 @@ class Install extends Command
$config = preg_replace_callback("/'(hostname|database|username|password|hostport|prefix)'(\s+)=>(\s+)Env::get\((.*)\)\,/", $callback, $config); $config = preg_replace_callback("/'(hostname|database|username|password|hostport|prefix)'(\s+)=>(\s+)Env::get\((.*)\)\,/", $callback, $config);
// 写入数据库配置 // 写入数据库配置
file_put_contents($dbConfigFile, $config); file_put_contents($dbConfigFile, $config);
\think\Cache::rm('__menu__'); \think\Cache::rm('__menu__');
$output->info("Install Successed!"); $output->info("Install Successed!");