Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/model/User.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/middleware/AuthCheck.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php

app/common/service/AuthService.php

@@ -31,7 +31,7 @@ class AuthService
 
         return match ($loginType) {
             'feishu'  => $logic->feishuLogin($data),
-            'qrcode'  => $logic->qrCodeLogin($data),
+            // 'qrcode'  => $logic->qrCodeLogin($data),
             default   => $logic->uPwdLogin($data),
         };
     }
@@ -86,4 +86,13 @@ class AuthService
     {
         (new AuthLogic())->blockToken($token, $systemCode);
     }
+
+
+    // public function perms()
+    // {
+    //     $permService = new PermService();
+    //     $menuTree = $permService->getMenuTree($uid);
+    //     $permissionCodes = $permService->getPermissionCodes($uid);
+    //     return (new PermService())->getMenuTree($this->userId)
+    // }
 }