Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DiscuzPHP
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Discuz
DiscuzPHP
Commits
b7548289
Commit
b7548289
authored
Mar 18, 2021
by
xiongyuwen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
4fd0c699
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
LoginController.php
app/Api/Controller/Users/LoginController.php
+2
-2
GenJwtToken.php
app/Commands/Users/GenJwtToken.php
+1
-1
RegisterUser.php
app/Commands/Users/RegisterUser.php
+1
-1
User.php
app/Models/User.php
+1
-0
No files found.
app/Api/Controller/Users/LoginController.php
View file @
b7548289
...
...
@@ -115,10 +115,10 @@ class LoginController extends AbstractResourceController
$Token
=
$token
[
'access_token'
];
$useid
=
$_GET
[
'useid'
];
//$usersinfo['UserId'] = 'xiongyuwen';
if
(
$useid
!=
null
)
//判斷是否存在对应得用户信息,如果存在则直接返回
{
//根據用戶id
$param
[
'userid'
]
=
$useid
;
$info
=
User
::
where
(
$param
)
->
first
();
...
...
@@ -146,7 +146,6 @@ class LoginController extends AbstractResourceController
$user
=
$this
->
https_request
(
$url
);
//判断获取成员信息是否成功
if
(
$usersinfo
[
'errcode'
]
==
0
||
$useid
!=
null
)
{
...
...
@@ -214,6 +213,7 @@ class LoginController extends AbstractResourceController
}
}
}
$this
->
validator
->
make
(
$data
,
[
'mobileToken'
=>
'filled'
,
'username'
=>
'required'
,
...
...
app/Commands/Users/GenJwtToken.php
View file @
b7548289
...
...
@@ -41,7 +41,7 @@ class GenJwtToken
'client_secret'
=>
''
,
'scope'
=>
''
,
'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
);
...
...
app/Commands/Users/RegisterUser.php
View file @
b7548289
...
...
@@ -76,7 +76,7 @@ class RegisterUser
$this
->
events
=
$events
;
$password
=
Arr
::
get
(
$this
->
data
,
'password'
);
$password
=
strtolower
(
Arr
::
get
(
$this
->
data
,
'password'
)
);
$password_confirmation
=
Arr
::
get
(
$this
->
data
,
'password_confirmation'
);
// check invite code
...
...
app/Models/User.php
View file @
b7548289
...
...
@@ -360,6 +360,7 @@ class User extends Model
*/
public
function
setPasswordAttribute
(
$value
)
{
$value
=
strtolower
(
$value
);
$this
->
attributes
[
'password'
]
=
$value
?
static
::
$hasher
->
make
(
$value
)
:
''
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment