From 068de0fa9f75a205824e1533d16b44f0fd0b39f3 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 24 Sep 2025 19:00:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90=E6=A3=80=E6=9F=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除冗余的游客访问权限检查代码
- 简化用户认证逻辑，确保在文件不允许游客访问时强制用户登录
- 更新返回数据结构，移除不再使用的 is_guest_access 字段
---
 app/Http/Controllers/Api/FileController.php | 37 ++-------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/Api/FileController.php b/app/Http/Controllers/Api/FileController.php
index 54ab4f682..1db3dd383 100755
--- a/app/Http/Controllers/Api/FileController.php
+++ b/app/Http/Controllers/Api/FileController.php
@@ -74,8 +74,6 @@ class FileController extends AbstractController
         $id = Request::input('id');
         //
         $permission = 0;
-        $isGuestAccess = false;
-        
         if (Base::isNumber($id)) {
             $user = User::auth();
             $file = File::permissionFind(intval($id), $user, 0, $permission);
@@ -91,37 +89,9 @@ class FileController extends AbstractController
                 return Base::retError($msg, $data);
             }
             
-            // 检查游客访问权限
-            $isGuestAccess = true;
-            
-            // 尝试获取当前用户，如果未登录则为null
-            $user = null;
-            $token = Base::token();
-            if ($token) {
-                try {
-                    $user = User::auth();
-                } catch (\Exception $e) {
-                    $user = null;
-                }
-            }
-            
-            // 如果文件不允许游客访问且用户未登录，抛出登录异常
-            if (!$file->guest_access && !$user) {
-                throw new ApiException('请登录后继续...', [], -1);
-            }
-            
-            // 如果用户已登录，检查用户是否有权限访问该文件
-            if ($user) {
-                try {
-                    File::permissionFind($file->id, $user, 0, $permission);
-                } catch (\Exception $e) {
-                    // 如果用户没有权限且文件不允许游客访问，抛出登录异常
-                    if (!$file->guest_access) {
-                        throw new ApiException('请登录后继续...', [], -1);
-                    }
-                    // 否则作为游客访问
-                    $permission = 0;
-                }
+            // 如果文件不允许游客访问，则需要登录
+            if (!$file->guest_access) {
+                User::auth();
             }
             
             $fileLink->increment("num");
@@ -131,7 +101,6 @@ class FileController extends AbstractController
         //
         $array = $file->toArray();
         $array['permission'] = $permission;
-        $array['is_guest_access'] = $isGuestAccess;
         return Base::retSuccess('success', $array);
     }