feat: reward

Author: modstart

README.md

@@ -283,6 +283,21 @@ AdminMenu::register(function () {
 - [https://modstart.com/forum](https://modstart.com/forum)
 
 
+## ⭐️ 贡献代码
+
+系统接受 Github 和 Gitee 的 Pull Request，欢迎提交代码。
+
+文件 `/vendor/modstart/modstart` 底层代码修改，可以提交 PR 到以下仓库，该仓库会在每次发版自动合入所有系统。
+
+- `Github` [https://github.com/modstart-lib/modstart](https://github.com/modstart-lib/modstart)
+- `Gitee` [https://gitee.com/modstart-lib/modstart](https://gitee.com/modstart-lib/modstart)
+
+如果是非底层代码修改，可具体提交 PR 到以下仓库
+
+- `Github` [https://github.com/modstart/ModStartBlog](https://github.com/modstart/ModStartBlog)
+- `Gitee` [https://gitee.com/modstart/ModStartBlog](https://gitee.com/modstart/ModStartBlog)
+
+
 ## ✉️ 使用交流
 
 ### QQ交流群

module/AdminManager/Asset/entry/upgrade.js

@@ -179,7 +179,7 @@
                         class="tw-bg-white tw-rounded-sm tw-mb-2 tw-box tw-px-5 tw-py-3 tw-mb-3 tw-flex tw-items-center tw-zoom-in">
                         <div class="tw-w-10 tw-h-10 tw-flex-none tw-image-fit tw-rounded-full tw-overflow-hidden">
                             <div class="circle tw-border tw-border-gray-200 tw-border-solid tw-shadow ub-cover-1-1"
-                                 :style="{backgroundImage:`url(${memberUser.avatar||'/asset/image/avatar.png'})`}"></div>
+                                 :style="{backgroundImage:`url(${memberUser.avatar||'/asset/image/avatar.svg'})`}"></div>
                         </div>
                         <div class="tw-ml-4 tw-mr-auto">
                             <div class="tw-font-medium">{{memberUser.username || ''}}</div>

module/AdminManager/resources/asset/src/pages/Upgrade.vue

@@ -41,6 +41,8 @@ protected function crud(AdminCRUDBuilder $builder)
                 $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->display('created_at', L('Created At'))->listable(false);
                 $builder->display('updated_at', L('Updated At'))->listable(false);

module/Blog/Admin/Controller/BlogController.php

@@ -0,0 +1,23 @@
+<?php
+
+
+namespace Module\Blog\Core;
+
+
+use Module\Reward\Biz\AbstractRewardBiz;
+
+class BlogRewardBiz extends AbstractRewardBiz
+{
+    const NAME = 'blog';
+
+    public function name()
+    {
+        return self::NAME;
+    }
+
+    public function title()
+    {
+        return '博客';
+    }
+
+}

module/Blog/Core/BlogRewardBiz.php

@@ -22,6 +22,33 @@ public static function latestBlog($limit)
         return $paginateData['records'];
     }
 
+    
+    public static function topestBlog($limit)
+    {
+        $paginateData = self::paginateBlog(0, 1, $limit, [
+            'isTop' => true,
+        ]);
+        return $paginateData['records'];
+    }
+
+    
+    public static function hotBlog($limit)
+    {
+        $paginateData = self::paginateBlog(0, 1, $limit, [
+            'isHot' => true,
+        ]);
+        return $paginateData['records'];
+    }
+
+    
+    public static function recommendBlog($limit)
+    {
+        $paginateData = self::paginateBlog(0, 1, $limit, [
+            'isRecommend' => true,
+        ]);
+        return $paginateData['records'];
+    }
+
 
 
     public static function hottestBlog($limit)

module/Blog/Core/MBlog.php

@@ -12,6 +12,7 @@
 use Module\Banner\Biz\BannerPositionBiz;
 use Module\Banner\Biz\QuickBannerPositionBiz;
 use Module\Blog\Util\BlogCategoryUtil;
+use Module\Reward\Biz\RewardBiz;
 use Module\Vendor\Admin\Config\AdminWidgetDashboard;
 use Module\Vendor\Admin\Config\AdminWidgetLink;
 use Module\Vendor\Provider\HomePage\HomePageProvider;
@@ -98,6 +99,9 @@ public function boot(Dispatcher $events)
         if (class_exists(SiteUrlBiz::class)) {
             SiteUrlBiz::register(BlogSiteUrlBiz::class);
         }
+        if (modstart_module_enabled('Reward')) {
+            RewardBiz::register(BlogRewardBiz::class);
+        }
     }
 
 

module/Blog/Core/ModuleServiceProvider.php

@@ -1,4 +1,12 @@
-## 2.4.0
+## 2.5.0
+
+- 新增：置顶、热门、推荐博客获取函数
+- 新增：博客热门、博客推荐功能
+- 新增：适配通用打赏功能，需安装 Reward 和 PayCenter
+
+---
+
+## 2.4.0 博客内容置顶，界面样式和动效优化
 
 - 新增：博客内容置顶功能，后台快捷编辑
 - 优化：博客标签、分类、最近内容、信息等样式优化

module/Blog/Docs/release.md

@@ -11,7 +11,7 @@ public function up()
         Schema::table('blog', function (Blueprint $table) {
 
             $table->tinyInteger('isTop')->nullable()->comment('置顶');
-            $table->integer('commentCount')->nullable()->comment('置顶');
+            $table->integer('commentCount')->nullable()->comment('评论数量');
 
         });
     }

module/Blog/Migrate/2022_05_26_000000_blog_fields_modify.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class BlogFieldsRecommendHotModify extends Migration
+{
+    
+    public function up()
+    {
+        Schema::table('blog', function (Blueprint $table) {
+
+            $table->tinyInteger('isHot')->nullable()->comment('热门');
+            $table->tinyInteger('isRecommend')->nullable()->comment('推荐');
+
+        });
+    }
+
+    
+    public function down()
+    {
+
+    }
+}