周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 e42886fa5a51781bb4a01ee7635e48bcb4d877c3 1 个父辈 835c85a6

gxai

内嵌 并排对比
正在显示 2 个修改的文件 包含 27 行增加 和 265 行删除
@@ -71,14 +71,18 @@ class AfterDayCount extends Command @@ -71,14 +71,18 @@ class AfterDayCount extends Command
71 ->where('gl_project.created_at','<=',$todayMidnight) 71 ->where('gl_project.created_at','<=',$todayMidnight)
72 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 72 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
73 ->whereIn('gl_project.type',[2,4]) 73 ->whereIn('gl_project.type',[2,4])
74 - ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count(); 74 + ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  75 + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
  76 + ->count();
75 $qualified_count = $projectModel->where('gl_project.extend_type',0) 77 $qualified_count = $projectModel->where('gl_project.extend_type',0)
76 ->where('gl_project.delete_status',0) 78 ->where('gl_project.delete_status',0)
77 ->where('gl_project.created_at','<=',$todayMidnight) 79 ->where('gl_project.created_at','<=',$todayMidnight)
78 ->where('gl_project.is_remain_today',1) 80 ->where('gl_project.is_remain_today',1)
79 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 81 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
80 ->whereIn('gl_project.type',[2,4]) 82 ->whereIn('gl_project.type',[2,4])
81 - ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count(); 83 + ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  84 + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
  85 + ->count();
82 $rate = number_format($qualified_count / $project_count, 2); 86 $rate = number_format($qualified_count / $project_count, 2);
83 $threeMonthsAgo = date('Y-m-d 00:00:00', strtotime('-3 months')); 87 $threeMonthsAgo = date('Y-m-d 00:00:00', strtotime('-3 months'));
84 $three_project_count = $projectModel->where('gl_project.extend_type',0) 88 $three_project_count = $projectModel->where('gl_project.extend_type',0)
@@ -86,14 +90,18 @@ class AfterDayCount extends Command @@ -86,14 +90,18 @@ class AfterDayCount extends Command
86 ->where('gl_project.created_at','<=',$threeMonthsAgo) 90 ->where('gl_project.created_at','<=',$threeMonthsAgo)
87 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 91 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
88 ->whereIn('gl_project.type',[2,4]) 92 ->whereIn('gl_project.type',[2,4])
89 - ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count(); 93 + ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  94 + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
  95 + ->count();
90 $three_qualified_count = $projectModel->where('gl_project.extend_type',0) 96 $three_qualified_count = $projectModel->where('gl_project.extend_type',0)
91 ->whereIn('gl_project.id',$projectIdArr) 97 ->whereIn('gl_project.id',$projectIdArr)
92 ->where('gl_project.delete_status',0) 98 ->where('gl_project.delete_status',0)
93 ->where('gl_project.created_at','<=',$threeMonthsAgo) 99 ->where('gl_project.created_at','<=',$threeMonthsAgo)
94 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 100 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
95 ->whereIn('gl_project.type',[2,4]) 101 ->whereIn('gl_project.type',[2,4])
96 - ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count(); 102 + ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  103 + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
  104 + ->count();
97 $three_rate = number_format($three_qualified_count / $three_project_count, 2); 105 $three_rate = number_format($three_qualified_count / $three_project_count, 2);
98 $data = $projectModel->where('gl_project.extend_type',0) 106 $data = $projectModel->where('gl_project.extend_type',0)
99 ->where('gl_project.delete_status',0) 107 ->where('gl_project.delete_status',0)
@@ -102,6 +110,7 @@ class AfterDayCount extends Command @@ -102,6 +110,7 @@ class AfterDayCount extends Command
102 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 110 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
103 ->whereIn('gl_project.type',[2,4]) 111 ->whereIn('gl_project.type',[2,4])
104 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 112 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
  113 + ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
