Commit 9093ee9b by 杨昕

tesg

parent 85a50add
Pipeline #10756 passed with stages
in 40 seconds
...@@ -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;
} }
......
...@@ -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;
......
...@@ -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]));
} }
......
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