Merge remote-tracking branch 'origin/master' into akun

@@ -105,7 +105,7 @@ class ReplaceHtml extends Command
                 'source_id'=>$v['id'],
                 'source_id'=>$v['id'],
                 'is_rollback'=>$info['is_rollback'],
                 'is_rollback'=>$info['is_rollback'],
                 'template_id'=>$info['template_id'],
                 'template_id'=>$info['template_id'],
-                'name'=>$v['name'],
+                'source_name'=>$v['name'],
                 'created_at'=>date('Y-m-d H:i:s'),
                 'created_at'=>date('Y-m-d H:i:s'),
                 'updated_at'=>date('Y-m-d H:i:s')
                 'updated_at'=>date('Y-m-d H:i:s')
             ];
             ];

@@ -26,7 +26,8 @@ class Common
         $data = [
         $data = [
             'operator_id'=>$param['operator_id'],
             'operator_id'=>$param['operator_id'],
             'model'=>$param['model'],
             'model'=>$param['model'],
-            'remark'=>$param['remark']
+            'remark'=>$param['remark'],
+            'project_id'=>$param['project_id']
         ];
         ];
         $model = new UserLogModel();
         $model = new UserLogModel();
         return $model->add($data);
         return $model->add($data);

@@ -159,7 +159,7 @@ class BaseController extends Controller
         $log = config('logging.operator_log');
         $log = config('logging.operator_log');
         if(isset($log) && $log['log'] == true){
         if(isset($log) && $log['log'] == true){
             if(empty($log['action']) || (strpos($log['action'],$this->request->route()->getName()) === false)){
             if(empty($log['action']) || (strpos($log['action'],$this->request->route()->getName()) === false)){
-                Common::set_user_log(['model'=>$this->request->route()->getName(),'remark'=>'请求的参数：param = '.json_encode($this->param),'operator_id'=>$this->uid,'type'=>isset($this->user['manager_id']) ? 1 : 0]);
+                Common::set_user_log(['project_id'=>$this->user['project_id'] ?? 0,'model'=>$this->request->route()->getName(),'remark'=>'请求的参数：param = '.json_encode($this->param),'operator_id'=>$this->uid,'type'=>isset($this->user['manager_id']) ? 1 : 0]);
             }
             }
         }
         }
         return true;
         return true;

@@ -388,8 +388,8 @@ class FileController
         if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
         if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
             $this->map['project_id'] = $this->cache['project_id'];
             $this->map['project_id'] = $this->cache['project_id'];
         }
         }
-        $this->map['refer'] = 1;
         $fileModel = new File();
         $fileModel = new File();
+        $this->map['type'] = 'mp4';
         $lists = $fileModel->list($this->map,'id',['id','hash','type','path','created_at','name']);
         $lists = $fileModel->list($this->map,'id',['id','hash','type','path','created_at','name']);
         foreach ($lists as $k => $v){
         foreach ($lists as $k => $v){
             $v['file_link'] = getFileUrl($v['path'],$this->cache['storage_type'] ?? 0,$this->cache['project_location'] ?? 0,$this->cache['file_cdn'] ?? 0);
             $v['file_link'] = getFileUrl($v['path'],$this->cache['storage_type'] ?? 0,$this->cache['project_location'] ?? 0,$this->cache['file_cdn'] ?? 0);

@@ -177,6 +177,7 @@ class UserLoginLogic
         $info['project_location'] = $project['project_location'];
         $info['project_location'] = $project['project_location'];
         $info['is_update_language'] = $project['is_update_language'];
         $info['is_update_language'] = $project['is_update_language'];
         $info['configuration'] = $project['deploy_build']['configuration'];
         $info['configuration'] = $project['deploy_build']['configuration'];
+        $info['file_cdn'] = $project['deploy_build']['file_cdn'];
         $info['project_type'] = $project['type'];
         $info['project_type'] = $project['type'];
         $info['service_duration'] = $project['deploy_build']['service_duration'];
         $info['service_duration'] = $project['deploy_build']['service_duration'];
         $info['remain_day'] = $project['remain_day'];
         $info['remain_day'] = $project['remain_day'];