兔姬桑 vor 4 Jahren
Ursprung
Commit
aa71f39d6f

+ 46 - 47
app/Http/Controllers/NodeController.php

@@ -29,60 +29,59 @@ use Validator;
 class NodeController extends Controller {
 	// 节点列表
 	public function nodeList(Request $request) {
-		if($request->isMethod('POST')){
-			$id = $request->input('id');
-			$node = SsNode::query()->whereId($id)->first();
-			// 使用DDNS的node先获取ipv4地址
-			if($node->is_ddns){
-				$ip = gethostbyname($node->server);
-				if(strcmp($ip, $node->server) != 0){
-					$node->ip = $ip;
-				}else{
-					return Response::json(['status' => 'fail', 'title' => 'IP获取错误', 'message' => $node->name.'IP获取失败']);
-				}
-			}
-			$data[0] = NetworkDetection::networkCheck($node->ip, true); //ICMP
-			$data[1] = NetworkDetection::networkCheck($node->ip, false, $node->single? $node->port : null); //TCP
+		$status = $request->input('status');
 
-			return Response::json(['status' => 'success', 'title' => '['.$node->name.']阻断信息', 'message' => $data]);
-		}else{
-			$status = $request->input('status');
+		$query = SsNode::query();
 
-			$query = SsNode::query();
+		if(isset($status)){
+			$query->whereStatus($status);
+		}
 
-			if(isset($status)){
-				$query->whereStatus($status);
-			}
+		$nodeList = $query->orderByDesc('status')->orderBy('id')->paginate(15)->appends($request->except('page'));
+		foreach($nodeList as $node){
+			// 在线人数
+			$online_log = SsNodeOnlineLog::query()
+			                             ->whereNodeId($node->id)
+			                             ->where('log_time', '>=', strtotime("-5 minutes"))
+			                             ->orderByDesc('id')
+			                             ->first();
+			$node->online_users = empty($online_log)? 0 : $online_log->online_user;
+
+			// 已产生流量
+			$totalTraffic = SsNodeTrafficDaily::query()->whereNodeId($node->id)->sum('total');
+			$node->transfer = flowAutoShow($totalTraffic);
+
+			// 负载(10分钟以内)
+			$node_info = SsNodeInfo::query()
+			                       ->whereNodeId($node->id)
+			                       ->where('log_time', '>=', strtotime("-10 minutes"))
+			                       ->orderByDesc('id')
+			                       ->first();
+			$node->isOnline = empty($node_info) || empty($node_info->load)? 0 : 1;
+			$node->load = $node->isOnline? $node_info->load : '离线';
+			$node->uptime = empty($node_info)? 0 : seconds2time($node_info->uptime);
+		}
 
-			$nodeList = $query->orderByDesc('status')->orderBy('id')->paginate(15)->appends($request->except('page'));
-			foreach($nodeList as $node){
-				// 在线人数
-				$online_log = SsNodeOnlineLog::query()
-				                             ->whereNodeId($node->id)
-				                             ->where('log_time', '>=', strtotime("-5 minutes"))
-				                             ->orderByDesc('id')
-				                             ->first();
-				$node->online_users = empty($online_log)? 0 : $online_log->online_user;
-
-				// 已产生流量
-				$totalTraffic = SsNodeTrafficDaily::query()->whereNodeId($node->id)->sum('total');
-				$node->transfer = flowAutoShow($totalTraffic);
-
-				// 负载(10分钟以内)
-				$node_info = SsNodeInfo::query()
-				                       ->whereNodeId($node->id)
-				                       ->where('log_time', '>=', strtotime("-10 minutes"))
-				                       ->orderByDesc('id')
-				                       ->first();
-				$node->isOnline = empty($node_info) || empty($node_info->load)? 0 : 1;
-				$node->load = $node->isOnline? $node_info->load : '离线';
-				$node->uptime = empty($node_info)? 0 : seconds2time($node_info->uptime);
-			}
+		$view['nodeList'] = $nodeList;
 
-			$view['nodeList'] = $nodeList;
+		return Response::view('admin.node.nodeList', $view);
+	}
+
+	public function checkNode($id){
+		$node = SsNode::query()->whereId($id)->first();
+		// 使用DDNS的node先获取ipv4地址
+		if($node->is_ddns){
+			$ip = gethostbyname($node->server);
+			if(strcmp($ip, $node->server) != 0){
+				$node->ip = $ip;
+			}else{
+				return Response::json(['status' => 'fail', 'title' => 'IP获取错误', 'message' => $node->name.'IP获取失败']);
+			}
 		}
+		$data[0] = NetworkDetection::networkCheck($node->ip, true); //ICMP
+		$data[1] = NetworkDetection::networkCheck($node->ip, false, $node->single? $node->port : null); //TCP
 
-		return Response::view('admin.node.nodeList', $view);
+		return Response::json(['status' => 'success', 'title' => '['.$node->name.']阻断信息', 'message' => $data]);
 	}
 
 	// 添加节点

+ 2 - 2
resources/views/admin/index.blade.php

@@ -110,7 +110,7 @@
 				</a>
 			</div>
 			<div class="col-xl-3 col-md-6 info-panel">
-				<a href="/node/list" class="card card-shadow">
+				<a href="/node" class="card card-shadow">
 					<div class="card-block bg-white">
 						<button type="button" class="btn btn-floating btn-sm btn-primary">
 							<i class="icon md-cloud"></i>
@@ -123,7 +123,7 @@
 				</a>
 			</div>
 			<div class="col-xl-3 col-md-6 info-panel">
-				<a href="/node/list?status=0" class="card card-shadow">
+				<a href="/node?status=0" class="card card-shadow">
 					<div class="card-block bg-white">
 						<button type="button" class="btn btn-floating btn-sm btn-info">
 							<i class="icon md-cloud-off"></i>

+ 32 - 37
resources/views/admin/layouts.blade.php

@@ -45,23 +45,18 @@
 </head>
 
 <body class="animsition dashboard">
-<nav class="site-navbar navbar navbar-default navbar-fixed-top navbar-mega navbar-inverse bg-indigo-600"
-		role="navigation">
+<nav class="site-navbar navbar navbar-default navbar-fixed-top navbar-mega navbar-inverse bg-indigo-600" role="navigation">
 	<div class="navbar-header">
-		<button type="button" class="navbar-toggler hamburger hamburger-close navbar-toggler-left hided"
-				data-toggle="menubar">
+		<button type="button" class="navbar-toggler hamburger hamburger-close navbar-toggler-left hided" data-toggle="menubar">
 			<span class="sr-only">Toggle navigation</span>
 			<span class="hamburger-bar"></span>
 		</button>
-		<button type="button" class="navbar-toggler collapsed" data-target="#site-navbar-collapse"
-				data-toggle="collapse">
+		<button type="button" class="navbar-toggler collapsed" data-target="#site-navbar-collapse" data-toggle="collapse">
 			<i class="icon wb-more-horizontal" aria-hidden="true"></i>
 		</button>
 		<div class="navbar-brand navbar-brand-center">
-			<img src="{{\App\Components\Helpers::systemConfig()['website_logo']? :'/assets/images/logo64.png'}}"
-					class="navbar-brand-logo" alt="logo"/>
-			<span
-					class="navbar-brand-text hidden-xs-down"> {{\App\Components\Helpers::systemConfig()['website_name']}}</span>
+			<img src="{{\App\Components\Helpers::systemConfig()['website_logo']? :'/assets/images/logo64.png'}}" class="navbar-brand-logo" alt="logo"/>
+			<span class="navbar-brand-text hidden-xs-down"> {{\App\Components\Helpers::systemConfig()['website_name']}}</span>
 		</div>
 	</div>
 	<div class="navbar-container container-fluid">
@@ -83,8 +78,7 @@
 			</ul>
 			<ul class="nav navbar-toolbar navbar-right navbar-toolbar-right">
 				<li class="nav-item dropdown">
-					<a class="nav-link navbar-avatar" data-toggle="dropdown" href="#" aria-expanded="false"
-							data-animation="scale-up" role="button">
+					<a class="nav-link navbar-avatar" data-toggle="dropdown" href="#" aria-expanded="false" data-animation="scale-up" role="button">
 						<span class="avatar avatar-online">
 							<img src="/assets/images/avatar.svg" alt="..."/>
 							<i></i>
@@ -135,14 +129,14 @@
 							<span class="site-menu-title">余额变动</span>
 						</a>
 					</li>
-					<li class="site-menu-item {{in_array(Request::path(), ['subscribe/list']) ? 'active open' : ''}}">
-						<a href="/subscribe/list" class="animsition-link">
+					<li class="site-menu-item {{in_array(Request::path(), ['subscribe']) ? 'active open' : ''}}">
+						<a href="/subscribe" class="animsition-link">
 							<span class="site-menu-title">订阅管理</span>
 						</a>
 					</li>
 				</ul>
 			</li>
-			<li class="site-menu-item has-sub {{in_array(Request::path(), ['ticket/list', 'ticket/add','ticket/reply', 'admin/articleList', 'admin/addArticle', 'admin/editArticle', 'marketing/push', 'marketing/email']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{in_array(Request::path(), ['ticket', 'ticket/add','ticket/reply', 'admin/articleList', 'admin/addArticle', 'admin/editArticle', 'marketing/push', 'marketing/email']) ? 'active open' : ''}}">
 				<a href="javascript:void(0)">
 					<i class="site-menu-icon wb-chat-working" aria-hidden="true"></i>
 					<span class="site-menu-title">客服系统</span>
@@ -153,8 +147,8 @@
 					@endif
 				</a>
 				<ul class="site-menu-sub">
-					<li class="site-menu-item {{in_array(Request::path(), ['ticket/list', 'ticket/add','ticket/reply']) ? 'active open' : ''}}">
-						<a href="/ticket/list" class="animsition-link">
+					<li class="site-menu-item {{in_array(Request::path(), ['ticket', 'ticket/add','ticket/reply']) ? 'active open' : ''}}">
+						<a href="/ticket" class="animsition-link">
 							<span class="site-menu-title">服务工单</span>
 							@if(\App\Models\Ticket::query()->whereStatus(0)->count() > 0 )
 								<div class="site-menu-label">
@@ -180,14 +174,14 @@
 					</li>
 				</ul>
 			</li>
-			<li class="site-menu-item has-sub {{in_array(Request::path(), ['node/list', 'node/add', 'node/edit', 'node/monitor', 'node/pingLog']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{in_array(Request::path(), ['node', 'node/add', 'node/edit', 'node/monitor', 'node/pingLog']) ? 'active open' : ''}}">
 				<a href="javascript:void(0)">
 					<i class="site-menu-icon wb-grid-4" aria-hidden="true"></i>
 					<span class="site-menu-title">线路系统</span>
 				</a>
 				<ul class="site-menu-sub">
-					<li class="site-menu-item {{in_array(Request::path(), ['node/list', 'node/add', 'node/edit', 'node/monitor']) ? 'active open' : ''}}">
-						<a href="/node/list" class="animsition-link">
+					<li class="site-menu-item {{in_array(Request::path(), ['node', 'node/add', 'node/edit', 'node/monitor']) ? 'active open' : ''}}">
+						<a href="/node" class="animsition-link">
 							<span class="site-menu-title">线路管理</span>
 						</a>
 					</li>
@@ -198,19 +192,19 @@
 					</li>
 				</ul>
 			</li>
-			<li class="site-menu-item has-sub {{in_array(Request::path(), ['rule/list', 'rule/add', 'rule/edit', 'rule/group/list', 'rule/group/add', 'rule/group/edit', 'rule/group/assign', 'rule/log']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{in_array(Request::path(), ['rule', 'rule/add', 'rule/edit', 'rule/group', 'rule/group/add', 'rule/group/edit', 'rule/group/assign', 'rule/log']) ? 'active open' : ''}}">
 				<a href="javascript:void(0)">
 					<i class="site-menu-icon wb-eye" aria-hidden="true"></i>
 					<span class="site-menu-title">审计规则</span>
 				</a>
 				<ul class="site-menu-sub">
-					<li class="site-menu-item {{in_array(Request::path(), ['rule/list', 'rule/add', 'rule/edit']) ? 'active open' : ''}}">
-						<a href="/rule/list" class="animsition-link">
+					<li class="site-menu-item {{in_array(Request::path(), ['rule', 'rule/add', 'rule/edit']) ? 'active open' : ''}}">
+						<a href="/rule" class="animsition-link">
 							<span class="site-menu-title">规则列表</span>
 						</a>
 					</li>
-					<li class="site-menu-item {{in_array(Request::path(), ['rule/group/list', 'rule/group/add', 'rule/group/edit', 'rule/group/assign']) ? 'active open' : ''}}">
-						<a href="/rule/group/list">
+					<li class="site-menu-item {{in_array(Request::path(), ['rule/group', 'rule/group/add', 'rule/group/edit', 'rule/group/assign']) ? 'active open' : ''}}">
+						<a href="/rule/group">
 							<span class="site-menu-title">规则分组</span>
 						</a>
 					</li>
@@ -221,19 +215,19 @@
 					</li>
 				</ul>
 			</li>
-			<li class="site-menu-item has-sub {{in_array(Request::path(), ['shop/list', 'shop/add', 'shop/edit', 'coupon/list', 'coupon/add','admin/orderList']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{in_array(Request::path(), ['shop', 'shop/add', 'shop/edit', 'coupon', 'coupon/add','admin/orderList']) ? 'active open' : ''}}">
 				<a href="javascript:void(0)">
 					<i class="site-menu-icon wb-shopping-cart" aria-hidden="true"></i>
 					<span class="site-menu-title">商品系统</span>
 				</a>
 				<ul class="site-menu-sub">
-					<li class="site-menu-item {{in_array(Request::path(), ['shop/list', 'shop/add', 'shop/edit']) ? 'active open' : ''}}">
-						<a href="/shop/list" class="animsition-link">
+					<li class="site-menu-item {{in_array(Request::path(), ['shop', 'shop/add', 'shop/edit']) ? 'active open' : ''}}">
+						<a href="/shop" class="animsition-link">
 							<span class="site-menu-title">商品管理</span>
 						</a>
 					</li>
-					<li class="site-menu-item {{in_array(Request::path(), ['coupon/list', 'coupon/add']) ? 'active open' : ''}}">
-						<a href="/coupon/list" class="animsition-link">
+					<li class="site-menu-item {{in_array(Request::path(), ['coupon', 'coupon/add']) ? 'active open' : ''}}">
+						<a href="/coupon" class="animsition-link">
 							<span class="site-menu-title">卡券管理</span>
 						</a>
 					</li>
@@ -250,8 +244,7 @@
 					<span class="site-menu-title">推广系统</span>
 					@if(\App\Models\ReferralApply::query()->whereStatus(0)->count() > 0 )
 						<div class="site-menu-badge">
-							<span
-									class="badge badge-pill badge-success">{{\App\Models\Ticket::query()->whereStatus(0)->count()}}</span>
+							<span class="badge badge-pill badge-success">{{\App\Models\Ticket::query()->whereStatus(0)->count()}}</span>
 						</div>
 					@endif
 				</a>
@@ -354,14 +347,14 @@
 					</li>
 				</ul>
 			</li>
-			<li class="site-menu-item has-sub {{in_array(Request::path(), ['sensitiveWords/list', 'admin/config', 'admin/system']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{in_array(Request::path(), ['sensitiveWords', 'admin/config', 'admin/system']) ? 'active open' : ''}}">
 				<a href="javascript:void(0)">
 					<i class="site-menu-icon wb-settings" aria-hidden="true"></i>
 					<span class="site-menu-title">设置</span>
 				</a>
 				<ul class="site-menu-sub">
-					<li class="site-menu-item {{in_array(Request::path(), ['sensitiveWords/list']) ? 'active open' : ''}}">
-						<a href="/sensitiveWords/list" class="animsition-link">
+					<li class="site-menu-item {{in_array(Request::path(), ['sensitiveWords']) ? 'active open' : ''}}">
+						<a href="/sensitiveWords" class="animsition-link">
 							<span class="site-menu-title">敏感词管理</span>
 						</a>
 					</li>
@@ -381,9 +374,11 @@
 	</div>
 </div>
 <div class="page">
-	<!--[if lt IE 8]> <p class="browserupgrade">您正在使用 <strong>过时/老旧</strong> 的浏览器。 为了您的使用体验,请
+	<!--[if lt IE 8]>
+	<p class="browserupgrade">您正在使用 <strong>过时/老旧</strong> 的浏览器。 为了您的使用体验,请
 		<a href="http://browsehappy.com/">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong> browser. Please
-		<a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+		<a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.
+	</p>
 	<![endif]-->
 	@yield('content')
 </div>

+ 1 - 1
resources/views/admin/node/nodeInfo.blade.php

@@ -524,7 +524,7 @@
 				success: function (ret) {
 					if (ret.status === 'success') {
 						swal.fire({title: ret.message, type: 'success', timer: 1000, showConfirmButton: false})
-							.then(() => window.location.href = '/node/list')
+							.then(() => window.location.href = '/node')
 					} else {
 						swal.fire({
 							title: '[错误 | Error]',

+ 21 - 16
resources/views/admin/node/nodeList.blade.php

@@ -28,7 +28,7 @@
 						<th> 存活</th>
 						<th> 状态</th>
 						<th> 在线</th>
-						<th>产生流量</th>
+						<th> 产生流量</th>
 						<th> 流量比例</th>
 						<th> 扩展</th>
 						<th> 操作</th>
@@ -58,21 +58,26 @@
 							<td>
 								@if($node->compatible) <span class="badge badge-lg badge-info">兼</span> @endif
 								@if($node->single) <span class="badge badge-lg badge-info">单</span> @endif
-								@if(!$node->is_subscribe) <span
-										class="badge badge-lg badge-danger"><s>订</s></span> @endif
+								@if(!$node->is_subscribe)
+									<span class="badge badge-lg badge-danger"><s>订</s></span> @endif
 							</td>
 							<td>
 								<div class="btn-group">
-									<a href="javascript:pingNode('{{$node->id}}')" class="btn btn-primary"><i
-												id="ping{{$node->id}}" class="icon wb-order"></i></a>
-									<a href="javascript:testNode('{{$node->id}}')" class="btn btn-primary"><i
-												id="node{{$node->id}}" class="icon wb-signal"></i></a>
-									<a href="/node/edit?id={{$node->id}}&page={{Request::get('page', 1)}}"
-											class="btn btn-primary"><i class="icon wb-edit"></i></a>
-									<a href="javascript:delNode('{{$node->id}}','{{$node->name}}')"
-											class="btn btn-danger"><i class="icon wb-trash"></i></a>
-									<a href="/node/monitor/{{$node->id}}" class="btn btn-primary"><i
-												class="icon wb-stats-bars"></i></a>
+									<a href="javascript:pingNode('{{$node->id}}')" class="btn btn-primary">
+										<i id="ping{{$node->id}}" class="icon wb-order"></i>
+									</a>
+									<a href="javascript:checkNode('{{$node->id}}')" class="btn btn-primary">
+										<i id="node{{$node->id}}" class="icon wb-signal"></i>
+									</a>
+									<a href="/node/edit?id={{$node->id}}&page={{Request::get('page', 1)}}" class="btn btn-primary">
+										<i class="icon wb-edit"></i>
+									</a>
+									<a href="javascript:delNode('{{$node->id}}','{{$node->name}}')" class="btn btn-danger">
+										<i class="icon wb-trash"></i>
+									</a>
+									<a href="/node/monitor/{{$node->id}}" class="btn btn-primary">
+										<i class="icon wb-stats-bars"></i>
+									</a>
 								</div>
 							</td>
 						</tr>
@@ -101,11 +106,11 @@
 			type="text/javascript"></script>
 	<script type="text/javascript">
 		//节点连通性测试
-		function testNode(id) {
+		function checkNode(id) {
 			$.ajax({
 				type: "POST",
-				url: '/node/list',
-				data: {_token: '{{csrf_token()}}', id: id},
+				url: '/node/check/' + id,
+				data: {_token: '{{csrf_token()}}'},
 				beforeSend: function () {
 					$("#node" + id).removeClass("wb-signal").addClass("wb-loop icon-spin");
 				},

+ 1 - 1
resources/views/admin/rule/ruleGroupInfo.blade.php

@@ -8,7 +8,7 @@
 			<div class="panel-heading">
 				<h2 class="panel-title">@isset($ruleGroup)编辑@else添加@endisset规则分组</h2>
 				<div class="panel-actions">
-					<a href="/rule/group/list" class="btn btn-danger">返 回</a>
+					<a href="/rule/group" class="btn btn-danger">返 回</a>
 				</div>
 			</div>
 			@if (Session::has('successMsg'))

+ 2 - 2
resources/views/admin/rule/ruleList.blade.php

@@ -26,7 +26,7 @@
 						</select>
 					</div>
 					<div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
-						<a href="/rule/list" class="btn btn-danger">重 置</a>
+						<a href="/rule" class="btn btn-danger">重 置</a>
 					</div>
 				</div>
 				<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -198,7 +198,7 @@
 
 		// 搜索
 		function Search() {
-			window.location.href = '/rule/list?type=' + $("#type").val();
+			window.location.href = '/rule?type=' + $("#type").val();
 		}
 	</script>
 @endsection

+ 1 - 1
resources/views/admin/shop/goodsInfo.blade.php

@@ -19,7 +19,7 @@
 					@isset($goods) 编辑商品 @else 添加商品 @endisset
 				</h1>
 				<div class="panel-actions">
-					<a href="{{url('/shop/list')}}" class="btn btn-danger">返 回</a>
+					<a href="{{url('/shop')}}" class="btn btn-danger">返 回</a>
 				</div>
 			</div>
 			@if (Session::has('successMsg'))

+ 2 - 2
resources/views/admin/shop/goodsList.blade.php

@@ -29,7 +29,7 @@
 					</div>
 					<div class="form-group col-lg-2 col-sm-4 btn-group">
 						<button class="btn btn-primary" onclick="Search()">搜 索</button>
-						<a href="/shop/list" class="btn btn-danger">重 置</a>
+						<a href="/shop" class="btn btn-danger">重 置</a>
 					</div>
 				</div>
 				<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -129,7 +129,7 @@
 
 		// 搜索
 		function Search() {
-			window.location.href = '/shop/list?type=' + $("#type option:selected").val() + '&status=' + $("#status option:selected").val();
+			window.location.href = '/shop?type=' + $("#type option:selected").val() + '&status=' + $("#status option:selected").val();
 		}
 
 		// 删除商品

+ 2 - 2
resources/views/admin/subscribe/subscribeList.blade.php

@@ -27,7 +27,7 @@
 					</div>
 					<div class="form-group col-lg-2 col-sm-6 btn-group">
 						<button class="btn btn-primary" onclick="Search()">搜 索</button>
-						<a href="/subscribe/list" class="btn btn-danger">重 置</a>
+						<a href="/subscribe" class="btn btn-danger">重 置</a>
 					</div>
 				</div>
 				<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -114,7 +114,7 @@
 
 		// 搜索
 		function Search() {
-			window.location.href = '/subscribe/list' + '?user_id=' + $("#user_id").val() + '&email=' + $("#email").val() + '&status=' + $("#status option:selected").val();
+			window.location.href = '/subscribe' + '?user_id=' + $("#user_id").val() + '&email=' + $("#email").val() + '&status=' + $("#status option:selected").val();
 		}
 
 		// 启用禁用用户的订阅

+ 1 - 1
resources/views/admin/ticket/addTicket.blade.php

@@ -68,7 +68,7 @@
 				dataType: 'json',
 				success: function (ret) {
 					swal.fire({title: ret.message, type: 'success', timer: 1000})
-						.then(() => window.location.href = '/ticket/list');
+						.then(() => window.location.href = '/ticket');
 				}
 			});
 			return false;

+ 2 - 2
resources/views/admin/ticket/replyTicket.blade.php

@@ -9,7 +9,7 @@
 				<h1 class="panel-title cyan-600"><i class="icon wb-help-circle"></i> {{$ticket->title}} </h1>
 				@if($ticket->status != 2)
 					<div class="panel-actions">
-						<a href="/ticket/list" class="btn btn-default">返 回</a>
+						<a href="/ticket" class="btn btn-default">返 回</a>
 						<button class="btn btn-danger" onclick="closeTicket()"> {{trans('home.ticket_close')}} </button>
 					</div>
 				@endif
@@ -123,7 +123,7 @@
 								type: 'success',
 								timer: 1000,
 								showConfirmButton: false
-							}).then(() => window.location.href = '/ticket/list')
+							}).then(() => window.location.href = '/ticket')
 						},
 						error: function () {
 							swal.fire("未知错误!请通知客服!")

+ 2 - 2
resources/views/admin/ticket/ticketList.blade.php

@@ -22,7 +22,7 @@
 					</div>
 					<div class="form-group col-lg-2 col-sm-6 btn-group">
 						<button class="btn btn-primary" onclick="Search()">搜 索</button>
-						<a href="/ticket/list" class="btn btn-danger">重 置</a>
+						<a href="/ticket" class="btn btn-danger">重 置</a>
 					</div>
 				</div>
 				<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -88,7 +88,7 @@
 
 		// 搜索
 		function Search() {
-			window.location.href = '/ticket/list?email=' + $("#email").val();
+			window.location.href = '/ticket?email=' + $("#email").val();
 		}
 	</script>
 @endsection

+ 10 - 9
routes/web.php

@@ -77,18 +77,19 @@ Route::group(['middleware' => ['isForbidden', 'isAdminLogin', 'isAdmin']], funct
 		});
 	});
 	Route::group(['prefix' => 'node'], function() {
-		Route::any('list', 'NodeController@nodeList'); // 节点列表
+		Route::get('/', 'NodeController@nodeList'); // 节点列表
 		Route::any('add', 'NodeController@addNode'); // 添加节点
 		Route::any('edit', 'NodeController@editNode'); // 编辑节点
 		Route::post('delete', 'NodeController@delNode'); // 删除节点
 		Route::get('monitor/{id}', 'NodeController@nodeMonitor'); // 节点流量监控
+		Route::post('check/{id}', 'NodeController@checkNode'); // 节点阻断检测
 		Route::post('ping', 'NodeController@pingNode'); // 节点ping测速
 		Route::get('pingLog', 'NodeController@pingLog'); //节点Ping测速日志
 	});
 
 	Route::group(['namespace' => 'Admin'], function() {
 		Route::group(['prefix' => 'ticket'], function() {
-			Route::get('list', 'TicketController@ticketList'); // 工单列表
+			Route::get('/', 'TicketController@ticketList'); // 工单列表
 			// Todo: 创建工单
 			// Route::post('create', 'TicketController@createTicket'); // 创建工单
 			Route::post('close', 'TicketController@closeTicket'); // 关闭工单
@@ -96,21 +97,21 @@ Route::group(['middleware' => ['isForbidden', 'isAdminLogin', 'isAdmin']], funct
 		});
 
 		Route::group(['prefix' => 'coupon'], function() {
-			Route::any('list', 'CouponController@couponList'); // 优惠券列表
+			Route::any('/', 'CouponController@couponList'); // 优惠券列表
 			Route::any('add', 'CouponController@addCoupon'); // 添加优惠券
 			Route::post('delete', 'CouponController@delCoupon'); // 删除优惠券
 			Route::get('export', 'CouponController@exportCoupon'); // 导出优惠券
 		});
 
 		Route::group(['prefix' => 'shop'], function() {
-			Route::any('list', 'ShopController@goodsList'); // 商品列表
+			Route::any('/', 'ShopController@goodsList'); // 商品列表
 			Route::any('add', 'ShopController@addGoods'); // 添加商品
 			Route::any('edit/{id}', 'ShopController@editGoods'); // 编辑商品
 			Route::post('delete', 'ShopController@delGoods'); // 删除商品
 		});
 
 		Route::group(['prefix' => 'subscribe'], function() {
-			Route::get('list', 'SubscribeController@subscribeList'); // 订阅码列表
+			Route::get('/', 'SubscribeController@subscribeList'); // 订阅码列表
 			Route::get('log', 'SubscribeController@subscribeLog'); // 订阅码记录
 			Route::post('set', 'SubscribeController@setSubscribeStatus'); // 启用禁用用户的订阅
 		});
@@ -122,9 +123,9 @@ Route::group(['middleware' => ['isForbidden', 'isAdminLogin', 'isAdmin']], funct
 		});
 
 		Route::group(['prefix' => 'sensitiveWords'], function() {
-			Route::get("list", "SensitiveWordsController@sensitiveWordslist"); // 敏感词列表
+			Route::get("/", "SensitiveWordsController@sensitiveWordslist"); // 敏感词列表
 			Route::post("add", "SensitiveWordsController@addSensitiveWords"); // 添加敏感词
-			Route::post("del", "SensitiveWordsController@delSensitiveWords"); // 删除敏感词
+			Route::post("delete", "SensitiveWordsController@delSensitiveWords"); // 删除敏感词
 		});
 
 		// 工具相关
@@ -138,12 +139,12 @@ Route::group(['middleware' => ['isForbidden', 'isAdminLogin', 'isAdmin']], funct
 
 		// 节点审计规则相关
 		Route::group(['prefix' => 'rule'], function() {
-			Route::get('list', 'RuleController@ruleList'); // 审计规则列表
+			Route::get('/', 'RuleController@ruleList'); // 审计规则列表
 			Route::post('add', 'RuleController@addRule'); // 添加审计规则
 			Route::post('edit', 'RuleController@editRule'); // 删除审计规则
 			Route::post('delete/{id}', 'RuleController@delRule'); // 删除审计规则
 			Route::group(['prefix' => 'group'], function() {
-				Route::get('list', 'RuleController@ruleGroupList'); // 审计规则分组列表
+				Route::get('/', 'RuleController@ruleGroupList'); // 审计规则分组列表
 				Route::any('add', 'RuleController@addRuleGroup'); // 添加审计规则分组
 				Route::any('edit', 'RuleController@editRuleGroup'); // 编辑审计规则分组
 				Route::post('delete/{id}', 'RuleController@delRuleGroup'); // 删除审计规则分组