mirror of
https://github.com/cedar2025/Xboard.git
synced 2025-01-22 10:38:14 -05:00
Compare commits
4 Commits
c9c72cc847
...
96df9305b6
Author | SHA1 | Date | |
---|---|---|---|
|
96df9305b6 | ||
|
444c3c93ed | ||
|
ff259aee44 | ||
|
9ca5d96048 |
@ -22,4 +22,6 @@ RUN composer install --optimize-autoloader --no-cache --no-dev \
|
||||
ENV ENABLE_WEB=true \
|
||||
ENABLE_HORIZON=true \
|
||||
ENABLE_REDIS=false
|
||||
|
||||
EXPOSE 7001
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
@ -116,9 +116,11 @@ class UniProxyController extends Controller
|
||||
...$baseConfig,
|
||||
'tls' => (int) $protocolSettings['tls'],
|
||||
'flow' => $protocolSettings['flow'],
|
||||
'tls_settings' => [...(int) $protocolSettings['tls'] === 1
|
||||
? $protocolSettings['tls_settings']
|
||||
: $protocolSettings['reality_settings']]
|
||||
'tls_settings' =>
|
||||
match ((int) $protocolSettings['tls']) {
|
||||
2 => $protocolSettings['reality_settings'],
|
||||
default => $protocolSettings['tls_settings']
|
||||
}
|
||||
],
|
||||
'hysteria' => [
|
||||
'server_port' => (int) $serverPort,
|
||||
|
@ -141,7 +141,7 @@ class Server extends Model
|
||||
|
||||
private function castValueWithConfig($value, array $config)
|
||||
{
|
||||
if ($value === null) {
|
||||
if ($value === null && $config['type'] !== 'object') {
|
||||
return $config['default'] ?? null;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user