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

@@ -167,7 +167,7 @@ class VideoTask extends Command
      */
      */
     public function getProjectKeyword($number)
     public function getProjectKeyword($number)
     {
     {
-        $keyword_arr_id = Keyword::where('video', null)->where('title', 'not like', '%-tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
+        $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         return $keyword;
         return $keyword;

+<?php
+/**
+ * @remark :
+ * @name   :UpdateRoute.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/11/20 15:07
+ */
+
+namespace App\Console\Commands\UpgradeKeyword;
+
+use App\Helper\Arr;
+use App\Helper\Translate;
+use App\Models\CustomModule\CustomModuleCategory;
+use App\Models\CustomModule\CustomModuleContent;
+use App\Models\Product\CategoryRelated;
+use App\Models\Product\Keyword;
+use App\Models\Product\Product;
+use App\Models\Project\Project;
+use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * @remark :更新所有项目的路由
+ * @name   :UpdateRoute
+ * @author :lyh
+ * @method :post
+ * @time   :2023/11/20 15:08
+ */
+class UpdateKeyword extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update_keyword_route';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '升级项目-关键字路由与其他路由重复时，删除关键字';
+
+    /**
+     * @remark :统一更新路由
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/20 15:13
+     */
+    public function handle(){
+        $projectModel = new Project();
+        $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]);
+
+        foreach ($list as $v){
+            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+            ProjectServer::useProject($v['id']);
+            $this->getRouteMap();
+            DB::disconnect('custom_mysql');
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+
+
+    /**
+     * @remark :升级项目查看路由是否有重复路由
+     * @name   :getRouteMap
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/4 11:53
+     */
+    public function getRouteMap(){
+        $routeMapModel = new RouteMap();
+        $list = $routeMapModel->list(['source'=>'product_keyword']);
+        foreach ($list as $k => $v){
+            $routeInfo = $routeMapModel->read(['source'=>['!=','product_keyword'],'route'=>$v['route']]);
+            if($routeInfo !== false){
+                try {
+                    $keywordModel = new Keyword();
+                    $keywordModel->del(['id'=>$v['source_id']]);
+                    $routeMapModel->del(['id'=>$v['id']]);
+                }catch (\Exception $e){
+                    echo date('Y-m-d H:i:s') . '关键字id:'.$v['source_id'] . PHP_EOL;
+                }
+            }
+        }
+        return true;
+    }
+}

@@ -174,9 +174,11 @@ class WebTraffic extends Command
                 }
                 }
                 $need_project = [];
                 $need_project = [];
                 foreach ($project_list as $project) {
                 foreach ($project_list as $project) {
+                    Log::channel('traffic')->info('开始引流 project_id:' . $project['project_id']);
                     //随机引流间隔
                     //随机引流间隔
                     $res_sjjg = $this->get_rand($this->sjjg);
                     $res_sjjg = $this->get_rand($this->sjjg);
                     if ($res_sjjg == 1) {
                     if ($res_sjjg == 1) {
+                        Log::channel('traffic')->info('随机不引流 project_id:' . $project['project_id']);
                         continue;
                         continue;
                     }
                     }
 
 
@@ -224,6 +226,7 @@ class WebTraffic extends Command
                     }
                     }
                     //不访问
                     //不访问
                     if($res == 1){
                     if($res == 1){
+                        Log::channel('traffic')->info('特殊日期随机不引流 project_id:' . $project['project_id']);
                         unset($need_project[$project_key]);
                         unset($need_project[$project_key]);
                         unset($ips[$project_key]);
                         unset($ips[$project_key]);
                     }
                     }

