|
@@ -8,9 +8,9 @@ use EasyWeChat\Kernel\Contracts\AccessToken as AccessTokenInterface;
|
|
|
use SixShop\Core\Attribute\Cron;
|
|
use SixShop\Core\Attribute\Cron;
|
|
|
use SixShop\Core\Job\BaseJob;
|
|
use SixShop\Core\Job\BaseJob;
|
|
|
use SixShop\System\Job\ClosureJob;
|
|
use SixShop\System\Job\ClosureJob;
|
|
|
|
|
+use SixShop\Wechat\Log;
|
|
|
use SixShop\Wechat\Service\MiniApp;
|
|
use SixShop\Wechat\Service\MiniApp;
|
|
|
use think\facade\Cache;
|
|
use think\facade\Cache;
|
|
|
-use think\facade\Log;
|
|
|
|
|
use function Symfony\Component\String\s;
|
|
use function Symfony\Component\String\s;
|
|
|
|
|
|
|
|
class AccessTokenCron extends BaseJob
|
|
class AccessTokenCron extends BaseJob
|
|
@@ -31,7 +31,7 @@ class AccessTokenCron extends BaseJob
|
|
|
*/
|
|
*/
|
|
|
private int $scheduleRefreshTime = 0;
|
|
private int $scheduleRefreshTime = 0;
|
|
|
|
|
|
|
|
- public function __construct(private MiniApp $miniApp)
|
|
|
|
|
|
|
+ public function __construct(private MiniApp $miniApp, private Log $log)
|
|
|
{
|
|
{
|
|
|
$this->accessToken = $this->miniApp->getAccessToken();
|
|
$this->accessToken = $this->miniApp->getAccessToken();
|
|
|
$this->cacheKey = Cache::getCachekey($this->accessToken->getKey());
|
|
$this->cacheKey = Cache::getCachekey($this->accessToken->getKey());
|
|
@@ -44,7 +44,7 @@ class AccessTokenCron extends BaseJob
|
|
|
$expireIn = $this->execute();
|
|
$expireIn = $this->execute();
|
|
|
self::dispatch()->delay($expireIn - self::LEAD_TIME);
|
|
self::dispatch()->delay($expireIn - self::LEAD_TIME);
|
|
|
$this->scheduleRefreshTime = time() + $expireIn - self::LEAD_TIME;
|
|
$this->scheduleRefreshTime = time() + $expireIn - self::LEAD_TIME;
|
|
|
- Log::debug('定时刷新小程序 AccessToken 任务已启动,计划执行时间:{time}', [
|
|
|
|
|
|
|
+ $this->log->debug('定时刷新小程序 AccessToken 任务已启动,计划执行时间:{time}', [
|
|
|
'time' => date('Y-m-d H:i:s', $this->scheduleRefreshTime)
|
|
'time' => date('Y-m-d H:i:s', $this->scheduleRefreshTime)
|
|
|
]);
|
|
]);
|
|
|
}
|
|
}
|
|
@@ -60,7 +60,7 @@ class AccessTokenCron extends BaseJob
|
|
|
$oldToken = $this->accessToken->getToken();
|
|
$oldToken = $this->accessToken->getToken();
|
|
|
$newToken = $this->accessToken->refresh();
|
|
$newToken = $this->accessToken->refresh();
|
|
|
$expireIn = Cache::ttl($this->cacheKey);
|
|
$expireIn = Cache::ttl($this->cacheKey);
|
|
|
- Log::debug('刷新小程序 AccessToken 成功,过期时间:{time}, 结果:{result}', [
|
|
|
|
|
|
|
+ $this->log->debug('刷新小程序 AccessToken 成功,过期时间:{time}, 结果:{result}', [
|
|
|
'time' => date('Y-m-d H:i:s', time() + $expireIn),
|
|
'time' => date('Y-m-d H:i:s', time() + $expireIn),
|
|
|
'result' => $oldToken === $newToken ? '未更新' : '已更新',
|
|
'result' => $oldToken === $newToken ? '未更新' : '已更新',
|
|
|
]);
|
|
]);
|