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

刘锟
app/Console/Commands/DayCount/AfterDayCount.php
app/Console/Commands/LyhTest/UpdateRoute.php
app/Console/Commands/RequestUrlLog/RequestUrlLog.php → app/Console/Commands/Monitor/RequestUrlLog.php
app/Models/RequestUrlLog/RequestUrlLog.php
--- a/app/Console/Commands/DayCount/AfterDayCount.php
查看文件 @05da73b
+++ b/app/Console/Commands/DayCount/AfterDayCount.php
查看文件 @05da73b
@@ -71,14 +71,18 @@ class AfterDayCount extends Command
                 ->where('gl_project.created_at','<=',$todayMidnight)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4])
-                ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count();
+                ->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")
+                ->count();
             $qualified_count = $projectModel->where('gl_project.extend_type',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.created_at','<=',$todayMidnight)
                 ->where('gl_project.is_remain_today',1)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4])
-                ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count();
+                ->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")
+                ->count();
             $rate = number_format($qualified_count / $project_count, 2);
             $threeMonthsAgo = date('Y-m-d 00:00:00', strtotime('-3 months'));
             $three_project_count = $projectModel->where('gl_project.extend_type',0)
@@ -86,14 +90,18 @@ class AfterDayCount extends Command
                 ->where('gl_project.created_at','<=',$threeMonthsAgo)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4])
-                ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count();
+                ->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")
+                ->count();
             $three_qualified_count = $projectModel->where('gl_project.extend_type',0)
                 ->whereIn('gl_project.id',$projectIdArr)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.created_at','<=',$threeMonthsAgo)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4])
-                ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')->count();
+                ->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")
+                ->count();
             $three_rate = number_format($three_qualified_count / $three_project_count, 2);
             $data = $projectModel->where('gl_project.extend_type',0)
                 ->where('gl_project.delete_status',0)
