Merge branch 'develop' into feature/user0812

# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
This commit is contained in:
2025-08-14 10:09:56 +08:00
19 changed files with 881 additions and 277 deletions
+6
View File
@@ -118,6 +118,12 @@ class AuthLogic
}
// 是否登陆
$user->isLogin = false;
$options = [
'corp_id' => $user->corp_id,
'user_id' => $user->id
];
\Webman\RedisQueue\Redis::send('perm-agt', $options);
} else {
$updated = [
'union_id' => $feishuUserInfo['union_id'],
+6
View File
@@ -14,4 +14,10 @@ class CorpFeishuAppLogic
*/
protected string $modelClass = CorpFeishuApp::class;
public function getFeishuApp($corpId, $systemId)
{
return CorpFeishuApp::where('corp_id', $corpId)->where('system_id', $systemId)->first(['id', 'corp_id', 'name', 'app_id', 'r_url', 'state']);
}
}