diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php index 1cad6b9e..053c722a 100644 --- a/application/admin/controller/Dashboard.php +++ b/application/admin/controller/Dashboard.php @@ -23,6 +23,11 @@ class Dashboard extends Backend */ public function index() { + try { + \think\Db::execute("SET @@sql_mode='';"); + } catch (\Exception $e) { + + } $column = []; $starttime = Date::unixtime('day', -6); $endtime = Date::unixtime('day', 0, 'end'); diff --git a/application/admin/lang/zh-cn/index.php b/application/admin/lang/zh-cn/index.php index 9d559c7b..21146677 100644 --- a/application/admin/lang/zh-cn/index.php +++ b/application/admin/lang/zh-cn/index.php @@ -33,12 +33,13 @@ return [ 'Verification code is incorrect' => '验证码不正确', 'Wipe cache completed' => '清除缓存成功', 'Wipe cache failed' => '清除缓存失败', - 'Wipe cache' => '清空缓存', + 'Wipe cache' => '清除缓存', 'Wipe all cache' => '一键清除缓存', 'Wipe content cache' => '清除内容缓存', 'Wipe template cache' => '清除模板缓存', 'Wipe addons cache' => '清除插件缓存', 'Wipe browser cache' => '清除浏览器缓存', + 'Wipe browser cache tips' => '清除浏览器端静态JS、CSS、图片等资源', 'Check for updates' => '检测更新', 'Discover new version' => '发现新版本', 'Go to download' => '去下载更新', diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html index aa3b3e33..5efa6b05 100755 --- a/application/admin/view/common/header.html +++ b/application/admin/view/common/header.html @@ -39,7 +39,9 @@
  • {:__('Wipe content cache')}
  • {:__('Wipe template cache')}
  • {:__('Wipe addons cache')}
  • -
  • {:__('Wipe browser cache')}
  • +
  • {:__('Wipe browser cache')} + +
  • diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php index 5a2604aa..ffa3eecf 100644 --- a/application/common/library/Upload.php +++ b/application/common/library/Upload.php @@ -273,6 +273,14 @@ class Upload throw new UploadException(__('Chunk file write error')); } $file = new File($destFile); + $info = [ + 'name' => $fileName, + 'type' => $file->getMime(), + 'tmp_name' => $destFile, + 'error' => 0, + 'size' => $file->getSize() + ]; + $file->setSaveName($fileName)->setUploadInfo($info); $this->setFile($file); return $file; }