周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 3c9ff07770d65397d44f7506216926bcf978e0d0 2 个父辈 d7c95745 718ad4cc

合并分支 'develop' 到 'master' 

Develop



查看合并请求 !476
内嵌 并排对比
正在显示 5 个修改的文件 包含 53 行增加 和 13 行删除
... ... @@ -594,14 +594,21 @@ if (!function_exists('getFileUrl')) {
if(substr($path,0,2) == '//'){
return 'https:'.$path;
}
$file_type = pathinfo($path, PATHINFO_EXTENSION);
$fileTypeArr = ['zip', 'pdf', 'mp4', 'doc', 'docx', 'm4v', 'xlsx'];
if(in_array(strtolower($file_type),$fileTypeArr)){
$cdn2 = config('filesystems.disks.cos')['cdn2'];
return $cdn2.$path;
}
if($location == 0){
//v6-file.globalso.com
$cos = config('filesystems.disks.cos');
$cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
$url = $cosCdn.$path;
return $cosCdn.$path;
}else{
$s3 = config('filesystems.disks.s3');
$cdn = $s3['cdn'];
$url = $cdn.$path;
return $cdn.$path;
}
}
return $url;
... ...
... ... @@ -995,7 +995,7 @@ class ProjectController extends BaseController
if($hrInfo === false){
$this->response('变更的用户不存在',Code::SYSTEM_ERROR);
}
$logic->getManagerFiled($hrInfo['entry_position'],$this->param['old_id'],$this->param['new_id']);
$logic->getManagerFiled($hrInfo['entry_position'],$this->param['old_id'],$this->param['new_id'],$this->param['project_id'] ?? []);
$this->response('success');
}
... ...
... ... @@ -210,10 +210,25 @@ class ImageController extends Controller
$amazonS3Service->uploadFiles($files,$this->path,$fileName);
}
$this->saveMysql($imageModel,$files->getSize(),$image_type,$fileName,$hash,$this->upload_location,$files->getMimeType(), $name);
$this->synchronizationImage($fileName);
return $this->response('图片资源',Code::SUCCESS,$this->responseData($this->path.'/'.$fileName, $name));
}
/**
* @remark :指定同步文件到獨立177服務器
* @name :synchronizationFile
* @author :lyh
* @method :post
* @time :2024/4/8 11:10
*/
public function synchronizationImage($fileName){
//同步到大文件
$file_path = getImageUrl($this->path.'/'.$fileName,$this->cache['storage_type'] ?? 0);
$cmd = 'curl -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$this->path.'" https://v6-file.globalso.com/upload.php';
shell_exec($cmd);
}
/**
* @remark :保存数据库
* @name :saveMysql
* @author :lyh
... ... @@ -290,6 +305,7 @@ class ImageController extends Controller
}
//批量存储
$this->saveMysql($imageModel,$file->getSize(),$image_type,$fileName,$hash,$this->upload_location,$file->getMimeType(),$name);
$this->synchronizationImage($fileName);
$data[] = $this->responseData($this->path.'/'.$fileName,$name);
}
$this->response('图片资源',Code::SUCCESS,$data);
... ...
... ... @@ -839,52 +839,68 @@ class ProjectLogic extends BaseLogic
* @method :post
* @time :2024/4/7 11:12
*/
public function getManagerFiled($entry_position,$old_id,$new_id){
public function getManagerFiled($entry_position,$old_id,$new_id,$project_id = []){
if(!empty($project_id)){
$param['project_id'] = ['in',$project_id];
}
switch ($entry_position){
//技术经理
case 41:
$param['leader_mid'] = $old_id;
$deployBuildModel = new DeployBuild();
$deployBuildModel->edit(['leader_mid'=>$new_id],['leader_mid'=>$old_id]);
$deployBuildModel->edit(['leader_mid'=>$new_id],$param);
break;
//项目经理
case 39:
$param['manager_mid'] = $old_id;
$deployBuildModel = new DeployBuild();
$deployBuildModel->edit(['manager_mid'=>$new_id],['manager_mid'=>$old_id]);
$deployBuildModel->edit(['manager_mid'=>$new_id],$param);
break;
//设计师
case 38:
$param['designer_mid'] = $old_id;
$deployBuildModel = new DeployBuild();
$deployBuildModel->edit(['tech_mid'=>$new_id],['tech_mid'=>$old_id]);
$deployBuildModel->edit(['designer_mid'=>$new_id],$param);
//技术助理
case 40:
$param['tech_mid'] = $old_id;
$deployBuildModel = new DeployBuild();
$deployBuildModel->edit(['tech_mid'=>$new_id],['tech_mid'=>$old_id]);
$deployBuildModel->edit(['tech_mid'=>$new_id],$param);
break;
//优化主管+优化经理
case 51:
case 48:
$param['manager_mid'] = $old_id;
$deployOptimizeModel = new DeployOptimize();
$deployOptimizeModel->edit(['manager_mid'=>$new_id],['manager_mid'=>$old_id]);
$deployOptimizeModel->edit(['manager_mid'=>$new_id],$param);
$param['tech_leader'] = $old_id;
unset($param['manager_mid']);
$deployOptimizeModel->edit(['tech_leader'=>$new_id],['tech_leader'=>$old_id]);
break;
//优化师
case 44:
$param['optimist_mid'] = $old_id;
$deployOptimizeModel = new DeployOptimize();
$deployOptimizeModel->edit(['optimist_mid'=>$new_id],['optimist_mid'=>$old_id]);
$deployOptimizeModel->edit(['optimist_mid'=>$new_id],$param);
$param['assist_mid'] = $old_id;
unset($param['optimist_mid']);
$deployOptimizeModel->edit(['assist_mid'=>$new_id],['assist_mid'=>$old_id]);
break;
case 46:
//优化师助理
$param['assist_mid'] = $old_id;
$deployOptimizeModel = new DeployOptimize();
$deployOptimizeModel->edit(['assist_mid'=>$new_id],['assist_mid'=>$old_id]);
$deployOptimizeModel->edit(['assist_mid'=>$new_id],$param);
case 45:
//售后技术
$param['tech_mid'] = $old_id;
$deployOptimizeModel = new DeployOptimize();
$deployOptimizeModel->edit(['tech_mid'=>$new_id],['tech_mid'=>$old_id]);
$deployOptimizeModel->edit(['tech_mid'=>$new_id],$param);
case 38:
//品控
$param['design_mid'] = $old_id;
$deployOptimizeModel = new DeployOptimize();
$deployOptimizeModel->edit(['design_mid'=>$new_id],['design_mid'=>$old_id]);
$deployOptimizeModel->edit(['design_mid'=>$new_id],$param);
default:
break;
}
... ...
... ... @@ -80,6 +80,7 @@ return [
'bucket' => env('COS_BUCKET'),
'cdn' => env('COS_CDN'),
'cdn1' => env('COS_CDN1'),
'cdn2' => env('COS_CDN2'),
'timeout' => 60,
'connect_timeout' => 60,
],
... ...