Commit Graph

648 Commits

Author SHA1 Message Date
yinjianm dbffb0a7bd 后端流量记录排序改为更精确时间优先(避免只按 record_at 导致排序/分钟不准)
StatController.php (E:/code/php/Xboard-new/app/Http/Controllers/V1/User/StatController.php:22)
     StatController.php (E:/code/php/Xboard-new/app/Http/Controllers/V2/Admin/StatController.php:242)
  2. 流量资源新增 display_at(优先 updated_at,回退 created_at/record_at)
     TrafficLogResource.php (E:/code/php/Xboard-new/app/Http/Resources/TrafficLogResource.php:19)
     TrafficLogResource.php (E:/code/php/Xboard-new/app/Http/Resources/TrafficLogResource.php:43)
  3. 管理端前端(打包产物)流量列改为:时间/上行/下行/倍率/节点/设备/总计,时间显示 YYYY/MM/DD HH:mm
     index.js (E:/code/php/Xboard-new/public/assets/admin/assets/index.js:16)
2026-02-26 05:55:02 +08:00
yinjianm 4f84034814 • 你这个现象我已经定位并修了,核心原因是节点匹配和设备映射都有歧义。
已修改:

  - 节点识别优先用 id,只有找不到才回退 code,避免子节点被匹配成父节点
    ServerService.php (/E:/code/php/Xboard-new/app/Services/ServerService.php#L101)
  - 在线设备解析补全 node_key/node_id,并按真实节点键归类
    UserOnlineService.php (/E:/code/php/Xboard-new/app/Services/UserOnlineService.php#L43)
  - 用户端流量日志设备映射改为按 node_key 精确匹配
    StatController.php (/E:/code/php/Xboard-new/app/Http/Controllers/V1/User/StatController.php#L43)
  - 管理端同样改为按 node_key 映射
    StatController.php (/E:/code/php/Xboard-new/app/Http/Controllers/V2/Admin/StatController.php#L270)

  说明:

  - 这次不涉及数据库结构变更,不需要 migrate。
  - 对管理后台现有统计接口兼容,不会破坏原有 u/d/record_at/server_rate 显示。
  - 旧的历史日志如果之前已经按父节点入库,不会自动改名;新流量会按修复后的逻辑记录。
2026-02-26 05:13:19 +08:00
yinjianm 1e291f8408 fix stat_user unique key with record_type and deduplicate before index 2026-02-26 04:39:42 +08:00
yinjianm 87e547d2f1 修复1 2026-02-26 04:21:30 +08:00
yinjianm 529953d98d 处理jc流量显示的问题 2026-02-26 04:06:28 +08:00
yinjianm 2d14e22322 翻译文档 2026-02-22 04:13:42 +08:00
yinjianm 267aeec5ba 修改文档 2026-02-22 03:58:02 +08:00
yinjianm 809860b8db 修改仓库地址 2026-02-22 03:57:06 +08:00
yinjianm 5370b21ef9 chore: support local docker build deployment 2026-02-22 03:23:33 +08:00
yinjianm 17a7c63aec 修改邮件部分 2026-02-22 03:22:14 +08:00
yinjianm 7a3e245887 添加开发文档 2026-02-22 02:52:32 +08:00
socksprox 3b3fc618d6 Make querying users better with "or" statements 2026-01-28 01:27:21 +01:00
lithromantic f6abc362fd Add sha256salt hashing option in password verification 2026-01-18 00:04:00 +01:00
xboard 601955e60d fix: read plugin enabled from DB for consistency 2026-01-02 18:30:21 +08:00
xboard 6f7181db2f fix(admin): guard unknown order status 2025-12-18 00:57:59 +08:00
socksprox c327fecb49 do not return strings, but int 2025-11-29 17:05:07 +01:00
socksprox 0446f88e9e again: update api combining times 2025-11-29 17:05:07 +01:00
socksprox a01151130e Revert "Combine data with node_id in api output, so its all still "one day", and fits vanilla xboard behaviour"
This reverts commit de39230cbe111bbf793f11bcf5046ef717c67f87.

The api change caused issues
2025-11-29 17:05:07 +01:00
socksprox 9ca8da045c Combine data with node_id in api output, so its all still "one day", and fits vanilla xboard behaviour 2025-11-29 14:07:10 +01:00
socksprox 1ebf86b510 fix: do not merge traffic from different nodes 2025-11-29 13:47:21 +01:00
socksprox 9e35d16fa6 User traffic can now be viewed by node 2025-11-29 13:47:15 +01:00
kuizw9 315b06d103 Merge branch 'cedar2025:master' into master 2025-11-23 14:55:14 +08:00
xboard 95e8e7bca7 feat: add v2node support 2025-11-22 20:33:38 +08:00
xboard 8d0e33ba23 fix: preserve theme config when upgrading theme 2025-11-07 19:25:40 +08:00
kelly5454 3754f7da0d fix: exchange gift card type error 2025-10-30 21:08:39 +08:00
xboard 213aff3993 feat(admin): add Custom ID/Original ID display with copy actions 2025-10-20 21:46:26 +08:00
xboard e3c746d314 feat(plugin): auto-decode JSON config values by type in PluginManager 2025-10-20 18:56:44 +08:00
xboard 7377460ba0 fix(telegram): correct traffic usage description in notification 2025-10-08 10:26:26 +08:00
KuizW9 2d8ed35096 Update General.php
Add AnyTLS to General Client
2025-10-05 22:34:36 +08:00
KuizW9 8941c6b065 Merge branch 'cedar2025:master' into master 2025-10-05 22:32:48 +08:00
xboard 0798b371b6 feat(telegram plugin): improve Telegram notification formatting 2025-09-27 16:53:17 +08:00
KuizW9 ea6bd6fabe Merge branch 'cedar2025:master' into master 2025-09-27 08:52:25 +08:00
xboard f83bdfc9ad fix: avoid getCurrentCommit on cache hit 2025-09-26 19:04:17 +08:00
xboard c5ac76823d allow free plans 2025-09-24 22:19:04 +08:00
KuizW9 35a9e02b8c Update Shadowrocket.php 2025-09-24 19:14:34 +08:00
xboard ccd65f26d4 fix(jobs): resolve PostgreSQL issue in StatServerJob and StatUserJob 2025-09-23 18:57:44 +08:00
xboard bf1234a9c2 fix(plugin): remove stale plugin records when files missing; adjust logging 2025-09-23 14:59:22 +08:00
xboard 92c448e2e1 fix: remove smogate 2025-09-22 22:52:11 +08:00
xboard 2808f40737 Remove Smogate plugin 2025-09-22 18:47:25 +08:00
xboard 61a44483d4 feat(knowledge): add KnowledgeResource with plugin hooks
- Add KnowledgeResource with user.knowledge.resource hook
- Unify processKnowledgeContent for both single and list items
- Remove isListItem parameter for cleaner architecture
2025-09-20 13:36:10 +08:00
xboard 8ae3de511b feat(plugin): add user.subscribe.response hook 2025-09-17 00:02:59 +08:00
xboard 58a374bde9 fix 2025-09-16 18:44:44 +08:00
socksprox 051813d39d Make that user batch generation works again 2025-09-15 15:43:43 +02:00
xboard 843c5af4c2 refactor(online-status): consolidate updates and add cleanup command 2025-09-15 20:32:22 +08:00
xboard cd8a8ecf58 feat(middleware): Add transaction state guard for Octane 2025-09-15 16:15:39 +08:00
xboard 2ac126dd42 refactor(Jobs): Optimize traffic statistics jobs with upsert 2025-09-15 09:56:36 +08:00
xboard 1fd4f923ad fix(server): Correct node_info retrieval method 2025-09-15 09:21:20 +08:00
xboard f289f68898 fix: resolve vmess http-opts headers null issue in subscription generation 2025-09-12 10:45:31 +08:00
superabbite1 fa4a84b3e2 Update Shadowrocket.php
新增Vless+ws+tls协议 Fingerprint指纹参数
2025-09-09 16:43:42 +08:00
superabbite1 3406448475 Update ClashMeta.php
新增vless+ws+tls协议Fingerprint指纹参数
2025-09-09 16:42:11 +08:00