Merge remote-tracking branch 'origin/master' into akun

刘锟
app/Console/Commands/Ai/AiBlogListTask.php
app/Console/Commands/Ai/AiVideoTask.php
app/Console/Commands/Inquiry/RelayInquiry.php
app/Http/Controllers/Aside/Project/ProjectController.php
app/Http/Controllers/Bside/Ai/AiVideoController.php
app/Http/Controllers/Bside/BCom/ComController.php
app/Http/Logic/Bside/Ai/AiBlogLogic.php
app/Http/Logic/Bside/Ai/AiVideoLogic.php
app/Http/Logic/Bside/Setting/WebSettingTextLogic.php
app/Services/AiBlogService.php
routes/bside.php
--- a/app/Console/Commands/Ai/AiBlogListTask.php
查看文件 @861d2b2
+++ b/app/Console/Commands/Ai/AiBlogListTask.php
查看文件 @861d2b2
@@ -22,6 +22,13 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use function Symfony\Component\String\s;
+/***
+ * @remark :根据项目更新blog列表
+ * @name   :AiBlogListTask
+ * @author :lyh
+ * @method :post
+ * @time   :2025/3/6 9:45
+ */
 class AiBlogListTask extends Command
 {
     /**
--- a/app/Console/Commands/Ai/AiVideoTask.php
查看文件 @861d2b2
+++ b/app/Console/Commands/Ai/AiVideoTask.php
查看文件 @861d2b2
@@ -82,7 +82,7 @@ class AiVideoTask extends Command
                 $aiBlogTaskModel->edit(['status'=>2],['id'=>$item['id']]);
             }
             //TODO::更新列表页及作者
-//            $this->updateProject($updateProject);
+            $this->updateProject($updateProject);
             echo '结束->任务id:' . $item['task_id'] . PHP_EOL . date('Y-m-d H:i:s');
         }
         return true;
@@ -102,7 +102,7 @@ class AiVideoTask extends Command
         foreach ($updateProject as $project_id => $author){
             ProjectServer::useProject($project_id);
             $aiSettingInfo = $this->getSetting($project_id);
-            $this->updateBlogList($aiSettingInfo);
+//            $this->updateBlogList($aiSettingInfo);
             //更新作者
             foreach ($author as $val){
                 $this->updateAiBlogAuthor($aiSettingInfo,$val);
--- a/app/Console/Commands/Inquiry/RelayInquiry.php
查看文件 @861d2b2
+++ b/app/Console/Commands/Inquiry/RelayInquiry.php
查看文件 @861d2b2
@@ -460,10 +460,13 @@ class RelayInquiry extends Command
             if (in_array($form->country_name, $this->multiple_ip_visit_country)) {
                 $times = mt_rand(2, 5); //随机次数
                 $inquiry_time = mt_rand(1, $times); //第几次询盘
-                $this->output('多次访问模拟：' . $times);
+                $this->output('多次访问模拟：' . $times .'，第' . $inquiry_time . '次询盘');
             }
             for ($i = 1; $i <= $times; $i++) {
-                $is_inquiry = $inquiry_time == $i;
+                $is_inquiry = ($inquiry_time == $i);
+                if($is_inquiry){
+                    $this->output('第' . $i . '次询盘');
+                }
                 //手机号过滤
                 $phone = $form->phone;
                 $filter_phone = $this->get_rand($this->filter_phone);
@@ -518,7 +521,8 @@ class RelayInquiry extends Command
                     $seconds += rand(5,60);
                     ReInquiryDetailLog::createInquiryLog($re_detail->id, ReInquiryDetailLog::TYPE_VISIT, $pre, $v, date('Y-m-d H:i:s', $start_time + $seconds));
                     // 最后一次访问询盘 加上询盘
-                    if($is_inquiry && $k+1 >= count($urls)){
+                    if($is_inquiry && $k+1 == count($urls)){
+                        $this->output('第' . $k+1 . '个链接询盘');
                         $seconds += rand(30,120);
                         $pre++;
                         ReInquiryDetailLog::createInquiryLog($re_detail->id, ReInquiryDetailLog::TYPE_INQUIRY, $pre, $v, date('Y-m-d H:i:s', $start_time + $seconds));
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @861d2b2
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @861d2b2
@@ -380,7 +380,7 @@ class ProjectController extends BaseController
      * @time   :2023/8/18 14:44
      */
     public function handleParam(&$item){
-        if($item['type'] != Project::TYPE_ZERO){
+        if(($item['type'] != Project::TYPE_ZERO)){
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         if($item['type'] == Project::TYPE_ONE){//建站中
--- a/app/Http/Controllers/Bside/Ai/AiVideoController.php
查看文件 @861d2b2
+++ b/app/Http/Controllers/Bside/Ai/AiVideoController.php
查看文件 @861d2b2
@@ -70,8 +70,42 @@ class AiVideoController extends BaseController
             'keyword.required' => '关键字不能为空',
             'type.required' => '场景不能为空',
         ]);
-        //获取当前项目的ai_blog设置
         $result = $aiVideoLogic->sendTask();
         $this->response('success',Code::SUCCESS,$result);
     }
+
+    /**
+     * @remark :更新任务
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/6 10:51
+     */
+    public function save(AiVideoLogic $aiVideoLogic){
+        $this->request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => '关键字不能为空',
+        ]);
+        $aiVideoLogic->videoSave();
+        $this->response('success');
+    }
+
+    /**
+     * @remark :删除ai视频
+     * @name   :delete
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/6 9:56
+     */
+    public function delete(AiVideoLogic $aiVideoLogic)
+    {
+        $this->request->validate([
+            'ids'=>['required'],
+        ],[
+            'ids.required' => 'ID不能为空'
+        ]);
+        $result = $aiVideoLogic->videoDelete();
+        $this->response('success',Code::SUCCESS,$result);
+    }
 }
