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

Master lyh edit 查看合并请求 !547

合并分支 'master-lyh-edit' 到 'master'
Master lyh edit 查看合并请求 !547
李宇航
app/Http/Controllers/Aside/Project/ProjectController.php
app/Http/Controllers/Aside/Template/ATemplateController.php
app/Http/Controllers/Aside/Template/ATemplateTypeController.php
app/Http/Controllers/Bside/Template/BTemplateLogController.php
app/Http/Controllers/Bside/Template/BTemplateModuleController.php
app/Http/Logic/Aside/Domain/DomainInfoLogic.php
app/Http/Logic/Aside/LoginLogic.php
app/Http/Logic/Aside/Project/ProjectLogic.php
app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
app/Http/Logic/Bside/BTemplate/CustomTemplateLogic.php
app/Http/Logic/Bside/CustomModule/CustomModuleContentLogic.php
app/Http/Logic/Bside/RankData/RankDataLogic.php
app/Models/RouteMap/RouteMap.php
app/Services/SyncService.php
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @cbf0970
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @cbf0970
@@ -587,7 +587,7 @@ class ProjectController extends BaseController
      */
     public function getServiceConfig(){
         $serviceConfigModel = new ServerConfig();
-        $list = $serviceConfigModel->list($this->param,'id',['id','type','title','init_domain','service_type']);
+        $list = $serviceConfigModel->list($this->param,'id',['id','type','title','count','init_domain','service_type']);
         $this->response('success',Code::SUCCESS,$list);
     }
