注册登录

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'));

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'));
     }

beike/Shop/Http/Requests/LoginRequest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Beike\Shop\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class LoginRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'email' => 'required|email:rfc,dns',
+            'password' => 'required',
+        ];
+    }
+
+    public function attributes()
+    {
+        return [
+            'email' => '邮箱地址',
+            'password' => '密码'
+        ];
+    }
+}

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',
         ];
     }
 

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);
     }
 
 }

themes/default/login.blade.php

@@ -89,9 +89,9 @@
                 </div>
 
                 <div class="mb-4">
-                  <label class="form-label" for="name">密码</label>
-                  <input type="password" name="password" class="form-control" placeholder="密码">
-                  @error('password')
+                  <label class="form-label" for="name">确认密码</label>
+                  <input type="password" name="password_confirmation" class="form-control" placeholder="密码">
+                  @error('password_confirmation')
                     <x-admin::form.error :message="$message" />
                   @enderror
                 </div>