周海龙 / globalso · 提交

转到一个项目

作者 zhl
提交 02fea576265ce34882e0eb592a17f03a315e5dc7 2 个父辈 43807d93 935fdb91

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

内嵌 并排对比
正在显示 8 个修改的文件 包含 26 行增加 和 42 行删除
... ... @@ -76,7 +76,7 @@ class AiVideoTask extends Command
$this->updateProject = [];
}
if(!empty($this->routes)){
// $this->updateRoutes($this->routes);
$this->updateRoutes($this->routes);
$this->routes = [];
}
$aiVideoTaskModel = new AiVideoTaskModel();
... ...
... ... @@ -92,7 +92,7 @@ class CropImage extends Command
public function _aiAction($project_id,$keywordImage){
$cosService = new CosService();
//ai_blog裁剪
$ai_image = $this->getAiBlogImage($project_id,$keywordImage ?? '');
$ai_image = $this->getAiBlogImage($project_id,$keywordImage ?? []);
if(empty($ai_image)){
echo '当前图片不需要裁剪。'.PHP_EOL;
return true;
... ...
... ... @@ -61,7 +61,7 @@ class AfterDayCount extends Command
$this->managerHrModel = new ManageHr();
$projectModel = new Project();
$rankDataLogModel = new RankDataLog();
$todayMidnight = date('Y-m-d 00:00:00', strtotime('today'));
$todayMidnight = date('Y-m-d', strtotime('today'));
$saveData = [];
$projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id
foreach ($this->after_manager as $key => $valM){
... ... @@ -69,9 +69,9 @@ class AfterDayCount extends Command
$project_count = $projectModel->where('gl_project.extend_type',0)
->where('gl_project.delete_status',0)
->where('gl_project.old_project_id',0)
->where('gl_project.created_at','<=',$todayMidnight)
->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
->whereIn('gl_project.type',[2,4])
->whereIn('gl_project.type',[2,4,6])
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
... ... @@ -79,25 +79,25 @@ class AfterDayCount extends Command
$qualified_count = $projectModel->where('gl_project.extend_type',0)
->where('gl_project.delete_status',0)
->where('gl_project.old_project_id',0)
->where('gl_project.created_at','<=',$todayMidnight)
->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
->where('gl_project.is_remain_today',1)
->where('gl_project_deploy_build.plan','!=',0)
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
->whereIn('gl_project.type',[2,4])
->whereIn('gl_project.type',[2,4,6])
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
->count();
$rate = number_format($qualified_count / $project_count, 2);
$threeMonthsAgo = date('Y-m-d', strtotime('-3 months'));
$threeMonthsAgo = date('Y-m', strtotime('-3 months'));
$three_project_count = $projectModel->where('gl_project.extend_type',0)
->where('gl_project.delete_status',0)
->where('gl_project.old_project_id',0)
->where('gl_project.created_at','>=',$threeMonthsAgo.' 00:00:00')
->where('gl_project.created_at','<=',$threeMonthsAgo.' 23:59:59')
->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
->whereIn('gl_project.type',[2,4])
->whereIn('gl_project.type',[2,4,6])
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
... ... @@ -106,23 +106,27 @@ class AfterDayCount extends Command
->whereIn('gl_project.id',$projectIdArr)
->where('gl_project.delete_status',0)
->where('gl_project.old_project_id',0)
->where('gl_project.created_at','>=',$threeMonthsAgo.' 00:00:00')
->where('gl_project.created_at','<=',$threeMonthsAgo.' 23:59:59')
->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
->whereIn('gl_project.type',[2,4])
->whereIn('gl_project.type',[2,4,6])
->where('gl_project_deploy_build.plan','!=',0)
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
->count();
$three_rate = number_format($three_qualified_count / $three_project_count, 2);
if($three_project_count != 0){
$three_rate = number_format($three_qualified_count / $three_project_count, 2);
}else{
$three_rate = 0;
}
$data = $projectModel->where('gl_project.extend_type',0)
->where('gl_project.delete_status',0)
->where('gl_project.created_at','<=',$todayMidnight)
->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
->where('gl_project.is_remain_today',1)
->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
->whereIn('gl_project.type',[2,4])
->whereIn('gl_project.type',[2,4,6])
->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
... ...
... ... @@ -147,11 +147,10 @@ class PostInquiryForward extends Command
'ip' => $detail['ip'],
'url' => $log['url'],
'device_port' => $detail['device_port'],
'referrer_url' => $detail['referrer'],
'user_agent' => $detail['user_agent'],
'referrer_url' => $detail['referrer']
];
$url = $website . 'api/traffic_visit/';
$res = Http::withoutVerifying()->timeout(30)->post($url, $data)->json();
$res = Http::withoutVerifying()->timeout(30)->withHeaders(['User-Agent' => $detail['user_agent']])->post($url, $data)->json();
if (empty($res['status']) || $res['status'] != 200) {
$log->status = InquiryRelayDetailLog::STATUS_FAIL;
$log->remark = mb_substr($res['message'] ?? '', 0, 200);
... ...
... ... @@ -312,4 +312,4 @@ class Supervisory extends Command
{
echo date('Y-m-d H:i:s') . ' ' . $message . PHP_EOL;
}
}
\ No newline at end of file
}
... ...
... ... @@ -43,16 +43,6 @@ class TestController extends BaseController
* @time :2025/2/13 16:34
*/
public function ceshi(){
$this->param = [
'title'=>'apple',
'description'=>'apples',
'images'=>[
['url'=>'https://ecdn6.globalso.com/upload/public/template/64e332671b32e25328.png','title'=>'apple'],
['url'=>'https://ecdn6.globalso.com/upload/public/template/64e32a24b314a39425.png','title'=>'apples'],
],
];
$aiVideoService = new AiVideoService(467);
$result = $aiVideoService->createTask($this->param['title'],$this->param['description'],$this->param['images'],$this->param['anchor'] ?? []);
$this->response('success',Code::SUCCESS,$result);
$this->response('success',Code::SUCCESS,[]);
}
}
... ...
... ... @@ -545,7 +545,7 @@ class RankDataLogic extends BaseLogic
$without_project_ids = []; //不用处理排名的项目
$without_extension_project_ids = [658]; //是否达标只统计主词的
$extension_project_ids = [354]; //扩展词也到达标的
$compliance_project_ids = [2163,257,823,1750,497]; //直接达标处理的
$compliance_project_ids = [2163,257,823,1750,497,2523,325,156]; //直接达标处理的
$ceaseProjectId = [47, 354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250];//暂停的项目
$uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
//一个项目多个api_no
... ...
Options +FollowSymLinks -Indexes
RewriteEngine On
RewriteCond %{HTTP:Authorization} .
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]