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
1be42477
Commit
1be42477
authored
Aug 19, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
中间件添加过滤器
parent
43283f3f
Pipeline
#10751
passed with stages
in 41 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
9 deletions
+39
-9
functions.php
app/Helpers/functions.php
+3
-2
IndexController.php
app/Http/Controllers/Web/IndexController.php
+1
-0
LoginController.php
app/Http/Controllers/Web/LoginController.php
+29
-7
Kernel.php
app/Http/Kernel.php
+1
-0
AdminLogin.php
app/Http/Middleware/AdminLogin.php
+3
-0
MediaCategoryModel.php
app/Model/MediaCategoryModel.php
+2
-0
No files found.
app/Helpers/functions.php
View file @
1be42477
...
@@ -316,7 +316,7 @@ function generateRandomNum( $len = 32, $md5 = true ) {
...
@@ -316,7 +316,7 @@ 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
();
//
$user = \Illuminate\Support\Facades\Auth::user();
if
(
$category_id
){
if
(
$category_id
){
...
@@ -325,9 +325,10 @@ function getRbac($request,$url='api/ram',$category_id = '' ,$type='base'){
...
@@ -325,9 +325,10 @@ function getRbac($request,$url='api/ram',$category_id = '' ,$type='base'){
$appid
=
$request
->
category_id
??
""
;
$appid
=
$request
->
category_id
??
""
;
}
}
// var_dump($request->all());die;
$mis_uid
=
$user
[
'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)
...
...
app/Http/Controllers/Web/IndexController.php
View file @
1be42477
...
@@ -19,6 +19,7 @@ class IndexController extends Controller
...
@@ -19,6 +19,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
;
return
view
(
'admin.index'
,
$data
);
return
view
(
'admin.index'
,
$data
);
...
...
app/Http/Controllers/Web/LoginController.php
View file @
1be42477
...
@@ -60,20 +60,38 @@ class LoginController extends Controller
...
@@ -60,20 +60,38 @@ class LoginController extends Controller
if
(
!
$user
->
mis_uid
){
if
(
!
$user
->
mis_uid
){
$staffNo
=
$request
->
username
;
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'mis_uid'
=>
'000000'
]));
$url
=
'http://api-mis.offcn.com/index.php/applogin/isworking'
;
$data
=
sign
(
$staffNo
);
$url
=
getRbac
(
$request
,
"api/mis/userinfo"
,
''
,
'mis_user'
);
$data
[
'type'
]
=
6
;
$data
[
'username'
]
=
$staffNo
;
$result
=
http_request_code
(
$url
,
$result
=
http_request_code
(
$url
,
null
,
null
,
'POST'
,
'GET'
$data
);
);
$userInfo
=
json_decode
(
$result
,
true
);
$userInfo
=
json_decode
(
$result
,
true
);
var_dump
(
$userInfo
);
die
;
// $staffNo = $request->username;
// $url = 'http://api-mis.offcn.com/index.php/applogin/isworking';
// $data = sign($staffNo);
// $data['type'] = 6;
// $data['username'] = $staffNo;
//
// $result = http_request_code($url,
// null,
// 'POST',
// $data
// );
// $userInfo = json_decode($result,true);
if
(
!
isset
(
$userInfo
[
'data'
])){
if
(
!
isset
(
$userInfo
[
'data'
])){
LogModel
::
addlog
([
"获取用户信息失败"
,
$request
->
all
(),
'userInfo'
=>
$userInfo
,
'data'
=>
$data
]);
LogModel
::
addlog
([
"获取用户信息失败"
,
$request
->
all
(),
'userInfo'
=>
$userInfo
,
'data'
=>
$data
]);
throw
new
\Exception
(
"获取用户信息失败"
);
throw
new
\Exception
(
"获取用户信息失败"
);
...
@@ -99,11 +117,14 @@ class LoginController extends Controller
...
@@ -99,11 +117,14 @@ class LoginController extends Controller
$catgList
=
MediaCategoryModel
::
get
()
->
toArray
();
$catgList
=
MediaCategoryModel
::
get
()
->
toArray
();
$tmp
=
[];
$tmp
=
[];
foreach
(
$catgList
as
$key
=>
$catg
){
foreach
(
$catgList
as
$key
=>
$catg
){
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'category_id'
=>
$catg
[
'media_category_id'
]]));
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'category_id'
=>
$catg
[
'media_category_id'
]]));
$url
=
getRbac
(
$request
,
'api/open/check'
,
$catg
[
'media_category_id'
]);
$url
=
getRbac
(
$request
,
'api/open/check'
,
$catg
[
'media_category_id'
]);
$data
[
'appid'
]
=
$catg
[
'media_category_id'
];
$data
[
'appid'
]
=
$catg
[
'media_category_id'
];
...
@@ -118,6 +139,7 @@ class LoginController extends Controller
...
@@ -118,6 +139,7 @@ class LoginController extends Controller
$privilege
=
json_decode
(
$result
,
true
);
$privilege
=
json_decode
(
$result
,
true
);
if
(
!
empty
(
$privilege
[
'data'
])){
if
(
!
empty
(
$privilege
[
'data'
])){
array_push
(
$tmp
,
$catg
);
array_push
(
$tmp
,
$catg
);
}
}
...
...
app/Http/Kernel.php
View file @
1be42477
...
@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
...
@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\VerifyCsrfToken
::
class
,
\App\Http\Middleware\VerifyCsrfToken
::
class
,
\Illuminate\Routing\Middleware\SubstituteBindings
::
class
,
\Illuminate\Routing\Middleware\SubstituteBindings
::
class
,
\App\Http\Middleware\ApiMiddleware
::
class
,
\App\Http\Middleware\ApiMiddleware
::
class
,
\App\Http\Middleware\AdminLogin
::
class
],
],
'auth'
=>
[
\App\Http\Middleware\Apprialisal
::
class
],
'auth'
=>
[
\App\Http\Middleware\Apprialisal
::
class
],
'api'
=>
[
'api'
=>
[
...
...
app/Http/Middleware/AdminLogin.php
View file @
1be42477
...
@@ -26,6 +26,9 @@ class AdminLogin
...
@@ -26,6 +26,9 @@ class AdminLogin
self
::
getPutValueHandle
(
$request
);
self
::
getPutValueHandle
(
$request
);
}
}
$user
=
Auth
::
user
();
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'mis_uid'
=>
$user
->
mis_uid
]));
return
$next
(
$request
);
return
$next
(
$request
);
}
}
}
}
app/Model/MediaCategoryModel.php
View file @
1be42477
...
@@ -35,6 +35,8 @@ class MediaCategoryModel extends Eloquent
...
@@ -35,6 +35,8 @@ class MediaCategoryModel extends Eloquent
/**
/**
* 获取用户业务线及对应业务线的权限
* 获取用户业务线及对应业务线的权限
*/
*/
$url
=
getRbac
(
$request
,
'api/open/getPlatform'
,
'ec8747abc5dbe8288e64f327a76ac517'
);
$url
=
getRbac
(
$request
,
'api/open/getPlatform'
,
'ec8747abc5dbe8288e64f327a76ac517'
);
$result
=
http_request_code
(
$url
,
$result
=
http_request_code
(
$url
,
array
(
array
(
...
...
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