周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 600fa364e21bb94cd2347a44ffc54c94b550ef64 2 个父辈 93a9d816 5a865179

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 35 行增加 和 27 行删除
@@ -52,9 +52,9 @@ class LyhImportTest extends Command @@ -52,9 +52,9 @@ class LyhImportTest extends Command
52 * @time :2023/11/20 15:13 52 * @time :2023/11/20 15:13
53 */ 53 */
54 public function handle(){ 54 public function handle(){
55 - ProjectServer::useProject(3494); 55 + ProjectServer::useProject(2140);
56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL; 56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
57 - $this->importCustomModule('https://ecdn6.globalso.com/upload/p/3494/file/2025-05/faq-1.csv',3494); 57 + $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/2025-16.csv',2140);
58 DB::disconnect('custom_mysql'); 58 DB::disconnect('custom_mysql');
59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
60 } 60 }
@@ -469,7 +469,7 @@ class LyhImportTest extends Command @@ -469,7 +469,7 @@ class LyhImportTest extends Command
469 $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE, 469 $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE,
470 $contentId, $project_id); 470 $contentId, $project_id);
471 $customContentModel->edit(['route'=>$route],['id'=>$contentId]); 471 $customContentModel->edit(['route'=>$route],['id'=>$contentId]);
472 - if(!empty($item[3])){ 472 + if(!empty($item[1])){
473 $categoryId = ','; 473 $categoryId = ',';
474 $cateArr = explode('/',$item[1]); 474 $cateArr = explode('/',$item[1]);
475 foreach ($cateArr as $cateV){ 475 foreach ($cateArr as $cateV){
@@ -491,18 +491,18 @@ class LyhImportTest extends Command @@ -491,18 +491,18 @@ class LyhImportTest extends Command
491 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 491 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
492 ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 492 ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
493 ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 493 ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
494 - ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
495 - ['key'=>'pd_extended_field_16', 'type'=>1, 'values'=>$item[8]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
496 - ['key'=>'pd_extended_field_15', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
497 - ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
498 - ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
499 - ['key'=>'pd_extended_field_20', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
500 - ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
501 - ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
502 - ['key'=>'pd_extended_field_21', 'type'=>1, 'values'=>$item[15], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
503 - ['key'=>'pd_extended_field_22', 'type'=>1, 'values'=>$item[16], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
504 - ['key'=>'pd_extended_field_24', 'type'=>1, 'values'=>$item[17], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
505 - ['key'=>'pd_extended_field_23', 'type'=>1, 'values'=>$item[18], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 494 + ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  495 + ['key'=>'pd_extended_field_20', 'type'=>1, 'values'=>$item[8]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  496 + ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  497 + ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  498 + ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  499 + ['key'=>'pd_extended_field_12', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  500 + ['key'=>'pd_extended_field_4', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  501 + ['key'=>'pd_extended_field_1', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  502 + ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[15], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  503 +// ['key'=>'pd_extended_field_22', 'type'=>1, 'values'=>$item[16], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  504 +// ['key'=>'pd_extended_field_24', 'type'=>1, 'values'=>$item[17], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  505 +// ['key'=>'pd_extended_field_23', 'type'=>1, 'values'=>$item[18], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
506 ]; 506 ];
507 $customExtendContentTModel->insert($saveData); 507 $customExtendContentTModel->insert($saveData);
508 // }catch (\Exception $e){ 508 // }catch (\Exception $e){
@@ -507,29 +507,36 @@ class UpdateSeoTdk extends Command @@ -507,29 +507,36 @@ class UpdateSeoTdk extends Command
507 } 507 }
508 508
509 $project = Project::find($project_id); 509 $project = Project::find($project_id);
510 - #TODO 2025-05-16 发现{qz_x}{hz_x} 已经应用到其他指令里面，去掉限制  
511 - if (!in_array(8, explode(',', $project->deploy_optimize->special))) {  
512 - // 前缀关键词  
513 - if (preg_match_all("/\{qz_(\d+)\}/", $prompt, $matches)) {  
514 - foreach ($matches[0] as $key => $val) { 510 + // 前缀关键词
  511 + if (preg_match_all("/\{qz_(\d+)\}/", $prompt, $matches)) {
  512 + foreach ($matches[0] as $key => $val) {
  513 + //特殊关键词项目 不适用前后缀关键词
  514 + if(in_array(8, explode(',', $project->deploy_optimize->special))){
  515 + $keyword = '';
  516 + }else{
515 $keyword = $this->getPrefixKeyword($project_id, 'prefix', $matches[1][$key]); 517 $keyword = $this->getPrefixKeyword($project_id, 'prefix', $matches[1][$key]);
516 if (!$keyword) { 518 if (!$keyword) {
517 echo getmypid() . ' ' . '前缀关键词为空 跳过' . PHP_EOL; 519 echo getmypid() . ' ' . '前缀关键词为空 跳过' . PHP_EOL;
518 return false; 520 return false;
519 } 521 }
520 - $prompt = str_replace($val, $keyword, $prompt);  
521 } 522 }
  523 + $prompt = str_replace($val, $keyword, $prompt);
522 } 524 }
523 - // 后缀关键词  
524 - if (preg_match_all("/\{hz_(\d+)\}/", $prompt, $matches)) {  
525 - foreach ($matches[0] as $key => $val) { 525 + }
  526 + // 后缀关键词
  527 + if (preg_match_all("/\{hz_(\d+)\}/", $prompt, $matches)) {
  528 + foreach ($matches[0] as $key => $val) {
  529 + //特殊关键词项目 不适用前后缀关键词
  530 + if(in_array(8, explode(',', $project->deploy_optimize->special))){
  531 + $keyword = '';
  532 + }else {
526 $keyword = $this->getPrefixKeyword($project_id, 'suffix', $matches[1][$key]); 533 $keyword = $this->getPrefixKeyword($project_id, 'suffix', $matches[1][$key]);
527 if (!$keyword) { 534 if (!$keyword) {
528 echo getmypid() . ' ' . '前缀关键词为空 跳过' . PHP_EOL; 535 echo getmypid() . ' ' . '前缀关键词为空 跳过' . PHP_EOL;
529 return false; 536 return false;
530 } 537 }
531 - $prompt = str_replace($val, $keyword, $prompt);  
532 } 538 }
  539 + $prompt = str_replace($val, $keyword, $prompt);
533 } 540 }
534 } 541 }
535 542
@@ -147,8 +147,9 @@ class OptimizeController extends BaseController @@ -147,8 +147,9 @@ class OptimizeController extends BaseController
147 $data = APublicModel::getNumByProjectId($item['id']); 147 $data = APublicModel::getNumByProjectId($item['id']);
148 } 148 }
149 $manageModel = new ManageHr(); 149 $manageModel = new ManageHr();
150 -// $plan = Project::planMap();  
151 -// $seo_plan = Project::seoMap(); 150 + $plan = Project::planMap();
  151 + $seo_plan = Project::seoMap();
  152 + $item['plan'] = $plan[$item['plan']] ?? $seo_plan[1];
152 $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0); 153 $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
153 $item['build_leader'] = $manageModel->getName($item['leader_mid']); 154 $item['build_leader'] = $manageModel->getName($item['leader_mid']);
154 $item['build_manager'] = $manageModel->getName($item['manager_mid']); 155 $item['build_manager'] = $manageModel->getName($item['manager_mid']);