周海龙 / globalso · 提交

转到一个项目

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

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

内嵌 并排对比
正在显示 8 个修改的文件 包含 24 行增加 和 40 行删除
@@ -76,7 +76,7 @@ class AiVideoTask extends Command @@ -76,7 +76,7 @@ class AiVideoTask extends Command
76 $this->updateProject = []; 76 $this->updateProject = [];
77 } 77 }
78 if(!empty($this->routes)){ 78 if(!empty($this->routes)){
79 -// $this->updateRoutes($this->routes); 79 + $this->updateRoutes($this->routes);
80 $this->routes = []; 80 $this->routes = [];
81 } 81 }
82 $aiVideoTaskModel = new AiVideoTaskModel(); 82 $aiVideoTaskModel = new AiVideoTaskModel();
@@ -92,7 +92,7 @@ class CropImage extends Command @@ -92,7 +92,7 @@ class CropImage extends Command
92 public function _aiAction($project_id,$keywordImage){ 92 public function _aiAction($project_id,$keywordImage){
93 $cosService = new CosService(); 93 $cosService = new CosService();
94 //ai_blog裁剪 94 //ai_blog裁剪
95 - $ai_image = $this->getAiBlogImage($project_id,$keywordImage ?? ''); 95 + $ai_image = $this->getAiBlogImage($project_id,$keywordImage ?? []);
96 if(empty($ai_image)){ 96 if(empty($ai_image)){
97 echo '当前图片不需要裁剪。'.PHP_EOL; 97 echo '当前图片不需要裁剪。'.PHP_EOL;
98 return true; 98 return true;
@@ -61,7 +61,7 @@ class AfterDayCount extends Command @@ -61,7 +61,7 @@ class AfterDayCount extends Command
61 $this->managerHrModel = new ManageHr(); 61 $this->managerHrModel = new ManageHr();
62 $projectModel = new Project(); 62 $projectModel = new Project();
63 $rankDataLogModel = new RankDataLog(); 63 $rankDataLogModel = new RankDataLog();
64 - $todayMidnight = date('Y-m-d 00:00:00', strtotime('today')); 64 + $todayMidnight = date('Y-m-d', strtotime('today'));
65 $saveData = []; 65 $saveData = [];
66 $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id 66 $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id
67 foreach ($this->after_manager as $key => $valM){ 67 foreach ($this->after_manager as $key => $valM){
@@ -69,9 +69,9 @@ class AfterDayCount extends Command @@ -69,9 +69,9 @@ class AfterDayCount extends Command
69 $project_count = $projectModel->where('gl_project.extend_type',0) 69 $project_count = $projectModel->where('gl_project.extend_type',0)
70 ->where('gl_project.delete_status',0) 70 ->where('gl_project.delete_status',0)
71 ->where('gl_project.old_project_id',0) 71 ->where('gl_project.old_project_id',0)
72 - ->where('gl_project.created_at','<=',$todayMidnight) 72 + ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
73 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 73 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
74 - ->whereIn('gl_project.type',[2,4]) 74 + ->whereIn('gl_project.type',[2,4,6])
75 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 75 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
76 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 76 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
77 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 77 ->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 @@ -79,25 +79,25 @@ class AfterDayCount extends Command
79 $qualified_count = $projectModel->where('gl_project.extend_type',0) 79 $qualified_count = $projectModel->where('gl_project.extend_type',0)
80 ->where('gl_project.delete_status',0) 80 ->where('gl_project.delete_status',0)
81 ->where('gl_project.old_project_id',0) 81 ->where('gl_project.old_project_id',0)
82 - ->where('gl_project.created_at','<=',$todayMidnight) 82 + ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
83 ->where('gl_project.is_remain_today',1) 83 ->where('gl_project.is_remain_today',1)
84 ->where('gl_project_deploy_build.plan','!=',0) 84 ->where('gl_project_deploy_build.plan','!=',0)
85 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 85 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
86 - ->whereIn('gl_project.type',[2,4]) 86 + ->whereIn('gl_project.type',[2,4,6])
87 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 87 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
88 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') 88 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
89 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 89 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
90 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 90 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
91 ->count(); 91 ->count();
92 $rate = number_format($qualified_count / $project_count, 2); 92 $rate = number_format($qualified_count / $project_count, 2);
93 - $threeMonthsAgo = date('Y-m-d', strtotime('-3 months')); 93 + $threeMonthsAgo = date('Y-m', strtotime('-3 months'));
94 $three_project_count = $projectModel->where('gl_project.extend_type',0) 94 $three_project_count = $projectModel->where('gl_project.extend_type',0)
95 ->where('gl_project.delete_status',0) 95 ->where('gl_project.delete_status',0)
96 ->where('gl_project.old_project_id',0) 96 ->where('gl_project.old_project_id',0)
97 - ->where('gl_project.created_at','>=',$threeMonthsAgo.' 00:00:00')  
98 - ->where('gl_project.created_at','<=',$threeMonthsAgo.' 23:59:59') 97 + ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
  98 + ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
99 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 99 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
100 - ->whereIn('gl_project.type',[2,4]) 100 + ->whereIn('gl_project.type',[2,4,6])
101 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 101 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
102 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 102 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
103 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 103 ->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 @@ -106,23 +106,27 @@ class AfterDayCount extends Command
106 ->whereIn('gl_project.id',$projectIdArr) 106 ->whereIn('gl_project.id',$projectIdArr)
107 ->where('gl_project.delete_status',0) 107 ->where('gl_project.delete_status',0)
108 ->where('gl_project.old_project_id',0) 108 ->where('gl_project.old_project_id',0)
109 - ->where('gl_project.created_at','>=',$threeMonthsAgo.' 00:00:00')  
110 - ->where('gl_project.created_at','<=',$threeMonthsAgo.' 23:59:59') 109 + ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
  110 + ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
111 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 111 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
112 - ->whereIn('gl_project.type',[2,4]) 112 + ->whereIn('gl_project.type',[2,4,6])
113 ->where('gl_project_deploy_build.plan','!=',0) 113 ->where('gl_project_deploy_build.plan','!=',0)
114 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 114 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
115 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') 115 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
116 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 116 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
117 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 117 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
118 ->count(); 118 ->count();
  119 + if($three_project_count != 0){
119 $three_rate = number_format($three_qualified_count / $three_project_count, 2); 120 $three_rate = number_format($three_qualified_count / $three_project_count, 2);
  121 + }else{
  122 + $three_rate = 0;
  123 + }
120 $data = $projectModel->where('gl_project.extend_type',0) 124 $data = $projectModel->where('gl_project.extend_type',0)
121 ->where('gl_project.delete_status',0) 125 ->where('gl_project.delete_status',0)
122 - ->where('gl_project.created_at','<=',$todayMidnight) 126 + ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
123 ->where('gl_project.is_remain_today',1) 127 ->where('gl_project.is_remain_today',1)
124 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 128 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
125 - ->whereIn('gl_project.type',[2,4]) 129 + ->whereIn('gl_project.type',[2,4,6])
126 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 130 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
127 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 131 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
128 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 132 ->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 @@ -147,11 +147,10 @@ class PostInquiryForward extends Command
147 'ip' => $detail['ip'], 147 'ip' => $detail['ip'],
148 'url' => $log['url'], 148 'url' => $log['url'],
149 'device_port' => $detail['device_port'], 149 'device_port' => $detail['device_port'],
150 - 'referrer_url' => $detail['referrer'],  
151 - 'user_agent' => $detail['user_agent'], 150 + 'referrer_url' => $detail['referrer']
152 ]; 151 ];
153 $url = $website . 'api/traffic_visit/'; 152 $url = $website . 'api/traffic_visit/';
154 - $res = Http::withoutVerifying()->timeout(30)->post($url, $data)->json(); 153 + $res = Http::withoutVerifying()->timeout(30)->withHeaders(['User-Agent' => $detail['user_agent']])->post($url, $data)->json();
155 if (empty($res['status']) || $res['status'] != 200) { 154 if (empty($res['status']) || $res['status'] != 200) {
156 $log->status = InquiryRelayDetailLog::STATUS_FAIL; 155 $log->status = InquiryRelayDetailLog::STATUS_FAIL;
157 $log->remark = mb_substr($res['message'] ?? '', 0, 200); 156 $log->remark = mb_substr($res['message'] ?? '', 0, 200);
@@ -43,16 +43,6 @@ class TestController extends BaseController @@ -43,16 +43,6 @@ class TestController extends BaseController
43 * @time :2025/2/13 16:34 43 * @time :2025/2/13 16:34
44 */ 44 */
45 public function ceshi(){ 45 public function ceshi(){
46 - $this->param = [  
47 - 'title'=>'apple',  
48 - 'description'=>'apples',  
49 - 'images'=>[  
50 - ['url'=>'https://ecdn6.globalso.com/upload/public/template/64e332671b32e25328.png','title'=>'apple'],  
51 - ['url'=>'https://ecdn6.globalso.com/upload/public/template/64e32a24b314a39425.png','title'=>'apples'],  
52 - ],  
53 - ];  
54 - $aiVideoService = new AiVideoService(467);  
55 - $result = $aiVideoService->createTask($this->param['title'],$this->param['description'],$this->param['images'],$this->param['anchor'] ?? []);  
56 - $this->response('success',Code::SUCCESS,$result); 46 + $this->response('success',Code::SUCCESS,[]);
57 } 47 }
58 } 48 }
@@ -545,7 +545,7 @@ class RankDataLogic extends BaseLogic @@ -545,7 +545,7 @@ class RankDataLogic extends BaseLogic
545 $without_project_ids = []; //不用处理排名的项目 545 $without_project_ids = []; //不用处理排名的项目
546 $without_extension_project_ids = [658]; //是否达标只统计主词的 546 $without_extension_project_ids = [658]; //是否达标只统计主词的
547 $extension_project_ids = [354]; //扩展词也到达标的 547 $extension_project_ids = [354]; //扩展词也到达标的
548 - $compliance_project_ids = [2163,257,823,1750,497]; //直接达标处理的 548 + $compliance_project_ids = [2163,257,823,1750,497,2523,325,156]; //直接达标处理的
549 $ceaseProjectId = [47, 354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250];//暂停的项目 549 $ceaseProjectId = [47, 354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250];//暂停的项目
550 $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目 550 $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
551 //一个项目多个api_no 551 //一个项目多个api_no
1 -Options +FollowSymLinks -Indexes  
2 -RewriteEngine On  
3 -  
4 -RewriteCond %{HTTP:Authorization} .  
5 -RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]  
6 -  
7 -RewriteCond %{REQUEST_FILENAME} !-d  
8 -RewriteCond %{REQUEST_FILENAME} !-f  
9 -RewriteRule ^ index.php [L]