BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-05 03:58:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

完善工单/节点/系统设置的请求合规检测

Browse Source
This commit is contained in:
兔姬桑
2020-12-30 02:32:10 +08:00
parent eed3c80fb6
commit 2bedbd6b59
11 changed files with 134 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Admin/NodeController.php
View File

@@ -14,6 +14,7 @@ use App\Models\NodeCertificate;
use App\Models\NodePing;
use App\Models\RuleGroup;
use App\Services\NodeService;
use Arr;
use Exception;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -68,7 +69,9 @@ class NodeController extends Controller
public function store(NodeRequest $request): JsonResponse
{
try {
$node = Node::create($request->except('_token', 'labels'));
$array = $request->validated();
Arr::forget($array, ['labels']);
$node = Node::create($array);
if ($node) {
// 生成节点标签
@@ -104,10 +107,12 @@ class NodeController extends Controller
public function update(NodeRequest $request, Node $node): JsonResponse
{
try {
// 更新节点标签
$node->labels()->sync($request->input('labels'));
$array = $request->validated();
Arr::forget($array, ['labels']);
if ($node->update($array)) {
// 更新节点标签
$node->labels()->sync($request->input('labels'));
if ($node->update($request->except('_token', 'labels'))) {
return Response::json(['status' => 'success', 'message' => '编辑成功']);
}
} catch (Exception $e) {
@@ -182,9 +187,7 @@ class NodeController extends Controller
// Ping节点延迟
public function pingNode(Node $node): JsonResponse
{
$result = NetworkDetection::ping($node->is_ddns ? $node->server : $node->ip);
if ($result) {
if ($result = NetworkDetection::ping($node->is_ddns ? $node->server : $node->ip)) {
return Response::json([
'status' => 'success',
'message' => [