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

Master server



查看合并请求 !1107

@@ -40,7 +40,8 @@ class AiBlogTask extends Command
         while (true){
         while (true){
             $info = $aiBlogTaskModel->where('status',1)->orderBy('id','asc')->first();
             $info = $aiBlogTaskModel->where('status',1)->orderBy('id','asc')->first();
             if($info === false){
             if($info === false){
-                sleep(10);
+                sleep(20);
+                continue;
             }
             }
             $info = $info->toArray();
             $info = $info->toArray();
             echo '开始->任务id:' . $info['task_id'] . PHP_EOL . date('Y-m-d H:i:s');
             echo '开始->任务id:' . $info['task_id'] . PHP_EOL . date('Y-m-d H:i:s');
@@ -52,7 +53,7 @@ class AiBlogTask extends Command
             $aiBlogService->task_id = $info['task_id'];
             $aiBlogService->task_id = $info['task_id'];
             $result = $aiBlogService->getDetail();
             $result = $aiBlogService->getDetail();
             if($result['status'] != 200){
             if($result['status'] != 200){
-                sleep(5);
+                sleep(10);
                 continue;
                 continue;
             }
             }
             //修改任务状态
             //修改任务状态

@@ -27,6 +27,18 @@ class AiBlogController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取ai博客列表
+     * @name   :getAiBlog
+     * @author :lyh
+     * @method :post
+     * @time   :2025/2/14 13:59
+     */
+    public function getAiBlog(AiBlog $aiBlog){
+        $lists = $aiBlog->lists($this->map,$this->page,$this->row,'id',['id','new_title','task_id','status','created_at','updated_at']);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
      * @remark :发布任务
      * @remark :发布任务
      * @name   :sendTask
      * @name   :sendTask
      * @author :lyh
      * @author :lyh

@@ -46,10 +46,10 @@ class CustomTemplateLogic extends BaseLogic
      */
      */
     public function customTemplateInfo(){
     public function customTemplateInfo(){
         $info = $this->model->read(['id'=>$this->param['id']]);
         $info = $this->model->read(['id'=>$this->param['id']]);
-        $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         if($info === false){
         if($info === false){
             $this->fail('当前数据不存在');
             $this->fail('当前数据不存在');
         }
         }
+        $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         if($info['is_visualization'] == 0 || $info['is_visualization'] == 1){
         if($info['is_visualization'] == 0 || $info['is_visualization'] == 1){
             $template_id = $this->getTemplateId();
             $template_id = $this->getTemplateId();
             $html = $this->getTemplateComHtml($info['html'],$info['html_style'],$template_id);
             $html = $this->getTemplateComHtml($info['html'],$info['html_style'],$template_id);

@@ -153,7 +153,8 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('ai')->group(function () {
     Route::prefix('ai')->group(function () {
         //ai
         //ai
         Route::any('/news/', [\App\Http\Controllers\Bside\Ai\AiNewsController::class, 'save'])->name('ai_news_save');
         Route::any('/news/', [\App\Http\Controllers\Bside\Ai\AiNewsController::class, 'save'])->name('ai_news_save');
-        Route::any('/blog/', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'save'])->name('ai_blog_save');
+        Route::any('/blog/getAiBlog', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'getAiBlog'])->name('ai_blog_getAiBlog');
+        Route::any('/blog/save', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'save'])->name('ai_blog_save');
         Route::any('/blog/sendTask', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'sendTask'])->name('ai_blog_sendTask');
         Route::any('/blog/sendTask', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'sendTask'])->name('ai_blog_sendTask');
         Route::any('/product/', [\App\Http\Controllers\Bside\Ai\AiProductController::class, 'save'])->name('ai_product_save');
         Route::any('/product/', [\App\Http\Controllers\Bside\Ai\AiProductController::class, 'save'])->name('ai_product_save');
         Route::any('/product/productList', [\App\Http\Controllers\Bside\Ai\AiProductController::class, 'productList'])->name('ai_product_productList');
         Route::any('/product/productList', [\App\Http\Controllers\Bside\Ai\AiProductController::class, 'productList'])->name('ai_product_productList');