Commit 2eb2b895 by 杨昕

清理第三方缓存

parent 2b49db89
Pipeline #11456 passed with stages
in 47 seconds
...@@ -316,6 +316,7 @@ function generateRandomNum( $len = 32, $md5 = true ) { ...@@ -316,6 +316,7 @@ function generateRandomNum( $len = 32, $md5 = true ) {
*/ */
function getRbac($request,$url='api/ram',$appid = '' ,$type='base'){ function getRbac($request,$url='api/ram',$appid = '' ,$type='base'){
if ($appid){ if ($appid){
$appid = $appid; $appid = $appid;
}else{ }else{
...@@ -348,6 +349,10 @@ function getRbac($request,$url='api/ram',$appid = '' ,$type='base'){ ...@@ -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; $rbac_url = $rbac.'/rbac/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak.'&staffNo='.$staffNo;
break; break;
case 'clear_cache':
$rbac_url = $rbac.'/cdn/'.$url.'?t='.$time.'&sign='.$sign.'&ak='.$rbac_ak;
break;
default: 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;
......
...@@ -51,6 +51,7 @@ class Apprialisal ...@@ -51,6 +51,7 @@ class Apprialisal
'access_token' => substr($headers['authorization'][0], 7), 'access_token' => substr($headers['authorization'][0], 7),
'token_username' => $user['name'], 'token_username' => $user['name'],
'token_user_id' => $_id, 'token_user_id' => $_id,
'mis_uid' => $user['mis_uid']
])); ]));
......
...@@ -187,8 +187,13 @@ class MediaModel extends Eloquent ...@@ -187,8 +187,13 @@ class MediaModel extends Eloquent
$recycleId = RecycleModel::addRecycle($media_id); $recycleId = RecycleModel::addRecycle($media_id);
$call_back = $mediaCatg['call_back']; $call_back = $mediaCatg['call_back'];
$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); self::updatehookMedia($request,$media_id);
http_request_code($call_back,null,'GET',['mediaId'=>$media_id]);
if (!$recycleId){ if (!$recycleId){
throw new \Exception('回收站保存失败'); throw new \Exception('回收站保存失败');
...@@ -318,6 +323,7 @@ class MediaModel extends Eloquent ...@@ -318,6 +323,7 @@ class MediaModel extends Eloquent
$start_time = new UTCDateTime(strtotime($request->start_time) * 1000); $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);
/** /**
* 处理文件名称,确认是否包含"&"符合 * 处理文件名称,确认是否包含"&"符合
*/ */
...@@ -330,9 +336,9 @@ class MediaModel extends Eloquent ...@@ -330,9 +336,9 @@ class MediaModel extends Eloquent
'media_type_id' => $mediaCatg['_id'], 'media_type_id' => $mediaCatg['_id'],
'book_num' => $media_info[0], 'book_num' => $media_info[0],
'book_name' => $media_info[1], 'book_name' => $media_info[1],
'media_url' => $request->media_url?$request->media_url:$media_info['media_url'], 'media_url' => $request->media_url?$request->media_url:$media['media_url'],
// 'access_key' => $request->access_key, // 'access_key' => $request->access_key,
'secret_key' => $request->secret_key?$request->secret_key:$media_info['secret_key'], 'secret_key' => $request->secret_key?$request->secret_key:$media['secret_key'],
// 'create_time' => $media['create_time'], // 'create_time' => $media['create_time'],
'description' => $request->description, 'description' => $request->description,
'start_time' => $request->start_time?$start_time:$media['start_time'], 'start_time' => $request->start_time?$start_time:$media['start_time'],
...@@ -348,9 +354,9 @@ class MediaModel extends Eloquent ...@@ -348,9 +354,9 @@ class MediaModel extends Eloquent
'media_type_id' => $mediaCatg['_id'], 'media_type_id' => $mediaCatg['_id'],
'book_num' => '', 'book_num' => '',
'book_name' => $request->media_name, 'book_name' => $request->media_name,
'media_url' => $request->media_url?$request->media_url:$media_info['media_url'], 'media_url' => $request->media_url?$request->media_url:$media['media_url'],
// 'access_key' => $request->access_key, // 'access_key' => $request->access_key,
'secret_key' => $request->secret_key?$request->secret_key:$media_info['secret_key'], 'secret_key' => $request->secret_key?$request->secret_key:$media['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, 'description' => $request->description,
'start_time' => $request->start_time?$start_time:$media['start_time'], 'start_time' => $request->start_time?$start_time:$media['start_time'],
......
...@@ -31,7 +31,7 @@ class RecycleModel extends Eloquent ...@@ -31,7 +31,7 @@ class RecycleModel extends Eloquent
$obj_model = 'App\\Model\\'.ucfirst($obj_type).'Model'; $obj_model = 'App\\Model\\'.ucfirst($obj_type).'Model';
$model = new $obj_model(); $model = new $obj_model();
$obj = $model->find($obj_id)->toArray(); $obj = $model->find($obj_id);
if (empty($obj)){ if (empty($obj)){
throw new \Exception('数据不存在'); throw new \Exception('数据不存在');
......
...@@ -245,7 +245,8 @@ return [ ...@@ -245,7 +245,8 @@ return [
'client_request_parameters' => [ 'client_request_parameters' => [
'token_user_id' => 'required', 'token_user_id' => 'required',
'access_token' => '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