@@ -102,6 +110,7 @@ class AfterDayCount extends Command
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4])
                 ->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")
                 ->pluck('gl_project.title')->toArray();
             $saveData[] = [
                 'date'=>date('Y-m-d', strtotime('yesterday')),
--- a/app/Console/Commands/LyhTest/UpdateRoute.php
查看文件 @05da73b
+++ b/app/Console/Commands/LyhTest/UpdateRoute.php
查看文件 @05da73b
@@ -67,7 +67,7 @@ class UpdateRoute extends Command
      */
     public function handle()
     {
-        return $this->keyword_actions();
+        return $this->settingSeo();
     }
     public function keyword_actions(){
@@ -592,270 +592,23 @@ class UpdateRoute extends Command
     }
     /**
-     * @remark :更新产品分类前后缀
-     * @name   :updateSeo
+     * @remark :设置seo_前后缀
+     * @name   :settingSeo
      * @author :lyh
      * @method :post
-     * @time   :2025/3/14 14:39
+     * @time   :2025/4/15 15:14
      */
-    public function insertData(){
-        $countries = [
-            'AFG' => 'Afghanistan',
-            'ALB' => 'Albania',
-            'DZA' => 'Algeria',
-            'AND' => 'Andorra',
-            'AGO' => 'Angola',
-            'ATG' => 'Antigua and Barbuda',
-            'ARG' => 'Argentina',
-            'ARM' => 'Armenia',
-            'AUS' => 'Australia',
-            'AUT' => 'Austria',
-            'AZE' => 'Azerbaijan',
-            'BHS' => 'Bahamas',
-            'BHR' => 'Bahrain',
-            'BGD' => 'Bangladesh',
-            'BRB' => 'Barbados',
-            'BLR' => 'Belarus',
-            'BEL' => 'Belgium',
-            'BLZ' => 'Belize',
-            'BEN' => 'Benin',
-            'BTN' => 'Bhutan',
-            'BOL' => 'Bolivia',
-            'BES' => 'Bonaire, Sint Eustatius and Saba',
-            'BIH' => 'Bosnia and Herzegovina',
-            'BWA' => 'Botswana',
-            'BVT' => 'Bouvet Island',
-            'BRA' => 'Brazil',
-            'IOT' => 'British Indian Ocean Territory',
-            'BRN' => 'Brunei Darussalam',
-            'BGR' => 'Bulgaria',
-            'BFA' => 'Burkina Faso',
-            'BDI' => 'Burundi',
-            'CPV' => 'Cabo Verde',
-            'KHM' => 'Cambodia',
-            'CMR' => 'Cameroon',
-            'CAN' => 'Canada',
-            'CYM' => 'Cayman Islands',
-            'CAF' => 'Central African Republic',
-            'TCD' => 'Chad',
-            'CHL' => 'Chile',
-            'CHN' => 'China',
-            'CXR' => 'Christmas Island',
-            'CCK' => 'Cocos (Keeling) Islands',
-            'COL' => 'Colombia',
-            'COM' => 'Comoros',
-            'COD' => 'Congo (Democratic Republic of the)',
-            'COG' => 'Congo',
-            'COK' => 'Cook Islands',
-            'CRI' => 'Costa Rica',
-            'CIV' => 'Côte d\'Ivoire',
-            'HRV' => 'Croatia',
-            'CUB' => 'Cuba',
-            'CUW' => 'Curaçao',
-            'CYP' => 'Cyprus',
-            'CZE' => 'Czech Republic',
-            'DNK' => 'Denmark',
-            'DJI' => 'Djibouti',
-            'DMA' => 'Dominica',
-            'DOM' => 'Dominican Republic',
-            'ECU' => 'Ecuador',
-            'EGY' => 'Egypt',
-            'SLV' => 'El Salvador',
-            'GNQ' => 'Equatorial Guinea',
-            'ERI' => 'Eritrea',
-            'EST' => 'Estonia',
-            'SWZ' => 'Eswatini',
-            'ETH' => 'Ethiopia',
-            'FLK' => 'Falkland Islands (Malvinas)',
-            'FRO' => 'Faroe Islands',
-            'FJI' => 'Fiji',
-            'FIN' => 'Finland',
-            'FRA' => 'France',
-            'GUF' => 'French Guiana',
-            'PYF' => 'French Polynesia',
-            'ATF' => 'French Southern Territories',
-            'GAB' => 'Gabon',
-            'GMB' => 'Gambia',
-            'GEO' => 'Georgia',
-            'DEU' => 'Germany',
-            'GHA' => 'Ghana',
-            'GIB' => 'Gibraltar',
-            'GRC' => 'Greece',
-            'GRL' => 'Greenland',
-            'GRD' => 'Grenada',
-            'GLP' => 'Guadeloupe',
-            'GUM' => 'Guam',
-            'GTM' => 'Guatemala',
-            'GGY' => 'Guernsey',
-            'GIN' => 'Guinea',
-            'GNB' => 'Guinea-Bissau',
-            'GUY' => 'Guyana',
-            'HTI' => 'Haiti',
-            'HMD' => 'Heard Island and McDonald Islands',
-            'VAT' => 'Holy See',
-            'HND' => 'Honduras',
-            'HKG' => 'Hong Kong',
-            'HUN' => 'Hungary',
-            'ISL' => 'Iceland',
-            'IND' => 'India',
-            'IDN' => 'Indonesia',
-            'IRN' => 'Iran (Islamic Republic of)',
-            'IRQ' => 'Iraq',
-            'IRL' => 'Ireland',
-            'IMN' => 'Isle of Man',
-            'ISR' => 'Israel',
-            'ITA' => 'Italy',
-            'JAM' => 'Jamaica',
-            'JPN' => 'Japan',
-            'JEY' => 'Jersey',
-            'JOR' => 'Jordan',
-            'KAZ' => 'Kazakhstan',
-            'KEN' => 'Kenya',
-            'KIR' => 'Kiribati',
-            'KOR' => 'Korea (Republic of)',
-            'KWT' => 'Kuwait',
-            'KGZ' => 'Kyrgyzstan',
-            'LAO' => 'Lao People\'s Democratic Republic',
-            'LVA' => 'Latvia',
-            'LBN' => 'Lebanon',
-            'LSO' => 'Lesotho',
-            'LBR' => 'Liberia',
-            'LBY' => 'Libya',
-            'LIE' => 'Liechtenstein',
-            'LTU' => 'Lithuania',
-            'LUX' => 'Luxembourg',
-            'MAC' => 'Macao',
-            'MDG' => 'Madagascar',
-            'MWI' => 'Malawi',
-            'MYS' => 'Malaysia',
-            'MDV' => 'Maldives',
-            'MLI' => 'Mali',
-            'MLT' => 'Malta',
-            'MHL' => 'Marshall Islands',
-            'MTQ' => 'Martinique',
-            'MRT' => 'Mauritania',
-            'MUS' => 'Mauritius',
-            'MYT' => 'Mayotte',
-            'MEX' => 'Mexico',
-            'FSM' => 'Micronesia (Federated States of)',
-            'MDA' => 'Moldova (Republic of)',
-            'MCO' => 'Monaco',
-            'MNG' => 'Mongolia',
-            'MNE' => 'Montenegro',
-            'MSR' => 'Montserrat',
-            'MAR' => 'Morocco',
-            'MOZ' => 'Mozambique',
-            'MMR' => 'Myanmar',
-            'NAM' => 'Namibia',
-            'NRU' => 'Nauru',
-            'NPL' => 'Nepal',
-            'NLD' => 'Netherlands',
-            'NCL' => 'New Caledonia',
-            'NZL' => 'New Zealand',
-            'NIC' => 'Nicaragua',
-            'NER' => 'Niger',
-            'NGA' => 'Nigeria',
-            'NIU' => 'Niue',
-            'NFK' => 'Norfolk Island',
-            'MNP' => 'Northern Mariana Islands',
-            'NOR' => 'Norway',
-            'OMN' => 'Oman',
-            'PAK' => 'Pakistan',
-            'PLW' => 'Palau',
-            'PSE' => 'Palestine, State of',
-            'PAN' => 'Panama',
-            'PNG' => 'Papua New Guinea',
-            'PRY' => 'Paraguay',
-            'PER' => 'Peru',
-            'PHL' => 'Philippines',
-            'PCN' => 'Pitcairn',
-            'POL' => 'Poland',
-            'PRT' => 'Portugal',
-            'PRI' => 'Puerto Rico',
-            'QAT' => 'Qatar',
-            'REU' => 'Réunion',
-            'ROU' => 'Romania',
-            'RUS' => 'Russian Federation',
-            'RWA' => 'Rwanda',
-            'BLM' => 'Saint Barthélemy',
-            'SHN' => 'Saint Helena, Ascension and Tristan da Cunha',
-            'KNA' => 'Saint Kitts and Nevis',
-            'LCA' => 'Saint Lucia',
-            'MAF' => 'Saint Martin (French part)',
-            'SPM' => 'Saint Pierre and Miquelon',
-            'VCT' => 'Saint Vincent and the Grenadines',
-            'WSM' => 'Samoa',
-            'SMR' => 'San Marino',
-            'STP' => 'Sao Tome and Principe',
-            'SAU' => 'Saudi Arabia',
-            'SEN' => 'Senegal',
-            'SRB' => 'Serbia',
-            'SYC' => 'Seychelles',
-            'SLE' => 'Sierra Leone',
-            'SGP' => 'Singapore',
-            'SXM' => 'Sint Maarten (Dutch part)',
-            'SVK' => 'Slovakia',
-            'SVN' => 'Slovenia',
-            'SLB' => 'Solomon Islands',
-            'SOM' => 'Somalia',
-            'ZAF' => 'South Africa',
-            'SGS' => 'South Georgia and the South Sandwich Islands',
-            'SSD' => 'South Sudan',
-            'ESP' => 'Spain',
-            'LKA' => 'Sri Lanka',
-            'SDN' => 'Sudan',
-            'SUR' => 'Suriname',
-            'SJM' => 'Svalbard and Jan Mayen',
-            'SWE' => 'Sweden',
-            'CHE' => 'Switzerland',
-            'SYR' => 'Syrian Arab Republic',
-            'TWN' => 'Taiwan, Province of China',
-            'TJK' => 'Tajikistan',
-            'TZA' => 'Tanzania, United Republic of',
-            'THA' => 'Thailand',
-            'TLS' => 'Timor-Leste',
-            'TGO' => 'Togo',
-            'TKL' => 'Tokelau',
-            'TON' => 'Tonga',
-            'TTO' => 'Trinidad and Tobago',
-            'TUN' => 'Tunisia',
-            'TUR' => 'Turkey',
-            'TKM' => 'Turkmenistan',
-            'TCA' => 'Turks and Caicos Islands',
-            'TUV' => 'Tuvalu',
-            'UGA' => 'Uganda',
-            'UKR' => 'Ukraine',
-            'ARE' => 'United Arab Emirates',
-            'GBR' => 'United Kingdom',
-            'USA' => 'United States',
-            'URY' => 'Uruguay',
-            'UZB' => 'Uzbekistan',
-            'VUT' => 'Vanuatu',
-            'VEN' => 'Venezuela (Bolivarian Republic of)',
-            'VNM' => 'Viet Nam',
-            'WLF' => 'Wallis and Futuna',
-            'ESH' => 'Western Sahara',
-            'YEM' => 'Yemen',
-            'ZMB' => 'Zambia',
-            'ZWE' => 'Zimbabwe',
-        ];
-        $codeCountryModel = new GoogleCodeCountry();
-        $data = [];
-        foreach ($countries as $key =>$val){
-            $wordModel = new WordCountry();
-            $info = $wordModel->read(['iso3'=>$key]);
-            if($info === false){
-                $zh = Translate::tran($val,'zh');
-            }else{
-                $zh = $info['chinese_name'];
+    public function settingSeo(){
+        $list = (new Project())->formatQuery(['delete_status'=>0,'type'=>[2,4]])->pluck('id')->unique()->values()->toArray();
+        foreach ($list as $val){
+            ProjectServer::useProject($val);
+            $seoModel = new WebSettingSeo();
+            $results = $seoModel->whereRaw('product_category_prefix = product_category_suffix')->get();
+            if(!empty($results)){
+                echo '项目id:'.$val.PHP_EOL;
             }
-            $data[] = [
-                'code'=>$key,
-                'en_country'=>$val,
-                'zh_country'=>$zh,
-            ];
+            DB::disconnect('custom_mysql');
         }
-        $codeCountryModel->insertAll($data);
-        return true;
+
     }
 }
--- a/app/Console/Commands/RequestUrlLog/RequestUrlLog.php → app/Console/Commands/Monitor/RequestUrlLog.php
查看文件 @05da73b
+++ b/app/Console/Commands/RequestUrlLog/RequestUrlLog.php → app/Console/Commands/Monitor/RequestUrlLog.php
查看文件 @05da73b
@@ -7,7 +7,7 @@
  * @time   :2025/2/21 9:55
  */
-namespace App\Console\Commands\RequestUrlLog;
+namespace App\Console\Commands\Monitor;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Com\RequestUrl;
@@ -42,15 +42,15 @@ class RequestUrlLog extends Command
         //获取需要请求的接口
         $requestUrlModel = new RequestUrl();
         $urlList = $requestUrlModel->list(['status'=>0]);
+        foreach ($urlList as $v){
+            //需要单独验证的方法
+            if($v['url'] == 'getMonthInquiry'){
                 //随机获取一个项目，需要验证的其他方法
                 $projectModel = new Project();
                 $projectInfo = $projectModel->formatQuery(['type'=>2,'delete_status'=>0])->inRandomOrder()->first();
                 //获取对应项目的域名
                 $domainModel = new DomainInfo();
                 $domainInfo = $domainModel->read(['project_id'=>$projectInfo['id']]);
-        foreach ($urlList as $v){
-            //需要单独验证的方法
-            if($v['url'] == 'getMonthInquiry'){
                 $result = $this->getMonthInquiry($domainInfo['domain'],date('Y-m'), 0);
                 $requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['$requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
                 continue;
@@ -60,8 +60,16 @@ class RequestUrlLog extends Command
                 $result = $this->postRequest($v['url'],$v['param']);
                 echo '执行的url:' . $v['url'] . PHP_EOL . '返回的结果：'.json_encode($result,true) . date('Y-m-d H:i:s').PHP_EOL;
                 //更新请求结果
-                $requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['$requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
+                $requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
+                continue;
+            }else if($v['method'] == 'get'){
+                $result = $this->getRequest($v['url']);
+                echo '执行的url:' . $v['url'] . PHP_EOL . '返回的结果：'.json_encode($result,true) . date('Y-m-d H:i:s').PHP_EOL;
+                //更新请求结果
+                $requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
                 continue;
+            }else{
+                //todo::其他方式的验证
             }
         }
         return true;
--- a/app/Models/RequestUrlLog/RequestUrlLog.php 已删除 100644 → 0
查看文件 @fa3b96d
+++ b/app/Models/RequestUrlLog/RequestUrlLog.php 已删除 100644 → 0
查看文件 @fa3b96d
-<?php
-/**
- * @remark :
- * @name   :RequestUrlLog.php
- * @author :lyh
- * @method :post
- * @time   :2025/2/21 9:38
- */
-
-namespace App\Models\RequestUrlLog;
-
-use App\Models\Base;
-
-/**
- * @remark :url请求日志
- * @name   :RequestUrlLog
- * @author :lyh
- * @method :post
- * @time   :2025/2/21 9:48
- */
-class RequestUrlLog extends Base
-{
-    protected $table = 'gl_request_url_log';
-}