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
3e80add8
Commit
3e80add8
authored
Mar 25, 2021
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改管理员店铺管理逻辑
parent
e91bfb1f
Pipeline
#14030
passed with stages
in 2 minutes 37 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
PrivilegeController.php
app/Http/Controllers/Web/PrivilegeController.php
+11
-1
UserModel.php
app/Model/UserModel.php
+3
-2
No files found.
app/Http/Controllers/Web/PrivilegeController.php
View file @
3e80add8
...
...
@@ -18,10 +18,19 @@ class PrivilegeController extends Controller
*/
public
function
index
(
Request
$request
)
{
$user
=
Auth
::
user
();
if
(
$user
->
name
==
config
(
"custom.supper_admin"
)[
'name'
]){
$url
=
getRbac
(
$request
);
$data
[
'url'
]
=
$url
;
return
view
(
'admin.privilege.list'
,
$data
);
}
$url
=
getRbac
(
$request
,
'api/open/check'
);
$data
[
'appid'
]
=
$request
->
appid
;
$data
[
'uid'
]
=
Auth
::
user
()
->
mis_uid
;
$data
[
'uid'
]
=
$user
->
mis_uid
;
$data
[
'tree'
]
=
1
;
...
...
@@ -31,6 +40,7 @@ class PrivilegeController extends Controller
$data
);
$result
=
json_decode
(
$result
,
true
);
if
(
empty
(
$result
[
'data'
])){
...
...
app/Model/UserModel.php
View file @
3e80add8
...
...
@@ -3,6 +3,7 @@
namespace
App\Model
;
use
App\Exceptions\DatabaseException
;
use
Carbon\Carbon
;
use
Illuminate\Notifications\Notifiable
;
use
Illuminate\Support\Facades\DB
;
use
Jenssegers\Mongodb\Auth\User
as
Authenticatable
;
...
...
@@ -169,13 +170,13 @@ class UserModel extends Authenticatable
if
(
!
empty
(
$user
)){
throw
new
\Exception
(
"用户已存在"
);
}
$create_time
=
new
UTCDateTime
(
time
()
*
1000
);
$data
=
[
'name'
=>
$request
->
name
,
'password'
=>
md5
(
$request
->
password
),
'organization_id'
=>
0
,
'status'
=>
0
,
'create_time'
=>
date
(
'Y-m-d H:i:s'
,
time
())
,
'create_time'
=>
$create_time
,
'user_type'
=>
1
];
...
...
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