opt 1.2.3

This commit is contained in:
Tokumeikoi 2020-03-10 21:13:41 +08:00
parent f17b5d04a8
commit ba9ec7006b

View File

@ -78,25 +78,25 @@ class AppController extends Controller
$json->outbound->settings->vnext[0]->users[0]->alterId = (int)$user->v2ray_alter_id; $json->outbound->settings->vnext[0]->users[0]->alterId = (int)$user->v2ray_alter_id;
$json->outbound->settings->vnext[0]->remark = (string)$server->name; $json->outbound->settings->vnext[0]->remark = (string)$server->name;
$json->outbound->streamSettings->network = $server->network; $json->outbound->streamSettings->network = $server->network;
if ($server->settings) { if ($server->networkSettings) {
switch ($server->network) { switch ($server->network) {
case 'tcp': case 'tcp':
$json->outbound->streamSettings->tcpSettings = json_decode($server->settings); $json->outbound->streamSettings->tcpSettings = json_decode($server->networkSettings);
break; break;
case 'kcp': case 'kcp':
$json->outbound->streamSettings->kcpSettings = json_decode($server->settings); $json->outbound->streamSettings->kcpSettings = json_decode($server->networkSettings);
break; break;
case 'ws': case 'ws':
$json->outbound->streamSettings->wsSettings = json_decode($server->settings); $json->outbound->streamSettings->wsSettings = json_decode($server->networkSettings);
break; break;
case 'http': case 'http':
$json->outbound->streamSettings->httpSettings = json_decode($server->settings); $json->outbound->streamSettings->httpSettings = json_decode($server->networkSettings);
break; break;
case 'domainsocket': case 'domainsocket':
$json->outbound->streamSettings->dsSettings = json_decode($server->settings); $json->outbound->streamSettings->dsSettings = json_decode($server->networkSettings);
break; break;
case 'quic': case 'quic':
$json->outbound->streamSettings->quicSettings = json_decode($server->settings); $json->outbound->streamSettings->quicSettings = json_decode($server->networkSettings);
break; break;
} }
} }