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

@@ -65,9 +65,9 @@ class UpgradeProjectCount extends Command
             ->groupBy('month')->get()->toArray();
             ->groupBy('month')->get()->toArray();
         foreach ($list as $k=>$v){
         foreach ($list as $k=>$v){
             $v = (array)$v;
             $v = (array)$v;
-            if($v['month'] == date('Y-m')){
-                continue;
-            }
+//            if($v['month'] == date('Y-m')){
+//                continue;
+//            }
             $monthCountModel = new MonthCount();
             $monthCountModel = new MonthCount();
             $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
             $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
             // 获取当月开始时间
             // 获取当月开始时间

@@ -16,6 +16,7 @@ use App\Models\Com\Notify;
 use App\Models\Com\UpdateNotify;
 use App\Models\Com\UpdateNotify;
 use App\Models\Com\UpdateProgress;
 use App\Models\Com\UpdateProgress;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Country as CountryModel;
 use App\Models\Project\Country as CountryModel;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -51,8 +52,14 @@ class CNoticeController extends BaseController
         //获取项目所在服务器
         //获取项目所在服务器
         $project_model = new Project();
         $project_model = new Project();
         $project_info = $project_model->read(['id'=>$project_id],['serve_id']);
         $project_info = $project_model->read(['id'=>$project_id],['serve_id']);
+        if(!$project_info){
+            $this->fail('未查询到项目数据');
+        }
+        $serve_ip_model = new ServersIp();
+        $serve_ip_info = $serve_ip_model->read(['id'=>$project_info['serve_id']],['servers_id']);
+        $servers_id = $serve_ip_info ? $serve_ip_info['servers_id'] : 0;
 
 
-        if($project_info && $project_info['serve_id'] == ServerConfig::SELF_SITE_ID){
+        if($servers_id == ServerConfig::SELF_SITE_ID){
             //自建站服务器：如果项目已经上线，不请求C端接口，数据直接入库
             //自建站服务器：如果项目已经上线，不请求C端接口，数据直接入库
             $domain_model = new DomainInfo();
             $domain_model = new DomainInfo();
             $domain_info = $domain_model->read(['project_id'=>$this->user['project_id']],['domain']);
             $domain_info = $domain_model->read(['project_id'=>$this->user['project_id']],['domain']);

@@ -7,6 +7,7 @@ use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Requests\Bside\Product\KeywordRequest;
 use App\Http\Requests\Bside\Product\KeywordRequest;
+use App\Models\Com\NoticeLog;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
@@ -232,4 +233,15 @@ class KeywordController extends BaseController
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量提交更新关键词
+     * @name   :batchUpdateKeyword
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/2 10:14
+     */
+    public function batchUpdateKeyword(){
+        $noticeLogModel = new NoticeLog();
+    }
 }
 }

@@ -34,7 +34,7 @@ class ServerConfig extends Base
 
 
     const STATUS_ONE = 1;
     const STATUS_ONE = 1;
 
 
-    const SELF_SITE_ID = 8;//自建站服务器ID
+    const SELF_SITE_ID = 6;//自建站服务器ID
 
 
     /**
     /**
      * @remark :获取数据用户名解密
      * @remark :获取数据用户名解密