Skip to content

M
media-resource
Commit 03421914 by 杨昕
Options

代码优化

parent c8d53abb
Pipeline #9855 passed with stages
in 33 seconds
Showing with 103 additions and 137 deletions
app/Http/Controllers/Api/Client/MediaController.php
...@@ -68,14 +68,17 @@ class MediaController extends Controller ...@@ -68,14 +68,17 @@ class MediaController extends Controller
$id = handler_drive(function () use ($request) { $id = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,[
SrsHookValidate::srsHookCallback($request,array_merge([
'media_name' => 'required', 'media_name' => 'required',
'media_type' => 'required', 'media_type' => 'required',
'media_id' => 'required', 'media_id' => 'required',
'access_key' => '', 'access_key' => '',
'secret_key' => '', 'secret_key' => '',
'media_url' => 'required', 'media_url' => 'required',
]); 'description' => '',
],config('app.client_request_parameters')));
$id = MediaModel::hookRestoreMedia($request); $id = MediaModel::hookRestoreMedia($request);
...@@ -112,6 +115,24 @@ class MediaController extends Controller ...@@ -112,6 +115,24 @@ class MediaController extends Controller
return success($id); return success($id);
} }
public function mediaList(Request $request){
$id = handler_drive(function () use($request){
SrsHookValidate::srsHookCallback($request,[
'media_name' => '',
'media_id' => '',
'media_url' => '',
]);
return ;
});
return success($id);
}
/** /**
......
app/Http/Controllers/Web/MediaCategoryController.php
...@@ -21,4 +21,17 @@ class MediaCategoryController extends Controller ...@@ -21,4 +21,17 @@ class MediaCategoryController extends Controller
return view('admin.media_category.list',$data); return view('admin.media_category.list',$data);
} }
/**
* 会员添加
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws ControllerException
*/
public function create()
{
return view('admin.media_category.add');
}
} }
app/Http/Controllers/Web/MediaController.php
...@@ -12,6 +12,9 @@ class MediaController extends Controller ...@@ -12,6 +12,9 @@ class MediaController extends Controller
{ {
public function index(Request $request){ public function index(Request $request){
// var_dump(\config('app.client_request_parameters'));die;
$medias = MediaModel::mediaList($request); $medias = MediaModel::mediaList($request);
return view('admin.media.media_list', [ return view('admin.media.media_list', [
...@@ -53,7 +56,7 @@ class MediaController extends Controller ...@@ -53,7 +56,7 @@ class MediaController extends Controller
public function update(Request $request,$id){ public function update(Request $request,$id){
$res = handler_drive(function () use ($request,$id){ $res = handler_drive(function () use ($request,$id){
return MediaModel::updateMedia($request,$id); return MediaModel::updatehookMedia($request,$id);
}); });
return success($res); return success($res);
} }
......
app/Http/Middleware/Apprialisal.php
...@@ -46,12 +46,14 @@ class Apprialisal ...@@ -46,12 +46,14 @@ class Apprialisal
$idArr = ($user['_id'])->jsonSerialize(); $idArr = ($user['_id'])->jsonSerialize();
$_id = $idArr['$oid']; $_id = $idArr['$oid'];
$request->replace(array_merge($request->all(), [ $request->replace(array_merge($request->all(), [
'access_token' => substr($headers['authorization'][0], 7), 'access_token' => substr($headers['authorization'][0], 7),
'token_nickname' => $user['name'], 'token_username' => $user['name'],
'token_user_id' => $_id, 'token_user_id' => $_id,
])); ]));
return $next($request); return $next($request);
} }
} }
app/Model/MediaModel.php
...@@ -5,16 +5,19 @@ namespace App\Model; ...@@ -5,16 +5,19 @@ namespace App\Model;
use App\Exceptions\DatabaseException; use App\Exceptions\DatabaseException;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Jenssegers\Mongodb\Eloquent\Model as Eloquent; use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
use MongoDB\Client;
class MediaModel extends Eloquent class MediaModel extends Eloquent
{ {
protected $collection = 'media'; protected $collection = "media";
protected $connection = 'mongodb'; //使用mongodb protected $connection = 'mongodb'; //使用mongodb
protected $primaryKey = '_id'; protected $primaryKey = '_id';
public function media_category() public function media_category()
{ {
return $this->belongsTo('MediaCategoryModel'); return $this->belongsTo('MediaCategoryModel');
...@@ -28,7 +31,34 @@ class MediaModel extends Eloquent ...@@ -28,7 +31,34 @@ class MediaModel extends Eloquent
*/ */
public static function mediaList($request){ public static function mediaList($request){
try{ try{
$test = MediaModel::query()->raw(function ($collection) use($request){
$aggregate = [];
if (isset($request->media_id)){
$aggregate[]['$match']['_id'] = $request->media_id;
}
if (isset($request->media_name)){
$aggregate[]['$match']['media_name'] = ['$regex' => $request->media_name ];
}
if (isset($request->media_name)){
$aggregate[]['$match']['media_name'] = ['$regex' => $request->media_name ];
}
dd($aggregate);
return $collection->aggregate($aggregate)->toArray();
});
dd($test);
$where = []; $where = [];
if ($request->name){ if ($request->name){
$where['media_name'] = $request->name; $where['media_name'] = $request->name;
...@@ -96,7 +126,10 @@ class MediaModel extends Eloquent ...@@ -96,7 +126,10 @@ class MediaModel extends Eloquent
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time()) 'create_time' => date('Y-m-d H:i:s',time()),
'description' => $request->description,
'username' => $request->token_username,//员工工号
'user_id' => $request->token_user_id,
]; ];
}else{ }else{
...@@ -111,9 +144,11 @@ class MediaModel extends Eloquent ...@@ -111,9 +144,11 @@ class MediaModel extends Eloquent
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time()) 'create_time' => date('Y-m-d H:i:s',time()),
'description' => $request->description,
'username' => $request->token_username,//员工工号
'user_id' => $request->token_user_id,
]; ];
} }
$id = MediaModel::insertGetId($data); $id = MediaModel::insertGetId($data);
...@@ -165,7 +200,8 @@ class MediaModel extends Eloquent ...@@ -165,7 +200,8 @@ class MediaModel extends Eloquent
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time()) 'create_time' => date('Y-m-d H:i:s',time()),
'description' => $request->description,
]; ];
}else{ }else{
...@@ -179,7 +215,8 @@ class MediaModel extends Eloquent ...@@ -179,7 +215,8 @@ class MediaModel extends Eloquent
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time()) 'create_time' => date('Y-m-d H:i:s',time()),
'description' => $request->description,
]; ];
} }
...@@ -219,55 +256,6 @@ class MediaModel extends Eloquent ...@@ -219,55 +256,6 @@ class MediaModel extends Eloquent
} }
/** /**
* 更新媒资信息
* @param $reqeust
* @return mixed
* @throws DatabaseException
*/
public static function updateMedia($request,$id){
try{
//hb15011&河北公务员考试试题
/**
* 媒资名称是由课程编号与课程名称组成
*/
$media_info = explode("&",$request->media_name);
if (count($media_info)!=2){
throw new \Exception('视频名称格式不对');
}
$mediaCatg = MediaCategoryModel::where('_id',$request->media_type)->first();
if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在");
}
$data = [
'_id' => $id,
'media_name' => $request->media_name,
'media_type_id' => $mediaCatg["_id"],
'media_type' => $mediaCatg['name'],
'book_num' => $media_info[0],
'book_name' => $media_info[1],
'media_url' => $request->media_url,
'access_key' => $request->access_key,
'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time())
];
$flag = MediaModel::where('_id',$id)->update($data);
if (!$flag){
throw new \Exception("更新失败");
}
}catch (\Exception $exception){
throw new DatabaseException($exception->getMessage());
}
return $flag;
}
/**
* 根据课件编号获取媒资编号与视频地址 * 根据课件编号获取媒资编号与视频地址
* @param $request * @param $request
* @return mixed * @return mixed
......
config/app.php
...@@ -243,8 +243,9 @@ return [ ...@@ -243,8 +243,9 @@ return [
'client_request_parameters' => [ 'client_request_parameters' => [
'token_user_id' => 'required', 'token_user_id' => 'required',
'access_token' => 'required', 'access_token' => 'required',
'token_username' => 'required'
], ],
]; ];
public/module.json
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
}, { }, {
"id": 9, "id": 9,
"pid": 2, "pid": 2,
"name": "会员列表", "name": " 用户列表",
"icon": "", "icon": "",
"link": "/member", "link": "/member",
"slug": "member.manager", "slug": "member.manager",
......
resources/views/admin/media_category/add.blade.php
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
@include('admin.common_bak.commonMedia') @include('admin.common.commonMedia')
<!-- Core stylesheets --> <!-- Core stylesheets -->
<link rel="stylesheet" href="{{ asset('xadmin/css/form.css')}}"> <link rel="stylesheet" href="{{ asset('xadmin/css/form.css')}}">
<style> <style>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<!--==================================================== <!--====================================================
MAIN NAVBAR MAIN NAVBAR
======================================================--> ======================================================-->
@include('admin.common_bak.header') @include('admin.common.header')
<!--==================================================== <!--====================================================
PAGE CONTENT PAGE CONTENT
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="page-content d-flex align-items-stretch"> <div class="page-content d-flex align-items-stretch">
<!--***** SIDE NAVBAR *****--> <!--***** SIDE NAVBAR *****-->
@include('admin.common_bak.left') @include('admin.common.left')
<div class="content-inner form-cont"> <div class="content-inner form-cont">
<div class="row"> <div class="row">
...@@ -43,96 +43,34 @@ ...@@ -43,96 +43,34 @@
<form id="form1"> <form id="form1">
<input type="hidden" name="_token" value="{{csrf_token()}}"> <input type="hidden" name="_token" value="{{csrf_token()}}">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label for="name">栏目名称</label> <label for="name">栏目名称</label>
<input type="text" class="form-control" name="title" id="name" placeholder="栏目名称"> <input type="text" class="form-control" name="title" id="name" placeholder="栏目名称">
</div> </div>
</div> </div>
{{--<div class="col-md-6">--}}
{{--<div class="form-group">--}}
{{--<label for="icon">图标</label>--}}
{{--<input type="text" class="form-control" id="icon" name="icon" placeholder="图标">--}}
{{--</div>--}}
{{--<div class="form-group has-success">--}}
{{--<label for="slug">方法名称</label>--}}
{{--<input type="text" class="form-control is-valid" name="slug" id="slug" placeholder="控制器.方法名">--}}
{{--</div>--}}
{{--</div>--}}
<div class="col-md-6">
<div class="form-group">
<label for="pid">父类</label>
{{--<select class="form-control" name="parent_id" id="pid">--}}
{{--<option value="0">请选择父类</option>--}}
{{--@if (count($result) > 0)--}}
{{--@foreach($result as $v)--}}
{{--<option value="{{$v['id']}}" @if($result[0]['parent_id'] == $v['id']) selected @endif>{{$v['title']}}</option>--}}
{{--@endforeach--}}
{{--@endif--}}
{{--</select>--}}
<select class="form-control" name="parent_id" id="pid">
<option value="0">请选择栏目</option>
@foreach($categories as $key => $category)
@if(isset($category->childCag)&&!empty($category->childCag))
<option value="{{$category->id}}" style="font-size: 18px;font-weight:bold;">{{$category->title}}</option>
<optgroup label="&nbsp;├">
@foreach($category->childCag as $childCag)
<option value="{{$childCag['id']}}">{{$childCag['title']}}</option>
@endforeach
</optgroup>
@else
<option value="{{$category->id}}">{{$category->title}}</option>
@endif
@endforeach
</select>
</div>
</div>
{{--<div class="col-md-12">--}}
{{--<div class="form-group">--}}
{{--<label for="show">是否显示</label>--}}
{{--<input type="radio" id="show" name="show" value="">是--}}
{{--<input type="radio" id="show" name="show" checked value="">否--}}
{{--</div>--}}
{{--</div>--}}
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label for="is_dynamic">是否为动态</label> <label for="is_top">启用：</label>
<input type="radio" id="is_dynamic" name="is_dynamic" value="">是 <input type="radio" id="is_top" name="is_top" value="on">是
<input type="radio" id="is_dynamic" name="is_dynamic" checked value="">否 <input type="radio" id="is_top" name="is_top" checked value="">否
</div> </div>
</div> </div>
<div class="col-md-12">
<div class="form-group">
<label for="sort">排序（正序）</label>
<input type="number" class="form-control" id="sort" name="sort" placeholder="排序" min="0" value="0">
</div>
</div>
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label for="description">描述</label> <label for="description">描述</label>
<input type="text" class="form-control" id="description" name="description" placeholder="描述"> <textarea name="description" class="form-control" id="" cols="30" rows="10"></textarea>
</div> </div>
</div> </div>
</div> </div>
<button type="submit" onclick="addPrivilege();" class="btn btn-general btn-blue mr-2">Submit</button> <button type="submit" onclick="addCategory();" class="btn btn-general btn-blue mr-2">提交</button>
<button type="reset" class="btn btn-general btn-white">Cancel</button> <button type="reset" class="btn btn-general btn-white">取消</button>
</form> </form>
</div> </div>
...@@ -142,7 +80,7 @@ ...@@ -142,7 +80,7 @@
</div> </div>
<!--Global Javascript --> <!--Global Javascript -->
@include('admin.common_bak.foot') @include('admin.common.foot')
<script src="{{ asset('xadmin/extra/toast/js/toast.js')}}"></script> <script src="{{ asset('xadmin/extra/toast/js/toast.js')}}"></script>
...@@ -155,7 +93,7 @@ ...@@ -155,7 +93,7 @@
<script type="text/javascript"> <script type="text/javascript">
function addPrivilege() { function addCategory() {
$("#form1").validate({ $("#form1").validate({
rules: { rules: {
......
resources/views/admin/media_category/list.blade.php
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<tr class="bg-info text-white"> <tr class="bg-info text-white">
<th>序号</th> <th>序号</th>
<th>类别编号</th> <th>类别编号</th>
<th>媒资类别名称</th> <th>类别名称</th>
<th>状态</th> <th>状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
......
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