github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-01 00:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 更换笑话和鸡汤接口

Browse Source
This commit is contained in:
kuaifan 2024-02-05 13:23:37 +08:00
parent 6320eaa3ac
commit 7dd5b082cf
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Module/Extranet.php
View File

@ -174,19 +174,16 @@ class Extranet
/**
* 随机笑话接口
* @return array
* @return string
*/
public static function randJoke(): array
public static function randJoke(): string
{
$jokeKey = env("JUKE_KEY_JOKE");
if ($jokeKey) {
$data = self::curl("http://v.juhe.cn/joke/randJoke.php?key=" . $jokeKey);
$data = Base::json2array($data);
if ($data['reason'] === 'success') {
return $data['result'];
}
$data = self::curl("https://hmajax.itheima.net/api/randjoke");
$data = Base::json2array($data);
if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
return $text;
}
return [];
return "";
}
/**
@ -195,13 +192,10 @@ class Extranet
*/
public static function soups(): string
{
$soupKey = env("JUKE_KEY_SOUP");
if ($soupKey) {
$data = self::curl("https://apis.juhe.cn/fapig/soup/query?key=" . $soupKey);
$data = Base::json2array($data);
if ($data['reason'] === 'success' && $text = trim($data['result']['text'])) {
return $text;
}
$data = self::curl("https://hmajax.itheima.net/api/ambition");
$data = Base::json2array($data);
if ($data['message'] === '获取成功' && $text = trim($data['data'])) {
return $text;
}
return "";
}

27
app/Tasks/JokeSoupTask.php
View File

@ -13,13 +13,12 @@ use Carbon\Carbon;
/**
* 获取笑话、心灵鸡汤
*
* 在.env添加笑话 JUKE_KEY_JOKE
* 在.env添加鸡汤 JUKE_KEY_SOUP
*
* 每日小时采集1次
* 每分钟采集1次
*/
class JokeSoupTask extends AbstractTask
{
private $keyPrefix = "JokeSoupTask-v2";
public function __construct()
{
parent::__construct();
@ -27,27 +26,25 @@ class JokeSoupTask extends AbstractTask
public function start()
{
// 判断每小时执行一次
if (Cache::get("JokeSoupTask:YmdH") == date("YmdH")) {
// 判断每分钟执行一次
if (Cache::get("{$this->keyPrefix}:YmdHi") == date("YmdHi")) {
return;
}
Cache::put("JokeSoupTask:YmdH", date("YmdH"), Carbon::now()->addDay());
Cache::put("{$this->keyPrefix}:YmdHi", date("YmdHi"), Carbon::now()->addDay());
//
$array = Base::json2array(Cache::get("JokeSoupTask:jokes"));
$array = Base::json2array(Cache::get("{$this->keyPrefix}:jokes"));
$data = Extranet::randJoke();
foreach ($data as $item) {
if ($text = trim($item['content'])) {
$array[] = $text;
}
if ($data) {
$array[] = $data;
}
Cache::forever("JokeSoupTask:jokes", Base::array2json(array_slice($array, -100)));
Cache::forever("{$this->keyPrefix}:jokes", Base::array2json(array_slice($array, -200)));
//
$array = Base::json2array(Cache::get("JokeSoupTask:soups"));
$array = Base::json2array(Cache::get("{$this->keyPrefix}:soups"));
$data = Extranet::soups();
if ($data) {
$array[] = $data;
}
Cache::forever("JokeSoupTask:soups", Base::array2json(array_slice($array, -24)));
Cache::forever("{$this->keyPrefix}:soups", Base::array2json(array_slice($array, -200)));
}
public function end()