百度推送

src/Admin/Controllers/PushController.php

@@ -35,15 +35,8 @@ protected function grid()
         return Grid::make(new BaiduPush(), function (Grid $grid) {
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
-                $filter->equal('type', '推送类型')->select([
-                    BaiduPush::TYPE_SITE => '普通推送',
-                    BaiduPush::TYPE_DAILY => '快速收录'
-                ]);
-                $filter->equal('status', '推送状态')->select([
-                    BaiduPush::STATUS_PENDING => '待推送',
-                    BaiduPush::STATUS_SUCCESS => '推送成功',
-                    BaiduPush::STATUS_FAILURE => '推送失败',
-                ]);
+                $filter->equal('type', '推送类型')->select(BaiduPush::TYPES);
+                $filter->equal('status', '推送状态')->select(BaiduPush::STATUS_MAPS);
                 //顶部筛选
                 $filter->scope('failure', '推送失败')->where('status', BaiduPush::STATUS_FAILURE);
                 $filter->scope('pending', '待推送')->where('status', BaiduPush::STATUS_PENDING);
@@ -52,16 +45,9 @@ protected function grid()
             $grid->model()->orderBy('id', 'desc');
 
             $grid->column('id', 'ID')->sortable();
-            $grid->column('type', '推送类型')->using([
-                BaiduPush::TYPE_SITE => '普通推送',
-                BaiduPush::TYPE_DAILY => '快速收录'
-            ]);
+            $grid->column('type', '推送类型')->using(BaiduPush::TYPES);
             $grid->column('url', 'Url')->link();
-            $grid->column('status', '状态')->using([
-                BaiduPush::STATUS_PENDING => '待推送',
-                BaiduPush::STATUS_SUCCESS => '推送成功',
-                BaiduPush::STATUS_FAILURE => '推送失败',
-            ])->dot([
+            $grid->column('status', '状态')->using(BaiduPush::STATUS_MAPS)->dot([
                 BaiduPush::STATUS_PENDING => 'info',
                 BaiduPush::STATUS_SUCCESS => 'success',
                 BaiduPush::STATUS_FAILURE => 'warning',

src/Jobs/DeleteJob.php

@@ -57,7 +57,7 @@ public function __construct(BaiduPush $baiduPush)
         $this->baiduPush = $baiduPush;
         if (function_exists('settings')) {
             $this->site = config('app.url');
-            $this->token = settings('system.baidu_site_token');
+            $this->token = settings('baidu.site_token');
         } else {
             $this->site = config('services.baidu.site');
             $this->token = config('services.baidu.site_token');

src/Jobs/PushJob.php

@@ -56,7 +56,7 @@ public function __construct(BaiduPush $baiduPush)
         $this->baiduPush = $baiduPush;
         if (function_exists('settings')) {
             $this->site = config('app.url');
-            $this->token = settings('system.baidu_site_token');
+            $this->token = settings('baidu.site_token');
         } else {
             $this->site = config('services.baidu.site');
             $this->token = config('services.baidu.site_token');

src/Jobs/UpdateJob.php

@@ -56,7 +56,7 @@ public function __construct(BaiduPush $baiduPush)
         $this->baiduPush = $baiduPush;
         if (function_exists('settings')) {
             $this->site = config('app.url');
-            $this->token = settings('system.baidu_site_token');
+            $this->token = settings('baidu.site_token');
         } else {
             $this->site = config('services.baidu.site');
             $this->token = config('services.baidu.site_token');

src/Models/BaiduPush.php

@@ -7,6 +7,7 @@
 
 namespace Larva\Baidu\Push\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
 
@@ -21,9 +22,9 @@
  * @property bool $included 是否已经收录
  * @property Carbon|null $push_at 推送时间
  *
- * @property-read boolean $failure
- * @method static \Illuminate\Database\Eloquent\Builder|BaiduPush failure()
- * @method static \Illuminate\Database\Eloquent\Builder|BaiduPush pending()
+ * @property-read boolean $failure 是否失败
+ * @method static Builder failure()
+ * @method static Builder pending()
  *
  * @author Tongle Xu <xutongle@gmail.com>
  */
@@ -33,17 +34,26 @@ class BaiduPush extends Model
 
     public const TYPE_SITE = 'site';//普通推送
     public const TYPE_DAILY = 'daily';//快速收录
+    public const TYPES = [
+        self::TYPE_SITE => '普通收录',
+        self::TYPE_DAILY => '快速收录'
+    ];
 
     public const STATUS_PENDING = 0b0;//待推送
     public const STATUS_SUCCESS = 0b1;//正常
     public const STATUS_FAILURE = 0b10;//失败
+    public const STATUS_MAPS = [
+        self::STATUS_PENDING => '待推送',
+        self::STATUS_SUCCESS => '推送成功',
+        self::STATUS_FAILURE => '推送失败'
+    ];
 
     /**
      * 与模型关联的数据表。
      *
      * @var string
      */
-    protected $table = 'baidu_push';
+    protected $table = 'baidu_pushes';
 
     /**
      * 可以批量赋值的属性
@@ -60,7 +70,7 @@ class BaiduPush extends Model
      * @var array
      */
     protected $attributes = [
-        'status' => 0b0
+        'status' => self::STATUS_PENDING
     ];
 
     /**
@@ -77,30 +87,30 @@ protected function serializeDate(\DateTimeInterface $date)
     /**
      * 查询等待的推送
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param Builder $query
+     * @return Builder
      */
-    public function scopePending($query)
+    public function scopePending(Builder $query): Builder
     {
         return $query->where('status', '=', static::STATUS_PENDING);
     }
 
     /**
      * 查询失败的推送
      *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @param Builder $query
+     * @return Builder
      */
-    public function scopeFailure($query)
+    public function scopeFailure(Builder $query): Builder
     {
         return $query->where('status', '=', static::STATUS_FAILURE);
     }
 
     /**
      * 是否已失败
-     * @return boolean
+     * @return bool
      */
-    public function getFailureAttribute()
+    public function getFailureAttribute(): bool
     {
         return $this->status == static::STATUS_FAILURE;
     }
@@ -125,7 +135,7 @@ public function setSuccess(): bool
     }
 
     /**
-     * 设置推送成功
+     * 设置为已收录
      * @return bool
      */
     public function setIncluded(): bool