From 63f1d0bc5d0555e6e50b8431bb2e37442012d7bf Mon Sep 17 00:00:00 2001
From: HongWeipeng <hongweichen8888@sina.com>
Date: Mon, 14 Oct 2019 01:40:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=97=B6=E9=97=B4=E6=88=B3?=
 =?UTF-8?q?=E7=9B=B8=E5=8A=A0=E6=95=B4=E5=9E=8B=E6=BA=A2=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/think/cache/driver/File.php   | 2 +-
 src/think/session/driver/File.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/think/cache/driver/File.php b/src/think/cache/driver/File.php
index c696b621ba..f0122f538a 100644
--- a/src/think/cache/driver/File.php
+++ b/src/think/cache/driver/File.php
@@ -95,7 +95,7 @@ protected function getRaw(string $name)
 
         if (false !== $content) {
             $expire = (int) substr($content, 8, 12);
-            if (0 != $expire && time() > filemtime($filename) + $expire) {
+            if (0 != $expire && time() - $expire > filemtime($filename)) {
                 //缓存过期删除缓存文件
                 $this->unlink($filename);
                 return;
diff --git a/src/think/session/driver/File.php b/src/think/session/driver/File.php
index 457bcd5677..1846089a76 100644
--- a/src/think/session/driver/File.php
+++ b/src/think/session/driver/File.php
@@ -77,7 +77,7 @@ public function gc(): void
         $now      = time();
 
         $files = $this->findFiles($this->config['path'], function (SplFileInfo $item) use ($lifetime, $now) {
-            return $now > $item->getMTime() + $lifetime;
+            return $now - $lifetime > $item->getMTime();
         });
 
         foreach ($files as $file) {