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

lyh
app/Console/Commands/WebTraffic.php
app/Http/Controllers/Aside/Project/MinorLanguagesController.php
app/Http/Controllers/Aside/Project/ProjectController.php
app/Http/Logic/Aside/Optimize/CreateKeywordLogic.php
app/Models/Project/MinorLanguages.php
routes/aside.php
--- a/app/Console/Commands/WebTraffic.php
查看文件 @f6be1c9
+++ b/app/Console/Commands/WebTraffic.php
查看文件 @f6be1c9
@@ -8,6 +8,7 @@ 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;
@@ -130,6 +131,19 @@ class WebTraffic extends Command
         '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 = [
@@ -230,7 +244,7 @@ class WebTraffic extends Command
                                 'ip' => $ips[$project_key]['ip'],
                                 'url' => $project['visit_urls'][$j],
                                 'device_port' => $project['device_port'],
-                                'referrer_url' => $this->getReferer($ips[$project_key]['ip_area']),
+                                'referrer_url' => $this->getReferer($ips[$project_key]['ip_area'], $project['lang']),
                                 'user_agent' => $project['user_agent'],
                             ];
                             Log::channel('traffic')->info('traffic project_id:' . $project['project_id'], $data);
@@ -293,12 +307,15 @@ class WebTraffic extends Command
                $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
                $query->where('pdo.start_date', '<', $startTime);
            }
-        })->select('pdo.project_id')->forPage($page, 500)->get();
+        })->select(['pdo.project_id','gl_project.main_lang_id'])->forPage($page, 500)->get();
         //其他地方在引流的域名
         $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
-
         $data = [];
         foreach ($list as $project) {
+            $lang = WebLanguage::getLangById($this->project['main_lang_id']??1)['short'];
+            if(empty($project->domainInfo['domain'])){
+                continue;
+            }
             //其他地方在引流就不再引流了
             if(in_array($project->domainInfo['domain'], $other)){
                 continue;
@@ -306,9 +323,9 @@ class WebTraffic extends Command
             $data[] = [
                 'project_id' => $project['project_id'],
                 'domain' => 'https://' . $project->domainInfo['domain'] . '/',
+                'lang' => $lang
             ];
         }
-
         return $data;
     }
@@ -440,7 +457,12 @@ class WebTraffic extends Command
     /**
      * 获取访问来路
      */
