wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed email validation

This commit is contained in:
Edward Yang 2022-09-19 14:39:43 +08:00
parent bd2b81c9df
commit 786dfccbfd
6 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beike/Admin/Http/Requests/AdminUserRequest.php
View File

@ -33,9 +33,9 @@ class AdminUserRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
if (!$this->id) { if (!$this->id) {
$rules['email'] = 'required|email:rfc,dns|unique:admin_users,email'; $rules['email'] = 'required|email:rfc|unique:admin_users,email';
} else { } else {
$rules['email'] = 'required|email:rfc,dns|unique:admin_users,email,' . $this->id; $rules['email'] = 'required|email:rfc|unique:admin_users,email,' . $this->id;
} }
return $rules; return $rules;

4
beike/Admin/Http/Requests/CustomerRequest.php
View File

@ -34,13 +34,13 @@ class CustomerRequest extends FormRequest
{ {
$rules = [ $rules = [
'name' => 'required|max:64', 'name' => 'required|max:64',
'email' => 'required|email:rfc,dns|unique:customers', 'email' => 'required|email:rfc|unique:customers',
'customer_group_id' => 'required|exists:customer_groups,id', 'customer_group_id' => 'required|exists:customer_groups,id',
]; ];
if (!$this->id) { if (!$this->id) {
$rules['password'] = 'required|max:64'; $rules['password'] = 'required|max:64';
} else { } else {
$rules['email'] = 'required|email:rfc,dns|unique:customers,email,' . $this->id; $rules['email'] = 'required|email:rfc|unique:customers,email,' . $this->id;
} }
return $rules; return $rules;
} }

41
beike/Installer/config.php
View File

@ -21,12 +21,19 @@ return [
], ],
'requirements' => [ 'requirements' => [
'php' => [ 'php' => [
'openssl', 'BCMath',
'pdo', 'Ctype',
'mbstring',
'tokenizer',
'JSON',
'cURL', 'cURL',
'DOM',
'Intl',
'Fileinfo',
'JSON',
'Mbstring',
'OpenSSL',
'PCRE',
'PDO',
'Tokenizer',
'XML',
], ],
'apache' => [ 'apache' => [
'mod_rewrite', 'mod_rewrite',
@ -43,10 +50,10 @@ return [
| |
*/ */
'permissions' => [ 'permissions' => [
'storage/framework/' => '755', 'storage/framework/' => '755',
'storage/logs/' => '755', 'storage/logs/' => '755',
'bootstrap/cache/' => '755', 'bootstrap/cache/' => '755',
'.env' => '755', '.env' => '755',
], ],
/* /*
@ -61,14 +68,14 @@ return [
'environment' => [ 'environment' => [
'form' => [ 'form' => [
'rules' => [ 'rules' => [
'database_connection' => 'required|string|max:50', 'database_connection' => 'required|string|max:50',
'database_hostname' => 'required|string|max:50', 'database_hostname' => 'required|string|max:50',
'database_port' => 'required|numeric', 'database_port' => 'required|numeric',
'database_name' => 'required|string|max:50', 'database_name' => 'required|string|max:50',
'database_username' => 'required|string|max:50', 'database_username' => 'required|string|max:50',
'database_password' => 'nullable|string|max:50', 'database_password' => 'nullable|string|max:50',
'admin_email' => 'required|email:rfc,dns', 'admin_email' => 'required|email:rfc',
'admin_password' => 'required|string|max:50', 'admin_password' => 'required|string|max:50',
], ],
], ],
], ],

2
beike/Shop/Http/Requests/EditRequest.php
View File

@ -25,7 +25,7 @@ class EditRequest extends FormRequest
{ {
return [ return [
'name' => 'required|string|min:2|max:16', 'name' => 'required|string|min:2|max:16',
'email' => 'required|email:rfc,dns|unique:customers,email,' . current_customer()->id, 'email' => 'required|email:rfc|unique:customers,email,' . current_customer()->id,
]; ];
} }

2
beike/Shop/Http/Requests/LoginRequest.php
View File

@ -24,7 +24,7 @@ class LoginRequest extends FormRequest
public function rules() public function rules()
{ {
return [ return [
'email' => 'required|email:rfc,dns', 'email' => 'required|email:rfc',
'password' => 'required', 'password' => 'required',
]; ];
} }

2
beike/Shop/Http/Requests/RegisterRequest.php
View File

@ -24,7 +24,7 @@ class RegisterRequest extends FormRequest
public function rules() public function rules()
{ {
return [ return [
'email' => 'required|email:rfc,dns|unique:customers,email', 'email' => 'required|email:rfc|unique:customers,email',
'password' => 'required|confirmed', 'password' => 'required|confirmed',
]; ];
} }