Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

+<?php
+/**
+ * @remark :
+ * @name   :UpgradeProjectCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/1/8 9:03
+ */
+
+namespace App\Console\Commands\DayCount;
+
+use App\Models\Project\Project;
+use App\Models\Visit\Visit;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use App\Models\HomeCount\Count;
+
+class UpgradeProjectCount extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'upgrade_count';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '升级项目统计';
+
+    public function handle(){
+        ProjectServer::useProject(439);
+        $this->count();
+        DB::disconnect('custom_mysql');
+    }
+
+    /**
+     * @remark :日统计记录
+     * @name   :count
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 9:05
+     */
+    public function count(){
+        $list = DB::connection('custom_mysql')->table('gl_customer_visit')->select('updated_date')
+            ->groupBy('updated_date')->get()->toArray();
+        $project = new Project();
+        $projectInfo = $project->read(['id'=>439]);
+        if(!empty($list)){
+            $arr = [];
+            foreach ($list as $k=>$v){
+                $v = (array)$v;
+                echo date('Y-m-d H:i:s') . '时间：'.$v['updated_date'] . PHP_EOL;
+                $count = new Count();
+                $arr['project_id'] = 439;
+                $arr['date'] = $v['updated_date'];
+                $arr['pv_num'] = $this->pv_num($v['updated_date']);
+                $arr['ip_num'] = $this->ip_num($v['updated_date']);
+                $arr['inquiry_num'] = $this->inquiry_num($v['updated_date']);
+                //服务达标天数
+                $arr['compliance_day'] = $projectInfo['finish_remain_day'];
+                //剩余服务时常
+                $arr['service_day'] = $projectInfo['remain_day'];
+                $arr['country'] = '{"也门": 4, "印度": 3, "埃及": 4, "巴西": 1, "约旦": 2, "美国": 3, "伊拉克": 4, "利比亚": 2, "墨西哥": 5, "摩洛哥": 8, "新加坡": 1, "突尼斯": 3, "巴勒斯坦": 2, "巴基斯坦": 1, "罗马尼亚": 1, "非洲地区": 2, "马来西亚": 5, "印度尼西亚": 2, "沙特阿拉伯": 3, "阿尔及利亚": 2}';
+                //查询当天数据是否存在  存在则更新
+                $info = $count->read(['date'=>$v['updated_date']]);
+                if($info === false){
+                    $arr['created_at'] = $v['updated_date'].' 01:00:00';
+                    $arr['updated_at'] = $v['updated_date'].' 01:00:00';
+                    $count->insert($arr);
+                }else{
+                    $count->edit($arr,['id'=>$info['id']]);
+                }
+            }
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+
+    /**
+     * @remark :询盘数量
+     * @name   :inquiry_num
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 9:24
+     */
+    public function inquiry_num($day){
+        $count = DB::connection('custom_mysql')->table('gl_customer_visit')->whereDate('updated_date', $day)->where('is_inquiry',1)->count();
+        return $count;
+    }
+
+    /**
+     * @name   :（统计pv）pv_num
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:40
+     */
+    public function pv_num($day){
+        $pv = DB::connection('custom_mysql')->table('gl_customer_visit_item')->whereDate('updated_date', $day)->count();
+        return $pv;
+    }
+
+    /**
+     * @name   :（统计ip）ip_num
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:40
+     */
+    public function ip_num($day){
+        $ip = DB::connection('custom_mysql')->table('gl_customer_visit')->whereDate('updated_date', $day)->count();
+        return $ip;
+    }
+
+
+
+}

+<?php
+
+namespace App\Console\Commands;
+
+use App\Http\Logic\Aside\Project\ProjectLogic;
+use App\Models\Com\NoticeLog;
+use App\Models\Product\Keyword;
+use App\Models\Project\Project;
+use App\Models\RouteMap\RouteMap;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * 初始化项目
+ * Class InitProject
+ * @package App\Console\Commands
+ * @author zbj
+ * @date 2023/10/8
+ */
+class InitKeyword extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'init_keyword';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '批量导入关键字生成路由';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * @return bool
+     */
+    public function handle()
+    {
+        while (true){
+            $list = NoticeLog::where('type', NoticeLog::TYPE_INIT_KEYWORD)->where('status', NoticeLog::STATUS_PENDING)->get();
+            if(!empty($list)){
+                foreach ($list as $item){
+                    echo 'start:' . $item['data']['project_id'] . PHP_EOL;
+                    ProjectServer::useProject($item['data']['project_id']);
+                    $keywordModel = new Keyword();
+                    $list = $keywordModel->list(['route'=>'']);
+                    echo 'start:' . json_encode($list) . PHP_EOL;
+                    foreach ($list as $v){
+                        $route = RouteMap::setRoute($v['title'],RouteMap::SOURCE_PRODUCT_KEYWORD,$v['id'],$item['data']['project_id']);
+                        if(empty($route)){
+                            $keywordModel->del(['id'=>$v['id']]);
+                            continue;
+                        }
+                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    }
+                    $item->status = NoticeLog::STATUS_SUCCESS;
+                    $item->save();
+                    DB::disconnect('custom_mysql');
+                }
+            }
+            sleep(2);
+        }
+    }
+
+}

