9ce345eb76
merge: sync upstream/master preserving local changes
2026-04-23 22:27:18 +08:00
fe62542b7c
fix: unify Trojan server_name/allow_insecure to tls_settings across all protocols
2026-04-18 21:00:21 +08:00
cd5e00bbfb
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# public/assets/admin
2026-04-18 00:35:04 +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
58ef46f754
fix: stop sending VLESS decryption when encryption is disabled
2026-04-08 11:05:55 +08:00
5f1afe4bdc
feat: add Vless Encryption support
2026-03-30 17:03:37 +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
3c3639613e
fix: use ServerService::getServer() for node lookup in WebSocket
2026-03-26 03:51:58 +08:00
7dacb69275
feat: Trojan Reality support and protocol distribution optimizations
2026-03-23 14:56:41 +08:00
ae8a913f9b
merge: sync upstream/master from cedar2025/Xboard
...
合并上游 cedar2025/Xboard 的 master，并按交互决策保留本地改动。
2026-03-19 21:04:27 +08:00
47983dec40
fix(runtime): force app_url/force_https per-request via middlewar
2026-03-19 04:22:17 +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
2e0b10e643
fix: return dynamic rate instead of base rate in user server list ( #709 )
2026-03-09 06:47:30 +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
95e8e7bca7
feat: add v2node support
2025-11-22 20:33:38 +08:00
8e0384c833
feat: optimize server.user.get hook definition
2025-08-29 19:21:49 +08:00
c9bab8fb02
feat: add multiple hooks, pligun schedule support ,add hook:list artisan command
2025-07-21 13:29:17 +08:00
97788e3c8f
feat: Add client.subscribe.servers hook for plugin-based server extension
...
- Add HookManager::filter('client.subscribe.servers') hook in ClientController::subscribe()
- Allow plugins to inject custom servers into subscription responses
- Update protocol classes to support extended server configurations
- Enable dynamic server list modification before protocol processing
2025-07-11 21:19:23 +08:00
44d92ac1c6
fix: resolve known issues and improve code standards
...
- Fix known bugs in user, plan, and server modules
- Standardize code formatting and structure
- Optimize database queries and model relationships
- Improve request validation and error handling
- Update admin controllers for better consistency
2025-06-22 17:38:17 +08:00
a3700ad685
feat: Add node load submission and display functionality
...
- Implemented node load status submission in UniProxyController with dynamic cache expiration based on server push interval.
- Added log filtering capability in the admin panel for better log management and analysis.
2025-05-24 12:31:18 +08:00
8377962836
fix(singbox): resolve port type casting and add port hopping support
2025-05-10 17:10:41 +08:00
73226f6820
fix(node): resolve port type validation error
2025-05-09 19:53:59 +08:00
97e7ffccae
fix: resolve PHPStan static analysis warnings
2025-05-07 19:48:19 +08:00
db235c10e8
Revert "fix: resolve PHPStan static analysis warnings"
...
This reverts commit 2d3e4b4a95
2025-04-14 21:23:08 +08:00
2d3e4b4a95
fix: resolve PHPStan static analysis warnings
2025-04-14 02:12:42 +08:00
0f43fff242
feat: new xboard
2025-01-21 14:57:54 +08:00
f86ccae28c
pref: Enhance TrafficFetch Performance and Optimize Code Structure
2024-11-29 19:22:12 +08:00
4d4adc4fac
fix: Hide online user count display for child nodes without independent online users
2024-10-20 12:03:21 +08:00
dd8267097e
feat: Support Shadowsocks obfs config
2024-07-21 13:58:22 +08:00
fd52795f49
fix: 修复ss2022订阅下发密码错误的问题
2024-05-24 22:45:27 +08:00
4c6c7182e2
refactor: 重构规范部分代码、邮件队列增加失败重试、去除多个支付方式、更新依赖
2024-04-10 00:51:03 +08:00
44eb05fb5b
fix: 修复v2ray、Trojan旧版接口获取用户列表失败的问题
2023-12-16 08:05:09 +08:00
83957db37f
perf: 优化节点后端获取用户用户列表接口响应速度，降低CPU使用资源
2023-12-12 21:49:16 +08:00
8db622eee4
perf: 优化用户流量消费队列（上万用户流量信息数秒即可处理完成
2023-11-21 15:59:06 +08:00
d1b3b739d3
fix: 修复mysql5.7和sqlite环境下无法上报流量的问题
2023-11-20 13:53:11 +08:00
65fe7682ff
Initial commit
2023-11-17 14:44:01 +08:00
yinjianm