Commit Graph

418 Commits

Author SHA1 Message Date
xboard
d799c8df8b Fix: Handle raw DB expressions in user filter
A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.Fix: Handle raw DB expressions in user filter

A TypeError occurred when filtering the user list by the `total_used` computed attribute. The `applyQueryCondition` method expected a string for the field name, but received an `Illuminate\Database\Query\Expression` object from `DB::raw`.

This commit updates the `buildFilterQuery` method to check if the query field is an `Expression` instance. If so, it now uses `whereRaw` to apply the filter, preventing the type error and enabling filtering on computed fields. For standard string fields, it continues to use the original `applyQueryCondition` logic.
2025-07-05 12:35:12 +08:00
xboard
a3c4cb1aea fix(setting): Resolve admin_setting helper incompatibility with Octane
Updated the `admin_setting` and `admin_settings_batch` helpers to retrieve the `Setting` instance from the service container. This fixes a fatal error and ensures correct behavior in a Laravel Octane environment by preventing the use of stale, shared static instances.
2025-07-04 22:16:19 +08:00
xboard
05afe870e7 feat: add tags to plans, refactor order service, adn fix ticket lock 2025-07-01 11:14:18 +08:00
xboard
349c1710fe feat: add PostgreSQL support and refactor database configuration in install command 2025-07-01 03:09:53 +08:00
xboard
690832e3eb feat: add socks protocol support for shadowrocket client 2025-07-01 00:49:55 +08:00
xboard
5b295dbec3 feat: plugin controller config system with guest_comm_config hook integration
- Add HasPluginConfig trait and PluginController base class
- Integrate guest_comm_config hook in CommController for plugin frontend config injection
- Add user creation functionality to UserService and fix null value handling
- Enhance AbstractPlugin.getConfig() with key parameter support
- Multiple service layer optimizations and architecture improvements
2025-06-29 01:42:48 +08:00
xboard
b96700ab30 docs: update issue template 2025-06-28 18:16:10 +08:00
xboard
6d85736eea eat: add reCAPTCHA v3 and Cloudflare Turnstile verification support
- Implement reCAPTCHA v3 with score-based validation
- Add Cloudflare Turnstile as captcha alternative
- Create reusable CaptchaService for unified validation
- Support switching between recaptcha, recaptcha-v3, and turnstile
- Maintain backward compatibility with existing configurations
2025-06-28 18:01:59 +08:00
xboard
f1d1dd5684 docs: update docs 2025-06-28 15:54:44 +08:00
xboard
f974a8c846 fix: admin export subscription link issue 2025-06-24 22:55:34 +08:00
xboard
1dcd2fcdf6 remove: disable traffic package stacking feature 2025-06-24 02:00:12 +08:00
xboard
eff2b1f8ba feat(admin): enhance i18n support
Fix system monitor button i18n syntax, complete coupon form i18n
2025-06-23 11:55:17 +08:00
xboard
7efc16990e feat(admin): optimize user traffic management features
- Improve traffic reset dialog interactions
- Enhance traffic reset logs display
2025-06-22 18:04:29 +08:00
xboard
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
Xboard
733cc7e9a5 Update README.md 2025-06-22 01:22:04 +08:00
xboard
4fe2f35183 feat: enhance plan validation, traffic system and email verification
- feat: add plan price validation
- feat: make traffic packages stackable
- feat: add commission and invite info to admin order details
- feat: apply email whitelist to verification code API
- fix: subscription link copy compatibility for non-HTTPS
- fix: resolve route editing 500 error in certain cases
- refactor: restructure traffic reset logic
2025-06-22 01:18:38 +08:00
Xboard
7bab761db6 Merge pull request #427 from OfficialKatana/patch-1
更换可用的DoH服务器
2025-06-22 00:05:52 +08:00
xboard
d7fb26d527 fix: getSystemStatus api 2025-06-21 16:01:51 +08:00
xboard
42258626b0 feat: enhance plan user statistics with active user count display 2025-06-21 13:20:57 +08:00
xboard
272dbd2107 feat: optimize settings management and admin functionality
- Add system log cleanup functionality with batch processing
- Optimize v2_settings table performance by unifying value storage
- Add comprehensive client support list for one-click subscription
- Fix QR code subscription links for specific node types
- Fix route addition issues in admin management panel
- Enhance admin system controller with log management APIs
2025-06-21 12:11:27 +08:00
xboard
895a870dfc fix(admin): fix shadowsocks plugin issue - save empty string instead of 'none' when plugin is set to none 2025-05-25 08:43:00 +08:00
xboard
6332d96131 fix(clash-meta): support custom SNI configuration for anytls protocol 2025-05-25 00:20:13 +08:00
xboard
c90e3d6424 fix(admin): optimize mail encryption selector and null value handling 2025-05-24 22:58:46 +08:00
xboard
fadeacf6f8 refactor: comment out update-check routes and refactor findUserByBearerToken, calcResetDayByMonthFirstDay, calcResetDayByExpireDay 2025-05-24 20:47:27 +08:00
xboard
7c86193215 fix: add missing files from previous commit 2025-05-24 20:19:54 +08:00
xboard
4e84cbd953 refactor: optimize mail reminder system - fix memory overflow, improve performance 20-30x, streamline code 2025-05-24 20:08:21 +08:00
Xboard
38f640c6d9 Update composer.json 2025-05-24 18:11:11 +08:00
xboard
78fc0ada98 feat: upgrade Laravel framework from 11.x to 12.15.0 with enhanced dependencies and performance optimizations 2025-05-24 16:28:49 +08:00
Xboard
2ad71017f9 Update 1panel.md 2025-05-24 14:17:22 +08:00
xboard
05f94aeadb fix: restrict anytls delivery to compatible stash client versions 2025-05-24 14:13:44 +08:00
xboard
fdb5b222b9 refactor: use request attributes instead of merge for middleware data transfer
- Replace request->merge() with request->attributes->set() in Server middleware to avoid polluting user input
- Add getNodeInfo() helper method in UniProxyController for cleaner node info access
- Update all node_info references to use the new attribute-based approach
2025-05-24 13:54:57 +08:00
xboard
bf3a9112f2 fix: improve node filtering by client base_version, set subscription content-type, and add hop_interval support for hysteria2
- Refactor node filtering logic to correctly handle client base_version requirements.
- Set appropriate Content-Type header for subscription responses.
- Add support for hop_interval configuration in hysteria2 node delivery.
2025-05-24 13:45:32 +08:00
xboard
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
xboard
61300fbcc3 fix: resolve AnyTLS padding scheme modification issue 2025-05-23 20:47:17 +08:00
xboard
fc5a957ddd feat: add AnyTLS support and improve system functionality
- Add AnyTLS protocol support
- Add system logs viewing in admin panel
- Refactor client subscription delivery code
- Refactor hook mechanism
- Add plugin support for Shadowsocks protocol
- Add CSV export option for batch user creation
- Fix mobile admin login page width display issue
2025-05-22 17:58:22 +08:00
Xboard
2580475f78 Merge pull request #504 from Fearless743/master
add anytls support
2025-05-21 10:13:28 +08:00
Fearless
711151c7d6 add anytls support 2025-05-19 09:25:52 +08:00
xboard
f839e8b3f0 fix: correct obfs host parameter in subscription delivery for clash/clash-meta/shadowsocks/stash 2025-05-18 03:58:14 +08:00
xboard
24d9533dca fix: add missing i18n fields in admin and fix Surge template issue 2025-05-16 23:18:30 +08:00
xboard
0d1588f58a chore: update docker-publish.yaml and Dockerfile 2025-05-16 22:43:00 +08:00
xboard
e49f88d311 feat(protocols): add support for ss obfs, ss2022, and vless reality
- Clash and Clash Meta: Added support for Shadowsocks (SS) with obfs.
- Loon: Added support for SS2022 and obfs.
- Stash: Added support for SS2022, obfs, and VLESS Reality.
2025-05-16 06:43:58 +08:00
xboard
bbeede8dbc fix(admin): remove one-click update feature and fix fuzzy order search in user management
- Removed the one-click update functionality from the admin panel.
- Fixed the issue where order search in user management used fuzzy matching; now uses precise matching.
2025-05-16 05:48:37 +08:00
xboard
434055f86c chore(redis): disable persistence configuration 2025-05-16 05:16:23 +08:00
xboard
417590e99c feat(admin): optimize subscription template configuration and add Surfboard subscription template
- Improved the code structure for subscription template configuration.
- Added a new feature in the admin panel to configure Surfboard subscription templates.
2025-05-16 05:13:49 +08:00
Xboard
f5c3d5c56b Merge pull request #497 from ztbh/master
Fix the bug of sub-node ss password mismatch
2025-05-16 00:18:00 +08:00
xboard
faedab24bf fix(admin): correct language pack errors in admin panel 2025-05-15 22:19:25 +08:00
ztb
6c4c296071 Fix the bug of sub-node ss password mismatch 2025-05-13 21:55:18 +08:00
xboard
f3cdc2e765 fix(admin): correct ticket message bubble alignment in admin panel 2025-05-11 17:44:18 +08:00
xboard
8377962836 fix(singbox): resolve port type casting and add port hopping support 2025-05-10 17:10:41 +08:00
xboard
73226f6820 fix(node): resolve port type validation error 2025-05-09 19:53:59 +08:00