refactor: 重构多飞书应用绑定架构和数据库清理
- 新增 user_feishu_apps 表支持用户绑定多个飞书应用 - users 表添加唯一约束(公司内邮箱/手机唯一) - 迁移现有飞书数据到 user_feishu_apps 表 - 清理冗余表(users_bak, user_feishu_binding) - 废弃 users 表中的 feishu_user_id/feishu_open_id/tenant_key 字段 - 更新 FeishuNotificationService 使用新的数据获取方式 - User 模型新增 getFeishuUserId() 等便捷方法 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -27,7 +27,7 @@ class FeishuNotificationService
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置飞书应用ID(支持多应用)
|
||||
* 设置飞书应用ID(必须指定)
|
||||
*/
|
||||
public function setApp(int $appId): self
|
||||
{
|
||||
@@ -36,7 +36,29 @@ class FeishuNotificationService
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取飞书应用配置
|
||||
* 根据用户ID自动设置其最后登录的应用
|
||||
*/
|
||||
public function setAppByUser(int $userId): self
|
||||
{
|
||||
$user = \app\model\User::find($userId);
|
||||
if (!$user) {
|
||||
throw new Exception('用户不存在');
|
||||
}
|
||||
|
||||
$this->setCompany($user->company_id);
|
||||
|
||||
// 使用用户最后登录的应用
|
||||
if ($user->feishu_app_id) {
|
||||
$this->appId = $user->feishu_app_id;
|
||||
} else {
|
||||
throw new Exception('用户未绑定飞书应用,请先通过飞书登录');
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取飞书应用配置(必须先通过 setApp 或 setAppByUser 指定)
|
||||
*/
|
||||
private function getAppConfig(): array
|
||||
{
|
||||
@@ -44,22 +66,17 @@ class FeishuNotificationService
|
||||
throw new Exception('未设置公司ID');
|
||||
}
|
||||
|
||||
if ($this->appId) {
|
||||
$app = \app\model\CompanyFeishuApp::find($this->appId);
|
||||
if (!$app || $app->status !== 1) {
|
||||
throw new Exception('飞书应用配置不存在');
|
||||
}
|
||||
return $app->toArray();
|
||||
if (!$this->appId) {
|
||||
throw new Exception('未指定飞书应用,请通过 setApp() 或 setAppByUser() 指定');
|
||||
}
|
||||
|
||||
$app = \app\model\CompanyFeishuApp::where('company_id', $this->companyId)
|
||||
->where('system_id', 1)
|
||||
->where('id', $this->appId)
|
||||
->where('status', 1)
|
||||
->orderBy('sort')
|
||||
->first();
|
||||
|
||||
if (!$app) {
|
||||
throw new Exception('未配置飞书应用');
|
||||
throw new Exception('指定的飞书应用不存在或未启用');
|
||||
}
|
||||
|
||||
return $app->toArray();
|
||||
@@ -74,6 +91,23 @@ class FeishuNotificationService
|
||||
return FeishuUtil::getAppAccessToken($app['id']);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户在指定飞书应用下的 feishu_user_id
|
||||
*/
|
||||
private function getFeishuUserId(int $userId, int $companyId): ?string
|
||||
{
|
||||
if (!$this->appId) {
|
||||
throw new Exception('未指定飞书应用,请先调用 setApp() 或 setAppByUser()');
|
||||
}
|
||||
|
||||
$binding = \app\model\UserFeishuApp::where('user_id', $userId)
|
||||
->where('company_id', $companyId)
|
||||
->where('feishu_app_id', $this->appId)
|
||||
->first();
|
||||
|
||||
return $binding ? $binding->feishu_user_id : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送审批通知
|
||||
*
|
||||
@@ -98,13 +132,20 @@ class FeishuNotificationService
|
||||
|
||||
try {
|
||||
$user = User::find($userId);
|
||||
if (!$user || !$user->feishu_user_id) {
|
||||
error_log("❌ sendApprovalNotification: 用户不存在或未绑定飞书, user_id={$userId}");
|
||||
if (!$user) {
|
||||
error_log("❌ sendApprovalNotification: 用户不存在, user_id={$userId}");
|
||||
return false;
|
||||
}
|
||||
|
||||
// 从 user_feishu_apps 获取指定应用下的 feishu_user_id
|
||||
$feishuUserId = $this->getFeishuUserId($userId, $user->company_id);
|
||||
if (!$feishuUserId) {
|
||||
error_log("❌ sendApprovalNotification: 用户未绑定飞书应用, user_id={$userId}");
|
||||
return false;
|
||||
}
|
||||
|
||||
$card = $this->buildApprovalCard($params);
|
||||
return $this->sendMessage($user->feishu_user_id, $card);
|
||||
return $this->sendMessage($feishuUserId, $card);
|
||||
} catch (Exception $e) {
|
||||
error_log('❌ sendApprovalNotification 失败: ' . $e->getMessage());
|
||||
return false;
|
||||
@@ -133,13 +174,20 @@ class FeishuNotificationService
|
||||
foreach ($userIds as $userId) {
|
||||
try {
|
||||
$user = User::find($userId);
|
||||
if (!$user || !$user->feishu_user_id) {
|
||||
if (!$user) {
|
||||
$results[$userId] = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
// 从 user_feishu_apps 获取指定应用下的 feishu_user_id
|
||||
$feishuUserId = $this->getFeishuUserId($userId, $user->company_id);
|
||||
if (!$feishuUserId) {
|
||||
$results[$userId] = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
$card = $this->buildSystemCard($params);
|
||||
$results[$userId] = $this->sendMessage($user->feishu_user_id, $card);
|
||||
$results[$userId] = $this->sendMessage($feishuUserId, $card);
|
||||
} catch (Exception $e) {
|
||||
error_log("❌ sendSystemNotification 失败: user_id={$userId}, error=" . $e->getMessage());
|
||||
$results[$userId] = false;
|
||||
@@ -170,13 +218,20 @@ class FeishuNotificationService
|
||||
|
||||
try {
|
||||
$user = User::find($userId);
|
||||
if (!$user || !$user->feishu_user_id) {
|
||||
error_log("❌ sendReminderNotification: 用户不存在或未绑定飞书, user_id={$userId}");
|
||||
if (!$user) {
|
||||
error_log("❌ sendReminderNotification: 用户不存在, user_id={$userId}");
|
||||
return false;
|
||||
}
|
||||
|
||||
// 从 user_feishu_apps 获取指定应用下的 feishu_user_id
|
||||
$feishuUserId = $this->getFeishuUserId($userId, $user->company_id);
|
||||
if (!$feishuUserId) {
|
||||
error_log("❌ sendReminderNotification: 用户未绑定飞书应用, user_id={$userId}");
|
||||
return false;
|
||||
}
|
||||
|
||||
$card = $this->buildReminderCard($params);
|
||||
return $this->sendMessage($user->feishu_user_id, $card);
|
||||
return $this->sendMessage($feishuUserId, $card);
|
||||
} catch (Exception $e) {
|
||||
error_log('❌ sendReminderNotification 失败: ' . $e->getMessage());
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user