--- a/app/Http/Controllers/Bside/BCom/ComController.php
查看文件 @861d2b2
+++ b/app/Http/Controllers/Bside/BCom/ComController.php
查看文件 @861d2b2
@@ -38,7 +38,7 @@ class ComController extends BaseController
         }
         $lists = $projectMenuModel->list($this->map,'sort');
         $menu = array();
-        foreach ($lists as $k => $v){
+        foreach ($lists as $v){
             $v = (array)$v;
             if ($v['pid'] == 0) {
                 $v['sub'] = _get_child($v['id'], $lists);
@@ -57,9 +57,10 @@ class ComController extends BaseController
      */
     public function seo_get_menu(){
         $seoMenuModel = new ProjectMenuSeo();
+        $this->map['status'] = 0;
         $lists = $seoMenuModel->list($this->map,'sort');
         $menu = array();
-        foreach ($lists as $k => $v){
+        foreach ($lists as $v){
             $v = (array)$v;
             if ($v['pid'] == 0) {
                 $v['sub'] = _get_child($v['id'], $lists);
--- a/app/Http/Logic/Bside/Ai/AiBlogLogic.php
查看文件 @861d2b2
+++ b/app/Http/Logic/Bside/Ai/AiBlogLogic.php
查看文件 @861d2b2
@@ -101,12 +101,12 @@ class AiBlogLogic extends BaseLogic
         $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
         $aiBlogService->key = $aiSettingInfo['key'];
         $aiBlogService->route = generateRoute(Translate::tran($this->param['keyword'], 'en'));
-        $result = $aiBlogService->createTask($this->param['keyword'],$this->param['type']);
+        $result = $aiBlogService->createTask($this->param['keyword'],2,'blog',$this->param['anchor'] ?? []);
         if($result['status'] == 200){
             $aiBlogTaskModel = new AiBlogTask();
             $aiBlogTaskModel->addReturnId(['project_id'=>$this->user['project_id'],'type'=>2,'task_id'=>$result['data']['task_id'],'status'=>1]);
             $aiBlogModel = new AiBlog();
-            $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>1, 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],
+            $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>1, 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],'anchor'=>json_encode($this->param['anchor'] ?? [],true)
             ]);
         }
         return $this->success();
--- a/app/Http/Logic/Bside/Ai/AiVideoLogic.php
查看文件 @861d2b2
+++ b/app/Http/Logic/Bside/Ai/AiVideoLogic.php
查看文件 @861d2b2
@@ -50,41 +50,18 @@ class AiVideoLogic extends BaseLogic
      * @method :post
      * @time   :2023/7/5 14:46
      */
-    public function blogSave(){
+    public function videoSave(){
         try {
             if(!empty($this->param['image'])){
                 $this->param['image'] = str_replace_url($this->param['image']);
             }
-            $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_AI_BLOG, $this->param['id'], $this->user['project_id']);
+            $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_AI_VIDEO, $this->param['id'], $this->user['project_id']);
             $this->model->edit($this->param,['id'=>$this->param['id']]);
             $aiSettingInfo = $this->getProjectAiSetting();
             $aiBlogService = new AiBlogService();
             $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
             $aiBlogService->key = $aiSettingInfo['key'];
-            $aiBlogService->updateDetail(['title'=>$this->param['new_title'],'thumb'=>$this->param['image'],'route'=>$this->param['route'],'author_id'=>$this->param['author_id']]);
-        }catch (\Exception $e){
-            $this->fail('保存失败，请联系管理员');
-        }
-        return $this->success();
-    }
-
-    /**
-     * @remark :编辑作者
-     * @name   :saveAuthor
-     * @author :lyh
-     * @method :post
-     * @time   :2025/2/21 14:46
-     */
-    public function saveBlogAuthor(){
-        try {
-            $aiAuthorModel = new AiBlogAuthor();
-            if(!empty($this->param['image'])){
-                $this->param['image'] = str_replace_url($this->param['image']);
-            }
-            $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_AI_BLOG_AUTHOR, $this->param['id'], $this->user['project_id']);
-            $aiAuthorModel->edit($this->param,['id'=>$this->param['id']]);
-            $aiBlogService = new AiBlogService();
-            $aiBlogService->updateAuthorInfo(['author_id'=>$this->param['author_id'],'title'=>$this->param['title'],'picture'=>$this->param['image'],'description'=>$this->param['description']]);
+            $aiBlogService->updateDetail(['task_id'=>$this->param['task_id'],'title'=>$this->param['new_title'],'thumb'=>$this->param['image'],'route'=>$this->param['route'],'author_id'=>$this->param['author_id']]);
         }catch (\Exception $e){
             $this->fail('保存失败，请联系管理员');
         }
@@ -97,7 +74,7 @@ class AiVideoLogic extends BaseLogic
      * @author :lyh
      * @method :post
      * @time   :2025/2/14 10:28
-     * @detail :type=2/生成文章 type=3/更新列表页记录
+     * @detail :createTask =>type=2/生成文章
      * @detail :status=1/待执行
      */
     public function sendTask(){
@@ -106,23 +83,23 @@ class AiVideoLogic extends BaseLogic
         $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
         $aiBlogService->key = $aiSettingInfo['key'];
         $aiBlogService->route = generateRoute(Translate::tran($this->param['keyword'], 'en'));
-        $result = $aiBlogService->createTask($this->param['keyword'],$this->param['type'],'video');
+        $result = $aiBlogService->createTask($this->param['keyword'],2,'video',$this->param['anchor'] ?? []);
         if($result['status'] == 200){
             $aiBlogTaskModel = new AiBlogTask();
             $aiBlogTaskModel->addReturnId(['project_id'=>$this->user['project_id'],'type'=>3,'task_id'=>$result['data']['task_id'],'status'=>1]);
-            $this->model->addReturnId(['keyword'=>$this->param['keyword'],'status'=>1,'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id']]);
+            $this->model->addReturnId(['keyword'=>$this->param['keyword'],'status'=>1,'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],'anchor'=>json_encode($this->param['anchor'] ?? [],true)]);
         }
         return $this->success();
     }
     /**
-     * @remark :删除
-     * @name   :blogDelete
+     * @remark :删除aiVideo
+     * @name   :videoDelete
      * @author :lyh
      * @method :post
-     * @time   :2025/2/20 18:21
+     * @time   :2025/3/6 10:00
      */
-    public function blogDelete(){
+    public function videoDelete(){
         try {
             $aiSettingInfo = $this->getProjectAiSetting();
             $aiBlogService = new AiBlogService();
@@ -132,12 +109,11 @@ class AiVideoLogic extends BaseLogic
                 $aiBlogService->key = $aiSettingInfo['key'];
                 $aiBlogService->delDetail($info['task_id']);
                 //删除路由映射
-                RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
+                RouteMap::delRoute(RouteMap::SOURCE_AI_VIDEO, $id, $this->user['project_id']);
                 $this->model->del(['id'=>$id]);
             }
-            shell_exec('php artisan save_ai_blog_list '.$this->user['project_id'].' > /dev/null 2>&1 &');
         }catch (\Exception $e){
-            $this->fail('删除失败');
+            $this->fail('删除失败,请联系管理员');
         }
         return $this->success();
     }
--- a/app/Http/Logic/Bside/Setting/WebSettingTextLogic.php
查看文件 @861d2b2
+++ b/app/Http/Logic/Bside/Setting/WebSettingTextLogic.php
查看文件 @861d2b2
@@ -72,13 +72,15 @@ class WebSettingTextLogic extends BaseLogic
             ];
             $web_setting->edit($data,['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
-            foreach ($this->param['data'] as $k => $v){
-                $v['created_at'] = date('Y-m-d H:i:s');
-                $v['updated_at'] = date('Y-m-d H:i:s');
-                $v['project_id'] = $this->user['project_id'];
-                $this->param['data'][$k] = $v;
+            if(!empty($this->param['data'])){
+                foreach ($this->param['data'] as $k => $v){
+                    $v['created_at'] = date('Y-m-d H:i:s');
+                    $v['updated_at'] = date('Y-m-d H:i:s');
+                    $v['project_id'] = $this->user['project_id'];
+                    $this->param['data'][$k] = $v;
+                }
+                $this->model->insert($this->param['data']);
             }
-            $this->model->insert($this->param['data']);
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
--- a/app/Services/AiBlogService.php
查看文件 @861d2b2
+++ b/app/Services/AiBlogService.php
查看文件 @861d2b2
@@ -70,16 +70,17 @@ class AiBlogService
      * @time   :2025/2/13 14:39
      * @param  :type=(1作者2文章) keyword=关键词 subtype=blog url=回调url
      */
-    public function createTask($keyword,$type = 2,$subtype = 'Blog',$template_id = 1){
+    public function createTask($keyword,$type = 2,$subtype = 'Blog',$anchor = []){
         $request_url = $this->url.'api/task/create';
         $param = [
-            'mch_id'=>$this->mch_id,
             'keyword'=>$keyword,
             'type'=>$type,
             'subtype'=>$subtype,
-            'url'=>$this->route,
-            'template_id'=>$template_id
         ];
+        $param['anchor'] = json_encode($anchor,true);
+        $param['url'] = $this->route;
+        $param['mch_id'] = $this->mch_id;
+        $param['template_id'] = 1;
         $this->sign = $this->generateSign($param,$this->key);
         $param['sign'] = $this->sign;
         $result = http_post($request_url,json_encode($param,true));
--- a/routes/bside.php
查看文件 @861d2b2
+++ b/routes/bside.php
查看文件 @861d2b2
@@ -152,6 +152,13 @@ Route::middleware(['bloginauth'])->group(function () {
     //ai生成相关接口
     Route::prefix('ai')->group(function () {
+        //ai视屏
+        Route::prefix('video')->group(function () {
+            Route::any('/', [\App\Http\Controllers\Bside\Ai\AiVideoController::class, 'lists'])->name('ai_video_lists');
+            Route::any('/getInfo', [\App\Http\Controllers\Bside\Ai\AiVideoController::class, 'getInfo'])->name('ai_video_getInfo');
+            Route::any('/sendTask', [\App\Http\Controllers\Bside\Ai\AiVideoController::class, 'sendTask'])->name('ai_video_sendTask');
+            Route::any('/del', [\App\Http\Controllers\Bside\Ai\AiVideoController::class, 'delete'])->name('ai_video_delete');
+        });
         //ai
         Route::any('/news/', [\App\Http\Controllers\Bside\Ai\AiNewsController::class, 'save'])->name('ai_news_save');
         Route::any('/blog/getAiBlog', [\App\Http\Controllers\Bside\Ai\AiBlogController::class, 'getAiBlog'])->name('ai_blog_getAiBlog');