tcjlj/Xboard
1
0
Fork 0
mirror of https://github.com/cedar2025/Xboard.git synced 2025-01-22 18:48:14 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Compare commits

base: tcjlj:c9c72cc847b75fc39a4ed58072e4b2373d4908fe
Branches Tags
tcjlj:dev
tcjlj:master
tcjlj:compose
tcjlj:docker-compose
tcjlj:v0.1.9
tcjlj:v0.1.8
tcjlj:v0.1.7
tcjlj:v0.1.6
tcjlj:v0.1.5
tcjlj:v0.1.4
tcjlj:v0.1.3
..
compare: tcjlj:96df9305b6ba71a0e7bc611d6003de8c05943e4e
Branches Tags
tcjlj:dev
tcjlj:master
tcjlj:compose
tcjlj:docker-compose
tcjlj:v0.1.9
tcjlj:v0.1.8
tcjlj:v0.1.7
tcjlj:v0.1.6
tcjlj:v0.1.5
tcjlj:v0.1.4
tcjlj:v0.1.3

4 Commits
c9c72cc847 ... 96df9305b6

Author SHA1 Message Date
xboard
96df9305b6 fix: correct know issues
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
Details
2025-01-19 21:51:38 +08:00
xboard
444c3c93ed update dockerfile 2025-01-19 21:13:09 +08:00
xboard
ff259aee44 fix: resolve array spread operator syntax in VLESS tls_settings again 2025-01-19 21:12:32 +08:00
xboard
9ca5d96048 fix: resolve array spread operator syntax in VLESS tls_settings 2025-01-19 19:06:47 +08:00
3 changed files with 8 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
Dockerfile
View File

@ -22,4 +22,6 @@ RUN composer install --optimize-autoloader --no-cache --no-dev \
ENV ENABLE_WEB=true \ ENV ENABLE_WEB=true \
ENABLE_HORIZON=true \ ENABLE_HORIZON=true \
ENABLE_REDIS=false ENABLE_REDIS=false
EXPOSE 7001
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

8
app/Http/Controllers/V1/Server/UniProxyController.php
View File

@ -116,9 +116,11 @@ class UniProxyController extends Controller
...$baseConfig, ...$baseConfig,
'tls' => (int) $protocolSettings['tls'], 'tls' => (int) $protocolSettings['tls'],
'flow' => $protocolSettings['flow'], 'flow' => $protocolSettings['flow'],
'tls_settings' => [...(int) $protocolSettings['tls'] === 1 'tls_settings' =>
? $protocolSettings['tls_settings'] match ((int) $protocolSettings['tls']) {
: $protocolSettings['reality_settings']] 2 => $protocolSettings['reality_settings'],
default => $protocolSettings['tls_settings']
}
], ],
'hysteria' => [ 'hysteria' => [
'server_port' => (int) $serverPort, 'server_port' => (int) $serverPort,

2
app/Models/Server.php
View File

@ -141,7 +141,7 @@ class Server extends Model
private function castValueWithConfig($value, array $config) private function castValueWithConfig($value, array $config)
{ {
if ($value === null) { if ($value === null && $config['type'] !== 'object') {
return $config['default'] ?? null; return $config['default'] ?? null;
} }