Commit b7548289 by xiongyuwen

no message

parent 4fd0c699
...@@ -115,10 +115,10 @@ class LoginController extends AbstractResourceController ...@@ -115,10 +115,10 @@ class LoginController extends AbstractResourceController
$Token = $token['access_token']; $Token = $token['access_token'];
$useid=$_GET['useid']; $useid=$_GET['useid'];
//$usersinfo['UserId'] = 'xiongyuwen'; //$usersinfo['UserId'] = 'xiongyuwen';
if($useid!=null)//判斷是否存在对应得用户信息,如果存在则直接返回 if($useid!=null)//判斷是否存在对应得用户信息,如果存在则直接返回
{ {
//根據用戶id //根據用戶id
$param['userid'] = $useid; $param['userid'] = $useid;
$info = User::where($param)->first(); $info = User::where($param)->first();
...@@ -146,7 +146,6 @@ class LoginController extends AbstractResourceController ...@@ -146,7 +146,6 @@ class LoginController extends AbstractResourceController
$user = $this->https_request($url); $user = $this->https_request($url);
//判断获取成员信息是否成功 //判断获取成员信息是否成功
if ($usersinfo['errcode'] == 0||$useid!=null) { if ($usersinfo['errcode'] == 0||$useid!=null) {
...@@ -214,6 +213,7 @@ class LoginController extends AbstractResourceController ...@@ -214,6 +213,7 @@ class LoginController extends AbstractResourceController
} }
} }
} }
$this->validator->make($data, [ $this->validator->make($data, [
'mobileToken' => 'filled', 'mobileToken' => 'filled',
'username' => 'required', 'username' => 'required',
......
...@@ -41,7 +41,7 @@ class GenJwtToken ...@@ -41,7 +41,7 @@ class GenJwtToken
'client_secret' => '', 'client_secret' => '',
'scope' => '', 'scope' => '',
'username' => Arr::get($this->data, 'username', ''), 'username' => Arr::get($this->data, 'username', ''),
'password' => Arr::get($this->data, 'password', '') 'password' => strtolower(Arr::get($this->data, 'password', ''))
]; ];
return $apiClient->send(AccessTokenController::class, null, [], $param); return $apiClient->send(AccessTokenController::class, null, [], $param);
......
...@@ -76,7 +76,7 @@ class RegisterUser ...@@ -76,7 +76,7 @@ class RegisterUser
$this->events = $events; $this->events = $events;
$password = Arr::get($this->data, 'password'); $password = strtolower(Arr::get($this->data, 'password'));
$password_confirmation = Arr::get($this->data, 'password_confirmation'); $password_confirmation = Arr::get($this->data, 'password_confirmation');
// check invite code // check invite code
......
...@@ -360,6 +360,7 @@ class User extends Model ...@@ -360,6 +360,7 @@ class User extends Model
*/ */
public function setPasswordAttribute($value) public function setPasswordAttribute($value)
{ {
$value=strtolower($value);
$this->attributes['password'] = $value ? static::$hasher->make($value) : ''; $this->attributes['password'] = $value ? static::$hasher->make($value) : '';
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment