HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity
744 Commits 29 Branches 0 Tags
c39bfd39ddcb2434baaff02a82f9d19b1439739f
Commit Graph

168 Commits

Author SHA1 Message Date
shanshanzhong147 c39bfd39dd 修复(#21): 禁止通用订单状态写入claimed (#20) 
* 修复(#21): 禁止通用订单状态写入claimed

Co-authored-by: multica-agent <github@multica.ai>

* 文档(#21): 补充PR说明

Co-authored-by: multica-agent <github@multica.ai>

---------

Co-authored-by: multica-agent <github@multica.ai>
 2026-06-11 02:47:48 -07:00
shanshanzhong147 de388ac1ef fix: expose user subscription speed override
测试环境部署 / 构建镜像并部署到测试环境 (push) Has been cancelled
Details
持续集成 / 构建/Vet/测试 (pull_request) Has been cancelled
Details
持续集成 / golangci-lint (pull_request) Has been cancelled
Details
2026-06-11 02:39:16 -07:00
shanshanzhong147 6157b2c571 修复(#23): 修复用户订阅列表未回显用户级限速 
* 修复(#23): 修复用户订阅列表未回显用户级限速

Co-authored-by: multica-agent <github@multica.ai>

* 修复(#23): 移除 PR 草稿文件

Co-authored-by: multica-agent <github@multica.ai>

---------

Co-authored-by: multica-agent <github@multica.ai>
 2026-06-11 01:50:47 -07:00
shanshanzhong147 9b5ff89ee8 修复(#17): 修复订阅流量限制更新未生效 
Closes HIF-17
 2026-06-09 22:56:40 -07:00
shanshanzhong147 e74958e17f 修复(#16): 修复订单退款状态与后台恢复冲突 (#16) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-09 11:31:31 -07:00
shanshanzhong147 21811f4d63 修复(#13): 邀请列表返回设备标识和设备号 (#15) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-08 22:24:51 -07:00
shanshanzhong147 b98d718f3c 修复(#11): 修复家庭组订单退款订阅归属 (#13) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-07 08:23:19 -07:00
shanshanzhong147 bcb8cd222c 修复(#10): 禁止通用订单状态接口标记退款 (#12) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-05 23:35:42 -07:00
shanshanzhong147 34cd1c524e 修复(#8): 分组管理核心缺陷与测试覆盖 (#11) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-04 03:13:38 -07:00
shanshanzhong147 c540091ef9 修复(#143): 邀请权益查询排序，消除 map 迭代序 flake 
Closes HIF-143. 让 `inviteeAndInviterIds` 在 append 后 `slices.Sort` 升序，让 sqlmock IN 参数匹配稳定，同时让生产 SQL EXPLAIN 计划稳定。修复 GitHub Actions Deploy Staging 自 2026-06-03 03:51 起连续 8 次 `go test ./...` 失败问题。

测试: go test -count=10 修复前 4/10 fail, 修复后 30/30 pass.
改动: 2 files, +4/-2 (internal/logic/admin/invite/{benefits.go,benefits_test.go})
 2026-06-02 22:04:16 -07:00
shanshanzhong147 5b9f384f81 修复(#132): 退款幂等校验 + 已退款订单防重新激活
Build docker and publish / build (20.15.1) (push) Failing after 21m4s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 21m47s
Details 
P01：refundOrderLogic.RefundOrder 在事务内 FOR UPDATE 后、lockCommissionSource 前新增
333 退款日志扫描，命中即返回 OrderAlreadyRefunded(61006)，不再写日志/扣 commission/
改 order.status。

P02：堵住已退款订单状态被回退入口
- queue/logic/order/stuckOrderRecoveryLogic.go：批扫 status=6 时新增 333 日志守卫，
  已退款订单不再被重置为 5 + 重新入队 activate（HIF-131 trace 中订单 53647 被刷回 5
  的真凶）
- queue/logic/order/activateOrderLogic.go：releaseClaim 同步加守卫做防御性兜底

新增 internal/model/log/refund.go 共享 helper HasRefundCommissionLog：
type=33 + content LIKE 走索引粗筛，再 JSON 反序列化确认 content.type==333 AND
content.order_no==orderNo，防 LIKE 子串误判。

测试：单元测试覆盖正常退款 / 已有 333 日志拒绝 / 子串误判防御 / 脏 JSON 容错；
sqlmock 严格断言命中后事务序列只含 BEGIN/SELECT order FOR UPDATE/SELECT
system_logs/ROLLBACK，无任何 commission 写入。

不做：calculateCommission、status 枚举拆分、表结构变更、支付通道 notify、用户余额回补。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-31 20:19:35 -07:00
shanshanzhong147 1e99cfb83c 修复(#128): 兼容促销规则毫秒时间戳
Build docker and publish / build (20.15.1) (push) Failing after 19m21s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 19m48s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-30 04:16:21 -07:00
shanshanzhong147 e5d6539d79 修复(#126): 修复家庭组邀请记录漏查验收分支
Build docker and publish / build (20.15.1) (push) Failing after 20m3s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 21m10s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-29 20:35:37 -07:00
shanshanzhong147 e17dc4a273 修复: GET /v1/admin/promo/price/list 字段不匹配导致 400
Build docker and publish / build (20.15.1) (push) Failing after 21m12s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 22m17s
Details 
前端发 rule_id/subscribe_id (均可选), 后端 API 定义为 promo_rule_id
(required), 直接返回 "PromoRuleId is a required field"。

对齐前端约定 (与 usage/list 命名一致):
- API: promo_rule_id(required) → rule_id + subscribe_id, 均可选
- model.QueryPriceList: 改为接 PriceFilter, 按条件过滤
- 同步 fake mock 与校验测试签名
 2026-05-29 01:04:37 -07:00
shanshanzhong147 b162022d39 修复: 邀请列表 UNIX_TIMESTAMP 在 DATETIME(N) 上返回小数导致 Scan int64 失败
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m37s
Details
Build docker and publish / build (20.15.1) (push) Failing after 20m37s
Details 
MySQL DATETIME 带小数秒精度时, UNIX_TIMESTAMP() 返回 "1779966403.631"
形式的 DECIMAL, Go 端 int64 字段无法 Scan, 触发 100 条 Scan error,
前端拿到的 invited_at/created_at 全为 0。

改用 CAST(UNIX_TIMESTAMP(...) AS SIGNED) 在 SQL 层截断转 BIGINT,
与 getInviteRecordsLogic / getInviteSalesLogic 的现有约定一致。
 2026-05-28 23:15:13 -07:00
shanshanzhong147 1022160ff8 新功能(#89): 增强邀请列表接口 + 新增全局邀请管理接口
Build docker and publish / build (20.15.1) (push) Failing after 9m30s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m48s
Details 
P01: GET /v1/admin/user/invite/list 增加 search/enable/user_id_search
筛选参数，响应新增 order_count/has_purchased/inviter_commission/
inviter_gift_days/invitee_gift_days 权益字段。

P02: 新增 GET /v1/admin/invite/list 全局邀请管理接口，支持按
邀请人/被邀请人筛选和搜索，返回邀请关系及权益聚合数据。

共用 QueryBenefits 批量查询防 N+1，分页上限 100。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 10:32:28 -07:00
shanshanzhong147 82eff47f38 新功能(#69): 用户级限速覆盖 — 数据层 + 核心逻辑 + 管理接口
Build docker and publish / build (20.15.1) (push) Failing after 8m52s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m51s
Details 
- 新增 migration 02153: user_subscribe 表添加 speed_limit、traffic_limit 列（幂等）
- model 层 Subscribe/SubscribeDetails 新增用户级限速字段（*string 类型支持 nil 回退）
- server 用户列表和管理员详情接口支持用户级限速覆盖优先级计算
- 更新管理员订阅更新接口支持写入/清除用户级限速

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 08:07:16 -07:00
shanshanzhong147 d351b50066 修复(#71): 管理员订阅限速接口拒绝负数限速和非法 traffic_limit
Build docker and publish / build (20.15.1) (push) Failing after 8m50s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m56s
Details 
- SpeedLimit 加 validate:"gte=0" 校验
- TrafficLimit 加 JSON 格式校验
- 新增单测覆盖负数限速和非法 JSON 场景

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 07:13:05 -07:00
shanshanzhong147 4366a9be8b 修复(#79): 促销管理后台API + 审查问题修复
Build docker and publish / build (20.15.1) (push) Failing after 9m10s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m18s
Details 
- 实现促销管理接口：规则CRUD、优惠价配置、使用记录查询
- 修复 UpsertPrices 新增记录时提前 return 的问题
- DeleteRule/DeletePrice 不存在记录返回 code=404
- SetPromoPriceRequest.items 空数组校验
- 分页参数限制 page>0、1<=size<=200
- 下单侧促销价格按数量档总价口径计算（含 #87 修复）

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 06:32:42 -07:00
shanshanzhong147 92e303aaa7 修复(#80): 修复wrapf非常量格式串vet阻断
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m39s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 22:18:26 -07:00
shanshanzhong147 f9fa4756e9 新功能(#41): 提现优化 — 收款方式选择 + 取消提现 + 收款码上传
Build docker and publish / build (20.15.1) (push) Failing after 8m37s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 08:36:25 -07:00
shanshanzhong147 27f1203282 修复(#49): 修复清空备注时数据丢失 — RefererId 改为指针类型 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 08:35:45 -07:00
shanshanzhong147 b798f520c8 fix: add zero-value guard for RefererId to prevent clearing inviter on remark update
Build docker and publish / build (20.15.1) (push) Failing after 8m39s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 20:04:22 -07:00
shanshanzhong147 bae234fe15 Merge remote-tracking branch 'remotes/origin/agent/agent/bfdd0bdd' into merge-to-internal
Build docker and publish / build (20.15.1) (push) Failing after 8m14s
Details
2026-05-25 18:17:24 -07:00
shanshanzhong147 79ab4460bc feat: add GET /v1/admin/log/message/detail endpoint 
Adds a temporary admin endpoint to query log_message by ID,
returning the full record including context (JSON) and digest
fields that the existing /error_message/detail endpoint omits.

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 12:18:27 -07:00
shanshanzhong147 eba256bdc9 merge: sync internal with main
Build docker and publish / build (20.15.1) (push) Failing after 8m22s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 10:32:06 -07:00
shanshanzhong147 80751eb8ef fix: move withdrawal commission deduction from application to approval
Build docker and publish / build (20.15.1) (push) Failing after 8m28s
Details 
- commissionWithdrawLogic: remove upfront commission deduction;
  balance check now includes sum of all pending withdrawals to prevent
  double-spending; transaction only creates the withdrawal record (status=0)
- approveWithdrawal: add FOR UPDATE lock on user row, balance check before
  deducting, atomic commission decrement and commission log inside one
  transaction; clear user cache after commit
- rejectWithdrawal: remove commission refund and log — commission was never
  deducted on application under the new flow
- add migration 02150: refund commission for existing status=0 withdrawals
  that were deducted under the old logic; includes rollback script

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-24 20:26:42 -07:00
shanshanzhong147 3bbce5ce84 fix: 修复退款与仪表盘订单统计口径
Build docker and publish / build (20.15.1) (push) Failing after 8m16s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-24 17:50:29 -07:00
shanshanzhong147 1726a584fa feat: add admin order refund flow 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-24 17:50:23 -07:00
shanshanzhong147 fd522b6c71 path
Build docker and publish / build (20.15.1) (push) Successful in 8m56s
Details
2026-05-19 19:35:44 -07:00
shanshanzhong147 7d2f98b7c9 fix: 修复管理员更新用户信息时意外覆盖字段的问题
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details 
- Enable/IsAdmin/OnlyFirstPurchase 改为 *bool，未传时不更新
- Avatar/Remark/ReferCode/ReferralPercentage 加空值保护
- getDeviceList: 恢复 hifastday@hifast.com 家庭成员受限逻辑

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-07 02:21:35 -07:00
shanshanzhong147 595e4c62f9 x
Build docker and publish / build (20.15.1) (push) Successful in 5m25s
Details
2026-05-03 18:34:14 -07:00
shanshanzhong147 62cf68b49b x
Build docker and publish / build (20.15.1) (push) Successful in 6m35s
Details
2026-04-04 11:46:06 -07:00
shanshanzhong147 df7303738a bug: 无订阅情况 出现下多笔订单 支付状态乱
Build docker and publish / build (20.15.1) (push) Successful in 7m18s
Details
2026-03-30 00:32:41 -07:00
shanshanzhong147 a9205cc3fc feat: 用户订阅显示节点分组名及限速起止时间
Build docker and publish / build (20.15.1) (push) Successful in 7m28s
Details 
- 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
shanshanzhong147 2db2bc0860 feat: 限速状态可视化 - 后台订阅详情展示实际限速与降速状态
Build docker and publish / build (20.15.1) (push) Successful in 8m7s
Details 
- 新增 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
shanshanzhong147 e5c8e965af fix: 设备组详情补充 auth_type/device_type 字段，统一用户名显示
Build docker and publish / build (20.15.1) (push) Successful in 8m15s
Details 
- 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
shanshanzhong147 774fce6147 fix: 预览节点只显示用户实际所在分组的节点，不再包含公共节点
Build docker and publish / build (20.15.1) (push) Successful in 7m48s
Details
2026-03-25 23:15:48 -07:00
shanshanzhong147 d63b943964 fix: 修复订阅更新 group_locked 不能为 null 问题 + Kutt 短链3次重试
Build docker and publish / build (20.15.1) (push) Successful in 7m46s
Details 
- updateUserSubscribeLogic: 更新订阅时补充 GroupLocked 字段，避免写入 NULL 触发数据库约束错误
- inviteLinkResolver: generateShortLinkWithTimeout 增加最多3次重试，防止网络波动导致短链生成失败

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-25 22:36:34 -07:00
shanshanzhong147 95830eae8a fix: 流量分组查询条件改为仅判断 max_traffic_gb > 0 2026-03-24 01:03:29 -07:00
shanshanzhong147 e5e9f93f68 Merge remote-tracking branch 'origin/master' into internal 2026-03-19 01:55:01 -07:00
shanshanzhong147 282e1e4087 deviceno
Build docker and publish / build (20.15.1) (push) Successful in 7m26s
Details
2026-03-17 09:12:56 -07:00
shanshanzhong147 dcdbabdb13 注销
Build docker and publish / build (20.15.1) (push) Successful in 7m34s
Details
2026-03-17 07:12:42 -07:00
shanshanzhong147 3cd22d8538 x
Build docker and publish / build (20.15.1) (push) Successful in 8m3s
Details
2026-03-16 00:59:49 -07:00
shanshanzhong147 3d732c0361 feat: 为用户设备添加 DeviceNo 字段并实现 ID 混淆，同时在迁移脚本中新增 ID 重建逻辑。
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
2026-03-15 19:38:37 -07:00
shanshanzhong147 ad578883e4 feat: 添加付费用户数据迁移脚本、报告及相关管理逻辑调整。
Build docker and publish / build (20.15.1) (push) Successful in 7m49s
Details
2026-03-14 22:37:03 -07:00
EUForest 06a2425474 feat(subscribe): add traffic limit rules and user traffic stats 
- Add subscribe traffic_limit schema and migration\n- Support traffic_limit in admin create/update and list/details\n- Apply traffic_limit when building server user list speed limits\n- Add public user traffic stats API
 2026-03-14 12:41:52 +08:00
shanshanzhong147 e4ec85c176 fix: clearAllSessions 改用 SCAN 查找 session，修复会话清理无效
Build docker and publish / build (20.15.1) (push) Successful in 7m37s
Details 
根因：登录时只写了 auth:session_id:{sessionId} (Redis SET)，
从未写入 auth:user_sessions:{userId} sorted set，
导致 clearAllSessions 用 ZRange 永远返回空，session 根本没被清除。

修复：改用 SCAN auth:session_id:* 遍历所有 session key，
按 value 匹配 userId 找出该用户的全部 session 后删除，
同时清理关联的 device cache key。

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-12 02:47:32 -07:00
shanshanzhong147 384c8df506 fix: 踢出用户时清除所有 session，确保旧 token 立即失效
Build docker and publish / build (20.15.1) (push) Successful in 7m43s
Details 
- kickOfflineByUserDeviceLogic: 管理员踢设备后新增 clearAllSessions，
  之前只清单个 WebSocket session，用户可用旧 token 继续访问
- unbindDeviceLogic: 家庭成员被踢时增加踢设备+清 session；
  补全 session detail key 清理

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-12 02:19:35 -07:00
EUForest 17163486f6 fix(subscribe): fix user subscription node retrieval logic to support directly assigned nodes 2026-03-10 18:29:19 +08:00