-    protected function getReferer($ip_area){
+    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{
--- a/app/Http/Controllers/Aside/Project/MinorLanguagesController.php 0 → 100644
查看文件 @f6be1c9
+++ b/app/Http/Controllers/Aside/Project/MinorLanguagesController.php 0 → 100644
查看文件 @f6be1c9
+<?php
+/**
+ * @remark :
+ * @name   :MinorLanguagesController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/2/28 9:08
+ */
+
+namespace App\Http\Controllers\Aside\Project;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Project\MinorLanguages;
+
+/**
+ * @remark :小语种
+ * @name   :MinorLanguagesController
+ * @author :lyh
+ * @method :post
+ * @time   :2024/2/28 9:09
+ */
+class MinorLanguagesController extends BaseController
+{
+    public function getMinorLanguageList(){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => 'keyword不能为空',
+        ]);
+        $languageModel = new MinorLanguages();
+        $lists = $languageModel->list($this->map);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+}
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @f6be1c9
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @f6be1c9
@@ -76,6 +76,49 @@ class ProjectController extends BaseController
     }
     /**
+     * 需要查询的字段
+     * @return array
+     */
+    public function selectParam(){
+        $select = [
+            'gl_project.id AS id',
+            'gl_project.title AS title',
+            'gl_project.channel AS channel',
+            'gl_project.company AS company',
+            'gl_project.type AS type',
+            'gl_project.is_upgrade AS is_upgrade',
+            'gl_project.created_at AS created_at',
+            'gl_project.cooperate_date AS cooperate_date',
+            'gl_project_online_check.id AS online_check_id',
+            'gl_project_online_check.question AS question',
+            'gl_project_online_check.optimist_status AS optimist_status',
+            'gl_project_online_check.qa_status AS qa_status',
+            'gl_project_payment.amount AS amount',
+            'gl_project_deploy_build.dept_id AS dept_id',
+            'gl_project_deploy_build.keyword_num AS key',
+            'gl_project_deploy_build.service_duration AS day',
+            'gl_project_deploy_build.leader_mid AS leader_mid',
+            'gl_project_deploy_build.manager_mid AS manager_mid',
+            'gl_project_deploy_build.designer_mid AS designer_mid',
+            'gl_project_deploy_build.tech_mid AS tech_mid',
+            'gl_project_deploy_build.test_domain AS test_domain',
+            'gl_project_deploy_build.plan AS plan',
+            'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
+            'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
+            'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
+            'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid',
+            'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
+            'gl_project_deploy_optimize.design_mid AS design_mid',
+            'gl_project_deploy_optimize.tech_leader AS tech_leader',
+            'gl_project_deploy_optimize.domain AS domain',
+            'gl_project_deploy_optimize.quality_mid AS quality_mid',
+            'gl_project_deploy_optimize.design_mid AS design_mid',
+            'gl_project_deploy_optimize.api_no AS api_no',
+        ];
+        return $select;
+    }
+
+    /**
      * @remark :排序
      * @name   :orderByList
      * @author :lyh
@@ -146,49 +189,6 @@ class ProjectController extends BaseController
     }
     /**
-     * 需要查询的字段
-     * @return array
-     */
-    public function selectParam(){
-        $select = [
-            'gl_project.id AS id',
-            'gl_project.title AS title',
-            'gl_project.channel AS channel',
-            'gl_project.company AS company',
-            'gl_project.type AS type',
-            'gl_project.is_upgrade AS is_upgrade',
-            'gl_project.created_at AS created_at',
-            'gl_project.cooperate_date AS cooperate_date',
-            'gl_project_online_check.id AS online_check_id',
-            'gl_project_online_check.question AS question',
-            'gl_project_online_check.optimist_status AS optimist_status',
-            'gl_project_online_check.qa_status AS qa_status',
-            'gl_project_payment.amount AS amount',
-            'gl_project_deploy_build.dept_id AS dept_id',
-            'gl_project_deploy_build.keyword_num AS key',
-            'gl_project_deploy_build.service_duration AS day',
-            'gl_project_deploy_build.leader_mid AS leader_mid',
-            'gl_project_deploy_build.manager_mid AS manager_mid',
-            'gl_project_deploy_build.designer_mid AS designer_mid',
-            'gl_project_deploy_build.tech_mid AS tech_mid',
-            'gl_project_deploy_build.test_domain AS test_domain',
-            'gl_project_deploy_build.plan AS plan',
-            'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
-            'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
-            'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
-            'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid',
-            'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
-            'gl_project_deploy_optimize.design_mid AS design_mid',
-            'gl_project_deploy_optimize.tech_leader AS tech_leader',
-            'gl_project_deploy_optimize.domain AS domain',
-            'gl_project_deploy_optimize.quality_mid AS quality_mid',
-            'gl_project_deploy_optimize.design_mid AS design_mid',
-            'gl_project_deploy_optimize.api_no AS api_no',
-        ];
-        return $select;
-    }
-
-    /**
      * 搜索框
      * @param $query
      * @return mixed
--- a/app/Http/Logic/Aside/Optimize/CreateKeywordLogic.php
查看文件 @f6be1c9
+++ b/app/Http/Logic/Aside/Optimize/CreateKeywordLogic.php
查看文件 @f6be1c9
@@ -83,9 +83,10 @@ class CreateKeywordLogic extends BaseLogic
             return $this->success($data);
         }
         $except_k = ['Quality','Philippines','USA','UK','America','China','Wholesale','Hot Sale','Cheap','cheap','price','pricelist','hot sale','Price','Pricelist','With ','For ','And ','Oem','Odm','Supplier','Manufacturer','CE Certification','Factory','Exporters','Company','Companies','Suppliers','Manufacturers','Factories','Company','Companies','Exporters','Exporter','Buy ',' Buy','Where ','What ','When ','How ','Which ','Producer','Producers','Best Selling','Hot Selling','Near','Chinese','India','use','high quality','discount','online','custom','customized','Enterprise','Agent','Plant','Refinery','Foundry','Maker','Distributor'];
+        $except_k = array_map('strtolower', $except_k);
         $filterKeywords = [];
         foreach ($this->param['keyword'] as $k=>$v){
-            if(in_array($v,$except_k)){
+            if(in_array(strtolower($v),$except_k)){
                 unset($this->param['keyword'][$k]);
                 $filterKeywords[] = $v;
             }
--- a/app/Models/Project/MinorLanguages.php 0 → 100644
查看文件 @f6be1c9
+++ b/app/Models/Project/MinorLanguages.php 0 → 100644
查看文件 @f6be1c9
+<?php
+/**
+ * @remark :
+ * @name   :MinorLanguages.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/2/28 9:26
+ */
+
+namespace App\Models\Project;
+
+use App\Models\Base;
+
+/**
+ * @remark :项目小语种
+ * @name   :MinorLanguages
+ * @author :lyh
+ * @method :post
+ * @time   :2024/2/28 9:27
+ */
+class MinorLanguages extends Base
+{
+    protected $table = 'gl_project_minor_languages';
+}
--- a/routes/aside.php
查看文件 @f6be1c9
+++ b/routes/aside.php
查看文件 @f6be1c9
@@ -190,6 +190,12 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/save', [Aside\Project\KeywordPrefixController::class, 'save'])->name('admin.keyword_save');
             Route::any('/del', [Aside\Project\KeywordPrefixController::class, 'del'])->name('admin.keyword_del');
         });
+
+        Route::prefix('language')->group(function () {
+            Route::any('/', [Aside\Project\MinorLanguagesController::class, 'getMinorLanguageList'])->name('admin.getMinorLanguageList');
+            Route::any('/save', [Aside\Project\KeywordPrefixController::class, 'save'])->name('admin.keyword_save');
+            Route::any('/del', [Aside\Project\KeywordPrefixController::class, 'del'])->name('admin.keyword_del');
+        });
         //更新项目tdk
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');
         //项目内容采集