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

Master server



查看合并请求 !1176

@@ -40,7 +40,7 @@ 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(empty($info)){
             if(empty($info)){
-                sleep(30);
+                sleep(300);
                 continue;
                 continue;
             }
             }
             $info = $info->toArray();
             $info = $info->toArray();

@@ -27,6 +27,41 @@ class AiBlogController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取详情
+     * @name   :getInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/2/20 18:17
+     */
+    public function getInfo(AiBlog $aiBlog){
+        $this->request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => '主键不能为空',
+        ]);
+        $info = $aiBlog->read(['id'=>$this->param['id']]);
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
+     * @remark :删除
+     * @name   :delete
+     * @author :lyh
+     * @method :post
+     * @time   :2025/2/20 18:19
+     */
+    public function delete(AiBlogLogic $aiBlogLogic)
+    {
+        $this->request->validate([
+            'ids'=>['required', new Ids()]
+        ],[
+            'ids.required' => 'ID不能为空'
+        ]);
+        $aiBlogLogic->blogDelete();
+        $this->response('success');
+    }
+
+    /**
      * @remark :获取ai博客列表
      * @remark :获取ai博客列表
      * @name   :getAiBlog
      * @name   :getAiBlog
      * @author :lyh
      * @author :lyh

@@ -88,4 +88,24 @@ class AiBlogLogic extends BaseLogic
         $result = $aiBlogService->createAuthor();
         $result = $aiBlogService->createAuthor();
         return $this->success($result);
         return $this->success($result);
     }
     }
+
+    /**
+     * @remark :删除
+     * @name   :blogDelete
+     * @author :lyh
+     * @method :post
+     * @time   :2025/2/20 18:21
+     */
+    public function blogDelete(){
+        try {
+            foreach ($this->param['ids'] as $id) {
+                //删除路由映射
+                RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
+                $this->model->del(['id'=>$id]);
+            }
+        }catch (\Exception $e){
+            $this->fail('删除失败');
+        }
+        return $this->success();
+    }
 }
 }

@@ -156,6 +156,8 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/blog/getAiBlog', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'getAiBlog'])->name('ai_blog_getAiBlog');
         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/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('/blog/del', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'delete'])->name('ai_blog_delete');
+        Route::any('/blog/getInfo', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'getInfo'])->name('ai_blog_getInfo');
         Route::any('/blog/createAuthor', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'createAuthor'])->name('ai_blog_createAuthor');
         Route::any('/blog/createAuthor', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'createAuthor'])->name('ai_blog_createAuthor');
         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');