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
9093ee9b
Commit
9093ee9b
authored
Aug 20, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tesg
parent
85a50add
Pipeline
#10756
passed with stages
in 40 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
functions.php
app/Helpers/functions.php
+1
-7
IndexController.php
app/Http/Controllers/Web/IndexController.php
+1
-0
ApiMiddleware.php
app/Http/Middleware/ApiMiddleware.php
+1
-1
No files found.
app/Helpers/functions.php
View file @
9093ee9b
...
@@ -316,20 +316,15 @@ function generateRandomNum( $len = 32, $md5 = true ) {
...
@@ -316,20 +316,15 @@ function generateRandomNum( $len = 32, $md5 = true ) {
*/
*/
function
getRbac
(
$request
,
$url
=
'api/ram'
,
$category_id
=
''
,
$type
=
'base'
){
function
getRbac
(
$request
,
$url
=
'api/ram'
,
$category_id
=
''
,
$type
=
'base'
){
// $user = \Illuminate\Support\Facades\Auth::user();
if
(
$category_id
){
if
(
$category_id
){
$appid
=
$category_id
;
$appid
=
$category_id
;
}
else
{
}
else
{
$appid
=
$request
->
category_id
??
""
;
$appid
=
$request
->
category_id
??
""
;
}
}
// var_dump($request->all());die;
$mis_uid
=
$request
->
mis_uid
;
$mis_uid
=
$request
->
mis_uid
;
//https://api.eoffcn.com/demo/get?t=xx&sign=xx&ak=xx
//https://api.eoffcn.com/demo/get?t=xx&sign=xx&ak=xx
//其中sign=md5(ak=$ak&t=时间戳&sk=$sk)
//其中sign=md5(ak=$ak&t=时间戳&sk=$sk)
...
@@ -360,7 +355,6 @@ function getRbac($request,$url='api/ram',$category_id = '' ,$type='base'){
...
@@ -360,7 +355,6 @@ function getRbac($request,$url='api/ram',$category_id = '' ,$type='base'){
//$rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&appid='.$appid.'&uid='.$mis_uid;
//$rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&appid='.$appid.'&uid='.$mis_uid;
return
$rbac_url
;
return
$rbac_url
;
}
}
...
...
app/Http/Controllers/Web/IndexController.php
View file @
9093ee9b
...
@@ -18,6 +18,7 @@ class IndexController extends Controller
...
@@ -18,6 +18,7 @@ class IndexController extends Controller
{
{
function
index
(
Request
$request
){
function
index
(
Request
$request
){
$mediaCatgs
=
MediaCategoryModel
::
catgList
(
$request
);
$mediaCatgs
=
MediaCategoryModel
::
catgList
(
$request
);
$data
[
'catgs'
]
=
$mediaCatgs
;
$data
[
'catgs'
]
=
$mediaCatgs
;
...
...
app/Http/Middleware/ApiMiddleware.php
View file @
9093ee9b
...
@@ -34,7 +34,7 @@ class ApiMiddleware
...
@@ -34,7 +34,7 @@ class ApiMiddleware
$user
=
Auth
::
user
();
$user
=
Auth
::
user
();
if
(
!
isset
(
$user
->
mis_uid
)){
if
(
isset
(
$user
->
mis_uid
)){
$user
=
Auth
::
user
();
$user
=
Auth
::
user
();
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'mis_uid'
=>
$user
->
mis_uid
]));
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'mis_uid'
=>
$user
->
mis_uid
]));
}
}
...
...
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