105 ->pluck('gl_project.title')->toArray(); 114 ->pluck('gl_project.title')->toArray();
106 $saveData[] = [ 115 $saveData[] = [
107 'date'=>date('Y-m-d', strtotime('yesterday')), 116 'date'=>date('Y-m-d', strtotime('yesterday')),
@@ -67,7 +67,7 @@ class UpdateRoute extends Command @@ -67,7 +67,7 @@ class UpdateRoute extends Command
67 */ 67 */
68 public function handle() 68 public function handle()
69 { 69 {
70 - return $this->keyword_actions(); 70 + return $this->settingSeo();
71 } 71 }
72 72
73 public function keyword_actions(){ 73 public function keyword_actions(){
@@ -592,270 +592,23 @@ class UpdateRoute extends Command @@ -592,270 +592,23 @@ class UpdateRoute extends Command
592 } 592 }
593 593
594 /** 594 /**
595 - * @remark :更新产品分类前后缀  
596 - * @name :updateSeo 595 + * @remark :设置seo_前后缀
  596 + * @name :settingSeo
597 * @author :lyh 597 * @author :lyh
598 * @method :post 598 * @method :post
599 - * @time :2025/3/14 14:39 599 + * @time :2025/4/15 15:14
600 */ 600 */
601 - public function insertData(){  
602 - $countries = [  
603 - 'AFG' => 'Afghanistan',  
604 - 'ALB' => 'Albania',  
605 - 'DZA' => 'Algeria',  
606 - 'AND' => 'Andorra',  
607 - 'AGO' => 'Angola',  
608 - 'ATG' => 'Antigua and Barbuda',  
609 - 'ARG' => 'Argentina',  
610 - 'ARM' => 'Armenia',  
611 - 'AUS' => 'Australia',  
612 - 'AUT' => 'Austria',  
613 - 'AZE' => 'Azerbaijan',  
614 - 'BHS' => 'Bahamas',  
615 - 'BHR' => 'Bahrain',  
616 - 'BGD' => 'Bangladesh',  
617 - 'BRB' => 'Barbados',  
618 - 'BLR' => 'Belarus',  
619 - 'BEL' => 'Belgium',  
620 - 'BLZ' => 'Belize',  
621 - 'BEN' => 'Benin',  
622 - 'BTN' => 'Bhutan',  
623 - 'BOL' => 'Bolivia',  
624 - 'BES' => 'Bonaire, Sint Eustatius and Saba',  
625 - 'BIH' => 'Bosnia and Herzegovina',  
626 - 'BWA' => 'Botswana',  
627 - 'BVT' => 'Bouvet Island',  
628 - 'BRA' => 'Brazil',  
629 - 'IOT' => 'British Indian Ocean Territory',  
630 - 'BRN' => 'Brunei Darussalam',  
631 - 'BGR' => 'Bulgaria',  
632 - 'BFA' => 'Burkina Faso',  
633 - 'BDI' => 'Burundi',  
634 - 'CPV' => 'Cabo Verde',  
635 - 'KHM' => 'Cambodia',  
636 - 'CMR' => 'Cameroon',  
637 - 'CAN' => 'Canada',  
638 - 'CYM' => 'Cayman Islands',  
639 - 'CAF' => 'Central African Republic',  
640 - 'TCD' => 'Chad',  
641 - 'CHL' => 'Chile',  
642 - 'CHN' => 'China',  
643 - 'CXR' => 'Christmas Island',  
644 - 'CCK' => 'Cocos (Keeling) Islands',  
645 - 'COL' => 'Colombia',  
646 - 'COM' => 'Comoros',  
647 - 'COD' => 'Congo (Democratic Republic of the)',  
648 - 'COG' => 'Congo',  
649 - 'COK' => 'Cook Islands',  
650 - 'CRI' => 'Costa Rica',  
651 - 'CIV' => 'Côte d\'Ivoire',  
652 - 'HRV' => 'Croatia',  
653 - 'CUB' => 'Cuba',  
654 - 'CUW' => 'Curaçao',  
655 - 'CYP' => 'Cyprus',  
656 - 'CZE' => 'Czech Republic',  
657 - 'DNK' => 'Denmark',  
658 - 'DJI' => 'Djibouti',  
659 - 'DMA' => 'Dominica',  
660 - 'DOM' => 'Dominican Republic',  
661 - 'ECU' => 'Ecuador',  
662 - 'EGY' => 'Egypt',  
663 - 'SLV' => 'El Salvador',  
664 - 'GNQ' => 'Equatorial Guinea',  
665 - 'ERI' => 'Eritrea',  
666 - 'EST' => 'Estonia',  
667 - 'SWZ' => 'Eswatini',  
668 - 'ETH' => 'Ethiopia',  
669 - 'FLK' => 'Falkland Islands (Malvinas)',  
670 - 'FRO' => 'Faroe Islands',  
671 - 'FJI' => 'Fiji',  
672 - 'FIN' => 'Finland',  
673 - 'FRA' => 'France',  
674 - 'GUF' => 'French Guiana',  
675 - 'PYF' => 'French Polynesia',  
676 - 'ATF' => 'French Southern Territories',  
677 - 'GAB' => 'Gabon',  
678 - 'GMB' => 'Gambia',  
679 - 'GEO' => 'Georgia',  
680 - 'DEU' => 'Germany',  
681 - 'GHA' => 'Ghana',  
682 - 'GIB' => 'Gibraltar',  
683 - 'GRC' => 'Greece',  
684 - 'GRL' => 'Greenland',  
685 - 'GRD' => 'Grenada',  
686 - 'GLP' => 'Guadeloupe',  
687 - 'GUM' => 'Guam',  
688 - 'GTM' => 'Guatemala',  
689 - 'GGY' => 'Guernsey',  
690 - 'GIN' => 'Guinea',  
691 - 'GNB' => 'Guinea-Bissau',  
692 - 'GUY' => 'Guyana',  
693 - 'HTI' => 'Haiti',  
694 - 'HMD' => 'Heard Island and McDonald Islands',  
695 - 'VAT' => 'Holy See',  
696 - 'HND' => 'Honduras',  
697 - 'HKG' => 'Hong Kong',  
698 - 'HUN' => 'Hungary',  
699 - 'ISL' => 'Iceland',  
700 - 'IND' => 'India',  
701 - 'IDN' => 'Indonesia',  
702 - 'IRN' => 'Iran (Islamic Republic of)',  
703 - 'IRQ' => 'Iraq',  
704 - 'IRL' => 'Ireland',  
705 - 'IMN' => 'Isle of Man',  
706 - 'ISR' => 'Israel',  
707 - 'ITA' => 'Italy',  
708 - 'JAM' => 'Jamaica',  
709 - 'JPN' => 'Japan',  
710 - 'JEY' => 'Jersey',  
711 - 'JOR' => 'Jordan',  
712 - 'KAZ' => 'Kazakhstan',  
713 - 'KEN' => 'Kenya',  
714 - 'KIR' => 'Kiribati',  
715 - 'KOR' => 'Korea (Republic of)',  
716 - 'KWT' => 'Kuwait',  
717 - 'KGZ' => 'Kyrgyzstan',  
718 - 'LAO' => 'Lao People\'s Democratic Republic',  
719 - 'LVA' => 'Latvia',  
720 - 'LBN' => 'Lebanon',  
721 - 'LSO' => 'Lesotho',  
722 - 'LBR' => 'Liberia',  
723 - 'LBY' => 'Libya',  
724 - 'LIE' => 'Liechtenstein',  
725 - 'LTU' => 'Lithuania',  
726 - 'LUX' => 'Luxembourg',  
727 - 'MAC' => 'Macao',  
728 - 'MDG' => 'Madagascar',  
729 - 'MWI' => 'Malawi',  
730 - 'MYS' => 'Malaysia',  
731 - 'MDV' => 'Maldives',  
732 - 'MLI' => 'Mali',  
733 - 'MLT' => 'Malta',  
734 - 'MHL' => 'Marshall Islands',  
735 - 'MTQ' => 'Martinique',  
736 - 'MRT' => 'Mauritania',  
737 - 'MUS' => 'Mauritius',  
738 - 'MYT' => 'Mayotte',  
739 - 'MEX' => 'Mexico',  
740 - 'FSM' => 'Micronesia (Federated States of)',  
741 - 'MDA' => 'Moldova (Republic of)',  
742 - 'MCO' => 'Monaco',  
743 - 'MNG' => 'Mongolia',  
744 - 'MNE' => 'Montenegro',  
745 - 'MSR' => 'Montserrat',  
746 - 'MAR' => 'Morocco',  
747 - 'MOZ' => 'Mozambique',  
748 - 'MMR' => 'Myanmar',  
749 - 'NAM' => 'Namibia',  
750 - 'NRU' => 'Nauru',  
751 - 'NPL' => 'Nepal',  
752 - 'NLD' => 'Netherlands',  
753 - 'NCL' => 'New Caledonia',  
754 - 'NZL' => 'New Zealand',  
755 - 'NIC' => 'Nicaragua',  
756 - 'NER' => 'Niger',  
757 - 'NGA' => 'Nigeria',  
758 - 'NIU' => 'Niue',  
759 - 'NFK' => 'Norfolk Island',  
760 - 'MNP' => 'Northern Mariana Islands',  
761 - 'NOR' => 'Norway',  
762 - 'OMN' => 'Oman',  
763 - 'PAK' => 'Pakistan',  
764 - 'PLW' => 'Palau',  
765 - 'PSE' => 'Palestine, State of',  
766 - 'PAN' => 'Panama',  
767 - 'PNG' => 'Papua New Guinea',  
768 - 'PRY' => 'Paraguay',  
769 - 'PER' => 'Peru',  
770 - 'PHL' => 'Philippines',  
771 - 'PCN' => 'Pitcairn',  
772 - 'POL' => 'Poland',  
773 - 'PRT' => 'Portugal',  
774 - 'PRI' => 'Puerto Rico',  
775 - 'QAT' => 'Qatar',  
776 - 'REU' => 'Réunion',  
777 - 'ROU' => 'Romania',  
778 - 'RUS' => 'Russian Federation',  
779 - 'RWA' => 'Rwanda',  
780 - 'BLM' => 'Saint Barthélemy',  
781 - 'SHN' => 'Saint Helena, Ascension and Tristan da Cunha',  
782 - 'KNA' => 'Saint Kitts and Nevis',  
783 - 'LCA' => 'Saint Lucia',  
784 - 'MAF' => 'Saint Martin (French part)',  
785 - 'SPM' => 'Saint Pierre and Miquelon',  
786 - 'VCT' => 'Saint Vincent and the Grenadines',  
787 - 'WSM' => 'Samoa',  
788 - 'SMR' => 'San Marino',  
789 - 'STP' => 'Sao Tome and Principe',  
790 - 'SAU' => 'Saudi Arabia',  
791 - 'SEN' => 'Senegal',  
792 - 'SRB' => 'Serbia',  
793 - 'SYC' => 'Seychelles',  
794 - 'SLE' => 'Sierra Leone',  
795 - 'SGP' => 'Singapore',  
796 - 'SXM' => 'Sint Maarten (Dutch part)',  
797 - 'SVK' => 'Slovakia',  
798 - 'SVN' => 'Slovenia',  
799 - 'SLB' => 'Solomon Islands',  
800 - 'SOM' => 'Somalia',  
801 - 'ZAF' => 'South Africa',  
802 - 'SGS' => 'South Georgia and the South Sandwich Islands',  
803 - 'SSD' => 'South Sudan',  
804 - 'ESP' => 'Spain',  
805 - 'LKA' => 'Sri Lanka',  
806 - 'SDN' => 'Sudan',  
807 - 'SUR' => 'Suriname',  
808 - 'SJM' => 'Svalbard and Jan Mayen',  
809 - 'SWE' => 'Sweden',  
810 - 'CHE' => 'Switzerland',  
811 - 'SYR' => 'Syrian Arab Republic',  
812 - 'TWN' => 'Taiwan, Province of China',  
813 - 'TJK' => 'Tajikistan',  
814 - 'TZA' => 'Tanzania, United Republic of',  
815 - 'THA' => 'Thailand',  
816 - 'TLS' => 'Timor-Leste',  
817 - 'TGO' => 'Togo',  
818 - 'TKL' => 'Tokelau',  
819 - 'TON' => 'Tonga',  
820 - 'TTO' => 'Trinidad and Tobago',  
821 - 'TUN' => 'Tunisia',  
822 - 'TUR' => 'Turkey',  
823 - 'TKM' => 'Turkmenistan',  
824 - 'TCA' => 'Turks and Caicos Islands',  
825 - 'TUV' => 'Tuvalu',  
826 - 'UGA' => 'Uganda',  
827 - 'UKR' => 'Ukraine',  
828 - 'ARE' => 'United Arab Emirates',  
829 - 'GBR' => 'United Kingdom',  
830 - 'USA' => 'United States',  
831 - 'URY' => 'Uruguay',  
832 - 'UZB' => 'Uzbekistan',  
833 - 'VUT' => 'Vanuatu',  
834 - 'VEN' => 'Venezuela (Bolivarian Republic of)',  
835 - 'VNM' => 'Viet Nam',  
836 - 'WLF' => 'Wallis and Futuna',  
837 - 'ESH' => 'Western Sahara',  
838 - 'YEM' => 'Yemen',  
839 - 'ZMB' => 'Zambia',  
840 - 'ZWE' => 'Zimbabwe',  
841 - ];  
842 - $codeCountryModel = new GoogleCodeCountry();  
843 - $data = [];  
844 - foreach ($countries as $key =>$val){  
845 - $wordModel = new WordCountry();  
846 - $info = $wordModel->read(['iso3'=>$key]);  
847 - if($info === false){  
848 - $zh = Translate::tran($val,'zh');  
849 - }else{  
850 - $zh = $info['chinese_name']; 601 + public function settingSeo(){
  602 + $list = (new Project())->formatQuery(['delete_status'=>0,'type'=>[2,4]])->pluck('project_id')->unique()->values()->toArray();
  603 + foreach ($list as $val){
  604 + ProjectServer::useProject($val);
  605 + $seoModel = new WebSettingSeo();
  606 + $results = $seoModel->whereRaw('product_category_prefix = product_category_suffix')->get();
  607 + if(!empty($results)){
  608 + echo '项目id:'.$val.PHP_EOL;
851 } 609 }
852 - $data[] = [  
853 - 'code'=>$key,  
854 - 'en_country'=>$val,  
855 - 'zh_country'=>$zh,  
856 - ]; 610 + DB::disconnect('custom_mysql');
857 } 611 }
858 - $codeCountryModel->insertAll($data);  
859 - return true; 612 +
860 } 613 }
861 } 614 }