|
|
@@ -32,7 +32,7 @@ class PushBaidu extends Command
|
|
|
|
|
|
protected function push($urls)
|
|
|
{
|
|
|
- $api = config('vienblog.manual_push.api');
|
|
|
+ $api = config('vienblog.baidu.manual_push.api');
|
|
|
$ch = curl_init();
|
|
|
$options = array(
|
|
|
CURLOPT_URL => $api,
|
|
|
@@ -55,16 +55,17 @@ class PushBaidu extends Command
|
|
|
*/
|
|
|
public function handle()
|
|
|
{
|
|
|
- if(!config('vienblog.manual_push.open')) {
|
|
|
+ dump(config('vienblog.baidu.manual_push.open'));
|
|
|
+ if(!config('vienblog.baidu.manual_push.open')) {
|
|
|
dump('未开启主动推送，请在config/vienblog.php中的baidu选项中根据注释内容配置，开启主动推送需要先配置domain和api');
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- $domain = config('vienblog.manual_push.domain');
|
|
|
+ $domain = config('vienblog.baidu.manual_push.domain');
|
|
|
|
|
|
- $articles = DB::select("select id from articles");
|
|
|
- $tags = DB::select("select id from tags");
|
|
|
- $categories = DB::select("select id from categories");
|
|
|
+ $articles = DB::select("select id, slug from blog_articles");
|
|
|
+ $tags = DB::select("select id, tag_name from blog_tags");
|
|
|
+ $categories = DB::select("select id, cate_name from blog_categories");
|
|
|
$postedUrls = DB::table("baidu_posted_urls")->get()->map(function ($value) {
|
|
|
return (array)$value;
|
|
|
})->toArray();
|
|
|
@@ -76,17 +77,17 @@ class PushBaidu extends Command
|
|
|
|
|
|
$urls = array($domain);
|
|
|
foreach ($articles as $article) {
|
|
|
- $url = $domain.'/article/'.strval($article->id);
|
|
|
+ $url = $domain.'/'.$article->slug;
|
|
|
array_push($urls, $url);
|
|
|
}
|
|
|
$tagUrls = array();
|
|
|
foreach ($tags as $tag) {
|
|
|
- $url = $domain.'/tag/'.strval($tag->id);
|
|
|
+ $url = $domain.'/tag/'.$tag->tag_name;
|
|
|
array_push($tagUrls, $url);
|
|
|
}
|
|
|
$catUrls = array();
|
|
|
foreach ($categories as $category) {
|
|
|
- $url = $domain.'/category/'.strval($category->id);
|
|
|
+ $url = $domain.'/category/'.$category->cate_name;
|
|
|
array_push($catUrls, $url);
|
|
|
}
|
|
|
$finalUrls = array_diff(array_merge($tagUrls, $catUrls, $urls), $postedUrlsArray);
|
|
|
@@ -107,10 +108,11 @@ class PushBaidu extends Command
|
|
|
array_push($doneUrls, ['url' => $url]);
|
|
|
}
|
|
|
DB::table('baidu_posted_urls')->insert($doneUrls);
|
|
|
- dump('yes');
|
|
|
+ dump('success');
|
|
|
}
|
|
|
if(isset($res->error)) {
|
|
|
- dump('no');
|
|
|
+ dump('error: ');
|
|
|
+ dump($res->error);
|
|
|
}
|
|
|
}
|
|
|
}
|
Vien