From af400b3a0be8327d460fcfead2342d4a34122bd7 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 Jan 2020 17:08:09 +0800 Subject: [PATCH] update --- .../Controllers/Passport/CommController.php | 14 +++ .../Controllers/Passport/ForgetController.php | 30 ------ .../Controllers/Passport/LoginController.php | 94 ------------------ .../Passport/RegisterController.php | 96 ------------------- 4 files changed, 14 insertions(+), 220 deletions(-) delete mode 100644 app/Http/Controllers/Passport/ForgetController.php delete mode 100755 app/Http/Controllers/Passport/LoginController.php delete mode 100755 app/Http/Controllers/Passport/RegisterController.php diff --git a/app/Http/Controllers/Passport/CommController.php b/app/Http/Controllers/Passport/CommController.php index 13c5e6b2..411887fc 100644 --- a/app/Http/Controllers/Passport/CommController.php +++ b/app/Http/Controllers/Passport/CommController.php @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Mail; use App\Utils\Helper; use Illuminate\Support\Facades\Cache; use App\Jobs\SendEmail; +use App\Models\InviteCode; class CommController extends Controller { @@ -56,4 +57,17 @@ class CommController extends Controller 'data' => true ]); } + + public function pv(Request $request) + { + $inviteCode = InviteCode::where('code', $request->input('invite_code'))->first(); + if ($inviteCode) { + $inviteCode->pv = $inviteCode->pv + 1; + $inviteCode->save(); + } + + return response([ + 'data' => true + ]); + } } diff --git a/app/Http/Controllers/Passport/ForgetController.php b/app/Http/Controllers/Passport/ForgetController.php deleted file mode 100644 index 209ca1a0..00000000 --- a/app/Http/Controllers/Passport/ForgetController.php +++ /dev/null @@ -1,30 +0,0 @@ -input('email'); - if (Cache::get($redisKey) !== $request->input('email_code')) { - abort(500, '邮箱验证码有误'); - } - $user = User::where('email', $request->input('email'))->first(); - $user->password = password_hash($request->input('password'), PASSWORD_DEFAULT); - if (!$user->save()) { - abort(500, '重置失败'); - } - Cache::forget($redisKey); - return response([ - 'data' => true - ]); - } -} diff --git a/app/Http/Controllers/Passport/LoginController.php b/app/Http/Controllers/Passport/LoginController.php deleted file mode 100755 index a261d11f..00000000 --- a/app/Http/Controllers/Passport/LoginController.php +++ /dev/null @@ -1,94 +0,0 @@ -input('email'); - $password = $request->input('password'); - - $user = User::where('email', $email)->first(); - if (!$user) { - abort(500, '用户名或密码错误'); - } - if (!password_verify($password, $user->password)) { - abort(500, '用户名或密码错误'); - } - - if ($user->banned) { - abort(500, '该账户已被停止使用'); - } - - $request->session()->put('email', $user->email); - $request->session()->put('id', $user->id); - if ($user->is_admin) { - $request->session()->put('is_admin', true); - } - return response([ - 'data' => [ - 'is_admin' => $user->is_admin ? 2 : 1, - 'token' => $user->token - ] - ]); - } - - public function token2Login(Request $request) - { - if ($request->input('token')) { - $user = User::where('token', $request->input('token'))->first(); - if (!$user) { - return header('Location:' . config('v2board.app_url')); - } - $code = Helper::guid(); - $key = 'token2Login_' . $code; - Cache::put($key, $user->id, 600); - $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard'); - if (config('v2board.app_url')) { - $location = config('v2board.app_url') . $redirect; - } else { - $location = url($redirect); - } - return header('Location:' . $location); - } - - if ($request->input('verify')) { - $key = 'token2Login_' . $request->input('verify'); - $userId = Cache::get($key); - if (!$userId) { - abort(500, '令牌有误'); - } - $user = User::find($userId); - if (!$user) { - abort(500, '用户不存在'); - } - if ($user->banned) { - abort(500, '该账户已被停止使用'); - } - $request->session()->put('email', $user->email); - $request->session()->put('id', $user->id); - if ($user->is_admin) { - $request->session()->put('is_admin', true); - } - Cache::forget($key); - return response([ - 'data' => true - ]); - } - } - - public function check(Request $request) - { - return response([ - 'data' => $request->session()->get('id') ? true : false - ]); - } -} diff --git a/app/Http/Controllers/Passport/RegisterController.php b/app/Http/Controllers/Passport/RegisterController.php deleted file mode 100755 index 4f8cd422..00000000 --- a/app/Http/Controllers/Passport/RegisterController.php +++ /dev/null @@ -1,96 +0,0 @@ -input('invite_code'))) { - abort(500, '必须使用邀请码才可以注册'); - } - } - if ((int)config('v2board.email_verify', 0)) { - $redisKey = 'sendEmailVerify:' . $request->input('email'); - if (empty($request->input('email_code'))) { - abort(500, '邮箱验证码不能为空'); - } - if (Cache::get($redisKey) !== $request->input('email_code')) { - abort(500, '邮箱验证码有误'); - } - } - $email = $request->input('email'); - $password = $request->input('password'); - $exist = User::where('email', $email)->first(); - if ($exist) { - abort(500, '邮箱已存在系统中'); - } - $user = new User(); - $user->email = $email; - $user->password = password_hash($password, PASSWORD_DEFAULT); - $user->v2ray_uuid = Helper::guid(true); - $user->token = Helper::guid(); - if ($request->input('invite_code')) { - $inviteCode = InviteCode::where('code', $request->input('invite_code')) - ->where('status', 0) - ->first(); - if (!$inviteCode) { - if ((int)config('v2board.invite_force', 0)) { - abort(500, '邀请码无效'); - } - } else { - $user->invite_user_id = $inviteCode->user_id ? $inviteCode->user_id : null; - if (!(int)config('v2board.invite_never_expire', env('V2BOARD_INVITE_NEVER_EXPIRE'))) { - $inviteCode->status = 1; - $inviteCode->save(); - } - } - } - - // try out - if ((int)config('v2board.try_out_enable', 0)) { - $plan = Plan::find(config('v2board.try_out_plan_id')); - if ($plan) { - $user->transfer_enable = $plan->transfer_enable * 1073741824; - $user->plan_id = $plan->id; - $user->group_id = $plan->group_id; - $user->expired_at = time() + (config('v2board.try_out_hour', 1) * 3600); - } - } - - if (!$user->save()) { - abort(500, '注册失败'); - } - if ((int)config('v2board.email_verify', 0)) { - Cache::forget($redisKey); - } - return response()->json([ - 'data' => true - ]); - } - - public function pv(Request $request) - { - $inviteCode = InviteCode::where('code', $request->input('invite_code'))->first(); - if ($inviteCode) { - $inviteCode->pv = $inviteCode->pv + 1; - $inviteCode->save(); - } - - return response([ - 'data' => true - ]); - } -}