yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-10-31 09:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix server rules maybe not defined

Browse Source
This commit is contained in:
Tokumeikoi
2020-02-16 16:51:25 +08:00
parent 557f6bc0c2
commit 0446e7d99f
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/Server/DeepbworkController.php
View File

@@ -146,20 +146,21 @@ class DeepbworkController extends Controller
if ($server->rules) { if ($server->rules) {
$rules = json_decode($server->rules); $rules = json_decode($server->rules);
// domain // domain
$domainObj = new \StdClass(); if (isset($rules->domain)) {
$domainObj->type = 'field'; $domainObj = new \StdClass();
$domainObj->domain = $rules->domain; $domainObj->type = 'field';
$domainObj->outboundTag = 'block'; $domainObj->domain = $rules->domain;
$domainObj->outboundTag = 'block';
array_push($json->routing->settings->rules, $domainObj);
}
// protocol // protocol
$protocolObj = new \StdClass(); if (isset($rules->protocol)) {
$protocolObj->type = 'field'; $protocolObj = new \StdClass();
$protocolObj->protocol = $rules->protocol; $protocolObj->type = 'field';
$protocolObj->outboundTag = 'block'; $protocolObj->protocol = $rules->protocol;
array_push( $protocolObj->outboundTag = 'block';
$json->routing->settings->rules, array_push($json->routing->settings->rules, $protocolObj);
$domainObj, }
$protocolObj
);
} }
if ((int)$server->tls) { if ((int)$server->tls) {

2
public/assets/admin/umi.js vendored
View File

File diff suppressed because one or more lines are too long