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

137 Commits

Author SHA1 Message Date
shanshanzhong147 3d1a31a19f 修复: 用户维度限速在过期节点组分支生效 + 统一 speed_limit 单位为 Mbps 
- getServerUserListLogic.getExpiredUsers 之前完全忽略 user_subscribe.speed_limit，
  现在带出用户级覆盖并与过期节点组 speed_limit 取更严（mergeSpeedLimit：0 视为无限制）
- node_group.SpeedLimit 注释从 "KB/s" 修正为 "Mbps"（旧注释是笔误，实际下发节点的
  ServerUser.SpeedLimit 字段语义就是 Mbps，节点端 ppanel-node 按 *1e6/8 换算为 Byte/s）
- apis/node/node.api 给 ServerUser.SpeedLimit 加 Mbps 单位注释
- 新增 TestMergeSpeedLimit 表驱动测试覆盖 8 种边界

主链路（活跃用户、套餐 traffic_limit 阶梯）行为不变，已在生产 (server_id=52)
验证 147 个限速用户下发正确，与 DB 完全对应。
 2026-06-12 22:39:15 -07:00
shanshanzhong147 be09a115ec 新功能: withdrawal_log 接口加 summary 字段 + admin 禁直接扣减 commission 
接口侧:
- /v1/public/user/withdrawal_log 响应新增 summary 字段, 包含:
  - commission_balance (当前余额)
  - locked_by_pending (待审批占用)
  - available_to_withdraw (可提现)
  - total_historical_amount (已通过提现总额)
  - total_refunded_amount (退款回扣总额)
  - total_income_amount (收入总额)
- 前端可据此自洽展示账目对账, 用户能在一个接口里看清整笔账

代码守护:
- updateUserBasicInfoLogic 拒绝任何 change<0 的 commission 修改
- 扣减必须走 approveWithdrawal 写 type=334 日志
- 防止未来 admin 误操作再次造成 user.commission 与 system_logs 失衡

时间戳修复:
- queryWithdrawalLogLogic 和 queryCommissionReturnLogLogic 的时间戳
  从 UnixMilli 改回 Unix (秒级), 符合项目"后端统一秒级"约定

测试:
- 补 buildSummary 的 4 个 mock 查询期望
- 加 summary 字段值正确性断言
 2026-06-12 19:49:03 -07:00
