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

@@ -9,11 +9,13 @@
 
 
 namespace App\Console\Commands;
 namespace App\Console\Commands;
 
 
+use App\Helper\Arr;
 use App\Models\Blog\Blog;
 use App\Models\Blog\Blog;
 use App\Models\Blog\BlogCategory;
 use App\Models\Blog\BlogCategory;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\News\NewsCategory;
 use App\Models\News\NewsCategory;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
+use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -54,13 +56,14 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[627]]]);
+        $list = $projectModel->list(['id'=>['in',[475]]]);
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
 //            $this->getProduct();
 //            $this->getProduct();
 //            $this->setProductKeyword();
 //            $this->setProductKeyword();
-            $this->getRouteMap();
+//            $this->getRouteMap();
+            $this->getProductCategory();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -157,6 +160,62 @@ class UpdateRoute extends Command
     }
     }
 
 
     /**
     /**
+     * @remark :更新产品关联表
+     * @name   :getProductCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/4 14:48
+     */
+    public function getProductCategory(){
+        $product = new Product();
+        $num = 35;
+        while ($num > 0){
+            $list = $product->lists(['status'=>1],$num,1000);
+            foreach ($list['list'] as $k => $v){
+                if(empty($v['category_id'])){
+                    continue;
+                }
+                $category_ids = $v['category_id'];
+                //产品分类关联
+                echo date('Y-m-d H:i:s') . '产品id--1:'.$v['id'] . PHP_EOL;
+                $this->saveRelated($v['id'], $category_ids);
+                echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
+            }
+            $num--;
+        }
+    }
+
+    /**
+     * 关联产品分类
+     * @param $product_id
+     * @param $cate_ids
+     * @author zbj
+     * @date 2023/4/21
+     */
+    public function saveRelated($product_id, $cate_ids)
+    {
+        if(!is_array($cate_ids)){
+            $cate_ids = array_filter(Arr::splitFilterToArray($cate_ids), 'intval');
+        }
+        //先删除
+        CategoryRelated::where('product_id', $product_id)->delete();
+        //批量保存
+        $data = [];
+        if(!empty($cate_ids)){
+            foreach ($cate_ids as $cate_id){
+                $data[] = [
+                    'product_id' => $product_id,
+                    'cate_id' => $cate_id,
+                    'created_at'=>date('Y-m-d H:i:s'),
+                    'updated_at'=>date('Y-m-d H:i:s')
+                ];
+            }
+            CategoryRelated::insert($data);
+        }
+        return true;
+    }
+
+    /**
      * @remark :删除路由通知C端
      * @remark :删除路由通知C端
      * @name   :curlDelRoute
      * @name   :curlDelRoute
      * @author :lyh
      * @author :lyh

@@ -87,9 +87,9 @@ class UpdateController extends BaseController
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
 
 
         $update = ['collect_status' => 0];
         $update = ['collect_status' => 0];
-        if ($this->param['type'] == 2) {
-            $update['status'] = 0;
-        }
+//        if ($this->param['type'] == 2) {
+//            $update['status'] = 0;
+//        }
 
 
         UpdateLog::where('project_id', $this->param['project_id'])->whereIn('api_type', ['post', 'page', 'news', 'blog'])->update($update);
         UpdateLog::where('project_id', $this->param['project_id'])->whereIn('api_type', ['post', 'page', 'news', 'blog'])->update($update);
 
 

@@ -150,7 +150,6 @@ class DomainInfoLogic extends BaseLogic
      */
      */
     public function setDomainSsl($initDomain,$domain,$rewrite,$other_domain)
     public function setDomainSsl($initDomain,$domain,$rewrite,$other_domain)
     {
     {
-        $this->fail('当前功能，占时无法使用，如有紧急需要上线项目，请联系管理人员');
         if($this->param['type'] == 2){
         if($this->param['type'] == 2){
             if(empty($this->param['key'])){
             if(empty($this->param['key'])){
                 $this->fail('证书KEY值不能为空');
                 $this->fail('证书KEY值不能为空');

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Project;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Exceptions\AsideGlobalException;
 use App\Exceptions\AsideGlobalException;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
+use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\ProjectRenew;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;

@@ -173,6 +173,7 @@ class BaseLogic extends Logic
         $data['project_id'] = $this->user['project_id'];
         $data['project_id'] = $this->user['project_id'];
         $str = http_build_query($data);
         $str = http_build_query($data);
         $url = $this->user['domain'].'api/delHtml/?'.$str;
         $url = $this->user['domain'].'api/delHtml/?'.$str;
+//        shell_exec($url);
         curlGet($url);
         curlGet($url);
         return $this->success();
         return $this->success();
     }
     }