fix: 云端函数默认注入当前登录用户信息
- 当请求参数未指定 user_id 时,使用 token 中的用户 ID - 确保 user、subscription、devices 等变量始终有值
This commit is contained in:
@@ -173,49 +173,52 @@ func handleExecuteDynamicCode(c *gin.Context) {
|
||||
userVariables := map[string]interface{}{}
|
||||
devices := []map[string]interface{}{}
|
||||
|
||||
targetUserID := claims.UserID
|
||||
if req.UserID != nil {
|
||||
var user model.AppUser
|
||||
if err := database.DB.Where("id = ? AND application_id = ?", *req.UserID, app.ID).First(&user).Error; err == nil {
|
||||
userData = map[string]interface{}{
|
||||
"id": user.ID,
|
||||
"username": user.Username,
|
||||
"email": user.Email,
|
||||
"status": user.Status,
|
||||
"device_id": user.DeviceID,
|
||||
"avatar": user.Avatar,
|
||||
"created_at": user.CreatedAt,
|
||||
"last_login_at": user.LastLoginAt,
|
||||
}
|
||||
targetUserID = *req.UserID
|
||||
}
|
||||
|
||||
subscription = map[string]interface{}{
|
||||
"balance": user.Balance,
|
||||
"is_trial_user": user.IsTrialUser,
|
||||
"trial_start_at": user.TrialStartAt,
|
||||
"trial_end_at": user.TrialEndAt,
|
||||
"expiry_at": user.ExpiryAt,
|
||||
"is_expired": user.ExpiryAt != nil && user.ExpiryAt.Before(time.Now()),
|
||||
"is_lifetime": user.Balance == -1,
|
||||
"days_remaining": calculateDaysRemaining(user.ExpiryAt, user.Balance),
|
||||
}
|
||||
var user model.AppUser
|
||||
if err := database.DB.Where("id = ? AND application_id = ?", targetUserID, app.ID).First(&user).Error; err == nil {
|
||||
userData = map[string]interface{}{
|
||||
"id": user.ID,
|
||||
"username": user.Username,
|
||||
"email": user.Email,
|
||||
"status": user.Status,
|
||||
"device_id": user.DeviceID,
|
||||
"avatar": user.Avatar,
|
||||
"created_at": user.CreatedAt,
|
||||
"last_login_at": user.LastLoginAt,
|
||||
}
|
||||
|
||||
var userDevices []model.UserDevice
|
||||
database.DB.Where("user_id = ? AND application_id = ?", user.ID, app.ID).Find(&userDevices)
|
||||
for _, d := range userDevices {
|
||||
devices = append(devices, map[string]interface{}{
|
||||
"id": d.ID,
|
||||
"device_id": d.DeviceID,
|
||||
"device_name": d.DeviceName,
|
||||
"device_type": d.DeviceType,
|
||||
"status": d.Status,
|
||||
"created_at": d.CreatedAt,
|
||||
})
|
||||
}
|
||||
subscription = map[string]interface{}{
|
||||
"balance": user.Balance,
|
||||
"is_trial_user": user.IsTrialUser,
|
||||
"trial_start_at": user.TrialStartAt,
|
||||
"trial_end_at": user.TrialEndAt,
|
||||
"expiry_at": user.ExpiryAt,
|
||||
"is_expired": user.ExpiryAt != nil && user.ExpiryAt.Before(time.Now()),
|
||||
"is_lifetime": user.Balance == -1,
|
||||
"days_remaining": calculateDaysRemaining(user.ExpiryAt, user.Balance),
|
||||
}
|
||||
|
||||
var userVars []model.UserVariable
|
||||
database.DB.Where("user_id = ? AND app_id = ?", user.ID, app.ID).Find(&userVars)
|
||||
for _, v := range userVars {
|
||||
userVariables[v.VarName] = v.VarValue
|
||||
}
|
||||
var userDevices []model.UserDevice
|
||||
database.DB.Where("user_id = ? AND application_id = ?", user.ID, app.ID).Find(&userDevices)
|
||||
for _, d := range userDevices {
|
||||
devices = append(devices, map[string]interface{}{
|
||||
"id": d.ID,
|
||||
"device_id": d.DeviceID,
|
||||
"device_name": d.DeviceName,
|
||||
"device_type": d.DeviceType,
|
||||
"status": d.Status,
|
||||
"created_at": d.CreatedAt,
|
||||
})
|
||||
}
|
||||
|
||||
var userVars []model.UserVariable
|
||||
database.DB.Where("user_id = ? AND app_id = ?", user.ID, app.ID).Find(&userVars)
|
||||
for _, v := range userVars {
|
||||
userVariables[v.VarName] = v.VarValue
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user