From daf1d965e713ad9325c7459626c8e4344a6cd2fb Mon Sep 17 00:00:00 2001
From: zhaoxiang <zhaoxiang051405@gmail.com>
Date: Wed, 15 May 2019 11:42:34 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E5=AE=8C=E6=88=90=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E5=85=A8=E9=83=A8=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/command/Install.php               |  7 +--
 .../20190515031308_ini_admin_user.php         | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 database/migrations/20190515031308_ini_admin_user.php

diff --git a/application/command/Install.php b/application/command/Install.php
index f28213c..094314c 100644
--- a/application/command/Install.php
+++ b/application/command/Install.php
@@ -16,8 +16,6 @@ class Install extends Command {
         // 指令配置
         $this->setName('apiadmin:install')
             ->addOption('db', null, Option::VALUE_REQUIRED, '数据库连接参数，格式为：数据库类型://用户名:密码@数据库地址:数据库端口/数据库名#字符集')
-            ->addOption('username', null, Option::VALUE_REQUIRED, '超管账号名', 'root')
-            ->addOption('password', null, Option::VALUE_REQUIRED, '超管账号密码', '123456')
             ->setDescription('ApiAdmin安装脚本');
     }
 
@@ -40,9 +38,6 @@ class Install extends Command {
         }
 
         if ($input->hasOption('db')) {
-            $user = $input->getOption('username');
-            $pass = $input->getOption('password');
-
             try {
                 $options = $options = $this->parseDsnConfig($input->getOption('db'));
                 Connection::instance($options)->getTables($options['database']);
@@ -68,7 +63,7 @@ class Install extends Command {
                 $output->info('ApiAdmin配置更新成功');
 
                 //生成lock文件，并且写入用户名密码
-                file_put_contents($lockFile, "<?php return ['username' => '{$user}', 'password' => '{$pass}'];");
+                file_put_contents($lockFile, "lock");
                 $output->info('lock文件初始化成功');
             } catch (\PDOException $e) {
                 $output->highlight($e->getMessage());
diff --git a/database/migrations/20190515031308_ini_admin_user.php b/database/migrations/20190515031308_ini_admin_user.php
new file mode 100644
index 0000000..b3b27c4
--- /dev/null
+++ b/database/migrations/20190515031308_ini_admin_user.php
@@ -0,0 +1,50 @@
+<?php
+
+use think\facade\Env;
+use think\migration\Migrator;
+use \app\util\Strs;
+use \app\util\Tools;
+
+class IniAdminUser extends Migrator {
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+
+    public function up() {
+        $pass = Strs::randString(8);
+        $data = [
+            'id'          => 1,
+            'username'    => 'root',
+            'nickname'    => 'root',
+            'password'    => Tools::userMd5($pass),
+            'create_time' => time(),
+            'create_ip'   => ip2long('127.0.0.1'),
+            'update_time' => time(),
+            'status'      => 1,
+            'openid'      => null
+        ];
+
+        $this->table('admin_user')->insert($data)->saveData();
+
+        $lockFile = Env::get('app_path') . 'install' . DIRECTORY_SEPARATOR . 'lock.php';
+        file_put_contents($lockFile, "username:{root}, password:{{$pass}}");
+    }
+}