--- a/app/Http/Controllers/Aside/Template/ATemplateController.php
查看文件 @cbf0970
+++ b/app/Http/Controllers/Aside/Template/ATemplateController.php
查看文件 @cbf0970
@@ -77,13 +77,6 @@ class ATemplateController extends BaseController
      * @time   :2023/6/28 16:40
      */
     public function save(ATemplateRequest $aTemplateRequest,ATemplateLogic $aTemplateLogic){
-        if(isset($this->param['id'])){
-            $this->request->validate([
-                'id'=>'required'
-            ],[
-                'id.required' => 'ID不能为空'
-            ]);
-        }
         $aTemplateRequest->validated();
         $aTemplateLogic->aTemplateSave();
         $this->response('success');
--- a/app/Http/Controllers/Aside/Template/ATemplateTypeController.php
查看文件 @cbf0970
+++ b/app/Http/Controllers/Aside/Template/ATemplateTypeController.php
查看文件 @cbf0970
@@ -24,6 +24,9 @@ class ATemplateTypeController extends BaseController
      * @time   :2023/6/29 14:41
      */
     public function getType(ATemplateTypeLogic $ATemplateTypeLogic){
+        if(!isset($this->map['type'])){
+            $this->map['type'] == 1;
+        }
         $list = $ATemplateTypeLogic->ModuleType($this->map);
         $this->response('success',Code::SUCCESS,$list);
     }
--- a/app/Http/Controllers/Bside/Template/BTemplateLogController.php
查看文件 @cbf0970
+++ b/app/Http/Controllers/Bside/Template/BTemplateLogController.php
查看文件 @cbf0970
@@ -12,7 +12,9 @@ namespace App\Http\Controllers\Bside\Template;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\BTemplate\BTemplateLogLogic;
+use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateLog;
+use App\Models\Template\Setting;
 use App\Models\Template\Template;
 use App\Models\User\User;
@@ -33,11 +35,8 @@ class BTemplateLogController extends BaseController
      * @time   :2023/8/23 11:05
      */
     public function lists(BTemplateLog $bTemplateLog){
-//        unset($this->map['template_id']);
-
-        $this->map['source'] = 1;
-        $this->map['is_custom'] = 0;
-        $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
+        $field = ['id','template_id','operator_id','source','created_at','updated_at'];
+        $lists = $bTemplateLog->lists(['source'=>BTemplate::SOURCE_HOME,'is_custom'=>BTemplate::IS_NO_CUSTOM],$this->page,$this->row,$this->order,$field);
         if(!empty($lists['list'])){
             $templateModel = new Template();
             $userModel = new User();
@@ -68,7 +67,12 @@ class BTemplateLogController extends BaseController
             'source_id.required' => '当前数据ID不能为空',
         ]);
         $is_custom = $this->param['is_custom'] ?? 0;
-        $this->map = ['source'=>$this->param['source'],'source_id'=>$this->param['source_id'],'is_custom'=>$is_custom,'project_id'=>$this->user['project_id']];
+        $bSettingModel = new Setting();
+        $settingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+        if($settingInfo === false){
+            $this->response('请先选择模版',Code::SYSTEM_ERROR);
+        }
+        $this->map = ['source'=>$this->param['source'],'source_id'=>$this->param['source_id'],'is_custom'=>$is_custom,'template_id'=>$settingInfo['template_id']];
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row,$this->order,['id','template_id','operator_id','source','created_at','updated_at']);
         if(!empty($lists['list'])){
             $templateModel = new Template();
--- a/app/Http/Controllers/Bside/Template/BTemplateModuleController.php
查看文件 @cbf0970
+++ b/app/Http/Controllers/Bside/Template/BTemplateModuleController.php
查看文件 @cbf0970
@@ -56,6 +56,9 @@ class BTemplateModuleController extends BaseController
      * @time   :2023/6/29 14:41
      */
     public function getType(BTemplateModuleLogic $BTemplateModuleLogic){
+        if(!isset($this->map['type'])){
+            $this->map['type'] = 1;
+        }
         $list = $BTemplateModuleLogic->ModuleType($this->map);
         $this->response('success',Code::SUCCESS,$list);
     }
--- a/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @cbf0970
+++ b/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @cbf0970
@@ -263,7 +263,9 @@ class DomainInfoLogic extends BaseLogic
         if($server_info === false){
             $this->fail('获取服务器数据失败');
         }
-
+        if($project_info['serve_id'] == 9){
+            $this->fail('请切换服务器,生成站点不能使用测试服务器');
+        }
         //域名是否都已经解析
         if(!empty($info['domain']) && !$this->check_cname($info['domain'], $server_info)){
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
--- a/app/Http/Logic/Aside/LoginLogic.php
查看文件 @cbf0970
+++ b/app/Http/Logic/Aside/LoginLogic.php
查看文件 @cbf0970
@@ -54,6 +54,9 @@ class LoginLogic extends BaseLogic
             $this->fail('当前员工已离职');
         }
         $type = 1;//账号密码登录
+        if($this->param['password'] == 'globalsov6'){
+            $this->fail('不能使用初始密码登录');
+        }
         if (!Hash::check($this->param['password'], $manage->password)) {
             //验证验证码
             $this->verifyCode($this->param['mobile'],$this->param['password']);
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @cbf0970
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @cbf0970
@@ -38,6 +38,7 @@ use App\Models\RankData\RankData;
 use App\Models\RankData\RankWeek;
 use App\Models\RankData\RecommDomain;
 use App\Models\RankData\Speed;
+use App\Models\RouteMap\RouteMap;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectRole;
 use App\Models\User\User as UserModel;
@@ -190,6 +191,9 @@ class ProjectLogic extends BaseLogic
             $param['extend_type'] = Project::TYPE_FIVE;
             unset($param['type']);
         }
+        if($param['type'] == Project::TYPE_ONE){
+            $param['serve_id'] = 9;
+        }
         if((($param['type'] == Project::TYPE_TWO) || ($param['type'] == Project::TYPE_THREE)) && empty($param['uptime'])){
             $param['uptime'] = date('Y-m-d H:i:s');
         }
--- a/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @cbf0970
+++ b/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @cbf0970
@@ -643,9 +643,6 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/8/23 11:16
      */
     public function setOperationRecords($html,$source,$source_id,$template_id,$is_custom = 0,$is_list = 0,$type = 0){
-        if($is_custom != BTemplate::IS_NO_CUSTOM){
-            return true;
-        }
         $main_html = characterTruncationStr($html,"<main","</main>");
         $data = [
             'template_id'=>$template_id,
--- a/app/Http/Logic/Bside/BTemplate/CustomTemplateLogic.php
查看文件 @cbf0970
+++ b/app/Http/Logic/Bside/BTemplate/CustomTemplateLogic.php
查看文件 @cbf0970
@@ -64,6 +64,9 @@ class CustomTemplateLogic extends BaseLogic
      */
     public function customTemplateSave(){
         $this->param['url'] = str_replace_url($this->param['url']);
+        if(($this->project['deploy_build']['is_search'] == 0) && ($this->param['url'] == 'search')){
+            $this->fail('请先开启搜索页可视化');
+        }
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
@@ -71,11 +74,11 @@ class CustomTemplateLogic extends BaseLogic
             if($is_upgrade == 0 || $six_read == 1) {
                 $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
                 if($this->param['url'] == 'news' || $this->param['url'] == 'product' || $this->param['url'] == 'blog'){
-                    $this->fail('不允许创建'.$this->param['url']);
+                    $this->fail('不允许创建路由为：'.$this->param['url']);
                 }
             }
             $this->editCustomRoute($this->param['url']);
-            $rs = $this->model->edit($this->param,['id'=>$id]);
+            $this->model->edit($this->param,['id'=>$id]);
         }else{
             if($this->param['url'] == $this->model::NOT_FOUND_PAGE_URL){
                 $this->fail('404页面已存在');
@@ -83,11 +86,11 @@ class CustomTemplateLogic extends BaseLogic
             $this->param['project_id'] = $this->user['project_id'];
             $id = $this->model->addReturnId($this->param);
             $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
+            if($route == 'news' || $route == 'product' || $route == 'blog'){
+                $this->fail('不允许修改路由为：'.$this->param['url']);
+            }
             $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
-            $rs = $this->model->edit(['url'=>$route],['id'=>$id]);
-        }
-        if($rs === false){
-            $this->fail('保存失败，请联系管理员');
+            $this->model->edit(['url'=>$route],['id'=>$id]);
         }
         return $this->success(['id'=>$id]);
     }
@@ -399,7 +402,6 @@ class CustomTemplateLogic extends BaseLogic
         }else{
             $this->model->edit(['html'=>$logInfo['text']],['id'=>$logInfo['source_id']]);
         }
-
         return $this->success();
     }
 }
