Merge branch 'develop'

app/middleware/AuthCheck.php

@@ -12,8 +12,10 @@ class AuthCheck implements MiddlewareInterface
     public function process(Request $request, callable $handler) : Response
     {
         $controller = new ReflectionClass($request->controller);
-        $noNeedLogin = $controller->getDefaultProperties()['noNeedLogin'] ?? [];
-
+        $properties = $controller->getDefaultProperties();
+        $noNeedLogin = $properties['noNeedLogin'] ?? [];
+        $noNeedAuth = $properties['noNeedAuth'] ?? [];
+        
         if (in_array($request->action, $noNeedLogin)) {
             // 白名单
             return $handler($request);
@@ -31,6 +33,7 @@ class AuthCheck implements MiddlewareInterface
                 }
                 $token = $matches[1];
                 $request->user = (new Jwt())->verifyToken($token);
+                return $handler($request);
             } catch (\Throwable $e) {
                 $body = [
                     'status'  => 'fail',
@@ -40,7 +43,8 @@ class AuthCheck implements MiddlewareInterface
                 ];
                 return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
             }
-            return $handler($request);
         }
+
+        return $handler($request);
     }
 }

app/middleware/BasicData.php

@@ -12,9 +12,9 @@ class BasicData implements MiddlewareInterface
     public function process(Request $request, callable $handler): Response
     {
         $controller = new ReflectionClass($request->controller);
-        $noNeedHeader = $controller->getDefaultProperties()['noNeedHeader'] ?? [];
+        $noNeedHeaderData = $controller->getDefaultProperties()['noNeedHeaderData'] ?? [];
 
-        if (in_array($request->action, $noNeedHeader) || in_array($request->path(), config('whitelist.basi_cdata'))) {
+        if (in_array($request->action, $noNeedHeaderData)) {
             // 白名单
             return $handler($request);
         } else {
@@ -35,7 +35,13 @@ class BasicData implements MiddlewareInterface
                 }
                 return $handler($request);
             } catch (\Throwable $th) {
-                throw $th;
+                $body = [
+                    'status'  => 'fail',
+                    'code'    => 403,
+                    'message' => $th->getMessage(),
+                    'data'    => [],
+                ];
+                return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
             }
         }
     }

app/middleware/PermissionMiddleware.php

@@ -1,33 +0,0 @@
-<?php
-namespace app\middleware;
-
-use Webman\MiddlewareInterface;
-use Webman\Http\Response;
-use Webman\Http\Request;
-use app\service\AuthService;
-
-class PermissionMiddleware implements MiddlewareInterface
-{
-    protected $permission_code;
-
-    // 支持传参（如 "user:view"），可以在路由闭包里传入
-    public function __construct($permission_code = null)
-    {
-        $this->permission_code = $permission_code;
-    }
-
-    public function process(Request $request, callable $next): Response
-    {
-        // 假设有 auth() helper 方法能获取当前登录用户ID
-        $user_id = $request->session()->get('user_id');
-        if (!$user_id) {
-            return json(['code' => 401, 'msg' => '未登录']);
-        }
-
-        if ($this->permission_code && !AuthService::check($user_id, $this->permission_code)) {
-            return json(['code' => 403, 'msg' => '没有权限']);
-        }
-
-        return $next($request);
-    }
-}