shanshanzhong147 f11097ab83 新功能(#26): 拆分退款日志查询接口 
拆分用户中心退款日志查询：

- 新增 GET /v1/public/user/commission_return_log（333/337/338）
- 旧 GET /v1/public/user/withdrawal_log?biz_type=commission_refund 复用新逻辑做兼容
- 默认 withdrawal_log 行为不变（仍查 withdrawals 表）
- 单测覆盖 333/337/338 happy path、坏 JSON 跳过、object_id 隔离、handler 级 HTTP 响应

父 issue: HIF-25
子 issue: HIF-26
 2026-06-11 22:02:22 -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 f5ad26b943 新功能(#18): 用户提现记录支持区分提现和退佣 (#18) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-10 00:19:12 -07:00
shanshanzhong147 9b5ff89ee8 修复(#17): 修复订阅流量限制更新未生效 
Closes HIF-17
 2026-06-09 22:56:40 -07:00
shanshanzhong147 21811f4d63 修复(#13): 邀请列表返回设备标识和设备号 (#15) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-08 22:24:51 -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 3e265bd837 新功能: 还原 v1/public/user/invite_sales 接口 + promo schema 修复迁移
Build docker and publish / build (20.15.1) (push) Failing after 13m47s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 15m7s
Details 
- 还原 /v1/public/user/invite_sales 接口及 /invite/sales 别名（与 invite_records 并存）
  逻辑/handler/types 与 197fed7d 删除前版本完全一致，按 fefbd4f5 新 routes 结构注册
- 新增迁移 02155_promo_schema_fix: 幂等修复 subscribe_promo / order 列类型与索引偏差
- 同步 etc/ppanel.yaml 数据库连接配置
- 补齐相关需求与设计文档
 2026-05-28 20:46:37 -07:00
shanshanzhong147 fefbd4f56a 修复(#104): 修复 goctl 重新生成代码漂移
Build docker and publish / build (20.15.1) (push) Failing after 58s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 52s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 23:54:26 -07:00
shanshanzhong147 197fed7d12 新功能(#102): 新增邀请记录接口并删除旧邀请销售接口
Build docker and publish / build (20.15.1) (push) Failing after 10m56s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m50s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 22:50: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 d12c340743 新功能(#77): 套餐列表 API 返回规格级促销信息
Build docker and publish / build (20.15.1) (push) Failing after 8m23s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m54s
Details 
将 promo 字段从 Subscribe 顶层移至 SubscribeDiscount（discount[] 项内），
促销查询按 subscribe_id + quantity 维度写入，每个规格独立命中最高优先级规则。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 02:19:58 -07:00
shanshanzhong147 b9192db042 feat: 文件上传接口直接返回完整 URL + 提现 content 改为非必填
Build docker and publish / build (20.15.1) (push) Failing after 8m29s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m3s
Details 
- FileUploadResponse / FileUploadCompleteResponse 精简为只返回 url
- S3Store.BuildObjectURL 拼接完整访问地址
- 提现 method=0 时 content 不再参与必填校验
- 新增用户端 API 接口文档
 2026-05-27 00:57:21 -07:00
shanshanzhong147 48e507783e 新功能(#77): 套餐列表返回促销信息
Build docker and publish / build (20.15.1) (push) Failing after 8m34s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m4s
Details 
- 新增 SubscribePromo 响应结构，套餐列表每项追加 promo 字段
- 新增 promo.go 促销候选规则查询与资格评估逻辑
- 重构 authMiddleware 提取 authenticateRequest，新增 OptionalAuthMiddleware
- /v1/public/subscribe/list 改为可选鉴权，未登录仅展示 campaign 类型促销
- /node/list、/group/list 保持强制鉴权不变
- 每个规格只返回最高优先级命中的规则，promo_price 为单价，expires_at 为秒级时间戳
- 新增单测覆盖 campaign/new_user 命中、活动窗口判定等场景

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 22:40:58 -07:00
shanshanzhong147 54328b197d 新功能(#78): 预算订单 API 返回 promo_discount 字段
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 7m54s
Details 
PreOrderResponse 新增 promo_discount 字段，未接入促销时默认返回 0。
促销命中逻辑待 HIF-76 接入后生效。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 22:13:40 -07:00
shanshanzhong147 5ebfe0a981 新功能(#65): 添加用户订阅限速数据层字段
Build docker and publish / build (20.15.1) (push) Failing after 8m30s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m58s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 11:23:57 -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 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 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 a1184ef5ed feat: add userinfo bind-email trial use status
Build docker and publish / build (20.15.1) (push) Successful in 9m2s
Details
2026-05-18 03:02:35 -07:00
shanshanzhong147 f2033fd4b9 feat: add rustfs direct upload endpoint
Build docker and publish / build (20.15.1) (push) Failing after 8m36s
Details
2026-05-14 23:33:50 -07:00
shanshanzhong147 4fa9fcd232 feat: add direct s3 upload flow 2026-05-13 11:24:13 -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 54daa923da 补单逻辑
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
2026-05-06 04:59:04 -07:00
shanshanzhong147 c8258dc93b feat: 设备登录新增 base_payload 字段，前端传入后存储到 user_device 表
Build docker and publish / build (20.15.1) (push) Successful in 4m48s
Details
2026-04-20 20:08:20 -07:00
shanshanzhong147 c0d839deb9 fix: 修复仪表盘时区统计偏移、重复订阅、新增map_apple字段
Build docker and publish / build (20.15.1) (push) Successful in 5m23s
Details 
- fix(order/model): QueryDateOrders/QueryDailyOrdersList 使用 time.Date 替代 Truncate 修复 UTC+8 时区偏移
- fix(user/model): QueryResisterUserTotalByDate 同样修复时区截断
- fix(traffic/model): QueryServerTrafficByDay 同样修复时区截断
- fix(activateOrder): 兜底查询防止过期用户重购产生重复订阅
- feat(api): SubscribeDiscount 新增 map_apple 字段
 2026-04-20 02:34:23 -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 b43dcd8dab merge: 同步 origin/master 新功能到定制版本
Build docker and publish / build (20.15.1) (push) Successful in 8m8s
Details
2026-03-24 01:03:56 -07:00
shanshanzhong147 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
shanshanzhong147 e5e9f93f68 Merge remote-tracking branch 'origin/master' into internal 2026-03-19 01:55:01 -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
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 76a1500d3c x
Build docker and publish / build (20.15.1) (push) Successful in 7m55s
Details
2026-03-11 01:13:56 -07:00
shanshanzhong147 26f6400e74 feat: 苹果支付uuid 及设备逻辑
Build docker and publish / build (20.15.1) (push) Successful in 8m3s
Details
2026-03-10 19:53:19 -07:00
EUForest eb327b26b9 feat(api): add captcha fields and admin authentication endpoints 
- Add CaptchaId and CaptchaCode fields to login/register/reset requests
- Add /v1/auth/captcha/generate endpoint for user captcha generation
- Add /v1/auth/admin/login endpoint for admin authentication
- Add /v1/auth/admin/reset-password endpoint for admin password reset
- Add /v1/auth/admin/captcha/generate endpoint for admin captcha generation
- Update GlobalConfigResponse with new verify configuration fields
- Add GenerateCaptchaResponse type for captcha generation
 2026-03-09 22:54:08 +08:00
shanshanzhong147 b9cc33ad70 chore: 补充 order.api 定义，新增 ActivateOrder 接口
Build docker and publish / build (20.15.1) (push) Successful in 7m49s
Details
2026-03-09 04:18:35 -07:00
EUForest 39310d5b9a Features: 
- Node group CRUD operations with traffic-based filtering
  - Three grouping modes: average distribution, subscription-based, and traffic-based
  - Automatic and manual group recalculation with history tracking
  - Group assignment preview before applying changes
  - User subscription group locking to prevent automatic reassignment
  - Subscribe-to-group mapping configuration
  - Group calculation history and detailed reports
  - System configuration for group management (enabled/mode/auto_create)

  Database:
  - Add node_group table for group definitions
  - Add group_history and group_history_detail tables for tracking
  - Add node_group_ids (JSON) to nodes and subscribe tables
  - Add node_group_id and group_locked fields to user_subscribe table
  - Add migration files for schema changes
 2026-03-08 23:22:38 +08:00
shanshanzhong147 b625dda4c9 修复：goctl api 生成的代码没有在路由中加入Ipa模式
Build docker and publish / build (20.15.1) (push) Successful in 7m48s
Details
2026-03-06 00:15:35 -08:00
shanshanzhong147 6e13e67dc8 修改签名头
Build docker and publish / build (20.15.1) (push) Successful in 7m44s
Details
2026-03-05 23:31:45 -08:00
shanshanzhong147 7308aa9191 无订阅 支付后出现两个订阅
Build docker and publish / build (20.15.1) (push) Failing after 7m37s
Details
2026-03-05 21:53:36 -08:00
shanshanzhong147 d962fafe7f 修复订单支付显示方式
Build docker and publish / build (20.15.1) (push) Successful in 7m59s
Details
2026-03-04 23:28:37 -08:00