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

gx复制项目脚本



查看合并请求 !1333

+<?php
+/**
+ * @remark :
+ * @name   :AiBlogTask.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/2/14 11:14
+ */
+
+namespace App\Console\Commands\AiBlog;
+
+use App\Models\Ai\AiBlog;
+use App\Models\Ai\AiBlogAuthor;
+use App\Models\Ai\AiBlogList;
+use App\Models\Project\ProjectAiSetting;
+use App\Models\RouteMap\RouteMap;
+use App\Services\AiBlogService;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use App\Models\Project\AiBlogTask as AiBlogTaskModel;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use function Symfony\Component\String\s;
+
+class AiBlogListTask extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'save_ai_blog_list {project_id}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '生成blog列表';
+
+    public function handle(){
+        $project_id = $this->argument('project_id');
+        ProjectServer::useProject($project_id);
+        $projectAiSettingModel = new ProjectAiSetting();
+        $aiSettingInfo = $projectAiSettingModel->read(['project_id'=>$this->user['project_id']]);
+        $this->updateBlogList($aiSettingInfo);
+        DB::disconnect('custom_mysql');
+        return true;
+    }
+
+    /**
+     * @remark :更新列表页数据
+     * @name   :updateBlogList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/5 11:07
+     */
+    public function updateBlogList($aiSettingInfo){
+        $aiBlogService = new AiBlogService();
+        $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
+        $aiBlogService->key = $aiSettingInfo['key'];
+        $page = 1;
+        $saveData = [];
+        $result = $aiBlogService->getAiBlogList($page,15);
+        if(!isset($result['status']) && $result['status'] != 200){
+            return true;
+        }
+        $total_page = $result['data']['total_page'];
+        //组装数据保存
+        $saveData[] = [
+            'route'=>$page,
+            'text'=>$result['data']['section'],
+        ];
+        while ($total_page > $page){
+            $page++;
+            $result = $aiBlogService->getAiBlogList($page,15);
+            if(isset($result['status']) && $result['status'] == 200){
+                $saveData[] = [
+                    'route'=>$page,
+                    'text'=>$result['data']['section'],
+                ];
+            }
+        }
+        $aiBlogListModel = new AiBlogList();
+        if(!empty($saveData)){
+            //写一条路由信息
+            $aiBlogListModel->truncate();
+            $aiBlogListModel->insertAll($saveData);
+        }
+        return true;
+    }
+}

@@ -387,7 +387,7 @@ class OptimizeController extends BaseController
         }
         }
         $url = $domain.'api/update_robots/?project_id='.$this->param['project_id'];
         $url = $domain.'api/update_robots/?project_id='.$this->param['project_id'];
         $res = curlGet($url);
         $res = curlGet($url);
-        if(empty($res) || $res['status'] != 200){
+        if(empty($res) || !isset($res['status']) || $res['status'] != 200){
             $this->response('生成robots失败，请联系开发人员',Code::SYSTEM_ERROR,['url'=>$url]);
             $this->response('生成robots失败，请联系开发人员',Code::SYSTEM_ERROR,['url'=>$url]);
         }
         }
         $this->response('success',Code::SUCCESS,['url'=>$domain.'robots.txt']);
         $this->response('success',Code::SUCCESS,['url'=>$domain.'robots.txt']);

@@ -131,8 +131,8 @@ class AiBlogLogic extends BaseLogic
                 //删除路由映射
                 //删除路由映射
                 RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
                 RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
                 $this->model->del(['id'=>$id]);
                 $this->model->del(['id'=>$id]);
-                $this->updateBlogList($aiSettingInfo);
             }
             }
+            shell_exec('php artisan save_ai_blog_list '.$this->user['project_id'].' > /dev/null 2>&1 &');
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('删除失败');
             $this->fail('删除失败');
         }
         }
@@ -140,45 +140,4 @@ class AiBlogLogic extends BaseLogic
     }
     }
 
 
 
 
-    /**
-     * @remark :更新列表页数据
-     * @name   :updateBlogList
-     * @author :lyh
-     * @method :post
-     * @time   :2025/3/5 11:07
-     */
-    public function updateBlogList($aiSettingInfo){
-        $aiBlogService = new AiBlogService();
-        $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
-        $aiBlogService->key = $aiSettingInfo['key'];
-        $page = 1;
-        $saveData = [];
-        $result = $aiBlogService->getAiBlogList($page,15);
-        if(!isset($result['status']) && $result['status'] != 200){
-            return true;
-        }
-        $total_page = $result['data']['total_page'];
-        //组装数据保存
-        $saveData[] = [
-            'route'=>$page,
-            'text'=>$result['data']['section'],
-        ];
-        while ($total_page > $page){
-            $page++;
-            $result = $aiBlogService->getAiBlogList($page,15);
-            if(isset($result['status']) && $result['status'] == 200){
-                $saveData[] = [
-                    'route'=>$page,
-                    'text'=>$result['data']['section'],
-                ];
-            }
-        }
-        $aiBlogListModel = new AiBlogList();
-        if(!empty($saveData)){
-            //写一条路由信息
-            $aiBlogListModel->truncate();
-            $aiBlogListModel->insertAll($saveData);
-        }
-        return true;
-    }
 }
 }