+<?php
+
+namespace App\Console\Commands;
+
+use App\Helper\Arr;
+use App\Models\Product\Category;
+use App\Models\Product\Product;
+use App\Models\Project\OnlineCheck;
+use App\Models\Project\Project;
+use App\Models\Template\BCustomTemplate;
+use App\Models\WebSetting\WebLanguage;
+use App\Services\ProjectServer;
+use Carbon\Carbon;
+use GuzzleHttp\Client;
+use GuzzleHttp\Promise\Utils;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+
+/**
+ * 网站特殊引流
+ * 需要单独加流量的
+ * Class Traffic
+ * @package App\Console\Commands
+ * @author zbj
+ * @date 2023/5/18
+ */
+class WebTrafficSpecial extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'web_traffic_special';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '网站引流';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+
+    /**
+     * 要增加引流的项目及腰增加的数量
+     *  key 要引流的ID
+     *  value 每天要增加的流量
+     * @var array
+     */
+    protected $projects = [
+        509 => 30
+    ];
+
+
+
+    /**
+     * google域名后缀
+     * @var string[]
+     */
+    protected $suffix = [
+        'co.jp' => '日本',
+        'com.tr' => '土耳其',
+        'nl' => '荷兰',
+        'ru' => '俄罗斯',
+        'fr' => '法国',
+        'co.kr' => '韩国',
+        'fi' => '芬兰',
+        'be' => '比利时',
+        'lt' => '立陶宛',
+        'es' => '西班牙',
+        'it' => '意大利',
+        'com.au' => '澳大利亚',
+        'no' => '挪威',
+        'al' => '阿尔巴尼亚',
+        'pt' => '葡萄牙',
+        'lv' => '拉脱维亚',
+        'hu' => '匈牙利',
+        'cz' => '捷克',
+        'de' => '德国',
+        'ca' => '加拿大',
+        'co.in' => '印度',
+        'co.uk' => '英国',
+        'com.vn' => '越南',
+        'com.br' => '巴西',
+        'co.il' => '以色列',
+        'pl' => '波兰',
+        'com.eg' => '埃及',
+        'co.th' => '泰国',
+        'sk' => '斯洛伐克',
+        'ro' => '罗马尼亚',
+        'com.mx' => '墨西哥',
+        'com.my' => '马来西亚',
+        'com.pk' => '巴基斯坦',
+        'co.nz' => '新西兰',
+        'co.za' => '南非',
+        'com.ar' => '阿根廷',
+        'com.kw' => '科威特',
+        'com.sg' => '新加坡',
+        'com.co' => '哥伦比亚',
+        'co.id' => '印度尼西亚',
+        'gr' => '希腊',
+        'bg' => '保加利亚',
+        'mn' => '蒙古',
+        'dk' => '丹麦',
+        'com.sa' => '沙特阿拉伯',
+        'com.pe' => '秘鲁',
+        'com.ph' => '菲律宾',
+        'com.ua' => '乌克兰',
+        'ge' => '格鲁吉亚',
+        'ae' => '阿拉伯联合酋长国',
+        'tn' => '突尼斯',
+    ];
+
+    /**
+     * 概率值
+     * @var int[]
+     */
+    protected $sjjg = [720, 280];//访问间隔占比  访问|不访问
+    //访问页面类型占比  产品详情页、单页|产品分类页
+    protected $ymzb = [
+        'urls_cats' => 700,
+        'urls_details' => 300
+    ];
+    protected $sdzb = [600, 200, 150, 50]; //访问页面深度占比 1页|2页|3-6页|7-11页
+    protected $yddzb = [1 => 700, 2 => 300]; //移动端占比 pc|mobile
+    //模拟访问来源占比 (美国)
+    protected $lyzb = [
+        'https://www.google.com/' => 630,
+        'http://www.google.com/' => 30,
+        'http://www.bing.com/' => 20,
+        'https://www.bing.com/' => 5,
+        'https://www.youtube.com/' => 5,
+        'https://search.yahoo.com/' => 5,
+        'https://www.facebook.com/' => 5,
+    ];
+
+    //俄语
+    protected $eylyzb = [
+        'https://www.yandex.com/' => 630,
+        'https://www.google.com/' => 30,
+        'http://www.google.com/' => 30,
+        'http://www.bing.com/' => 20,
+        'https://www.bing.com/' => 5,
+        'https://www.youtube.com/' => 5,
+        'https://search.yahoo.com/' => 5,
+        'https://www.facebook.com/' => 5,
+    ];
+
+    protected $otherzb = [700, 300]; //模拟访问来源占比 (非美国) google.com|google.其他后缀
+
+    protected $pc_ua = [
+        0  => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11',
+        1  => 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36',
+        2  => 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1'
+    ];
+
+    protected $mobile_ua = [
+        0  => 'Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 5 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko; googleweblight) Chrome/38.0.1025.166 Mobile Safari/535.19',
+    ];
+
+    /**
+     * @return bool
+     */
+    public function handle()
+    {
+        try {
+            $this->sleep();
+
+            $page = 1;
+            while (true){
+                $project_list = $this->getProjectList($page);
+                if(!$project_list){
+                    break;
+                }
+                $need_project = [];
+                foreach ($project_list as $project) {
+                    Log::channel('traffic')->info('开始特殊引流 project_id:' . $project['project_id']);
+                    //随机引流间隔
+                    $res_sjjg = $this->get_rand($this->sjjg);
+                    if ($res_sjjg == 1) {
+                        Log::channel('traffic')->info('随机不特殊引流 project_id:' . $project['project_id']);
+                        continue;
+                    }
+
+                    $project_urls = $this->getProductUrls($project['project_id']);
+                    $project_urls['home'] = $project['domain'];
+                    //随机访问页面
+                    $project['visit_urls'] = $this->getVisitUrls($project_urls);
+                    //随机客户端
+                    $project['device_port'] = $this->get_rand($this->yddzb);
+                    $project['user_agent'] = $project['device_port'] == 1 ? Arr::random($this->pc_ua) : Arr::random($this->mobile_ua);
+
+                    $need_project[] = $project;
+                }
+                //随机访问ip
+                $ips = $this->getIpAreas(count($need_project));
+
+                //特殊日期 降访问率
+                foreach ($need_project as $project_key => $project){
+                    $diff = $ips[$project_key]['diff'];
+                    //当地时间
+                    $w = date('w', strtotime($diff . 'hour'));
+                    $date = date('m-d', strtotime($diff . 'hour'));
+                    //元旦节和圣诞节按照周六的比例处理
+                    if(in_array($date, ['01-01', '12-25'])){
+                        $w = 6;
+                    }
+                    switch ($w){
+                        case 0:
+                            //周日降70-80%
+                            $rate = rand(70, 80) * 10;
+                            $res = $this->get_rand([1000-$rate, $rate]);
+                            break;
+                        case 5:
+                            //周5降30-40%
+                            $rate = rand(30, 40) * 10;
+                            $res = $this->get_rand([1000-$rate, $rate]);
+                            break;
+                        case 6:
+                            //周6降60-70%
+                            $rate = rand(60, 70) * 10;
+                            $res = $this->get_rand([1000-$rate, $rate]);
+                            break;
+                        default:
+                            $res = 0;
+                    }
+                    //不访问
+                    if($res == 1){
+                        Log::channel('traffic')->info('特殊日期随机不特殊引流 project_id:' . $project['project_id']);
+                        unset($need_project[$project_key]);
+                        unset($ips[$project_key]);
+                    }
+                }
+
+                //最多10层深度
+                $client = new Client(['verify' => false]);
+                for ($j = 0; $j < 10; $j++) {
+                    for ($j = 0; $j < 10; $j++) {
+                        //并发请求
+                        $promises = [];
+                        foreach ($need_project as $project_key => $project) {
+                            if (empty($project['visit_urls'][$j])) {
+                                continue;
+                            }
+
+                            $data = [
+                                'ip' => $ips[$project_key]['ip'],
+                                'url' => $project['visit_urls'][$j],
+                                'device_port' => $project['device_port'],
+                                'referrer_url' => $this->getReferer($ips[$project_key]['ip_area'], $project['lang']),
+                                'user_agent' => $project['user_agent'],
+                            ];
+                            Log::channel('traffic')->info('traffic_special project_id:' . $project['project_id'], $data);
+                            $promises[] = $client->postAsync($project['domain'] . 'api/traffic_visit', ['form_params' => $data]);
+                        }
+
+                        if($promises){
+                            Utils::settle($promises)->wait();
+                            //每个深度随机等待
+                            sleep(rand(2, 10));
+                        }
+                    }
+                }
+
+                $page++;
+            }
+        }catch (\Exception $e){
+            Log::channel('traffic')->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 不同项目 休眠
+     */
+    protected function sleep(){
+        sleep(rand(5,480));
+    }
+
+    /**
+     * 非俄语站的引流的项目
+     */
+    protected function getProjectList($page){
+        $ru_lang_id = WebLanguage::getIdByLang('ru');
+
+        //推广项目
+        $list = Project::with('domainInfo')
+            ->leftJoin('gl_project_deploy_optimize as pdo', 'pdo.project_id', '=', 'gl_project.id')
+            ->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id')
+            ->where('pdo.domain', '>', 0)
+            ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
+            ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
+            ->where('gl_project.is_upgrade', 0)   //非升级项目
+            ->where('gl_project.main_lang_id', '<>', $ru_lang_id) //非俄语站
+            ->whereIn('gl_project.id', array_keys($this->projects))
+            ->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get();
+        //其他地方在引流的域名
+//        $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
+        $other = [];
+        $data = [];
+        foreach ($list as $project) {
+
+            //根据增加的次数 设置间隔
+            if(Cache::get('traffic_special_' . $project['project_id'])){
+                continue;
+            }else{
+                $ttl = 24 * 60 * 60 / $this->projects[$project['project_id']];
+                Cache::put('traffic_special_' . $project['project_id'], 1, $ttl);
+            }
+
+            $lang = WebLanguage::getLangById($project['main_lang_id']??1)['short'];
+            if(empty($project->domainInfo['domain'])){
+                continue;
+            }
+            //其他地方在引流就不再引流了
+            if(in_array($project->domainInfo['domain'], $other)){
+                continue;
+            }
+            $data[] = [
+                'project_id' => $project['project_id'],
+                'domain' => 'https://' . $project->domainInfo['domain'] . '/',
+                'lang' => $lang
+            ];
+        }
+        return $data;
+    }
+
+    /**
+     * 获取产品分类、单页和详情链接
+     */
+    protected function getProductUrls($project_id){
+        ProjectServer::useProject($project_id);
+        //已发布产品分类页面
+        $data['urls_cats'] = DB::connection('custom_mysql')->table('gl_product_category')
+            ->where('project_id', $project_id)->where('status',  Category::STATUS_ACTIVE)
+            ->whereNull('deleted_at')
+            ->pluck('route','id')->toArray();
+
+        //已发布单页面
+        $data['urls_page'] = [];
+//        $data['urls_page'] = DB::connection('custom_mysql')->table('gl_web_custom_template')
+//            ->where('project_id', $project_id)->where('url', '<>', '404')->where('status', BCustomTemplate::STATUS_ACTIVE)->pluck('url', 'id')->toArray();
+
+        //已发布产品详情页
+        $data['urls_details'] =  DB::connection('custom_mysql')->table('gl_product')
+            ->where('project_id', $project_id)->where('status', Product::STATUS_ON)
+            ->whereNull('deleted_at')
+            ->pluck('route', 'id')->toArray();
+
+        $data['urls_cats'] = array_merge($data['urls_cats'], $data['urls_page']);
+        if(empty($data['urls_cats'])){
+            $data['urls_cats'] = $data['urls_details'];
+        }
+        DB::disconnect('custom_mysql');
+        return $data;
+    }
+
+    /**
+     * 获取地区IP
+     */
+    protected function getIpAreas($num)
+    {
+        //本地时间为7-23点的地区
+        $h = date('H');
+        $areas = [];
+        $list = DB::table('gl_area_timezone')->get();
+        $time_zones = [];
+        foreach ($list as $v) {
+            $v = (array)$v;
+            $country_hour = $h + $v['diff'];
+            if ($country_hour < 0) {
+                $country_hour = 24 + $country_hour;
+            }
+            if ($country_hour >= 7 && $country_hour < 23) {
+                $areas[] = $v['name'];
+                $time_zones[$v['name']] = $v['diff'];
+            }
+        }
+        //根据地区随机取该地区的IP
+        $data = DB::table('gl_xunpan_ipdata')->whereIn('ip_area', $areas)->inRandomOrder()->limit($num)->get();
+        $data = Arr::s2a(Arr::a2s($data));
+        foreach ($data as &$item){
+            $item['diff'] = $time_zones[$item['ip_area']];
+        }
+        return $data;
+    }
+
+    /**
+     * 概率算法
+     */
+    protected function get_rand($proArr) {
+        $result = '';
+        $proSum = array_sum($proArr);
+        foreach ($proArr as $key => $proCur) {
+            $randNum = mt_rand(1, $proSum);
+            if ($randNum <= $proCur) {
+                $result = $key;
+                break;
+            } else {
+                $proSum -= $proCur;
+            }
+        }
+        unset ($proArr);
+        return $result;
+    }
+
+    /**
+     * 根据随机访问深度 随机获取访问页面
+     */
+    protected function getVisitUrls($project_urls){
+        //没有分类页 就只访问首页
+        if(!$project_urls['urls_cats']){
+            $url[] = $project_urls['home'];
+            return $url;
+        }
+        //随机访问深度
+        $res_sdzb = $this->get_rand($this->sdzb);
+        //随机访问页面类型
+        $res_ymzb = $this->get_rand($this->ymzb);
+
+        $all_url = array_merge($project_urls['urls_cats'],$project_urls['urls_details']);
+        if(!$all_url){
+            $url[] = $project_urls['home'];
+            return $url;
+        }
+
+        $url = [];
+        if($res_sdzb == 0){//深度一页
+            $url[] = $project_urls[$res_ymzb] ? Arr::random($project_urls[$res_ymzb]) : '';
+        }elseif($res_sdzb == 1){//深度两页
+            $url[] = $project_urls['home'];
+            $url[] = $project_urls[$res_ymzb] ? Arr::random($project_urls[$res_ymzb]) : '';
+        }elseif($res_sdzb == 2){//深度3-6页
+            $yms = rand(2,5); //随机页面数
+            $url = Arr::random($all_url, $yms);
+            $url = Arr::prepend($url, $project_urls['home']);//首页加到最前面去
+        }elseif($res_sdzb == 3){//深度7-11页
+            $yms = rand(6,10); //随机页面数
+            $url = Arr::random($all_url, $yms);
+            $url = Arr::prepend($url, $project_urls['home']);//首页加到最前面去
+        }
+        foreach ($url as &$v){
+            if(!Str::contains($v, $project_urls['home'])){
+                if (FALSE === strpos($v, '.htm')) {
+                    $v .= '/';
+                }
+                $v = $project_urls['home'] . $v;
+            }
+        }
+        return array_unique(array_filter($url));
+    }
+
+    /**
+     * 获取访问来路
+     */
+    protected function getReferer($ip_area, $lang){
+
+        if($lang == 'ru'){
+            return $this->get_rand($this->eylyzb);
+        }
+
+        if($ip_area == '美国'){
+            $referer = $this->get_rand($this->lyzb);
+        }else{
+            $referer = 'https://www.google.com/';
+
+            $suffix = array_search($ip_area, $this->suffix);
+            if($suffix){
+                $res_qtzb = $this->get_rand($this->otherzb);
+                if($res_qtzb == 1){
+                    $referer = 'https://www.google.'.$suffix.'/';
+                }
+            }
+        }
+        return $referer;
+    }
+}

@@ -20,13 +20,15 @@ class Kernel extends ConsoleKernel
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
         $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
-        $schedule->command('rank_data_external_links')->dailyAt('01:20')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-        $schedule->command('rank_data_indexed_pages')->dailyAt('01:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
-        $schedule->command('rank_data_recomm_domain')->dailyAt('01:40')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
-        $schedule->command('rank_data_week')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据，每周一凌晨执行一次
+        $schedule->command('rank_data_external_links')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
+        $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
+        $schedule->command('rank_data_indexed_pages')->dailyAt('07:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
+        $schedule->command('rank_data_recomm_domain')->dailyAt('07:40')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
+        $schedule->command('rank_data_week')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据，每周一凌晨执行一次
 //        $schedule->command('share_user')->dailyAt('01:00')->withoutOverlapping(1); // 清除用户ayr_share数据，每天凌晨1点执行一次
 //        $schedule->command('share_user')->dailyAt('01:00')->withoutOverlapping(1); // 清除用户ayr_share数据，每天凌晨1点执行一次
 //        $schedule->command('count')->dailyAt('00:30')->withoutOverlapping(1); //每天凌晨1点执行一次
 //        $schedule->command('count')->dailyAt('00:30')->withoutOverlapping(1); //每天凌晨1点执行一次
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨1点执行一次
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨1点执行一次
+        $schedule->command('web_traffic_special')->everyMinute()->withoutOverlapping(1); // 特殊引流
         $schedule->command('web_traffic 1')->everyThirtyMinutes(); // 引流 1-3个月的项目,半小时一次
         $schedule->command('web_traffic 1')->everyThirtyMinutes(); // 引流 1-3个月的项目,半小时一次
         $schedule->command('web_traffic 2')->cron('*/18 * * * *'); // 引流 4-8个月的项目，18分钟一次
         $schedule->command('web_traffic 2')->cron('*/18 * * * *'); // 引流 4-8个月的项目，18分钟一次
         $schedule->command('web_traffic 3')->cron('*/12 * * * *'); // 引流 大于9个月的项目，12分钟一次
         $schedule->command('web_traffic 3')->cron('*/12 * * * *'); // 引流 大于9个月的项目，12分钟一次

@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Api;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Exceptions\InquiryFilterException;
 use App\Exceptions\InquiryFilterException;
+use App\Models\Domain\DomainInfo;
+use App\Models\Project\Project;
 use App\Models\SyncSubmitTask\SyncSubmitTask;
 use App\Models\SyncSubmitTask\SyncSubmitTask;
 use App\Models\Visit\Visit;
 use App\Models\Visit\Visit;
 use App\Services\CosService;
 use App\Services\CosService;
@@ -57,7 +59,7 @@ class InquiryController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :修改
+     * @remark :修改路由状态
      * @name   :editInquiryStatus
      * @name   :editInquiryStatus
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
@@ -65,15 +67,19 @@ class InquiryController extends BaseController
      */
      */
     public function editInquiryStatus(){
     public function editInquiryStatus(){
         $this->request->validate([
         $this->request->validate([
-            'project_id'=>'required',
+            'domain'=>'required',
             'ip'=>'required',
             'ip'=>'required',
             'updated_date'=>'required',
             'updated_date'=>'required',
         ],[
         ],[
-            'project_id.required' => 'project_id不能为空',
+            'domain.required' => 'domain不能为空',
             'ip.required' => 'ip不能为空',
             'ip.required' => 'ip不能为空',
             'updated_date.required' => '日期不能为空',
             'updated_date.required' => '日期不能为空',
         ]);
         ]);
-        ProjectServer::useProject($this->param['project_id']);
+        $project = Project::getProjectByDomain($this->param['domain']);
+        if(!$project){
+            $this->response('域名不存在',Code::SYSTEM_ERROR);
+        }
+        ProjectServer::useProject($project->id);
         $customerVisitModel = new Visit();
         $customerVisitModel = new Visit();
         $info = $customerVisitModel->read([
         $info = $customerVisitModel->read([
             'ip'=>$this->param['ip'],
             'ip'=>$this->param['ip'],

@@ -152,6 +152,8 @@ class CategoryLogic extends  BaseLogic
                 $this->param['describe_image'][$k] = $v;
                 $this->param['describe_image'][$k] = $v;
             }
             }
             $this->param['describe_image'] = json_encode($this->param['describe_image']);
             $this->param['describe_image'] = json_encode($this->param['describe_image']);
+        }else{
+            $this->param['describe_image'] = json_encode([]);
         }
         }
         return $this->success($param);
         return $this->success($param);
     }
     }

@@ -522,7 +522,7 @@ class RankDataLogic extends BaseLogic
 
 
             $model = ExternalLinksModel::where('project_id', $project_id)->first();
             $model = ExternalLinksModel::where('project_id', $project_id)->first();
             if ($model && $model->updated_date >= getThisWeekStarDate() && !$force) {
             if ($model && $model->updated_date >= getThisWeekStarDate() && !$force) {
-                continue;
+                //continue;
             }
             }
             if (!$model) {
             if (!$model) {
                 $model = new ExternalLinksModel();
                 $model = new ExternalLinksModel();

@@ -48,8 +48,8 @@ class QueryListener
                 $log = $log.'  [ RunTime:'.$event->time.'ms ] ';
                 $log = $log.'  [ RunTime:'.$event->time.'ms ] ';
                 Log::debug($log);
                 Log::debug($log);
             }
             }
-            //监听9644这个api_no是TM咋个被改的
-            if (in_array(9644, $event->bindings) && Str::contains($event->sql, 'update') && Str::contains($event->sql, '`api_no` =')) {
+            //监听api_no是TM咋个被改的
+            if (Str::contains($event->sql, 'update') && Str::contains($event->sql, '`api_no` =')) {
                 //记录debug  根据这个溯源
                 //记录debug  根据这个溯源
                 $trace = debug_backtrace();
                 $trace = debug_backtrace();
                 $traces = [];
                 $traces = [];