16203b14f6
feat(admin-frontend): 新增系统与订阅管理后台页面
...
扩展管理端侧边栏与路由，新增系统配置真实页面、订阅套餐
管理页、节点管理页及多个结构化占位页
补齐前端 API、类型与工具层，并增强仪表盘刷新、趋势切换、
失败作业详情与流量排行 limit 联动能力
同步后端 traffic rank limit 支持与知识库归档、设计约束、
验证配置及视觉验收产物
2026-04-24 15:32:09 +08:00
9ce345eb76
merge: sync upstream/master preserving local changes
2026-04-23 22:27:18 +08:00
2efef9e8ee
fix(security): prevent payment gateway credentials leakage via OrderResource
2026-04-23 10:26:35 +08:00
60b5c99e74
✨ feat(admin): 补齐工单工作台与流量日志
...
---
✨ feat(admin): add ticket workspace and traffic logs
2026-04-21 23:13:00 +08:00
e01620689b
refactor: all-in-one docker deployment with auto-tuned resources and per-mode compose templates
2026-04-19 21:18:15 +08:00
c0b6ee1763
refactor: core plugins to plugins-core
2026-04-18 23:31:59 +08:00
bdd7820a69
feat(admin): batch node-machine binding & frontend update
2026-04-18 19:38:31 +08:00
360684245e
fix: ticket reply_status semantics, N+1 query, and admin reply auto-reopen
2026-04-18 16:40:21 +08:00
9ba946621e
feat: email template management with DB override, modern mail redesign
2026-04-18 15:41:23 +08:00
e689699f44
fix: batchUpdate use model instance to trigger observer
2026-04-18 04:26:25 +08:00
1708b6564b
feat: add xhttp subscriptions, network monitoring, chart legend toggle and ticket sender labels
2026-04-18 02:02:06 +08:00
cd5e00bbfb
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# public/assets/admin
2026-04-18 00:35:04 +08:00
d9833fab47
fix(plugin): improve plugin install and uninstall migration handling
2026-04-17 23:11:03 +08:00
fea7d97aa3
Update installer URL to use 'dev' branch
2026-04-17 12:54:22 +08:00
a74cc2f19d
feat: show install command on machine creation
2026-04-17 06:47:05 +08:00
e297b5fe9f
feat: machine mode, ECH subscriptions, batch ops & security hardening
2026-04-17 03:02:53 +08:00
abd64ed20c
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# app/Services/UserOnlineService.php
# public/assets/admin
2026-04-16 16:59:21 +08:00
13756956a6
fix: reset traffic stats when copying server nodes
2026-04-11 20:24:43 +08:00
c5a8c836c0
Revert "feat: Track user traffic per node (server_id)"
2026-03-30 18:17:27 +08:00
0cd20d12dd
Merge pull request #755 from socksprox/feat/server-id-stat-user
...
feat: Track user traffic per node (server_id)
2026-03-30 13:55:11 +08:00
b4a94d1605
Merge pull request #689 from socksprox/fix-user-generation-multiple-prefix
...
Fix user generation with email_prefix to support multiple users
2026-03-30 13:32:46 +08:00
a58d66d72e
feat: node traffic limit & batch operations
...
- Traffic monitoring with transfer_enable limit
- Batch delete nodes
- Reset traffic (single/batch)
2026-03-30 02:50:56 +08:00
7fbd1bb92d
feat: implement email case-insensitive queries ( fix #318 )
2026-03-28 07:09:21 +08:00
74b5ef0b27
fix: resolve device sync issues and refactor WebSocket server
2026-03-26 03:33:01 +08:00
420521d90a
refactor: restructure device limit system
2026-03-25 17:50:16 +08:00
b779bd4fd5
Merge pull request #789 from socksprox/feat/or-filter-logic
...
feat: Add OR logic support to user fetch API filters
2026-03-21 07:49:03 +08:00
1b3d022969
feat(payment): add TokenPay payment plugin
...
Register a new TokenPay payment plugin with configurable API
credentials, payment URL generation, and signed callback
verification.
Also improve admin config fetching to support single-group
lookups and add backwards-compatible subscribe template loading
from legacy settings and bundled files when the database table
is unavailable.
2026-03-19 22:32:28 +08:00
ae8a913f9b
merge: sync upstream/master from cedar2025/Xboard
...
合并上游 cedar2025/Xboard 的 master，并按交互决策保留本地改动。
2026-03-19 21:04:27 +08:00
64e6d8148e
feat: Add admin bulk-mail placeholder variables and template rendering
2026-03-19 05:02:16 +08:00
b55091a066
feat: Refactor uTLS & Multiplex Support, Node Status Push Optimization
...
- Server/ServerSave/Server.php: Unified utls and multiplex schema, validation, and defaults for vmess/vless/trojan/mieru protocols, enabling more flexible protocol configuration.
- Protocols (SingBox/ClashMeta/Shadowrocket/Stash/General): All protocol generators now support utls (client-fingerprint/fp) and multiplex options. Removed getRandFingerprint, replaced with getTlsFingerprint supporting random/custom fingerprints.
- Helper.php: Refactored TLS fingerprint utility to support object/string/random input.
- ServerService: Abstracted updateMetrics method to unify HTTP/WS node status caching logic.
- NodeWebSocketServer: Improved node connection, status push, and full sync logic; adjusted log levels; clarified push logic.
- ServerController: Reused ServerService for node metrics handling, reducing code duplication.
- Docs: Improved aapanel installation docs, added fix for empty admin dashboard.
2026-03-16 23:09:56 +08:00
010275b09e
feat: introduce WebSocket sync for XBoard nodes
...
- Implement Workerman-based `xboard:ws-server` for real-time node synchronization.
- Support custom routes, outbounds, and certificate configurations via JSON.
- Optimize scheduled tasks with `lazyById` to minimize memory footprint.
- Enhance reactivity using Observers for `Plan`, `Server`, and `ServerRoute`.
- Expand protocol support for `httpupgrade`, `h2`, and `mieru`.
2026-03-15 09:49:11 +08:00
8bb4682e98
feat: add configurable ticket_must_wait_reply setting
2026-03-11 07:31:09 +08:00
2d538c15de
perf: fix getTrafficRank slow query with index and batch loading
2026-03-11 07:01:19 +08:00
ec20847f31
refactor: replace database logging with file logging and admin audit log
2026-03-11 06:50:07 +08:00
6efedcebd4
refactor: move subscribe templates to dedicated database table
2026-03-11 05:47:29 +08:00
b340652b4d
feat(config): support custom telegram webhook url
2026-03-11 02:50:33 +08:00
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
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
529953d98d
处理jc流量显示的问题
2026-02-26 04:06:28 +08:00
17a7c63aec
修改邮件部分
2026-02-22 03:22:14 +08:00
3b3fc618d6
Make querying users better with "or" statements
2026-01-28 01:27:21 +01:00
c327fecb49
do not return strings, but int
2025-11-29 17:05:07 +01:00
0446f88e9e
again: update api combining times
2025-11-29 17:05:07 +01:00
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
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
051813d39d
Make that user batch generation works again
2025-09-15 15:43:43 +02:00
fe94d7ebc6
fix: remove dependency on job_batches table for batch email sending
2025-09-02 23:54:21 +08:00
8f3cdf0dde
fix: optimize batch email performance and fix gift card issues
...
- Add chunking and batching for admin email sending
- Fix gift card pagination and add per_page limits
- Update frontend prompts and complete language packs
2025-08-23 00:11:45 +08:00
78e7be8766
feat: add plugin migrations and fix plan management bugs
...
- Plugin database migration support
- Fix empty prices error in plan management
- Plugin update functionality
- Custom shadowsocks encryption algorithms
2025-07-27 00:19:14 +08:00
58868268dd
feat: enhance plugin management
...
- Add command support for plugin management
- Optimize plugin management page layout
- Add email copy functionality for users
- Convert payment methods and Telegram Bot to plugin system
2025-07-26 18:49:58 +08:00
yinjianm