Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -9,6 +9,7 @@ namespace App\Http\Controllers\Api;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Http\Logic\Bside\User\UserLoginLogic;
+use App\Models\Ai\AiBlog;
 use App\Models\Blog\Blog;
 use App\Models\Blog\Blog;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\News\News;
 use App\Models\News\News;
@@ -317,6 +318,7 @@ class PrivateController extends BaseController
         $news = News::where(['status' => News::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
         $news = News::where(['status' => News::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
         $blog = Blog::where(['status' => Blog::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
         $blog = Blog::where(['status' => Blog::STATUS_ONE])->where('release_at', '>', $date)->pluck('url');
 //        $keyword = Keyword::where('created_at', '>', $date)->pluck('route');
 //        $keyword = Keyword::where('created_at', '>', $date)->pluck('route');
+        $ai_blog = AiBlog::where(['status' => AiBlog::STATUS_FINISH])->where('updated_at', '>=', $date)->pluck('route');
 
 
         // 组装链接
         // 组装链接
         foreach ($product as $item) {
         foreach ($product as $item) {
@@ -335,6 +337,10 @@ class PrivateController extends BaseController
             $url = 'https://' . $domain . '/blogs/' . $item;
             $url = 'https://' . $domain . '/blogs/' . $item;
             array_push($result, $url);
             array_push($result, $url);
         }
         }
+        foreach ($ai_blog as $item) {
+            $url = 'https://' . $domain . '/blog/' . $item;
+            array_push($result, $url);
+        }
         return $this->success($result);
         return $this->success($result);
     }
     }
 
 

@@ -10,4 +10,7 @@ class AiBlog extends Base
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';
 
 
+    const STATUS_INIT = 0;
+    const STATUS_RUNNING = 1;
+    const STATUS_FINISH = 2;
 }
 }