HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
hi-server/internal/logic/public/user
History
shanshanzhong 19777df2ed fix: bindEmailWithVerificationLogic 邮箱绑定后赠送逻辑错误 
**问题**: 邮箱绑定后应该赠送 trial 的逻辑判断错误，导致以下场景无法赠送：
- EnableTrial=true, EnableTrialEmailWhitelist=false → 应该赠送但未赠送

**根本原因**: 第215行条件判断使用 OR 逻辑，要求白名单必须启用才处理
```go
if !rc.EnableTrial || !rc.EnableTrialEmailWhitelist {
    return  // ❌ 错误：关闭白名单时也返回，无法赠送
}
```

**修复**: 改为正确的逻辑
```go
if !rc.EnableTrial {
    return  // 关闭赠送时不处理
}
if rc.EnableTrialEmailWhitelist && !IsEmailDomainWhitelisted(...) {
    return  // 白名单启用但域名不匹配时不赠送
}
// 否则赠送
```

**影响场景**:
- 设备登录 → 绑定邮箱 → 应该赠送 trial
  - 当 EnableTrialEmailWhitelist=false 时，应该赠送（修复前未赠送）
  - 当 EnableTrialEmailWhitelist=true 且域名在白名单 → 赠送（修复前未赠送）

Co-Authored-By: claude-flow <ruv@ruv.net>
2026-04-03 07:17:27 -07:00
..
ws
家庭组 权益修改
2026-03-04 22:02:42 -08:00
accountMergeHelper.go
feat: 绑定新邮箱时创建独立邮箱用户并转移订阅，而非挂在设备用户上
2026-03-12 00:52:50 -07:00
bindEmailWithVerificationLogic.go
fix: bindEmailWithVerificationLogic 邮箱绑定后赠送逻辑错误
2026-04-03 07:17:27 -07:00
bindInviteCodeLogic.go
同步历史版本代码
2026-03-03 09:32:22 -08:00
bindOAuthCallbackLogic.go
feat(auth): improve email and mobile config unmarshalling with default values
2025-07-24 03:06:44 +09:00
bindOAuthLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
bindTelegramLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
calculateRemainingAmount.go
fix(purchase): correct gift amount deduction logic and enhance payment processing comments
2025-07-07 14:26:53 -04:00
commissionWithdrawLogic.go
Merge branch perfect-panel/master/server into develop
2025-12-11 23:53:32 +08:00
deleteAccountLogic.go
fix: 任何人注销账号都解散整个家庭组，删除所有成员的登录方式和订阅
2026-03-12 06:23:11 -07:00
deleteCurrentUserAccountLogic.go
update: device delete current user
2025-11-13 14:49:25 +08:00
deviceOnlineStatisticsLogic.go
Add: Add a WebSocket connection to monitor the app's online status.
2025-11-06 15:35:49 +08:00
familyBindingHelper.go
feat: 绑定新邮箱时创建独立邮箱用户并转移订阅，而非挂在设备用户上
2026-03-12 00:52:50 -07:00
familyExitHelper.go
同步历史版本代码
2026-03-03 09:32:22 -08:00
familyScopeHelper.go
同步历史版本代码
2026-03-03 09:32:22 -08:00
getAgentDownloadsLogic.go
修改签名头
2026-03-05 23:31:45 -08:00
getAgentRealtimeLogic.go
同步历史版本代码
2026-03-03 09:32:22 -08:00
getDeviceListLogic.go
deviceno
2026-03-17 09:12:56 -07:00
getInviteSalesLogic.go
修复：goctl api 生成的代码没有在路由中加入Ipa模式
2026-03-06 00:15:35 -08:00
getLoginLogLogic.go
feat(api): standardize timestamp field across log structures
2025-08-26 14:39:54 -04:00
getOAuthMethodsLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
getSubscribeLogLogic.go
feat(api): standardize timestamp field across log structures
2025-08-26 14:39:54 -04:00
getSubscribeStatusLogic.go
家庭组 权益修改
2026-03-04 22:02:42 -08:00
getUserInviteStatsLogic.go
修复：goctl api 生成的代码没有在路由中加入Ipa模式
2026-03-06 00:15:35 -08:00
getUserTrafficStatsLogic.go
feat(subscribe): add traffic limit rules and user traffic stats
2026-03-14 12:41:52 +08:00
preUnsubscribeLogic.go
家庭组 权益修改
2026-03-04 22:02:42 -08:00
queryUserAffiliateListLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
queryUserAffiliateLogic.go
refactor(log): consolidate logging models and update related logic for improved clarity and functionality
2025-08-20 13:36:06 -04:00
queryUserBalanceLogLogic.go
fix(balance): update QueryUserBalanceLog response structure to include balance log list
2025-09-07 11:59:34 -04:00
queryUserCommissionLogLogic.go
feat(api): standardize timestamp field across log structures
2025-08-26 14:39:54 -04:00
queryUserInfoLogic.go
fix: QueryUserInfo 设备列表改为家庭范围查询，修复 email 用户 user_devices 为空的问题
2026-03-31 17:07:09 -07:00
queryUserSubscribeLogic.go
Merge remote-tracking branch 'origin/master' into internal
2026-03-19 01:55:01 -07:00
queryWithdrawalLogLogic.go
Merge branch perfect-panel/master/server into develop
2025-12-11 23:53:32 +08:00
resetUserSubscribeTokenLogic.go
家庭组 权益修改
2026-03-04 22:02:42 -08:00
unbindDeviceLogic.go
fix: 踢其他设备时不再清除踢人者自己的 session
2026-03-12 03:05:34 -07:00
unbindOAuthLogic.go
Develop (#64)
2025-08-15 12:30:21 -04:00
unbindTelegramLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
unsubscribeLogic.go
修复缓存
2026-03-06 21:58:29 -08:00
updateBindEmailLogic.go
同步历史版本代码
2026-03-03 09:32:22 -08:00
updateBindMobileLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
updateUserNotifyLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
updateUserPasswordLogic.go
refactor: update import paths from ppanel-server to server
2025-04-25 15:09:31 +09:00
updateUserRulesLogic.go
Merge branch perfect-panel/master/server into develop
2025-12-11 23:53:32 +08:00
updateUserSubscribeNoteLogic.go
家庭组 权益修改
2026-03-04 22:02:42 -08:00
verifyEmailLogic.go
fix gitea workflow path and runner label
2026-03-04 03:07:41 -08:00