Skip to content

M
media-resource
Commit 2beed58f by 杨昕
Options

Merge branch 'test' into 'master' 

Test

See merge request !26
parents 19d2b729 2eb2b895
Pipeline #11468 passed with stages
in 1 minute 3 seconds
Showing with 81 additions and 32 deletions
app/Helpers/functions.php
......@@ -316,6 +316,7 @@ function generateRandomNum( $len = 32, $md5 = true ) {
*/
function getRbac($request,$url='api/ram',$appid = '' ,$type='base'){
if ($appid){
$appid = $appid;
}else{
......@@ -348,6 +349,10 @@ function getRbac($request,$url='api/ram',$appid = '' ,$type='base'){
$rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&staffNo='.$staffNo;
break;
case 'clear_cache':
$rbac_url = $rbac.'/cdn/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak;
break;
default:
$rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&appid='.$appid.'&uid='.$mis_uid;
......
app/Http/Controllers/Api/Client/MediaController.php
......@@ -34,8 +34,28 @@ class MediaController extends Controller
public function index(Request $request){
$result = handler_drive(function () use ($request) {
return ["mediaID" => 'mda-'.generateRandomNum(16)];
$i = 0;
do {
$media_id = "mda-".generateRandomNum(16);
$media = MediaModel::find($media_id);
$i ++;
} while ($i < 3 && !empty($media) );
if ($i == 3){
return 0;
}
return ["mediaID" => $media_id];
});
if (!$result){
return error("mediaID重复生成次数太多");
}
return success($result);
}
......@@ -91,6 +111,7 @@ class MediaController extends Controller
'start_time' => 'required|date',
'end_time' => 'required|date|after_or_equal:start_time',
'duration' => '',
'replace' => ''
],config('app.client_request_parameters')),null,[
'start_time.date' => '开始时间格式错误',
'start_time.required'=> '开始时间不能为空',
......@@ -126,7 +147,7 @@ class MediaController extends Controller
'access_key' => '',
'secret_key' => '',
'media_url' => 'required',
'description' => '',
'description' => '',
// 'start_time' => 'required|date',
// 'end_time' => 'required|date|after_or_equal:start_time',
]);
......
app/Http/Middleware/Apprialisal.php
......@@ -51,6 +51,7 @@ class Apprialisal
'access_token' => substr($headers['authorization'][0], 7),
'token_username' => $user['name'],
'token_user_id' => $_id,
'mis_uid' => $user['mis_uid']
]));
......
app/Model/MediaModel.php
......@@ -176,12 +176,37 @@ class MediaModel extends Eloquent
* 判断媒资ID是否存在
*/
$media_id = $request->media_id;
$media_type = $request->media_type;
$mediaCatg = MediaCategoryModel::where('_id',$media_type)->first();
if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在");
}
if ($request->replace){
$recycleId = RecycleModel::addRecycle($media_id);
$call_back = $mediaCatg['call_back'];
$media = MediaModel::where("_id",$media_id)->first();
$url = getRbac($request,$call_back,$mediaCatg['media_category_id'] ,$type='clear_cache');
http_request_code($url,null,'POST',['mediaId'=>$media_id]);
self::updatehookMedia($request,$media_id);
if (!$recycleId){
throw new \Exception('回收站保存失败');
}
return $media_id;
}else{
$media = MediaModel::where("_id",$media_id)->first();
if (!empty($media)){
throw new \Exception("媒资编号已被使用");
if (!empty($media)){
throw new \Exception("媒资编号已被使用");
}
}
//hb15011&河北公务员考试试题
......@@ -190,15 +215,6 @@ class MediaModel extends Eloquent
*/
$media_info = explode("&",$request->media_name);
$media_type = $request->media_type;
$mediaCatg = MediaCategoryModel::where('_id',$media_type)->first();
if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在");
}
$media_url = $request->media_url;
$media_url = str_replace("http:","https:",$media_url);
......@@ -208,7 +224,7 @@ class MediaModel extends Eloquent
* 构造开始时间，结束时间
*/
$start_time = new UTCDateTime(strtotime($request->start_time) * 1000);
$end_time = new UTCDateTime(strtotime($request->end_time) * 1000);;
$end_time = new UTCDateTime(strtotime($request->end_time) * 1000);
$create_time = new UTCDateTime(time() * 1000);;
// $start_time = $request->start_time;
......@@ -305,6 +321,9 @@ class MediaModel extends Eloquent
throw new \Exception("媒资类别不存在");
}
$start_time = new UTCDateTime(strtotime($request->start_time) * 1000);
$end_time = new UTCDateTime(strtotime($request->end_time) * 1000);
/**
* 处理文件名称，确认是否包含"&"符合
......@@ -318,13 +337,14 @@ class MediaModel extends Eloquent
'media_type_id' => $mediaCatg['_id'],
'book_num' => $media_info[0],
'book_name' => $media_info[1],
// 'media_url' => $request->media_url,
'media_url' => $request->media_url?$request->media_url:$media['media_url'],
// 'access_key' => $request->access_key,
// 'secret_key' => $request->secret_key,
'secret_key' => $request->secret_key?$request->secret_key:$media['secret_key'],
// 'create_time' => $media['create_time'],
'description' => $request->description,
// 'start_time' => $request->start_time??'',
// 'end_time' => $request->end_time??'',
'start_time' => $request->start_time?$start_time:$media['start_time'],
'end_time' => $request->end_time?$end_time:$media['start_time'],
'duration' => $request->duration??"0",
];
}else{
......@@ -335,13 +355,14 @@ class MediaModel extends Eloquent
'media_type_id' => $mediaCatg['_id'],
'book_num' => '',
'book_name' => $request->media_name,
// 'media_url' => $request->media_url,
'media_url' => $request->media_url?$request->media_url:$media['media_url'],
// 'access_key' => $request->access_key,
// 'secret_key' => $request->secret_key,
'secret_key' => $request->secret_key?$request->secret_key:$media['secret_key'],
// 'create_time' => date('Y-m-d H:i:s',time()),
'description' => $request->description,
// 'start_time' => $request->start_time??'',
// 'end_time' => $request->end_time??'',
'start_time' => $request->start_time?$start_time:$media['start_time'],
'end_time' => $request->end_time?$end_time:$media['start_time'],
'duration' => $request->duration??"0",
];
}
......
app/Model/RecycleModel.php
......@@ -19,19 +19,19 @@ class RecycleModel extends Eloquent
public static function addRecycle($obj_id,$obj_type="media"){
$recycle = RecycleModel::where([
"obj_type" => $obj_type,
"obj_id" => $obj_id,
])->first();
// $recycle = RecycleModel::where([
// "obj_type" => $obj_type,
// "obj_id" => $obj_id,
// ])->first();
if (!empty($recycle)){
throw new \Exception("回收站已存在");
}
// if (!empty($recycle)){
// throw new \Exception("回收站已存在");
// }
$obj_model = 'App\\Model\\'.ucfirst($obj_type).'Model';
$model = new $obj_model();
$obj = $model->find($obj_id)->toArray();
$obj = $model->find($obj_id);
if (empty($obj)){
throw new \Exception('数据不存在');
......
config/app.php
......@@ -245,7 +245,8 @@ return [
'client_request_parameters' => [
'token_user_id' => 'required',
'access_token' => 'required',
'token_username' => 'required'
'token_username' => 'required',
'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