Merge branch 'main' of https://github.com/easyadmin8/EasyAdmin8

- Add MiddlewareAnnotation to CheckLogin middleware for login exemption
- Implement IGNORE_LOGIN constant in MiddlewareAnnotation
- Use MiddlewareAnnotation in Goods controller for login exemption

Signed-off-by: wolfcode <37436228+wolf-leo@users.noreply.github.com>

app/admin/controller/mall/Goods.php

@@ -4,6 +4,7 @@ namespace app\admin\controller\mall;
 
 use app\admin\model\MallCate;
 use app\admin\model\MallGoods;
+use app\admin\service\annotation\MiddlewareAnnotation;
 use app\common\controller\AdminController;
 use app\admin\service\annotation\ControllerAnnotation;
 use app\admin\service\annotation\NodeAnnotation;
@@ -66,4 +67,9 @@ class Goods extends AdminController
         return $this->fetch();
     }
 
+    #[MiddlewareAnnotation(ignore: MiddlewareAnnotation::IGNORE_LOGIN)]
+    public function no_check_login(Request $request): string
+    {
+        return '这里演示方法不需要经过登录验证';
+    }
 }

app/admin/middleware/CheckLogin.php

@@ -7,6 +7,7 @@ use app\Request;
 use Closure;
 use ReflectionClass;
 use ReflectionException;
+use app\admin\service\annotation\MiddlewareAnnotation;
 
 class CheckLogin
 {
@@ -31,6 +32,13 @@ class CheckLogin
             if (in_array($action, $noNeedCheck)) {
                 return $next($request);
             }
+            $reflectionMethod = new \ReflectionMethod($controllerClass, $action);
+            $attributes       = $reflectionMethod->getAttributes(MiddlewareAnnotation::class);
+            foreach ($attributes as $attribute) {
+                $annotation = $attribute->newInstance();
+                $_ignore    = (array)$annotation->ignore;
+                if (in_array('LOGIN', (array)$_ignore)) return $next($request);
+            }
             if (empty($adminUserInfo)) {
                 return redirect(__url('login/index'));
             }

app/admin/service/annotation/MiddlewareAnnotation.php

@@ -10,6 +10,9 @@ final class MiddlewareAnnotation
     /** 过滤日志 */
     const IGNORE_LOG = 'LOG';
 
+    /** 免登录 */
+    const IGNORE_LOGIN = 'LOGIN';
+
     public function __construct(public string $type = '', public string|array $ignore = '')
     {
     }

app/common/controller/AdminController.php

@@ -133,6 +133,9 @@ class AdminController extends BaseController
     {
         if ($layout) View::instance()->engine()->layout('/layout/default');
         View::assign($vars);
+        if (empty($template)) {
+            $template = strtolower(str_replace('.', '/', $this->request->pathinfo()));
+        }
         return View::fetch($template);
     }
 
@@ -249,7 +252,7 @@ class AdminController extends BaseController
             'version'              => env('APP_DEBUG') ? time() : ConfigService::getVersion(),
             'adminUploadUrl'       => url('ajax/upload', [], false),
             'adminEditor'          => sysConfig('site', 'editor_type') ?: 'wangEditor',
-            'iframeOpenTop'           => sysConfig('site', 'iframe_open_top') ?: 0,
+            'iframeOpenTop'        => sysConfig('site', 'iframe_open_top') ?: 0,
         ];
         View::assign($data);
     }

composer.json

@@ -24,7 +24,7 @@
         "topthink/framework": "^8.0",
         "topthink/think-orm": "^3.0",
         "topthink/think-multi-app": "^1.1.0",
-        "topthink/think-view": "^2.0",
+        "topthink/think-view": "2.0.0",
         "topthink/think-captcha": "^3.0",
         "topthink/think-filesystem": "^2.0",
         "aliyuncs/oss-sdk-php": "^2.6",

public/static/admin/css/public.css

@@ -516,4 +516,5 @@ table样式
 
 .wangEditor_div {
     z-index: 99999;
+    border: 1px solid var(--w-e-textarea-slight-border-color);
 }