优化：博客自动发布逻辑优化调整，支持定时发布

Author: modstart

module/Blog/Admin/Controller/BlogController.php

@@ -57,11 +57,15 @@ protected function crud(AdminCRUDBuilder $builder)
                 $builder->images('images', '图片')->listable(false);
                 $builder->text('seoKeywords', 'SEO关键词')->listable(false);
                 $builder->textarea('seoDescription', 'SEO描述')->listable(false);
-                $builder->datetime('postTime', '发布时间')->defaultValue(date('Y-m-d H:i:s'));
                 $builder->switch('isTop', '置顶')->gridEditable(true);
                 $builder->switch('isHot', '热门')->gridEditable(true);
                 $builder->switch('isRecommend', '推荐')->gridEditable(true);
-                $builder->switch('isPublished', '发布')->optionsYesNo()->defaultValue(true);
+                $builder->switch('isPublished', '发布')
+                    ->optionsYesNo()->defaultValue(true)
+                    ->when('=', false, function ($builder) {
+                        /** @var HasFields $builder */
+                        $builder->datetime('postTime', '发布时间')->defaultValue(date('Y-m-d H:i:s'));
+                    });
                 $builder->radio('visitMode', '访问模式')
                     ->optionType(BlogVisitMode::class)
                     ->defaultValue(BlogVisitMode::OPEN)

module/Blog/Api/Controller/ArchiveController.php

@@ -34,11 +34,11 @@ public function get()
             $timeEnd = date($year . '-' . $month . '-31 23:59:59');
         }
 