+<?php
+/**
+ * @remark :
+ * @name   :UpgradeProjectCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/1/8 9:03
+ */
+
+namespace App\Console\Commands\MonthlyCount;
+
+use App\Helper\FormGlobalsoApi;
+use App\Models\HomeCount\MonthCount;
+use App\Models\Project\Project;
+use App\Models\Visit\Visit;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use App\Models\HomeCount\Count;
+
+class UpgradeProjectCount extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'upgrade_month_count';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '升级项目统计';
+
+    public function handle(){
+        ProjectServer::useProject(439);
+        $this->count();
+
+        DB::disconnect('custom_mysql');
+    }
+
+    /**
+     * @remark :日统计记录
+     * @name   :count
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 9:05
+     */
+    public function count(){
+        $list = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select(DB::raw('DATE_FORMAT(updated_date, "%Y-%m") as month'))
+            ->groupBy('month')->get()->toArray();
+        foreach ($list as $k=>$v){
+            $v = (array)$v;
+            $monthCountModel = new MonthCount();
+            $info = $monthCountModel->read(['month'=>$v['month']]);
+            // 获取当月开始时间
+            $start = date('Y-m-01', strtotime($v['month']));
+            // 获取当月结束时间
+            $end = date('Y-m-t', strtotime($v['month']));
+            $arr['project_id'] = 439;
+            $res = $this->inquiry('www.cnzyl.com',$v['month']);
+            $arr['month_total'] = 0;
+            if(isset($res['data']['count'])){
+                $arr['month_total'] = $res['data']['count'];
+            }
+            if(isset($res['data']['data'])){
+                $arr['country'] = $res['data']['data'];
+            }
+            $arr['month'] = $v['month'];
+            $arr = $this->pv_ip($arr,$start,$end);
+            $arr = $this->sourceCount($arr,$start,$end);
+            if($info === false){
+                $selectedDate = $start;
+                $firstDayOfNextMonth = date('Y-m-01 01:00:00', strtotime("$selectedDate +1 month"));
+                $arr['created_at'] = $firstDayOfNextMonth;
+                $arr['updated_at'] = $firstDayOfNextMonth;
+                $monthCountModel->insert($arr);
+            }else{
+                $monthCountModel->edit($arr,['id'=>$info['id']]);
+            }
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+
+    /**
+     * @remark :本月询盘总量
+     * @name   :month_total
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 11:02
+     */
+    public function pv_ip(&$arr,$start,$end){
+        $pv_ip = DB::table('gl_count')
+            ->where(['project_id'=>439])
+            ->where('date','>=',$start.' 00:00:00')
+            ->where('date','<=',$end.' 23:59:59')
+            ->select(DB::raw('SUM(pv_num) as pv_num'), DB::raw('SUM(ip_num) as ip_num'),DB::raw('SUM(inquiry_num) as inquiry_num'))
+            ->first();
+        $arr['pv'] = $pv_ip->pv_num;
+        $arr['ip'] = $pv_ip->ip_num;
+        $arr['month_total'] = $pv_ip->inquiry_num;
+        if($arr['ip'] != 0){
+            $arr['rate'] = round(($arr['month_total'] / $arr['ip']) * 10,2);
+        }
+        return $arr;
+    }
+    /**
+     * @remark :来源访问前8
+     * @name   :sourceCount
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/30 16:14
+     */
+    public function sourceCount(&$arr,$startTime,$endTime){
+        //访问来源前10
+        $source = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('referrer_url', DB::raw('COUNT(*) as count'))
+            ->groupBy('referrer_url')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->orderByDesc('count')->limit(10)->get()->toArray();
+        $arr['source'] = json_encode($source);
+        //访问国家前15
+        $source_country = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
+            ->groupBy('country')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->orderBy('ip','desc')->limit(15)->get()->toArray();
+        $arr['source_country'] = json_encode($source_country);
+        //受访界面前15
+        $referrer_url = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('url',DB::raw('COUNT(*) as num'))
+            ->orderBy('num','desc')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->groupBy('url')
+            ->limit(15)->get()->toArray();
+        $arr['referrer_url'] = json_encode($referrer_url);
+        //访问端口
+        $referrer_port = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('device_port',DB::raw('COUNT(*) as num'))
+            ->orderBy('num','desc')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->groupBy('device_port')
+            ->limit(15)->get()->toArray();
+        $arr['referrer_port'] = json_encode($referrer_port);
+        return $arr;
+    }
+
+    public function inquiry($url,$month){
+        $url = 'https://'.$url.'/';
+        $token = md5($url.date("Y-m-d"));
+        $url = 'https://form.globalso.com/api/external-interface/country_con/15243d63ed5a5738?domain='.$url.'&token='.$token.'&source=1,2,3,4&model=month&sta_date='.$month;
+        $res = http_get($url,['charset=utf-8']);
+        echo date('Y-m-d H:i:s') . '数据：'.json_encode($res) . PHP_EOL;
+        return $res;
+    }
+
+}

@@ -51,7 +51,7 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>183]);
+        $list = $projectModel->list(['id'=>209]);
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -59,6 +59,7 @@ class UpdateRoute extends Command
             $this->setProductKeyword();
 //            $this->getRouteMap();
 //            $this->getProductCategory();
