yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-11-10 09:39:10 +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
Show Stats 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) {
$rules = json_decode($server->rules);
// domain
$domainObj = new \StdClass();
$domainObj->type = 'field';
$domainObj->domain = $rules->domain;
$domainObj->outboundTag = 'block';
if (isset($rules->domain)) {
$domainObj = new \StdClass();
$domainObj->type = 'field';
$domainObj->domain = $rules->domain;
$domainObj->outboundTag = 'block';
array_push($json->routing->settings->rules, $domainObj);
}
// protocol
$protocolObj = new \StdClass();
$protocolObj->type = 'field';
$protocolObj->protocol = $rules->protocol;
$protocolObj->outboundTag = 'block';
array_push(
$json->routing->settings->rules,
$domainObj,
$protocolObj
);
if (isset($rules->protocol)) {
$protocolObj = new \StdClass();
$protocolObj->type = 'field';
$protocolObj->protocol = $rules->protocol;
$protocolObj->outboundTag = 'block';
array_push($json->routing->settings->rules, $protocolObj);
}
}
if ((int)$server->tls) {

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

File diff suppressed because one or more lines are too long