crud

app/middleware/AuthCheck.php

@@ -6,18 +6,50 @@ use ReflectionClass;
 use Webman\MiddlewareInterface;
 use Webman\Http\Response;
 use Webman\Http\Request;
+use app\common\service\BasicDataService;
 
 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'] ?? [];
+        $noNeedHeaderData = $properties['noNeedHeaderData'] ?? [];
 
-        if (in_array($request->action, $noNeedLogin)) {
-            // 白名单
-            return $handler($request);
-        } else {
+        // header数据
+        if (!in_array($request->action, $noNeedHeaderData)) { //如果需要header数据
+            try {
+                $corpAbbr = $request->header('Fdesk-Corp-Abbr');
+                $systemCode = $request->header('Fdesk-System-Code');
+                $loginType = $request->header('Fdesk-Login-Type');
+                $basicDataService = new BasicDataService();
+                if ($basicDataService->checkAndCacheBaseParams($loginType, $systemCode, $corpAbbr)) {
+                    $request->login_type = $loginType;
+                    $request->system_code = $systemCode;
+                    $request->corp_abbr = $corpAbbr;
+                    $request->basic_data = [
+                        'login_type' => $loginType,
+                        'system_code' => $systemCode,
+                        'corp_abbr' => $corpAbbr
+                    ];
+                }
+                return $handler($request);
+            } catch (\Throwable $th) {
+                throw $th;
+                $body = [
+                    'status'  => 'fail',
+                    'code'    => 401,
+                    'message' => $th->getMessage(),
+                    'data'    => [],
+                ];
+                return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
+            }
+        }
+
+        // 不登陆&不鉴权
+        if (!in_array($request->action, $noNeedLogin)) { //如果需要登陆&鉴权
             try {
                 $authHeader = $request->header('Fdesk-Auth-Token');
                 if (!$authHeader || !preg_match('/Bearer\s(\S+)/', $authHeader, $matches)) {
@@ -31,6 +63,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 +73,24 @@ class AuthCheck implements MiddlewareInterface
                 ];
                 return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
             }
-            return $handler($request);
         }
+
+        // 登陆&不鉴权
+        // if (!in_array($request->action, $noNeedAuth)) { //如果需要登陆&不鉴权
+        //     try { 
+
+        //         return $handler($request);
+        //     } catch (\Throwable $e) {
+        //         $body = [
+        //             'status'  => 'fail',
+        //             'code'    => 401,
+        //             'message' => $e->getMessage(),
+        //             'data'    => [],
+        //         ];
+        //         return response(json_encode($body, JSON_UNESCAPED_UNICODE), 401, ['Content-Type' => 'application/json']);
+        //     }
+        // }
+
+        return $handler($request);
     }
 }

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);
-    }
-}