Commit 1be42477 by 杨昕

中间件添加过滤器

parent 43283f3f
Pipeline #10751 passed with stages
in 41 seconds
......@@ -316,7 +316,7 @@ function generateRandomNum( $len = 32, $md5 = true ) {
*/
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){
......@@ -325,9 +325,10 @@ function getRbac($request,$url='api/ram',$category_id = '' ,$type='base'){
$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
//其中sign=md5(ak=$ak&t=时间戳&sk=$sk)
......
......@@ -19,6 +19,7 @@ class IndexController extends Controller
function index(Request $request){
$mediaCatgs = MediaCategoryModel::catgList($request);
$data['catgs'] = $mediaCatgs;
return view('admin.index',$data);
......
......@@ -60,20 +60,38 @@ class LoginController extends Controller
if (!$user->mis_uid){
$staffNo = $request->username;
$url = 'http://api-mis.offcn.com/index.php/applogin/isworking';
$data = sign($staffNo);
$data['type'] = 6;
$data['username'] = $staffNo;
$request->replace(array_merge($request->all(),['mis_uid'=>'000000']));
$url = getRbac($request,"api/mis/userinfo",'','mis_user');
$result = http_request_code($url,
null,
'POST',
$data
'GET'
);
$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'])){
LogModel::addlog(["获取用户信息失败",$request->all(),'userInfo'=>$userInfo,'data'=>$data]);
throw new \Exception("获取用户信息失败");
......@@ -99,11 +117,14 @@ class LoginController extends Controller
$catgList = MediaCategoryModel::get()->toArray();
$tmp = [];
foreach ($catgList as $key => $catg){
$request->replace(array_merge($request->all(),['category_id'=>$catg['media_category_id']]));
$url = getRbac($request,'api/open/check',$catg['media_category_id']);
$data['appid'] = $catg['media_category_id'];
......@@ -118,6 +139,7 @@ class LoginController extends Controller
$privilege = json_decode($result,true);
if (!empty($privilege['data'])){
array_push($tmp,$catg);
}
......
......@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\ApiMiddleware::class,
\App\Http\Middleware\AdminLogin::class
],
'auth' => [\App\Http\Middleware\Apprialisal::class],
'api' => [
......
......@@ -26,6 +26,9 @@ class AdminLogin
self::getPutValueHandle($request);
}
$user = Auth::user();
$request->replace(array_merge($request->all(),['mis_uid'=>$user->mis_uid]));
return $next($request);
}
}
......@@ -35,6 +35,8 @@ class MediaCategoryModel extends Eloquent
/**
* 获取用户业务线及对应业务线的权限
*/
$url = getRbac($request,'api/open/getPlatform','ec8747abc5dbe8288e64f327a76ac517');
$result = http_request_code($url,
array(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment