合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2186

@@ -13,8 +13,10 @@ use App\Models\Ai\AiBlog;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\AiBlogTask;
+use App\Models\Project\KeywordPrefix;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\ProjectAiSetting;
 use App\Models\Project\ProjectAiSetting;
+use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Services\AiBlogService;
 use App\Services\AiBlogService;
@@ -39,6 +41,24 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
+        $projectModel = new Project();
+        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>1,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
+        //获取
+        $keywordPrefixModel = new KeywordPrefix();
+        $keywordPrefixArr = $keywordPrefixModel->selectField(['project_id'=>0,'type'=>1],'keyword');
+        $prefixStr = explode("\n",$keywordPrefixArr);
+        $keywordSuffixArr = $keywordPrefixModel->selectField(['project_id'=>0,'type'=>2],'keyword');
+        $suffixStr = explode("\n",$keywordSuffixArr);
+        $whiteModel = new ProjectWhiteHatAffix();
+        foreach ($lists as $val) {
+            echo date('Y-m-d H:i:s') . '开始--项目的id:' . $val['id'] . PHP_EOL;
+            $data = [
+                'project_id'=>$val['id'],
+                'prefix'=>$prefixStr,
+                'suffix'=>$suffixStr,
+            ];
+            $whiteModel->add($data);
+        }
         return true;
         return true;
     }
     }
 
 

@@ -43,7 +43,7 @@ class InitKeywordComment extends Command
             $this->_action($val['id']);
             $this->_action($val['id']);
         }
         }
         return true;
         return true;
-        $keywordCommonModel = new AggregateKeywordComment();
+        $keywordCommentModel = new AggregateKeywordComment();
         while (true){
         while (true){
             $list = NoticeLog::where('type', NoticeLog::TYPE_INIT_KEYWORD_COMMON)->where('status', NoticeLog::STATUS_PENDING)->get();
             $list = NoticeLog::where('type', NoticeLog::TYPE_INIT_KEYWORD_COMMON)->where('status', NoticeLog::STATUS_PENDING)->get();
             if(empty($list)){
             if(empty($list)){
@@ -56,7 +56,7 @@ class InitKeywordComment extends Command
                 echo date('Y-m-d H:i:s').'执行的项目id:' . $project_id . PHP_EOL;
                 echo date('Y-m-d H:i:s').'执行的项目id:' . $project_id . PHP_EOL;
                 try {
                 try {
                     $this->_action($project_id);
                     $this->_action($project_id);
-                    $count = $keywordCommonModel->counts(['project_id'=>$project_id]);
+                    $count = $keywordCommentModel->counts(['project_id'=>$project_id]);
                     if($count > 100){
                     if($count > 100){
                         $item->status = NoticeLog::STATUS_SUCCESS;
                         $item->status = NoticeLog::STATUS_SUCCESS;
                         $item->save();
                         $item->save();
@@ -107,8 +107,8 @@ class InitKeywordComment extends Command
                     'updated_at'=>date('Y-m-d H:i:s')
                     'updated_at'=>date('Y-m-d H:i:s')
                 ];
                 ];
             }
             }
-            $keywordCommonModel = new AggregateKeywordComment();
-            $keywordCommonModel->insertAll($data);
+            $keywordCommentModel = new AggregateKeywordComment();
+            $keywordCommentModel->insertAll($data);
         }
         }
         return true;
         return true;
     }
     }

@@ -43,69 +43,6 @@ use Illuminate\Support\Facades\DB;
 class CNoticeController extends BaseController
 class CNoticeController extends BaseController
 {
 {
     /**
     /**
-     * @remark :计算页面数量
-     * @name   :countLanguagePage
-     * @author :lyh
-     * @method :post
-     * @time   :2025/6/19 17:14
-     */
-    public function countLanguagePage(){
-        $this->request->validate([
-            'language'=>'required',
-            'project_id'=>'required',
-        ],[
-            'language.required' => 'language不能为空',
-            'project_id.required' => 'project_id不能为空',
-        ]);
-        $bigProjectModel = new TranslateBigProject();
-        $project_id_arr = $bigProjectModel->selectField(['status'=>1],'project_id') ?? [];
-        if(in_array($this->param['project_id'],$project_id_arr)){
-            $this->response('success');
-        }
-        $lang_num = count($this->param['language']);
-        ProjectServer::useProject($this->param['project_id']);
-        $keyword_num = (new Keyword())->counts(['route'=>['!=',null]]);
-        $data_num = $this->productNum() + $this->customNum() + $this->newsNum() + $this->blogNum();
-        DB::disconnect('custom_mysql');
-        $number = $keyword_num * 18 + $lang_num * $data_num;
-        if($number >= 450000){
-            $this->response('success',Code::SUCCESS,['msg'=>'翻译数量过多， 大概页面数量：'.$number.'， 磁盘空间占用可能会超过40G，请联系管理员操作！']);
-        }
-        $this->response('success');
-    }
-
-    /**
-     * @remark :产品分类页面数量
-     * @name   :productCateNum
-     * @author :lyh
-     * @method :post
-     * @time   :2025/1/4 10:43
-     */
-    public function productNum(){
-        $number = (new Product())->counts(['status'=>1]);
-        $settingModel = new SettingNum();
-        $info = $settingModel->read(['type'=>1]);
-        if($info === false){
-            $product_page_number = 15;
-        }else{
-            $product_page_number = $info['num'];
-        }
-        $productCateModel = new Category();
-        $productCateList = $productCateModel->list(['status'=>1]);
-        if(!empty($productCateList)){
-            $cateReModel = new CategoryRelated();
-            foreach ($productCateList as $v){
-                $cate_num = $cateReModel->counts(['cate_id'=>$v['id']]);
-                if($cate_num == 0){
-                    $number += 1;
-                }else{
-                    $number += ceil($cate_num / $product_page_number);
-                }
-            }
-        }
-        return $number;
-    }
-    /**
      * 更新通知C端
      * 更新通知C端
      * @param Request $request
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @return \Illuminate\Http\JsonResponse
@@ -134,102 +71,8 @@ class CNoticeController extends BaseController
         http_post($url, json_encode($param));
         http_post($url, json_encode($param));
         $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
         $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
     }
     }
-    /**
-     * @remark :新闻数量
-     * @name   :newsNum
-     * @author :lyh
-     * @method :post
-     * @time   :2025/1/4 11:21
-     */
-    public function newsNum(){
-        $newsModel = new News();
-        $number = $newsModel->counts(['status'=>1]);
-        $settingModel = new SettingNum();
-        $info = $settingModel->read(['type'=>2]);
-        if($info === false){
-            $news_page_number = 10;
-        }else{
-            $news_page_number = $info['num'];
-        }
-        $newsCateModel = new NewsCategory();
-        $newsCateList = $newsCateModel->list(['status'=>0]);
-        if(!empty($newsCateList)){
-            foreach ($newsCateList as $v){
-                $cate_num = $newsModel->counts(['category_id'=>['like',','.$v['id'].',']]);
-                if($cate_num == 0){
-                    $number += 1;
-                }else{
-                    $number += ceil($cate_num / $news_page_number);
-                }
-            }
-        }
-        return $number;
-    }
-
-    /**
-     * @remark :博客数量
-     * @name   :blogNum
-     * @author :lyh
-     * @method :post
-     * @time   :2025/1/4 11:21
-     */
-    public function blogNum(){
-        $blogModel = new Blog();
-        $number = $blogModel->counts(['status'=>1]);
-        $settingModel = new SettingNum();
-        $info = $settingModel->read(['type'=>3]);
-        if($info === false){
-            $news_page_number = 10;
-        }else{
-            $news_page_number = $info['num'];
-        }
-        $blogCateModel = new BlogCategory();
-        $blogCateList = $blogCateModel->list(['status'=>0]);
-        if(!empty($blogCateList)){
-            foreach ($blogCateList as $v){
-                $cate_num = $blogModel->counts(['category_id'=>['like',','.$v['id'].',']]);
-                if($cate_num == 0){
-                    $number += 1;
-                }else{
-                    $number += ceil($cate_num / $news_page_number);
-                }
-            }
-        }
-        return $number;
-    }
 
 
     /**
     /**
-     * @remark :扩展模块数量
-     * @name   :blogNum
-     * @author :lyh
-     * @method :post
-     * @time   :2025/1/4 11:21
-     */
-    public function customNum(){
-        $contentModel = new CustomModuleContent();
-        $number = $contentModel->counts(['status'=>0]);
-        $settingModel = new SettingNum();
-        $info = $settingModel->read(['type'=>2]);
-        if($info === false){
-            $news_page_number = 10;
-        }else{
-            $news_page_number = $info['num'];
-        }
-        $cateModel = new CustomModuleCategory();
-        $cateList = $cateModel->list(['status'=>0]);
-        if(!empty($cateList)){
-            foreach ($cateList as $v){
-                $cate_num = $contentModel->counts(['category_id'=>['like',','.$v['id'].',']]);
-                if($cate_num == 0){
-                    $number += 1;
-                }else{
-                    $number += ceil($cate_num / $news_page_number);
-                }
-            }
-        }
-        return $number;
-    }
-    /**
      * @remark :获取当前项目选中的语种
      * @remark :获取当前项目选中的语种
      * @name   :getCountry
      * @name   :getCountry
      * @author :lyh
      * @author :lyh

+<?php
+/**
+ * @remark :
+ * @name   :ProjectWhiteHatAffixController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/6/23 10:59
+ */
+
+namespace App\Http\Controllers\Aside\Project;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Project\ProjectWhiteHatAffix;
+use Illuminate\Http\Request;
+
+/**
+ * @remark :白帽seo前后缀
+ * @name   :ProjectWhiteHatAffixController
+ * @author :lyh
+ * @method :post
+ * @time   :2025/6/23 10:59
+ */
+class ProjectWhiteHatAffixController extends BaseController
+{
+    public function __construct(Request $request)
+    {
+        $this->model = new ProjectWhiteHatAffix();
+        parent::__construct($request);
+    }
+
+    /**
+     * @remark :根据项目获取白帽前后缀
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/6/23 11:00
+     * @param  :project_id->项目id
+     */
+    public function read(){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => '项目id不能为空',
+        ]);
+        $data = $this->model->read($this->map);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :保存数据
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2025/6/23 11:04
+     * @param  :prefix->前缀
+     * @param  :suffix->后缀
+     * @param  :project_id->项目id
+     */
+    public function save(){
+        $this->request->validate([
+            'project_id'=>'required',
+            'prefix'=>'required',
+            'suffix'=>'required',
+        ],[
+            'project_id.required' => '项目id不能为空',
+            'prefix.required' => '前缀不能为空，一行一个',
+            'suffix.required' => '项目id不能为空，一行一个',
+        ]);
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $this->model->edit($this->param,['id'=>$this->param['id']]);
+        }else{
+            $id = $this->model->addReturnId($this->param);
+        }
+        $this->response('success',Code::SUCCESS,['id'=>$id]);
+    }
+
+}

@@ -26,6 +26,7 @@ use App\Models\Inquiry\InquiryIP;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
 use App\Models\Project\After;
 use App\Models\Project\After;
+use App\Models\Project\AggregateKeywordComment;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\AiBlogTask;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
@@ -427,6 +428,12 @@ class ProjectLogic extends BaseLogic
                     $this->param['deploy_build']['is_supplier'] = 1;
                     $this->param['deploy_build']['is_supplier'] = 1;
                 }
                 }
             }
             }
+            //聚合页评论为空时，生成评论
+            $keywordCommentModel = new AggregateKeywordComment();
+            $commentNum = $keywordCommentModel->counts(['project_id'=>$param['id']]);
+            if(empty($commentNum)){
+                NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD_COMMON, ['project_id' => $this->param['project_id']]);
+            }
         }
         }
         if($param['type'] == Project::TYPE_FIVE){
         if($param['type'] == Project::TYPE_FIVE){
             $param['extend_type'] = Project::TYPE_FIVE;
             $param['extend_type'] = Project::TYPE_FIVE;

+<?php
+/**
+ * @remark :
+ * @name   :ProjectWhiteHatAffix.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/6/23 11:01
+ */
+
+namespace App\Models\Project;
+
+use App\Models\Base;
+
+/**
+ * @remark :白帽seo的前后缀
+ * @name   :ProjectWhiteHatAffix
+ * @author :lyh
+ * @method :post
+ * @time   :2025/6/23 11:02
+ */
+class ProjectWhiteHatAffix extends Base
+{
+    protected $table = 'gl_project_white_hat_affix';
+}

@@ -15,7 +15,6 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::any('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
     Route::any('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
     Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址
     Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址
     Route::any('/sendNotify', [Aside\Com\CNoticeController::class, 'sendNotify'])->name('admin.sendNotify');
     Route::any('/sendNotify', [Aside\Com\CNoticeController::class, 'sendNotify'])->name('admin.sendNotify');
-    Route::any('/countLanguagePage', [Aside\Com\CNoticeController::class, 'countLanguagePage'])->name('admin.countLanguagePage');//统计页面数量
     Route::any('/getCountry', [Aside\Com\CNoticeController::class, 'getCountry'])->name('admin.getCountry');
     Route::any('/getCountry', [Aside\Com\CNoticeController::class, 'getCountry'])->name('admin.getCountry');
     Route::any('/getDynamicPassword', [Aside\Com\IndexController::class, 'getDynamicPassword'])->name('admin.getDynamicPassword');
     Route::any('/getDynamicPassword', [Aside\Com\IndexController::class, 'getDynamicPassword'])->name('admin.getDynamicPassword');
     Route::any('/notAiHumanizer', [Aside\Com\IndexController::class, 'notAiHumanizer'])->name('admin.notAiHumanizer');
     Route::any('/notAiHumanizer', [Aside\Com\IndexController::class, 'notAiHumanizer'])->name('admin.notAiHumanizer');
@@ -596,6 +595,11 @@ Route::middleware(['aloginauth'])->group(function () {
         });
         });
     });
     });
 
 
+    //白帽seo前后缀
+    Route::prefix('white_hat')->group(function () {
+        Route::any('/read', [Aside\Project\ProjectWhiteHatAffixController::class, 'read'])->name('admin.white_hat_read');
+        Route::any('/save', [Aside\Project\ProjectWhiteHatAffixController::class, 'save'])->name('admin.white_hat_save');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组