Skip to content

M
media-resource
Commit 312fcc1d by 杨昕
Options

更改获取mis用户信息方式

parent be183a97
Pipeline #10748 passed with stages
in 41 seconds
Showing with 92 additions and 33 deletions
app/Helpers/functions.php
......@@ -314,7 +314,7 @@ function generateRandomNum( $len = 32, $md5 = true ) {
* 获取rbac统一验权
* @return string
*/
function getRbac($request,$url='api/ram',$category_id = '' ){
function getRbac($request,$url='api/ram',$category_id = '' ,$type='base'){
$user = \Illuminate\Support\Facades\Auth::user();
......@@ -322,7 +322,7 @@ function getRbac($request,$url='api/ram',$category_id = '' ){
if ($category_id){
$appid = $category_id;
}else{
$appid = $request->category_id;
$appid = $request->category_id??"";
}
......@@ -340,7 +340,24 @@ function getRbac($request,$url='api/ram',$category_id = '' ){
$time = time();
$sign = md5('ak='.$rbac_ak.'&t='.$time.'&sk='.$rbac_sk);
$rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&appid='.$appid.'&uid='.$mis_uid;
switch ($type){
case 'base':
$rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&appid='.$appid.'&uid='.$mis_uid;
break;
case 'mis_user':
$staffNo = $request->username;
$rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&staffNo='.$staffNo;
break;
default:
$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;
......
app/Http/Controllers/Api/Client/MediaController.php
......@@ -156,8 +156,13 @@ class MediaController extends Controller
'description' => '',
'sort' => '',
'page_size' => 'integer',
'media_type_id' => ''
]);
if (!isset($request->media_type_id)){
$request->replace(array_merge($request->all(),['media_type_id'=>'5efa9cb5d16f5a214671fd86']));
}
return MediaModel::mediaList($request);
});
......
app/Http/Controllers/Api/MediaController.php
......@@ -121,6 +121,7 @@ class MediaController extends Controller
'media_url' => 'required',
'description' => '',
'duration' => '',
'media_type' => 'required',
]));
$data_time = Carbon::now();
......@@ -128,11 +129,10 @@ class MediaController extends Controller
$params = array(
'media_id' => 'mda-'.generateRandomNum(16),
'media_type'=> '5efa9cb5d16f5a214671fd86',
'start_time'=> $data_time,
'end_time' => $data_time,
'access_key'=> '',
'description'=>'网校',
'description'=>'',
);
$request->replace(array_merge($request->all(),$params));
......
app/Http/Controllers/Web/MediaCategoryController.php
......@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Web;
use App\Model\MediaCategoryModel;
use App\Tool\SrsHookValidate;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
......@@ -19,6 +20,7 @@ class MediaCategoryController extends Controller
$data['name'] = $request->name;
$data['media_categories'] = $result;
return view('admin.media_category.list',$data);
}
......@@ -33,5 +35,26 @@ class MediaCategoryController extends Controller
return view('admin.media_category.add');
}
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function store(Request $request){
handler_drive(function () use($request){
SrsHookValidate::srsHookCallback($request,[
'name' => 'required',
'media_category_id' => '',
'status' => '',
'description' => ''
]);
MediaCategoryModel::addMediaCatg($request);
});
return success();
}
}
app/Http/Controllers/Web/MediaController.php
......@@ -40,7 +40,7 @@ class MediaController extends Controller
'medias' => $medias,
'start_time' => substr($request->start_time, 0, 10),
'end_time' => substr($request->end_time, 0, 10),
'name' => $request->media_name,
'media_name' => $request->media_name,
'media_id' => $request->media_id,
'STATUS' => ['启用','停用'],
]);
......@@ -61,7 +61,8 @@ class MediaController extends Controller
$media = handler_drive(function () use ($request,$id){
return MediaModel::getMediaDetail($id);
});
$media_types = MediaCategoryModel::catgList($request);
$media_types = MediaCategoryModel::get()->toArray();
return view('admin.media.media_edit', [
'media' => $media,
......
app/Model/MediaCategoryModel.php
......@@ -104,8 +104,10 @@ class MediaCategoryModel extends Eloquent
try{
$data = [
'name' => $request->name??"百度",
'status' => 0
'name' => $request->name,
'status' => 0,
'media_category_id' => $request->media_category_id??'',
'description' => $request->description??''
];
$mediaCatg = MediaCategoryModel::where('name',$request->name)->first();
......@@ -115,9 +117,8 @@ class MediaCategoryModel extends Eloquent
}
$id = MediaCategoryModel::insertGetId($data);
}catch (\Exception $exception){
throw new DatabaseException("组织不存在");
throw new DatabaseException($exception->getMessage());
}
return $id;
}
}
app/Model/MediaModel.php
......@@ -68,6 +68,8 @@ class MediaModel extends Eloquent
$aggregate[]['$match']['media_name'] = ['$regex' => addslashes($request->media_name) ];
}
if (isset($request->username) && !empty($request->username)){
$aggregate[]['$match']['username'] = $request->username;
}
......@@ -196,6 +198,12 @@ class MediaModel extends Eloquent
// $create_time = date('Y-m-d H:i:s',time());
if ($request->media_type=='100'){
$mediaCatg = MediaCategoryModel::where('_id','5f3d073a033f5a336b2b4346')->first();
}
/**
* 处理文件名称，确认是否包含"&"符合
*/
......@@ -225,8 +233,8 @@ class MediaModel extends Eloquent
$data = [
'_id' => $media_id,
'media_name' => $request->media_name,
'media_type_id' => $mediaCatg['_id'],
'media_type'=> $mediaCatg['name'],
'media_type_id' => $mediaCatg['_id'],
'media_type' => $mediaCatg['name'],
'book_num' => '',
'book_name' => $request->media_name,
'media_url' => $media_url,
......
app/Model/UserModel.php
......@@ -223,24 +223,28 @@ class UserModel extends Authenticatable
$user = UserModel::where('name', 'regexp', '/^.*?'.$username.'/')->first();
if (empty($user)|| !$user['mis_uid']){
if (empty($user)|| !isset($user['mis_uid'])){
/**
* 获取mis用户基本信息
*/
$staffNo = $username;
$url = 'http://api-mis.offcn.com/index.php/applogin/isworking';
$data = sign($staffNo);
$data['type'] = 6;
$data['username'] = $staffNo;
// $staffNo = $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);
if (empty($userInfo['data'])){
LogModel::addlog(["获取用户信息失败",$request->all()]);
throw new \Exception("获取用户信息失败");
......@@ -248,10 +252,10 @@ class UserModel extends Authenticatable
$userInfo = $userInfo['data'];
$result = self::getUserPrivilege($request,['mis_uid'=>$userInfo['userid']]);
$userid = $userInfo['userId'];
$result = self::getUserPrivilege($request,['mis_uid'=>$userid]);
$userid = $userInfo['userid'];
if (empty($user)){
//杨帆-yf18512-yf60144-8086
......
resources/views/admin/media/media_list.blade.php
......@@ -37,7 +37,7 @@
</button>
<form>
<input type="text" name="media_name" class="form-input" placeholder="请输入媒资名称" value="{{$name}}" autocomplete="off">
<input type="text" name="media_name" class="form-input" placeholder="请输入媒资名称" value="{{$media_name}}" autocomplete="off">
<input type="text" style="width: 200px;" name="media_id" class="form-input" placeholder="请输入媒资编号" value="{{$media_id}}" autocomplete="off">
<input class="form-input" name="start_time" data-toggle="start_time" autocomplete="off" value="{{$start_time}}" placeholder="请输入开始时间"/>
<input class="form-input" name="end_time" data-toggle="end_time" autocomplete="off" value="{{$end_time}}" placeholder="请输入结束时间"/>
......@@ -73,7 +73,7 @@
<td class="td-manage">
<a title="编辑" href="/web/media_manager/{{$media['_id']}}/edit">
<a title="编辑" href="/web/media_model/{{$media['_id']}}/edit">
<i class="iconfont">&#xe609;</i>
</a>
{{--<a onclick="x_admin_show('修改密码','/web/password/{{$user->id}}',500,300)" title="修改密码"--}}
......@@ -96,7 +96,7 @@
<div class="page">
<div>
{{$medias->appends(['name'=>$name,'start_time'=>$start_time,'end_time'=>$end_time,'media_id'=>$media_id])->links()}}
{{$medias->appends(['media_name'=>$media_name,'start_time'=>$start_time,'end_time'=>$end_time,'media_id'=>$media_id])->links()}}
</div>
</div>
</div>
......@@ -140,7 +140,7 @@
confirm: function () {
fetch_response('DELETE',"/web/media_manager/"+id).then(function (res) {
fetch_response('DELETE',"/web/media_model/"+id).then(function (res) {
if (res.code==200) {
$('body').toast({
position:'fixed',
......@@ -149,7 +149,7 @@
top:'50%'
});
setTimeout(function () {
window.location.href='/web/media_manager';
window.location.href='/web/media_model';
},2000)
}else{
$('body').toast({
......
resources/views/admin/media_category/add.blade.php
......@@ -46,7 +46,7 @@
<div class="col-md-12">
<div class="form-group">
<label for="name">栏目名称</label>
<input type="text" class="form-control" name="title" id="name" placeholder="栏目名称">
<input type="text" class="form-control" name="name" id="name" placeholder="栏目名称">
</div>
</div>
......@@ -54,8 +54,8 @@
<div class="form-group">
<label for="is_top">启用：</label>
<input type="radio" id="is_top" name="is_top" value="on">是
<input type="radio" id="is_top" name="is_top" checked value="">否
<input type="radio" id="status" name="status" value="on">是
<input type="radio" id="status" name="status" checked value="">否
</div>
</div>
......@@ -133,7 +133,7 @@
var form = document.querySelector("#form1");
var formdata = new FormData(form);
fetch_response('POST', '/web/news_category', formdata).then(function (res) {
fetch_response('POST', '/web/media_category', formdata).then(function (res) {
if (res.code == 200) {
$('body').toast({
position: 'fixed',
......@@ -142,7 +142,7 @@
top: '50%'
});
setTimeout(function () {
window.location.href = '/web/news_category';
window.location.href = '/web/media_category';
}, 2000)
} else {
......
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