From 0a5484b738616610dd67decef8f859d0397d2bb9 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Mon, 25 Mar 2024 22:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/common.php                 | 2 +-
 application/admin/library/traits/Backend.php | 2 +-
 application/admin/model/UserGroup.php        | 2 +-
 application/admin/model/UserRule.php         | 2 +-
 application/common/library/Ems.php           | 4 ++--
 application/common/library/Sms.php           | 2 +-
 application/common/library/Token.php         | 2 +-
 application/common/library/Upload.php        | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/admin/common.php b/application/admin/common.php
index 3efbc8d1..f3d1e991 100755
--- a/application/admin/common.php
+++ b/application/admin/common.php
@@ -121,7 +121,7 @@ if (!function_exists('build_toolbar')) {
         $html = [];
         foreach ($btns as $k => $v) {
             //如果未定义或没有权限
-            if (!isset($btnAttr[$v]) || ($v !== 'refresh' && !$auth->check("{$controller}/{$v}"))) {
+            if (!isset($btnAttr[$v]) || ($v !== 'refresh' && !$auth->check("{$controller}/{$v}", $auth->id))) {
                 continue;
             }
             list($href, $class, $icon, $text, $title) = $btnAttr[$v];
diff --git a/application/admin/library/traits/Backend.php b/application/admin/library/traits/Backend.php
index 2eafdee5..df96bb36 100755
--- a/application/admin/library/traits/Backend.php
+++ b/application/admin/library/traits/Backend.php
@@ -391,7 +391,7 @@ trait Backend
         }
 
         //导入文件首行类型,默认是注释,如果需要使用字段名称请使用name
-        $importHeadType = $this->importHeadType ?? 'comment';
+        $importHeadType = isset($this->importHeadType) ? $this->importHeadType : 'comment';
 
         $table = $this->model->getQuery()->getTable();
         $database = \think\Config::get('database.database');
diff --git a/application/admin/model/UserGroup.php b/application/admin/model/UserGroup.php
index 8ce26bc6..07fc653c 100644
--- a/application/admin/model/UserGroup.php
+++ b/application/admin/model/UserGroup.php
@@ -28,7 +28,7 @@ class UserGroup extends Model
     {
         $value = $value ? $value : $data['status'];
         $list = $this->getStatusList();
-        return isset($list[$value]) ? $list[$value] : '';
+        return $list[$value] ?? '';
     }
 
 }
diff --git a/application/admin/model/UserRule.php b/application/admin/model/UserRule.php
index 683e6059..37ac709d 100644
--- a/application/admin/model/UserRule.php
+++ b/application/admin/model/UserRule.php
@@ -42,7 +42,7 @@ class UserRule extends Model
     {
         $value = $value ? $value : $data['status'];
         $list = $this->getStatusList();
-        return isset($list[$value]) ? $list[$value] : '';
+        return $list[$value] ?? '';
     }
 
     public static function getTreeList($selected = [])
diff --git a/application/common/library/Ems.php b/application/common/library/Ems.php
index ca31afc1..c655cf17 100644
--- a/application/common/library/Ems.php
+++ b/application/common/library/Ems.php
@@ -28,7 +28,7 @@ class Ems
      *
      * @param int    $email 邮箱
      * @param string $event 事件
-     * @return  Ems
+     * @return  Ems|null
      */
     public static function get($email, $event = 'default')
     {
@@ -36,7 +36,7 @@ class Ems
             ->order('id', 'DESC')
             ->find();
         Hook::listen('ems_get', $ems, null, true);
-        return $ems ? $ems : null;
+        return $ems ?: null;
     }
 
     /**
diff --git a/application/common/library/Sms.php b/application/common/library/Sms.php
index aa6421d7..2bf2b4f2 100644
--- a/application/common/library/Sms.php
+++ b/application/common/library/Sms.php
@@ -36,7 +36,7 @@ class Sms
             ->order('id', 'DESC')
             ->find();
         Hook::listen('sms_get', $sms, null, true);
-        return $sms ? $sms : null;
+        return $sms ?: null;
     }
 
     /**
diff --git a/application/common/library/Token.php b/application/common/library/Token.php
index 3486c46a..dab87097 100644
--- a/application/common/library/Token.php
+++ b/application/common/library/Token.php
@@ -150,7 +150,7 @@ class Token
     /**
      * 清除Token
      * @access public
-     * @param int user_id 会员ID
+     * @param int $user_id 会员ID
      * @return boolean
      */
     public static function clear($user_id = null)
diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php
index 19697337..add846dd 100644
--- a/application/common/library/Upload.php
+++ b/application/common/library/Upload.php
@@ -147,7 +147,7 @@ class Upload
         $size = $matches ? $matches[1] : $this->config['maxsize'];
         $type = $matches ? strtolower($matches[2]) : 'b';
         $typeDict = ['b' => 0, 'k' => 1, 'kb' => 1, 'm' => 2, 'mb' => 2, 'gb' => 3, 'g' => 3];
-        $size = $size * pow(1024, $typeDict[$type] ?? 0);
+        $size = (int)($size * pow(1024, $typeDict[$type] ?? 0));
         if ($this->fileInfo['size'] > $size) {
             throw new UploadException(__(
                 'File is too big (%sMiB), Max filesize: %sMiB.',