Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

+<?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);
+        }
+    }
+
+}

@@ -37,6 +37,7 @@ class UpgradeProjectCount extends Command
     public function handle(){
         ProjectServer::useProject(439);
         $this->count();
+
         DB::disconnect('custom_mysql');
     }
 
@@ -60,11 +61,15 @@ class UpgradeProjectCount extends Command
             // 获取当月结束时间
             $end = date('Y-m-t', strtotime($v['month']));
             $arr['project_id'] = 439;
-            $inquiry_list = (new FormGlobalsoApi())->getInquiryList('www.cnzyl.com','',1,100000000);
-            //总数
-            $arr['total'] = $inquiry_list['data']['total'] ?? 0;
+            $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['country'] = '{"\u5c3c\u65e5\u5229\u4e9a":1,"\u5370\u5ea6\u5c3c\u897f\u4e9a":1,"\u4f0a\u6717":1}';
             $arr = $this->pv_ip($arr,$start,$end);
             $arr = $this->sourceCount($arr,$start,$end);
             if($info === false){
@@ -143,4 +148,13 @@ class UpgradeProjectCount extends Command
         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'=>290]);
+        $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);
+        }
+    }
 }

+<?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);
     }

@@ -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)){
@@ -152,11 +149,10 @@ class KeywordLogic extends  BaseLogic
                     $param['created_at'] = date('Y-m-d H:i:s');
                     $param['updated_at'] = $param['created_at'];
                     $param['title'] = $v;
-                    $id = $this->model->insertGetId($param);
-                    $route = RouteMap::setRoute($route_array[$k], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
-                    $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');
         }

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

@@ -18,4 +18,5 @@ Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
     return $request->user();
 });
 
-Route::any('traffic_visit', [\App\Http\Controllers\Api\NoticeController::class, 'trafficVisit'])->name('api.traffic_visit');
\ No newline at end of file
+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