+//            $this->delRouteMap();
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -225,4 +226,11 @@ class UpdateRoute extends Command
         return true;
     }
 
+    public function delRouteMap(){
+        $productKeywordModel = new Keyword();
+        $list = $productKeywordModel->list();
+        foreach ($list as $k=>$v){
+            RouteMap::setRoute($v['route'],'product_keyword',$v['id'],569);
+        }
+    }
 }

@@ -3,6 +3,7 @@
 
 namespace App\Helper;
 
+use App\Models\Project\Project;
 use App\Utils\HttpUtils;
 use GuzzleHttp\Exception\GuzzleException;
 
@@ -51,6 +52,8 @@ class FormGlobalsoApi
      */
     public function getInquiryList($domain, $search = '', $page = 1, $page_size = 20)
     {
+        $project = Project::getProjectByDomain($domain);
+        $is_upgrade = $project['is_upgrade'] ??0;
         $api_url = $this->url . '/api/external-interface/6a1bd159b1fd60af';
 
         $params = [
@@ -58,7 +61,7 @@ class FormGlobalsoApi
             'domain' => $domain,
             'limit' => $page_size,
             'page' => $page,
-            'source' => '1,3' //来源类型 新项目用1,3
+            'source' => $is_upgrade ? '1,2,3,4' : '1,3' //来源类型 新项目用1,3
         ];
         if($search){
             $params['name'] = $search;

+<?php
+/**
+ * Created by PhpStorm.
+ * User: zhl
+ * Date: 2024/1/6
+ * Time: 17:41
+ */
+namespace App\Http\Controllers\Api;
+
+use App\Models\Project\OnlineCheck;
+use App\Models\Project\Project;
+use Illuminate\Http\Request;
+
+/**
+ * Class PrivateController
+ * @package App\Http\Controllers\Api
+ */
+class PrivateController extends BaseController
+{
+    /**
+     * 优化中项目列表
+     * @param Request $request
+     * @return false|string
+     */
+    public function optimizeProjectList(Request $request)
+    {
+        $page_size = $request->input('page_size', 20);
+        $field = ['gl_project.id', 'gl_project.company', 'gl_project.is_upgrade', 'b.start_date', 'd.domain'];
+        $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
+            ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
+            ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
+            ->where('c.qa_status', '=', OnlineCheck::STATUS_ONLINE_TRUE)
+            ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
+            ->paginate($page_size)
+            ->toArray();
+        return $this->success($result);
+    }
+}
\ No newline at end of file

@@ -69,7 +69,7 @@ class OptimizeController extends BaseController
         if(!empty($list)){
             foreach ($list as $v) {
                 $last = Arr::last($v);
-                if(isset($last['g']) && ($last['g'] == 1)){
+                if(isset($last['g']) && ($last['g'] == 1) && ($last['position'] <= 10) && ($last['position'] >= 1)){
                     $num = $num+1;
                 }
             }

@@ -63,6 +63,7 @@ class KeywordController extends BaseController
         if(!empty($map['keyword_title'])){
             $map['keyword_title'] = ['like','%'.$map['keyword_title'].'%'];
         }
+        $map['route'] = ['<>',''];
         $map['project_id'] = $this->user['project_id'];
         return $this->success($map);
     }
@@ -114,7 +115,7 @@ class KeywordController extends BaseController
             'title.max' => '批量操作不能超过1000条数据'
         ]);
         $logic->batchAdd();
-        $this->response('success');
+        $this->response('路由生成中，请稍后刷新查看');
     }
 
     /**

@@ -7,6 +7,7 @@ use App\Helper\Arr;
 use App\Helper\Common;
 use App\Helper\Translate;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Com\NoticeLog;
 use App\Models\News\News;
 use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
@@ -136,10 +137,6 @@ class KeywordLogic extends  BaseLogic
      * @time   :2023/8/28 14:03
      */
     public function batchAdd(){
-        $route_array = Translate::tran($this->param['title'], 'en');
-        if (empty($route_array)) {
-            $this->fail('路由生成失败，请稍后重试！');
-        }
         try {
             foreach ($this->param['title'] as $k=>$v){
                 if(empty($v)){
@@ -148,18 +145,14 @@ class KeywordLogic extends  BaseLogic
                 $this->model = new Keyword();
                 $info = $this->model->read(['title'=>$v]);
                 if($info === false){
-                    $route = $this->specialRouteCheck($v);
                     $param['project_id'] = $this->user['project_id'];
                     $param['created_at'] = date('Y-m-d H:i:s');
                     $param['updated_at'] = $param['created_at'];
                     $param['title'] = $v;
-                    $param['route'] = $route;
-                    $id = $this->model->insertGetId($param);
-                    $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
-////                    $this->curlDelRoute(['new_route'=>$route]);
-//                    $this->model->edit(['route'=>$route],['id'=>$id]);
+                    $this->model->insertGetId($param);
                 }
             }
+            NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD, ['project_id' => $this->user['project_id']]);
         }catch (\Exception $e){
             $this->fail('error');
         }

@@ -175,7 +175,7 @@ class ProductLogic extends  BaseLogic
             $v['values'] = json_encode($v['values']);
         }elseif ($v['type'] == 4){
             foreach ($v['values'] as $k1=>$v1){
-                $v1 = str_replace_url($v1);
+                $v1['url'] = str_replace_url($v1['url']);
                 $v['values'][$k1] = $v1;
             }
             $v['values'] = json_encode($v['values']);

@@ -12,7 +12,7 @@ class NoticeLog extends Model
     const TYPE_PROJECT = 'project';
     const TYPE_RANK_DATA = 'rank_data';
     const TYPE_INIT_PROJECT = 'init_project';
-
+    const TYPE_INIT_KEYWORD = 'init_keyword';
     const STATUS_PENDING = 0;
     const STATUS_SUCCESS = 1;
     const STATUS_FAIL = 2;

@@ -9,4 +9,6 @@ class OnlineCheck extends Base
     //设置关联表名
     protected $table = 'gl_project_online_check';
 
+    const STATUS_ONLINE_FALSE = 0;
+    const STATUS_ONLINE_TRUE = 1;
 }

@@ -284,24 +284,15 @@ class Project extends Base
      */
     public static function getProjectByDomain($domain)
     {
-        $cache_key = 'project_' . $domain;
-        $data = Cache::get($cache_key);
-        if (!$data) {
+        $domain = parse_url($domain);
+        $domain = $domain['host'] ?? $domain;
         //是否测试域名
         $project_id = DeployBuild::where('test_domain', $domain)->value('project_id');
         //是否正式域名
         if (!$project_id) {
-                $project_id = DeployOptimize::where('domain', $domain)->value('project_id');
+            $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
         }
-            if (!$project_id) {
-                return [];
-            }
-            $data = self::find($project_id);
-            if ($data) {
-                Cache::put($cache_key, $data);
-            }
-        }
-        return $data;
+        return self::find($project_id ?: 0);
     }
 
     /**

@@ -19,3 +19,4 @@ Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
 });
 
 Route::any('traffic_visit', [\App\Http\Controllers\Api\NoticeController::class, 'trafficVisit'])->name('api.traffic_visit');
+Route::get('optimize_project_list', [\App\Http\Controllers\Api\PrivateController::class, 'optimizeProjectList'])->name('api.optimize_project_list');
\ No newline at end of file