98d8525fa9
refactor: 简化 trial 赠送配置，删除多余的白名单启用开关
...
Build docker and publish / build (20.15.1) (push) Successful in 7m42s
**简化方案**:
- 删除 `EnableTrialEmailWhitelist` 配置字段（多余）
- 保留 `TrialEmailDomainWhitelist`（逗号分隔的白名单域名）
- 赠送规则：白名单**非空** 且 **邮箱在列表** 才赠送
**新的赠送逻辑**:
```yaml
TrialEmailDomainWhitelist: "qq.com,163.com,gmail.com"
```
- 为空 → ❌ 不赠送（关闭）
- 非空 → ✅ 赠送给白名单域名的邮箱
**更新的地方**:
1. internal/config/config.go - 删除 EnableTrialEmailWhitelist 字段
2. userRegisterLogic.go - 简化赠送逻辑
3. emailLoginLogic.go - 简化赠送逻辑
4. bindEmailWithVerificationLogic.go - 简化赠送逻辑
5. oAuthLoginGetTokenLogic.go - 简化赠送逻辑
**配置升级说明**:
旧配置:
```yaml
EnableTrial: true
EnableTrialEmailWhitelist: true
TrialEmailDomainWhitelist: "qq.com,163.com"
```
新配置（只保留两项）:
```yaml
EnableTrial: true
TrialEmailDomainWhitelist: "qq.com,163.com"
```
关闭赠送:
```yaml
EnableTrial: true
TrialEmailDomainWhitelist: ""
```
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-04-03 07:20:10 -07:00
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
d586bbeabb
fix: OAuth registration missing email domain whitelist check for trial gifting
...
**Problem**: OAuth registration path (Google, Apple, Telegram) was missing the
email domain whitelist validation, causing trial subscriptions to be granted to
all users regardless of the whitelist configuration.
**Root Cause**: The previous commit (3417da2a) that implemented trial domain
whitelist only updated device/phone/email direct registration paths, but
missed the OAuth registration path in oAuthLoginGetTokenLogic.go.
**Solution**:
- Added email domain whitelist check to OAuth register() method
- Added isEmailDomainWhitelisted() helper function matching the pattern
used in other auth logic files
- Only activate trial if EnableTrial=true AND
(whitelist disabled OR email domain matches whitelist)
- Added email logging to trial subscription activation log
Affected flows:
- OAuth Google login with new user
- OAuth Apple login with new user
- OAuth Telegram login with new user
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-04-03 06:44:33 -07:00
3417da2a9e
feat: trial 赠送改为白名单邮箱域名控制
...
Build docker and publish / build (20.15.1) (push) Failing after 7m14s
- 新增 EnableTrialEmailWhitelist + TrialEmailDomainWhitelist 配置
- 邮箱注册/登录：加白名单域名判断，域名匹配才赠送 trial
- 设备登录/手机注册：移除 activeTrial，不再自动赠送
- 绑定邮箱(bindEmailWithVerification)：绑定成功后检查白名单+防重复赠送
- 新增 IsEmailDomainWhitelisted 导出函数供跨包调用
- 清理 deviceLoginLogic/telephoneUserRegisterLogic 中的 activeTrial 死代码
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-04-02 05:46:04 -07:00
2362b67634
fix: QueryUserInfo 设备列表改为家庭范围查询，修复 email 用户 user_devices 为空的问题
Build docker and publish / build (20.15.1) (push) Failing after 7m43s
2026-03-31 17:07:09 -07:00
e51dbea7c7
fix: getDiscount 新人取折扣最大档，非新人取折扣最小档
...
Build docker and publish / build (20.15.1) (push) Failing after 7m31s
- 新人：所有匹配 quantity 的条目中取 discount 值最小的（折扣力度最大）
- 非新人：所有匹配 quantity 的条目中取 discount 值最大的（折扣力度最小，接近原价）
- 不再按 new_user_only 过滤，由 isNewUserOnlyForQuantity 在上层控制准入
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 07:22:12 -07:00
c8f172dc0e
fix: getDiscount 新人取折扣最大档，非新人取最贵档
...
Build docker and publish / build (20.15.1) (push) Has been cancelled
- 新人：遍历所有匹配 quantity 的条目，取 discount 值最小的（折扣力度最大）
- 非新人：仅看 new_user_only=false 的条目，取 discount 值最大的（最接近原价）
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 07:18:04 -07:00
52aaaf4de5
fix: getDiscount 新人价取值错误 — 始终优先取 new_user_only=false 的实际折扣档
...
Build docker and publish / build (20.15.1) (push) Has been cancelled
同一 quantity 有两条记录时：
- new_user_only=true (discount=99.64) 是新人限制标记，非实际折扣
- new_user_only=false (discount=35.36) 是实际折扣价格
原逻辑遍历到第一条即返回，导致新人拿到 99.64 而非 35.36。
修复后优先取 new_user_only=false 的条目，仅在无 false 条目时才降级到 new_user_only=true。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 07:14:37 -07:00
40cfe46ba8
fix: CountScopedSubscribePurchaseOrders 包含续费单并排除赠送单
...
Build docker and publish / build (20.15.1) (push) Has been cancelled
- type IN (1, 2)：同时统计首购和续费历史，防止用户用续费绕过新人价限制
- amount > 0：排除 admin 赠送的免费订单（amount=0），避免误判新人资格
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 06:56:35 -07:00
5733ebe40d
fix: renewal logic 尝鲜价未生效 — 改为走 newUser 资格判断
...
Build docker and publish / build (20.15.1) (push) Successful in 7m17s
renewalLogic 在计算折扣时硬编码 isNewUser=false，
导致新用户在 24h 窗口内通过 renewal 接口购买时无法享受尝鲜价。
改为调用 resolveNewUserDiscountEligibility，与 purchaseLogic 保持一致。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 06:35:14 -07:00
3167465865
fix: 单订阅模式成员购买时用家庭主 ID 查锚点订阅
...
Build docker and publish / build (20.15.1) (push) Has been cancelled
ResolvePurchaseRoute 传入 entitlement.EffectiveUserID
（家庭主 ID）而非 u.Id（成员 ID），确保成员购买时
能找到家庭主已有订阅并续费，而不是新建一条订阅。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 06:08:28 -07:00
ea34718a0b
fix: 设备变更时同步清除用户缓存，修复 user_devices 为空问题
...
Build docker and publish / build (20.15.1) (push) Successful in 7m23s
Device.GetCacheKeys() 新增 cacheUserIdPrefix+UserId，
确保 InsertDevice/UpdateDevice/DeleteDevice 时同时失效
cache:user:id:{userId}，避免下次 FindOne 读到不含
UserDevices 的旧缓存。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 05:46:48 -07:00
abc9864d46
fix: 单订阅模式下避免重复创建订阅
...
Build docker and publish / build (20.15.1) (push) Successful in 7m31s
1. FindSingleModeAnchorSubscribe 补充 status=4（流量耗完）到查询范围，
避免流量耗尽的订阅被忽略导致续费时新建订阅
2. activateOrderLogic NewPurchase 路径去掉套餐ID匹配检查，
单订阅模式下无论购买何种套餐都更新现有订阅而非新建
3. singleModeHelper fallback 查询同步补充 status=4
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 05:13:00 -07:00
e3cd0643e1
fix: IAP续费双重叠加订阅天数
...
Build docker and publish / build (20.15.1) (push) Successful in 7m43s
早返回路径（existTx!=nil）中的 existSub/orderLinkedSub/singleModeAnchorSub
分支同时调用 extendSubscribeForIAP 更新 expire_time，又通过
syncOrderStatusAndEnqueue(iapExpireAt=0) 入队，导致激活队列再次叠加天数。
修复：移除早返回路径中的 extendSubscribeForIAP 直接写入，改为传入
exp.Unix() 给 syncOrderStatusAndEnqueue，由激活队列的
updateSubscriptionWithIAPExpire 统一处理，前端返回 calcIAPRenewalExpire
估算值，与事务路径行为一致。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-31 02:54:52 -07:00
202c1c18d7
fix: 修复同 quantity 存在新用户和普通折扣档时老用户无法下单的问题
...
Build docker and publish / build (20.15.1) (push) Successful in 7m34s
isNewUserOnlyForQuantity 原逻辑取第一条匹配记录即返回，
当同一 quantity 同时配置了 new_user_only=true 和 false 两档时，
结果依赖数组顺序，导致老用户/超24h用户触发 SubscribeNewUserOnly 错误。
修复：扫描所有同 quantity 档位，仅当存在 true 且无 false 兜底时才返回 true；
有 false 兜底则返回 false，老用户可正常购买并命中普通折扣档。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-30 22:30:12 -07:00
e0b2be2058
x
Build docker and publish / build (20.15.1) (push) Successful in 7m36s
2026-03-30 21:05:21 -07:00
2a9c01ff8b
x
Build docker and publish / build (20.15.1) (push) Successful in 7m28s
2026-03-30 04:49:55 -07:00
df7303738a
bug: 无订阅情况 出现下多笔订单 支付状态乱
Build docker and publish / build (20.15.1) (push) Successful in 7m18s
2026-03-30 00:32:41 -07:00
a9205cc3fc
feat: 用户订阅显示节点分组名及限速起止时间
...
Build docker and publish / build (20.15.1) (push) Successful in 7m28s
- UserSubscribe/UserSubscribeDetail 新增 node_group_id/node_group_name 字段
- 管理员查询用户订阅列表批量填充分组名
- 管理员查询单个订阅详情填充分组名
- ThrottleResult/UserSubscribeDetail 新增 throttle_start/throttle_end 字段
- 限速时返回限速窗口起止时间（秒级 Unix 时间戳）
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-29 10:07:17 -07:00
1dbc3a81e9
fix: 老版本客户端去掉每个套餐 discount 最后一个，而非整个套餐
2026-03-29 03:19:15 -07:00
3b4e882965
feat: 根据 X-App-Id 判断是否裁剪套餐列表，老版客户端去掉最后一个
Build docker and publish / build (20.15.1) (push) Successful in 7m37s
2026-03-28 23:21:00 -07:00
26c9ff2f0f
x
Build docker and publish / build (20.15.1) (push) Successful in 8m31s
2026-03-28 22:57:19 -07:00
aaacb47dad
x
Build docker and publish / build (20.15.1) (push) Failing after 7m51s
2026-03-28 22:44:22 -07:00
0f28f4995f
fix: 修复在线设备列表无数据问题
...
user_device 表的 subscribe_id 字段从未在插入时写入（始终为 NULL），
导致 QueryDevicePageList 的 WHERE 条件 `subscribe_id = ?` 永远匹配不到记录。
移除 subscribe_id 过滤，改为只按 user_id 查询。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-28 18:23:18 -07:00
8398865bd3
fix: SingleModel 下首购 isNew 判断错误导致佣金不发
...
SingleModel 模式下，用户首次购买会被路由成 orderType=2（续费），
导致 isNew 判断逻辑跳过，始终为 false，激活时 shouldProcessCommission
误判为非首购，佣金不发给邀请人。
修复：去除 isNew 查询对 orderType==1 的依赖，始终通过
IsUserEligibleForNewOrder 判断用户是否有历史完成订单。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-28 11:28:02 -07:00
6f6943f295
api-header
Build docker and publish / build (20.15.1) (push) Successful in 8m23s
2026-03-28 10:05:32 -07:00
507ee16a30
x
Build docker and publish / build (20.15.1) (push) Successful in 8m20s
2026-03-28 09:06:24 -07:00
2db2bc0860
feat: 限速状态可视化 - 后台订阅详情展示实际限速与降速状态
...
Build docker and publish / build (20.15.1) (push) Successful in 8m7s
- 新增 pkg/speedlimit/calculator.go 公共限速计算函数
- UserSubscribeDetail 响应新增 effective_speed/is_throttled/throttle_rule 字段
- GetUserSubscribeById 接口查询时实时计算并返回限速状态
- 重构 getServerUserListLogic 的 calculateEffectiveSpeedLimit，改用共享函数
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-28 08:14:07 -07:00
2bdda7558c
fix: JSON_CONTAINS node_group_ids 参数需用引号包裹
...
Build docker and publish / build (20.15.1) (push) Successful in 8m25s
JSON_CONTAINS 第二参数必须是 JSON 字符串，裸数字会报 Error 3146。
修复：%d → '%d'
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-27 07:22:39 -07:00
89e0c03fec
fix: 统一限速单位为 Mbps，与 ppanel-node 节点端对齐
...
Build docker and publish / build (20.15.1) (push) Successful in 8m1s
ppanel-node limiter.go 将 speed_limit 视为 Mbps（× 1000000 / 8 → Bytes/s），
但后端之前存储的是 Bytes（前端 mbToBits 转换），导致节点收到天文数字等于不限速。
- 回滚 traffic_limit KB→Bytes 转换，统一用 Mbps 直接比较
- 部署后需执行数据迁移：UPDATE subscribe SET speed_limit = speed_limit / 1048576 WHERE speed_limit > 0
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-27 02:46:25 -07:00
315c59e5b7
fix: traffic_limit 限速值 KB→Bytes 转换，修复与基础限速单位不一致
...
Build docker and publish / build (20.15.1) (push) Successful in 7m56s
traffic_limit 的 speed_limit 前端输入单位是 KB，
订阅基础 speed_limit 存储单位是 Bytes，
比较和返回前需要 ×1024 转换为 Bytes，否则限速值异常偏低。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-27 02:30:06 -07:00
cee97ae630
fix: /v1/common/log/report 跳过签名验证
...
Build docker and publish / build (20.15.1) (push) Successful in 8m7s
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-27 00:05:43 -07:00
e5c8e965af
fix: 设备组详情补充 auth_type/device_type 字段，统一用户名显示
...
Build docker and publish / build (20.15.1) (push) Successful in 8m15s
- FamilyMemberItem 新增 auth_type、device_type 字段
- FamilySummary 新增 owner_auth_type 字段
- findUserIdentifiers 返回 identifierInfo（含 auth_type）
- 新增 parseDeviceType() 从 UserAgent 解析设备类型
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-26 21:30:51 -07:00
4a2501a3d1
fix: 折扣匹配改为精确匹配 quantity，不再取全局最小值
...
Build docker and publish / build (20.15.1) (push) Successful in 7m55s
将 getDiscount 和 isNewUserOnlyForQuantity 的匹配逻辑从
inputMonths >= discount.Quantity 改为 inputMonths == discount.Quantity，
买多少天就用多少天对应的折扣，避免错误配置导致折扣泄漏。
同时增加 discount 值合法性校验（>0 且 <100）。
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-26 01:28:50 -07:00
774fce6147
fix: 预览节点只显示用户实际所在分组的节点，不再包含公共节点
Build docker and publish / build (20.15.1) (push) Successful in 7m48s
2026-03-25 23:15:48 -07:00
d63b943964
fix: 修复订阅更新 group_locked 不能为 null 问题 + Kutt 短链3次重试
...
Build docker and publish / build (20.15.1) (push) Successful in 7m46s
- updateUserSubscribeLogic: 更新订阅时补充 GroupLocked 字段，避免写入 NULL 触发数据库约束错误
- inviteLinkResolver: generateShortLinkWithTimeout 增加最多3次重试，防止网络波动导致短链生成失败
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-25 22:36:34 -07:00
b43dcd8dab
merge: 同步 origin/master 新功能到定制版本
Build docker and publish / build (20.15.1) (push) Successful in 8m8s
2026-03-24 01:03:56 -07:00
95830eae8a
fix: 流量分组查询条件改为仅判断 max_traffic_gb > 0
2026-03-24 01:03:29 -07:00
f111b36389
fix: JSON_CONTAINS 参数类型修复 + API sync
...
- 修复 JSON_CONTAINS(node_group_ids, int64) 类型错误，改为传 JSON 字符串
- 添加 node_group_ids IS NOT NULL 兼容判断，防止 NULL 列报错
- 同步 apis/ 及 routes.go、compat_types.go 改动
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-23 06:58:28 -07:00
EUForest
7fe7243c24
feat: Add slider verification code
2026-03-23 02:42:12 +08:00
f703b5089a
分组概念
Build docker and publish / build (20.15.1) (push) Successful in 7m58s
2026-03-19 03:21:47 -07:00
e5e9f93f68
Merge remote-tracking branch 'origin/master' into internal
2026-03-19 01:55:01 -07:00
de6fbcb518
device_no
Build docker and publish / build (20.15.1) (push) Successful in 7m22s
2026-03-18 10:28:55 -07:00
1e12c58986
tg
Build docker and publish / build (20.15.1) (push) Successful in 7m22s
2026-03-18 03:52:26 -07:00
fdfadca57f
赠送逻辑
Build docker and publish / build (20.15.1) (push) Successful in 6m57s
2026-03-18 02:04:34 -07:00
50f6995d60
redis
Build docker and publish / build (20.15.1) (push) Successful in 7m33s
2026-03-18 00:53:35 -07:00
282e1e4087
deviceno
Build docker and publish / build (20.15.1) (push) Successful in 7m26s
2026-03-17 09:12:56 -07:00
dcdbabdb13
注销
Build docker and publish / build (20.15.1) (push) Successful in 7m34s
2026-03-17 07:12:42 -07:00
3cd22d8538
x
Build docker and publish / build (20.15.1) (push) Successful in 8m3s
2026-03-16 00:59:49 -07:00
1d2f2a594a
feat: 增强用户搜索功能，支持通过设备ID哈希进行查找。
Build docker and publish / build (20.15.1) (push) Successful in 8m42s
2026-03-15 22:02:23 -07:00
