From 60f515e720009f36bc65d6b9b6dee1f71c77d03d Mon Sep 17 00:00:00 2001
From: 578939494 <578939494@qq.com>
Date: Fri, 13 Nov 2020 14:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E7=AE=A1=E7=90=86=E5=91=98=E5=92=8C=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Ajax.php | 3 +++
 application/api/controller/Common.php | 3 +++
 application/common/library/Upload.php | 9 +++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php
index dd58cf117..33dc73d57 100644
--- a/application/admin/controller/Ajax.php
+++ b/application/admin/controller/Ajax.php
@@ -55,6 +55,9 @@ class Ajax extends Backend
      */
     public function upload()
     {
+        \think\Hook::add('upload_uploader', function (&$params) {
+            $params['admin_id'] = $this->auth->id;
+        });
         Config::set('default_return_type', 'json');
         //必须设定cdnurl为空,否则cdnurl函数计算错误
         Config::set('upload.cdnurl', '');
diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php
index 645d7bbcc..4c967de7c 100644
--- a/application/api/controller/Common.php
+++ b/application/api/controller/Common.php
@@ -68,6 +68,9 @@ class Common extends Api
      */
     public function upload()
     {
+        Hook::add('upload_uploader', function (&$params) {
+            $params['user_id'] = $this->auth->id;
+        });
         Config::set('default_return_type', 'json');
         //必须设定cdnurl为空,否则cdnurl函数计算错误
         Config::set('upload.cdnurl', '');
diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php
index 5a2604aa1..75c14d5fc 100644
--- a/application/common/library/Upload.php
+++ b/application/common/library/Upload.php
@@ -325,9 +325,14 @@ class Upload
             }
         }
         $this->file = $file;
+        $uploader = [
+            'admin_id'  => 0,
+            'user_id'   => 0,
+        ];
+        Hook::listen('upload_uploader', $uploader);
         $params = array(
-            'admin_id'    => (int)session('admin.id'),
-            'user_id'     => (int)cookie('uid'),
+            'admin_id'    => $uploader['admin_id'],
+            'user_id'     => $uploader['user_id'],
             'filename'    => substr(htmlspecialchars(strip_tags($this->fileInfo['name'])), 0, 100),
             'filesize'    => $this->fileInfo['size'],
             'imagewidth'  => $this->fileInfo['imagewidth'],
-- 
Gitee