Kaynağa Gözat

feat(wechat): 移除SixShop\System\Log

runphp 1 ay önce
ebeveyn
işleme
3a9a933ad3
2 değiştirilmiş dosya ile 4 ekleme ve 22 silme
  1. 4 7
      src/Cron/AccessTokenCron.php
  2. 0 15
      src/Log.php

+ 4 - 7
src/Cron/AccessTokenCron.php

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

+ 0 - 15
src/Log.php

@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace SixShop\Wechat;
-
-use SixShop\System\ExtensionManager;
-use think\App;
-
-class Log extends \SixShop\System\Log
-{
-    public function __construct(App $app, private ExtensionManager $extensionManager)
-    {
-        parent::__construct($app, $extensionManager, Extension::EXTENSION_ID);
-    }
-}