diff --git a/beike/Shop/Http/Controllers/account/LoginController.php b/beike/Shop/Http/Controllers/account/LoginController.php index 3c5b5ed8..e81f6305 100644 --- a/beike/Shop/Http/Controllers/account/LoginController.php +++ b/beike/Shop/Http/Controllers/account/LoginController.php @@ -13,6 +13,7 @@ namespace Beike\Shop\Http\Controllers\account; use Beike\Models\Customer; use Beike\Shop\Http\Controllers\Controller; +use Beike\Shop\Http\Requests\LoginRequest; use Illuminate\Http\Request; use function auth; use function back; @@ -26,12 +27,9 @@ class LoginController extends Controller return view('login'); } - public function store(Request $request) + public function store(LoginRequest $request) { - $credentials = $request->validate([ - 'email' => ['required', 'email'], - 'password' => ['required'], - ]); + $credentials = $request->only('email', 'password'); if (auth(Customer::AUTH_GUARD)->attempt($credentials)) { return redirect(shop_route('account.index')); diff --git a/beike/Shop/Http/Controllers/account/RegisterController.php b/beike/Shop/Http/Controllers/account/RegisterController.php index 61a1b232..f842fdbd 100644 --- a/beike/Shop/Http/Controllers/account/RegisterController.php +++ b/beike/Shop/Http/Controllers/account/RegisterController.php @@ -28,7 +28,7 @@ class RegisterController extends Controller public function store(RegisterRequest $request) { - AccountService::register($request->all()); + AccountService::register($request->only('email', 'password')); return redirect(shop_route('login.index')); } diff --git a/beike/Shop/Http/Requests/LoginRequest.php b/beike/Shop/Http/Requests/LoginRequest.php new file mode 100644 index 00000000..16790318 --- /dev/null +++ b/beike/Shop/Http/Requests/LoginRequest.php @@ -0,0 +1,39 @@ + 'required|email:rfc,dns', + 'password' => 'required', + ]; + } + + public function attributes() + { + return [ + 'email' => '邮箱地址', + 'password' => '密码' + ]; + } +} diff --git a/beike/Shop/Http/Requests/RegisterRequest.php b/beike/Shop/Http/Requests/RegisterRequest.php index 20369223..9dd29f2a 100644 --- a/beike/Shop/Http/Requests/RegisterRequest.php +++ b/beike/Shop/Http/Requests/RegisterRequest.php @@ -24,7 +24,8 @@ class RegisterRequest extends FormRequest public function rules() { return [ - 'email' => 'required|email:rfc,dns', + 'email' => 'required|email:rfc,dns|unique:customers,email', + 'password' => 'required|confirmed', ]; } diff --git a/beike/Shop/Repositories/CustomerRepo.php b/beike/Shop/Repositories/CustomerRepo.php index e79f9b30..cf9ce0e4 100644 --- a/beike/Shop/Repositories/CustomerRepo.php +++ b/beike/Shop/Repositories/CustomerRepo.php @@ -24,17 +24,7 @@ class CustomerRepo */ public static function create($customerData) { - return Customer::query()->insertGetId([ - 'name' => $customerData['name'], - 'email' => $customerData['email'], - 'password' => $customerData['password'], - 'status' => $customerData['status'], - 'avatar' => $customerData['avatar'], - 'customer_group_id' => $customerData['customer_group_id'], - 'language_id' => $customerData['language_id'], - 'status' => $customerData['status'], - 'from' => $customerData['from'], - ]); + return Customer::query()->insertGetId($customerData); } } diff --git a/themes/default/login.blade.php b/themes/default/login.blade.php index 43bf18f6..d7d2cfa2 100644 --- a/themes/default/login.blade.php +++ b/themes/default/login.blade.php @@ -89,9 +89,9 @@
- - - @error('password') + + + @error('password_confirmation') @enderror