diff --git a/app/controller/FeishuController.php b/app/controller/FeishuController.php index 8a61dd2..3e5cedb 100644 --- a/app/controller/FeishuController.php +++ b/app/controller/FeishuController.php @@ -41,6 +41,22 @@ class FeishuController ]; return Util::success($arr,trans('success')); } + /** + * 获取应用信息 + * @return \support\Response + */ + public function getSign(Request $request) + { + + // 获取凭证 + $certificate = config('feishu'); + + $res = []; + foreach ($certificate as $k => $v) { + $res []=$k; + } + return Util::success($res,trans('success')); + } /** * 获取飞书code diff --git a/app/controller/UserController.php b/app/controller/UserController.php index 8a472f3..0941ef7 100644 --- a/app/controller/UserController.php +++ b/app/controller/UserController.php @@ -59,7 +59,7 @@ class UserController $result = $user; unset($result['password']); $result['token'] = $token; - $result['feishu_openid'] = FeishuUser::where('id', $userId)->value('open_id'); + $result['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id'); if (Util::isEmpty($language)) { User::where('id', $userId) @@ -169,6 +169,19 @@ class UserController } } + + public function getInfo(Request $request) + { + $userId = $request->user['id']; + $user = User::where('id', $userId) + ->first(); + $user->toArray(); + unset($user->password); + $user['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id'); + + return Util::success($user, trans('save_success')); + } + /** * 修改 * @param Request $request