diff --git a/app/Console/Commands/V2boardInit.php b/app/Console/Commands/V2boardInit.php index c333835b..7c8dcf19 100644 --- a/app/Console/Commands/V2boardInit.php +++ b/app/Console/Commands/V2boardInit.php @@ -3,6 +3,8 @@ namespace App\Console\Commands; use Illuminate\Console\Command; +use App\Models\User; +use App\Utils\Helper; use Illuminate\Support\Facades\DB; class V2boardInit extends Command @@ -53,12 +55,34 @@ class V2boardInit extends Command if (!is_array($sql)) { abort(500, '数据库文件格式有误'); } + $this->info('正在导入数据库请稍等...'); foreach($sql as $item) { - echo 'RUN ' . $item . "\r\n"; try { DB::select(DB::raw($item)); } catch (\Exception $e) {} } + $email = ''; + while (!$email) { + $email = $this->ask('请输入管理员邮箱?'); + } + $password = ''; + while (!$password) { + $password = $this->ask('请输入管理员密码?'); + } + if (!$this->registerAdmin($email, $password)) { + abort(500, '管理员账号注册失败,请重试'); + } + + $this->info('一切就绪'); \File::put(base_path() . '/.lock', time()); } + + private function registerAdmin ($email, $password) { + $user = new User(); + $user->email = $email; + $user->password = password_hash($password, PASSWORD_DEFAULT); + $user->v2ray_uuid = Helper::guid(true); + $user->token = Helper::guid(); + return $user->save(); + } } diff --git a/app/Console/Commands/V2boardUpdate.php b/app/Console/Commands/V2boardUpdate.php index 3ab13ddc..88af7dca 100644 --- a/app/Console/Commands/V2boardUpdate.php +++ b/app/Console/Commands/V2boardUpdate.php @@ -48,12 +48,13 @@ class V2boardUpdate extends Command $sql = preg_split("/;/", $sql); if (!is_array($sql)) { abort(500, '数据库文件格式有误'); - } + } + $this->info('正在导入数据库请稍等...'); foreach($sql as $item) { - echo 'RUN ' . $item . "\r\n"; try { DB::select(DB::raw($item)); } catch (\Exception $e) {} } + $this->info('更新完毕'); } } diff --git a/app/Http/Controllers/Passport/RegisterController.php b/app/Http/Controllers/Passport/RegisterController.php index 6a9390ad..ed9c5117 100755 --- a/app/Http/Controllers/Passport/RegisterController.php +++ b/app/Http/Controllers/Passport/RegisterController.php @@ -41,7 +41,6 @@ class RegisterController extends Controller $user = new User(); $user->email = $email; $user->password = password_hash($password, PASSWORD_DEFAULT); - $user->last_login_at = time(); $user->v2ray_uuid = Helper::guid(true); $user->token = Helper::guid(); if ($request->input('invite_code')) { diff --git a/install.sql b/install.sql index 366dab86..ecc1305c 100644 --- a/install.sql +++ b/install.sql @@ -153,7 +153,7 @@ CREATE TABLE `v2_user` ( `enable` tinyint(1) NOT NULL DEFAULT '1', `banned` tinyint(1) NOT NULL DEFAULT '0', `is_admin` tinyint(1) NOT NULL DEFAULT '0', - `last_login_at` int(11) NOT NULL, + `last_login_at` int(11) DEFAULT NULL, `last_login_ip` int(11) DEFAULT NULL, `v2ray_uuid` varchar(36) NOT NULL, `v2ray_alter_id` tinyint(4) NOT NULL DEFAULT '2', @@ -171,4 +171,4 @@ CREATE TABLE `v2_user` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- 2019-12-13 09:26:39 \ No newline at end of file +-- 2019-12-19 14:14:39 \ No newline at end of file diff --git a/update.sql b/update.sql index 9107bd96..9396c094 100644 --- a/update.sql +++ b/update.sql @@ -56,3 +56,6 @@ CREATE TABLE `v2_ticket_message` ( ALTER TABLE `v2_ticket` ADD `last_reply_user_id` int(11) NOT NULL AFTER `user_id`; + +ALTER TABLE `v2_user` +CHANGE `last_login_at` `last_login_at` int(11) NULL AFTER `is_admin`; \ No newline at end of file