This commit is contained in:
2025-03-22 18:30:38 +08:00
parent e58ed1ee14
commit 504bf7885c
8 changed files with 24 additions and 17 deletions
+12 -10
View File
@@ -25,9 +25,14 @@ class FeishuController
*/
public function getinfo(Request $request)
{
$config = Util::getParam($request, 'config');
if (Util::isEmpty($config)) {
$config = $this->config;
// $config = Util::getParam($request, 'config');
// if (Util::isEmpty($config)) {
// $config = $this->config;
// }
$userId = $request->user['id'];
$config = User::where('id',$userId)->value('sign');
if(Util::isEmpty($config)){
return Util::fail(null,trans('sign_not_null'));
}
// 获取凭证
@@ -48,13 +53,10 @@ class FeishuController
public function getSign(Request $request)
{
// 获取凭证
$certificate = config('feishu');
$res = [];
foreach ($certificate as $k => $v) {
$res []=['id'=>$k,'name'=>$k];
}
$res = [['xinyouhe'=>'新友合'],['mbaf'=>'MAGIC BRIDGE AUTO FZE']];
// foreach ($certificate as $k => $v) {
// $res []=['id'=>$k,'name'=>$k];
// }
return Util::success($res,trans('success'));
}
+1 -1
View File
@@ -62,7 +62,7 @@ class UserController
$result['token'] = $token;
$result['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
if (Util::isEmpty($language)) {
if (!Util::isEmpty($language)) {
User::where('id', $userId)
->update(['language' => $language]);
locale($language);