Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
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
杨昕
media-resource
Commits
51289383
Commit
51289383
authored
May 20, 2021
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code format
parent
1aa21c25
Pipeline
#14721
passed with stages
in 3 minutes 23 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
UserModel.php
app/Model/UserModel.php
+5
-5
No files found.
app/Model/UserModel.php
View file @
51289383
...
...
@@ -212,13 +212,13 @@ class UserModel extends Authenticatable
try
{
$password
=
strtolower
(
$request
->
password
)
;
$password
=
$request
->
password
;
$username
=
$request
->
username
;
/**
* 陈腾飞-ctf37800-ctf88614
-89043
* 用户名称是有
四部分组成,姓名-新账号-旧账号-mis_uid
* 陈腾飞-ctf37800-ctf88614
* 用户名称是有
三部分组成,姓名-新账号-旧账号
*/
$user
=
UserModel
::
where
(
'name'
,
'regexp'
,
'/^.*?'
.
$username
.
'/'
)
->
first
();
...
...
@@ -398,7 +398,7 @@ class UserModel extends Authenticatable
$data = sign($staffNo);
$data['type'] = 6;
$data['username'] = $staffNo;*/
//第三方接口要求mis_uid是必填字段,第一次获取的时候默认传值000000
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'mis_uid'
=>
'000000'
]));
$url
=
getRbac
(
$request
,
"api/mis/userinfo"
,
''
,
'mis_user'
);
...
...
@@ -410,7 +410,7 @@ class UserModel extends Authenticatable
$userInfo
=
json_decode
(
$result
,
true
);
if
(
empty
(
$userInfo
[
'data'
][
'userId'
])
){
if
(
!
$userInfo
[
'data'
][
'userId'
]
){
LogModel
::
addlog
([
"用户不存在"
,
$request
->
all
()]);
throw
new
\Exception
(
"用户不存在"
);
}
...
...
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