Compare commits

...

5 Commits

Author SHA1 Message Date
Xboard
c2c88cd7a5
Update aapanel-docker.md
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
2025-01-17 11:56:59 +08:00
xboard
14d9299a5c update README 2025-01-17 10:32:17 +08:00
xboard
f8c899b552 update README 2025-01-17 10:30:20 +08:00
xboard
0bbdf7a558 fix: correct know issues 2025-01-17 10:21:45 +08:00
xboard
ef8cc8b9a0 fix: correct know issues 2025-01-17 10:07:27 +08:00
7 changed files with 43 additions and 23 deletions

View File

@ -39,7 +39,7 @@ docker compose up -d
> After installation, visit: http://SERVER_IP:7001
> ⚠️ Make sure to save the admin credentials shown during installation
## <EFBFBD><EFBFBD> Documentation
## 📖 Documentation
### 🔄 Upgrade Notice
> 🚨 **Important:** This version involves significant changes. Please strictly follow the upgrade documentation and backup your database before upgrading. Note that upgrading and migration are different processes, do not confuse them.
@ -84,4 +84,8 @@ docker compose restart
## 🤝 Contributing
Issues and Pull Requests are welcome to help improve the project.
Issues and Pull Requests are welcome to help improve the project.
## 📈 Star History
[![Stargazers over time](https://starchart.cc/cedar2025/Xboard.svg)](https://starchart.cc/cedar2025/Xboard)

View File

@ -56,6 +56,10 @@ docker compose up -d
- [从 v2board 1.7.3 迁移](./docs/zh-CN/migration/v2board-1.7.3.md)
- [从 v2board wyx2685 迁移](./docs/zh-CN/migration/v2board-wyx2685.md)
## 🤝 参与贡献
欢迎提交 Issue 和 Pull Request 来帮助改进项目。
## 🛠️ 技术栈
- 后端Laravel 11 + Octane
@ -85,4 +89,8 @@ docker compose restart
## 🤝 参与贡献
欢迎提交 Issue 和 Pull Request 来帮助改进项目。
欢迎提交 Issue 和 Pull Request 来帮助改进项目。
## 📈 Star 增长趋势
[![Stargazers over time](https://starchart.cc/cedar2025/Xboard.svg)](https://starchart.cc/cedar2025/Xboard)

View File

@ -26,9 +26,9 @@ class UserUpdate extends FormRequest
'is_staff' => 'required|in:0,1',
'u' => 'integer',
'd' => 'integer',
'balance' => 'integer',
'balance' => 'numeric',
'commission_type' => 'integer',
'commission_balance' => 'integer',
'commission_balance' => 'numeric',
'remarks' => 'nullable',
'speed_limit' => 'nullable|integer',
'device_limit' => 'nullable|integer'

View File

@ -184,15 +184,21 @@ class SingBox implements ProtocolInterface
'fingerprint' => Helper::getRandFingerprint()
]
];
if ($serverName = data_get($protocol_settings, 'tls_settings.server_name')) {
$tlsConfig['server_name'] = $serverName;
}
if ($protocol_settings['tls'] == 2) {
$tlsConfig['reality'] = [
'enabled' => true,
'public_key' => data_get($protocol_settings, 'reality_settings.public_key'),
'short_id' => data_get($protocol_settings, 'reality_settings.short_id')
];
switch ($protocol_settings['tls']) {
case 1:
if ($serverName = data_get($protocol_settings, 'tls_settings.server_name')) {
$tlsConfig['server_name'] = $serverName;
}
break;
case 2:
$tlsConfig['server_name'] = data_get($protocol_settings, 'reality_settings.server_name');
$tlsConfig['reality'] = [
'enabled' => true,
'public_key' => data_get($protocol_settings, 'reality_settings.public_key'),
'short_id' => data_get($protocol_settings, 'reality_settings.short_id')
];
break;
}
$array['tls'] = $tlsConfig;

View File

@ -114,6 +114,7 @@ docker compose up -d
```
> - 如果您是较早安装的旧版本,需要将命令中的 `web` 改为 `xboard`,即:
```bash
git config --global --add safe.directory $(pwd)
git fetch --all && git reset --hard origin/master && git pull origin master
docker compose pull && \
docker compose run -it --rm xboard php artisan xboard:update && \
@ -126,4 +127,4 @@ docker compose up -d
- 监控系统资源使用情况
- 定期备份数据库和配置文件
## 故障排查
## 故障排查

File diff suppressed because one or more lines are too long

View File

@ -617,7 +617,8 @@ window.XBOARD_TRANSLATIONS['zh-CN'] = {
"common": {
"saving": "保存中...",
"save_success": "已自动保存",
"placeholder": "请输入"
"placeholder": "请输入",
"autoSaved": "已自动保存"
},
"invite": {
"title": "邀请&佣金设置",