Merge branch 'develop'

app/common/service/AuthService.php

@@ -4,11 +4,23 @@ namespace app\common\service;
 
 use app\common\logic\AuthLogic;
 use app\common\model\User;
+use app\common\utils\Feishu;
 use support\Db;
 
 class AuthService
 {
 
+    /**
+     * 飞书授权
+     */
+    public function feishuAuthorize(string $corpAbbr, string $systemCcode)
+    {
+        $logic = new AuthLogic();
+        $certificate = $logic->feishuAppInfo($corpAbbr, $systemCcode);
+        $feishu = new Feishu($certificate['app_id'], $certificate['app_secret'], $certificate['abbr']);
+        return ['auth_url' => $feishu->authorize($certificate)];
+    }
+
     /**
      * 登录，支持多类型
      */
@@ -19,7 +31,7 @@ class AuthService
 
         return match ($loginType) {
             'feishu'  => $logic->feishuLogin($data),
-            'qrcode'  => $logic->qrCodeLogin($data),
+            // 'qrcode'  => $logic->qrCodeLogin($data),
             default   => $logic->uPwdLogin($data),
         };
     }
@@ -74,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)
+    // }
 }