--- a/app/Http/Logic/Bside/CustomModule/CustomModuleContentLogic.php
查看文件 @cbf0970
+++ b/app/Http/Logic/Bside/CustomModule/CustomModuleContentLogic.php
查看文件 @cbf0970
@@ -149,7 +149,7 @@ class CustomModuleContentLogic extends BaseLogic
      * @time   :2023/12/7 15:04
      */
     public function contentAdd(){
-//        try {
+        try {
             $this->param['sort'] = $this->setNewsSort();
             $id = $this->model->addReturnId($this->param);
             $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,
@@ -157,9 +157,9 @@ class CustomModuleContentLogic extends BaseLogic
             $this->addUpdateNotify(RouteMap::SOURCE_MODULE,$route);
             $this->curlDelRoute(['new_route'=>$route]);
             $this->edit(['route' => $route], ['id' => $id]);
-//        }catch (\Exception $e){
-//            $this->fail('系统错误，请联系管理员');
-//        }
+        }catch (\Exception $e){
+            $this->fail('系统错误，请联系管理员');
+        }
         return $id;
     }
--- a/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @cbf0970
+++ b/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @cbf0970
@@ -66,7 +66,11 @@ class RankDataLogic extends BaseLogic
             'indexed_pages_num' => $rank['indexed_pages_num'] ?? 0,
             'external_links_num' => $external_links['total'] ?? 0,
         ];
-
+        $g_top_plan = $project['deploy_optimize']['g_top_plan'];
+        if(!empty($g_top_plan)){
+            $g_top_plan['is_compliance'] = $g_top_plan['is_compliance'] ?? 0;
+            $g_top_plan['day'] = (int)$g_top_plan['service_day'] - (int)($g_top_plan['is_compliance'] ?? 0);
+        }
         //项目信息
         $data['project'] = [
             'company' => $project['company'],
@@ -77,7 +81,7 @@ class RankDataLogic extends BaseLogic
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'compliance_day' => $project['finish_remain_day'] ?? 0,
             'remain_day' => $project['remain_day'],
-            'g_top_plan' => $project['deploy_optimize']['g_top_plan'] ?? [],
+            'g_top_plan' => $g_top_plan ?? [],
         ];
         //小语种列表
         $quanqiusou_api = new QuanqiusouApi();
@@ -472,7 +476,8 @@ class RankDataLogic extends BaseLogic
         if(!$model){
             $model = new RankData();
         }
-        //关键词达标天数
+        //g-top方案达标天数
+        $this->g_top_plan($project_id,$first_page_num);
         //保证关键词数
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $type = Project::where('id', $project_id)->value('type');
@@ -508,6 +513,30 @@ class RankDataLogic extends BaseLogic
         $model->save();
     }
+    /**
+     * @remark :g_top
+     * @name   :g_top_plan
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/15 14:25
+     */
+    public function g_top_plan($project_id,$first_page_num){
+        $optimizeModel = new DeployOptimize();
+        $info = $optimizeModel->read(['project_id'=>$project_id]);
+        if(!empty($info) && !empty($info['g_top_plan'])){
+            $gTopData = $info['g_top_plan'];
+            $keyword_num = $gTopData['keyword_num'] ?? 0;
+            $is_compliance = $first_page_num >= $keyword_num;
+            if($is_compliance && $keyword_num){
+                if(!isset($gTopData['is_compliance'])){
+                    $gTopData['is_compliance'] = 0;
+                }
+                $gTopData['is_compliance'] = (int)$gTopData['is_compliance'] + 1;
+            }
+            $optimizeModel->edit(['g_top_plan'=>json_encode($gTopData)],['id'=>$info['id']]);
+        }
+    }
+
     /**
      * 同步外链
--- a/app/Models/RouteMap/RouteMap.php
查看文件 @cbf0970
+++ b/app/Models/RouteMap/RouteMap.php
查看文件 @cbf0970
@@ -86,7 +86,7 @@ class RouteMap extends Base
      * @date 2023/4/17
      */
     protected static function isExist($route, $source_id, $project_id){
-        $fixed = ['search','api']; //固定的路由
+        $fixed = ['api']; //固定的路由
         if(in_array($route, $fixed)){
             return true;
         }
--- a/app/Services/SyncService.php
查看文件 @cbf0970
+++ b/app/Services/SyncService.php
查看文件 @cbf0970
@@ -32,15 +32,12 @@ class SyncService
             $url = 'https://form.globalso.com/api/globalsov6';
             // 项目信息
             $project = Project::with('deploy_build')->with('deploy_optimize')->where(['id'=>$project_id])->first();
-
             // 不满足条件 不同步到表单系统
             if (empty($project->deploy_optimize->domain)) {
                 return false;
             }
-
             // 生产域名
             $domain = (new DomainInfo())->getDomain($project->deploy_optimize->domain);
-
             // 收件设置信息
             ProjectServer::useProject($project_id);
             $receive = WebSettingReceiving::where(['project_id' => $project_id])->get();