-        $result = Blog::where('postTime', '<', date('Y-m-d H:i:s'))
-            ->where('postTime', '>=', date('Y-m-d H:i:s', strtotime($timeStart)))
-            ->where('postTime', '<=', date('Y-m-d H:i:s', strtotime($timeEnd)))
-            ->orderBy('postTime', 'asc')
-            ->paginate($pageSize, ['id', 'title','isTop','isHot','isRecommend'], 'page', $page)->toArray();
+        $result = Blog::where('created_at', '<', date('Y-m-d H:i:s'))
+            ->where('created_at', '>=', date('Y-m-d H:i:s', strtotime($timeStart)))
+            ->where('created_at', '<=', date('Y-m-d H:i:s', strtotime($timeEnd)))
+            ->orderBy('id', 'asc')
+            ->paginate($pageSize, ['id', 'title', 'isTop', 'isHot', 'isRecommend'], 'page', $page)->toArray();
         $paginateData = [
             'records' => $result['data'],
             'total' => $result['total'],

module/Blog/Api/Controller/BlogController.php

@@ -15,6 +15,7 @@
 use ModStart\Core\Util\HtmlUtil;
 use ModStart\Core\Util\TagUtil;
 use Module\Blog\Core\BlogSuperSearchBiz;
+use Module\Blog\Model\Blog;
 use Module\Blog\Type\BlogCommentStatus;
 use Module\Blog\Type\BlogVisitMode;
 use Module\Blog\Util\BlogCategoryUtil;
@@ -61,11 +62,9 @@ public function paginate()
         } else {
             $query = [
                 ['isPublished' => ['eq' => 1]],
-                ['postTime' => ['lt' => date('Y-m-d H:i:s')]],
             ];
             $order = [
                 ['isTop', 'desc'],
-                ['postTime', 'desc'],
                 ['id', 'desc'],
             ];
             if ($categoryId) {
@@ -138,13 +137,14 @@ public function get()
     {
         $input = InputPackage::buildFromInput();
         $id = $input->getInteger('id');
-        $record = ModelUtil::get('blog', ['id' => $id]);
+        $record = Blog::published()->where(['id' => $id])->first();
         BizException::throwsIfEmpty('记录不存在', $record);
+        $record = $record->toArray();
         ModelUtil::decodeRecordJson($record, ['images']);
         $record['images'] = AssetsUtil::fixFull($record['images']);
         $record['tag'] = TagUtil::string2Array($record['tag']);
         $record['_category'] = BlogCategoryUtil::get($record['categoryId']);
-        $record['_date'] = date('Y-m-d', strtotime($record['postTime']));
+        $record['_date'] = date('Y-m-d', strtotime($record['created_at']));
         $summary = $record['seoDescription'];
         $images = $record['images'];
         if (isset($record['content'])) {
@@ -209,18 +209,16 @@ public function get()
         }
 
 
-        $recordNext = ModelUtil::model('blog')
-            ->where('postTime', '<', $record['postTime'])
-            ->orderBy('postTime', 'desc')
+        $recordNext = Blog::published()
+            ->orderBy('id', 'desc')
             ->limit(1)->first();
         if ($recordNext) {
             $recordNext = ArrayUtil::keepKeys($recordNext->toArray(), ['id', 'title']);
             $recordNext['_url'] = UrlUtil::blog($recordNext);
         }
 
-        $recordPrev = ModelUtil::model('blog')
-            ->where('postTime', '>', $record['postTime'])
-            ->orderBy('postTime', 'desc')
+        $recordPrev = Blog::published()
+            ->orderBy('id', 'asc')
             ->limit(1)->first();
         if ($recordPrev) {
             $recordPrev = ArrayUtil::keepKeys($recordPrev->toArray(), ['id', 'title']);

module/Blog/Core/BlogAutoPostScheduleBiz.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Module\Blog\Core;
+
+use Module\Blog\Model\Blog;
+use Module\Vendor\Provider\Schedule\AbstractScheduleBiz;
+
+class BlogAutoPostScheduleBiz extends AbstractScheduleBiz
+{
+    const NAME = 'Blog';
+
+    public function cron()
+    {
+        return $this->cronEveryMinute();
+    }
+
+    public function title()
+    {
+        return '博客自动发布';
+    }
+
+    public function run()
+    {
+        Blog::unPublished()
+            ->where('postTime', '<=', date('Y-m-d H:i:s'))
+            ->update(['isPublished' => true]);
+    }
+
+}

module/Blog/Core/BlogSuperSearchBiz.php

@@ -37,7 +37,6 @@ public function fields()
             'id' => ['type' => FieldTypes::F_LONG],
             'isPublished' => ['type' => FieldTypes::F_LONG],
             'isTop' => ['type' => FieldTypes::F_LONG],
-            'postTime' => ['type' => FieldTypes::F_DATETIME],
             'categoryId' => ['type' => FieldTypes::F_LONG],
             'title' => ['type' => FieldTypes::F_TEXT],
             'summary' => ['type' => FieldTypes::F_TEXT],
@@ -83,7 +82,6 @@ public static function syncUpsert($records, $checkExists = true)
                 'id' => intval($record['id']),
                 'isPublished' => intval($record['isPublished']),
                 'isTop' => intval($record['isTop']),
-                'postTime' => $record['postTime'],
                 'categoryId' => intval($record['categoryId']),
                 'title' => $record['title'],
                 'summary' => $record['summary'],

module/Blog/Core/MBlog.php

@@ -455,9 +455,9 @@ public static function randomBlog($limit)
      * @example
      * // $option 说明
      * // 发布时间倒序
-     * $option = [ 'order'=>['postTime', 'desc'] ];
+     * $option = [ 'order'=>['id', 'desc'] ];
      * // 发布时间顺序
-     * $option = [ 'order'=>['postTime', 'asc'] ];
+     * $option = [ 'order'=>['id', 'asc'] ];
      * // 增加检索条件
      * $option = [ 'where'=>['id'=>1] ];
      */
@@ -522,15 +522,14 @@ public static function listBlogByYear($option = [])
     {
 
         $records = Blog::query()->where(['isPublished' => true])
-            ->where('postTime', '<', date('Y-m-d H:i:s'))
-            ->orderBy('postTime', 'desc')
-            ->get(['id', 'images', 'tag', 'title', 'categoryId', 'postTime'])
+            ->orderBy('id', 'desc')
+            ->get(['id', 'images', 'tag', 'title', 'categoryId', 'created_at'])
             ->toArray();
         $records = self::buildRecords($records);
 
         $yearRecords = [];
         foreach ($records as $i => $v) {
-            $year = date('Y', strtotime($v['postTime']));
+            $year = date('Y', strtotime($v['created_at']));
             if (!isset($yearRecords[$year])) {
                 $yearRecords[$year] = [
                     'count' => 0,
@@ -653,10 +652,10 @@ public static function tagRecords()
     public static function archiveMonthCounts($year)
     {
         $archiveCounts = Blog::query()
-            ->where('postTime', '<', date('Y-m-d H:i:s'))
-            ->where('postTime', '>=', $year . '-01-01 00:00:00')
-            ->where('postTime', '<=', $year . '-12-31 23:59:59')
-            ->select([DB::raw("DATE_FORMAT(`postTime`,'%m') AS `month`"), DB::raw("COUNT(*) AS total")])
+            ->where('created_at', '<', date('Y-m-d H:i:s'))
+            ->where('created_at', '>=', $year . '-01-01 00:00:00')
+            ->where('created_at', '<=', $year . '-12-31 23:59:59')
+            ->select([DB::raw("DATE_FORMAT(`created_at`,'%m') AS `month`"), DB::raw("COUNT(*) AS total")])
             ->groupBy('month')
             ->orderBy('month', 'desc')
             ->get()->toArray();
@@ -680,9 +679,8 @@ public static function archiveMonthCounts($year)
      */
     public static function archiveYearCounts()
     {
-        $archiveCounts = Blog::query()
-            ->where('postTime', '<', date('Y-m-d H:i:s'))
-            ->select([DB::raw("DATE_FORMAT(`postTime`,'%Y') AS `year`"), DB::raw("COUNT(*) AS total")])
+        $archiveCounts = Blog::published()
+            ->select([DB::raw("DATE_FORMAT(`created_at`,'%Y') AS `year`"), DB::raw("COUNT(*) AS total")])
             ->groupBy('year')
             ->orderBy('year', 'desc')
             ->get()->toArray();

module/Blog/Core/ModuleServiceProvider.php

@@ -22,6 +22,7 @@
 use Module\Vendor\Admin\Widget\AdminWidgetDashboard;
 use Module\Vendor\Admin\Widget\AdminWidgetLink;
 use Module\Vendor\Provider\HomePage\HomePageProvider;
+use Module\Vendor\Provider\Schedule\ScheduleBiz;
 use Module\Vendor\Provider\SearchBox\SearchBoxProvider;
 use Module\Vendor\Provider\SiteUrl\SiteUrlBiz;
 use Module\Vendor\Provider\SuperSearch\SuperSearchBiz;
@@ -128,6 +129,7 @@ public function boot(Dispatcher $events)
                 }
             });
         }
+        ScheduleBiz::register(BlogAutoPostScheduleBiz::class);
     }
 
     /**

module/Blog/Docs/release.md

@@ -1,6 +1,9 @@
 ## 3.5.0
 
+- 优化：博客自动发布逻辑优化调整，支持定时发布
 - 新增：博客分类支持二级分类，博客列表页面支持二级分类筛选
+- 修复：博客编辑状态下可浏览，标签和博客分类数量计算数量异常
+
 
 ---
 

module/Blog/Migrate/2017_01_01_000000_create_blog.php

@@ -30,7 +30,7 @@ public function up()
             $table->timestamp('postTime')->nullable()->comment('发布时间');
             $table->integer('clickCount')->nullable()->comment('点击数');
 
-            $table->index(['postTime']);
+            $table->index(['created_at']);
 
         });
     }

module/Blog/Model/Blog.php

@@ -9,4 +9,19 @@
 class Blog extends Model
 {
     protected $table = 'blog';
+
+
+    public static function published()
+    {
+        return self::where([
+            'isPublished' => true,
+        ]);
+    }
+
+    public static function unPublished()
+    {
+        return self::where([
+            'isPublished' => false,
+        ]);
+    }
 }