From f0413230d4a2f3229e606088e1085575abbb11a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Wed, 5 Aug 2020 23:39:48 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/admin/layouts.blade.php       | 24 +++++++++----------
 .../views/admin/rule/group/assign.blade.php   |  2 +-
 resources/views/admin/rule/log.blade.php      |  6 ++---
 routes/web.php                                | 16 ++++++-------
 sql/db.sql                                    |  2 +-
 sql/mod/20200805.sql                          | 13 ++++++----
 6 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/resources/views/admin/layouts.blade.php b/resources/views/admin/layouts.blade.php
index 68728154..a02ff531 100644
--- a/resources/views/admin/layouts.blade.php
+++ b/resources/views/admin/layouts.blade.php
@@ -113,7 +113,7 @@
 					<span class="site-menu-title">管理中心</span>
 				</a>
 			</li>
-			<li class="site-menu-item has-sub {{in_array(Request::path(), ['admin/userList', 'admin/addUser', 'admin/editUser', 'admin/export', 'admin/userMonitor', 'group', 'group/add', 'group/edit', 'admin/userCreditLogList', 'subscribe']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{in_array(Request::path(), ['admin/userList', 'admin/addUser', 'admin/editUser', 'admin/export', 'admin/userMonitor', 'admin/userCreditLogList', 'subscribe']) || request()->routeIs('group*') ? 'active open' : ''}}">
 				<a href="javascript:void(0)">
 					<i class="site-menu-icon wb-user" aria-hidden="true"></i>
 					<span class="site-menu-title">用户系统</span>
@@ -124,8 +124,8 @@
 							<span class="site-menu-title">用户管理</span>
 						</a>
 					</li>
-					<li class="site-menu-item {{Str::in_array(Request::path(), ['group']) ? 'active open' : ''}}">
-						<a href="/group">
+					<li class="site-menu-item {{request()->routeIs('group*') ? 'active open' : ''}}">
+						<a href="{{route('group.index')}}">
 							<span class="site-menu-title">用戶分组</span>
 						</a>
 					</li>
@@ -207,36 +207,36 @@
 					</li>
 				</ul>
 			</li>
-			<li class="site-menu-item has-sub {{in_array(Request::path(), ['rule', 'rule/group', 'rule/group/add', 'rule/group/edit', 'rule/group/assign', 'rule/log']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{request()->routeIs('rule*') ? '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']) ? 'active open' : ''}}">
-						<a href="/rule">
+					<li class="site-menu-item {{request()->routeIs(['rule.index']) ? 'active open' : ''}}">
+						<a href="{{route('rule.index')}}">
 							<span class="site-menu-title">规则列表</span>
 						</a>
 					</li>
-					<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">
+					<li class="site-menu-item {{request()->routeIs('rule.group*') ? 'active open' : ''}}">
+						<a href="{{route('rule.group.index')}}">
 							<span class="site-menu-title">规则分组</span>
 						</a>
 					</li>
-					<li class="site-menu-item {{in_array(Request::path(), ['rule/log']) ? 'active open' : ''}}">
-						<a href="/rule/log">
+					<li class="site-menu-item {{request()->routeIs('rule.log') ? 'active open' : ''}}">
+						<a href="{{route('rule.log')}}">
 							<span class="site-menu-title">触发记录</span>
 						</a>
 					</li>
 				</ul>
 			</li>
-			<li class="site-menu-item has-sub {{Str::contains(Request::path(), ['goods', 'coupon', 'admin/orderList']) ? 'active open' : ''}}">
+			<li class="site-menu-item has-sub {{in_array(Request::path(), ['coupon', 'coupon/add', 'admin/orderList']) || request()->routeIs('goods*') ? '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 {{Str::contains(Request::path(),'goods') ? 'active open' : ''}}">
+					<li class="site-menu-item {{request()->routeIs('goods*') ? 'active open' : ''}}">
 						<a href="{{route('goods.index')}}">
 							<span class="site-menu-title">商品管理</span>
 						</a>
diff --git a/resources/views/admin/rule/group/assign.blade.php b/resources/views/admin/rule/group/assign.blade.php
index 18c2a7ea..22ca421e 100644
--- a/resources/views/admin/rule/group/assign.blade.php
+++ b/resources/views/admin/rule/group/assign.blade.php
@@ -8,7 +8,7 @@
 			<div class="panel-heading">
 				<h2 class="panel-title">分配节点</h2>
 				<div class="panel-actions">
-					<a href="/rule/group" class="btn btn-danger">返 回</a>
+					<a href="{{route('rule.group.index')}}" class="btn btn-danger">返 回</a>
 				</div>
 			</div>
 			@if (Session::has('successMsg'))
diff --git a/resources/views/admin/rule/log.blade.php b/resources/views/admin/rule/log.blade.php
index 6f3cc4a1..08f5bb42 100644
--- a/resources/views/admin/rule/log.blade.php
+++ b/resources/views/admin/rule/log.blade.php
@@ -40,7 +40,7 @@
 					</div>
 					<div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4 btn-group">
 						<button class="btn btn-primary" onclick="Search()">搜 索</button>
-						<a href="/rule/log" class="btn btn-danger">重 置</a>
+						<a href="{{route('rule.log')}}" class="btn btn-danger">重 置</a>
 					</div>
 				</div>
 				<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -91,7 +91,7 @@
 	<script type="text/javascript">
 		// 搜索
 		function Search() {
-			window.location.href = '/rule/log?uid=' + $("#uid").val() + '&username=' + $("#username").val() + '&node_id=' + $("#node_id option:selected").val() + '&rule_id=' + $("#rule_id option:selected").val();
+			window.location.href = '{{route('rule.log')}}?uid=' + $("#uid").val() + '&username=' + $("#username").val() + '&node_id=' + $("#node_id option:selected").val() + '&rule_id=' + $("#rule_id option:selected").val();
 		}
 
 		// 清除所有记录
@@ -105,7 +105,7 @@
 				confirmButtonText: '{{trans('home.ticket_confirm')}}',
 			}).then((result) => {
 				if (result.value) {
-					$.post("/rule/clear", {_token: '{{csrf_token()}}'}, function (ret) {
+					$.post("{{route('rule.clear')}}", {_token: '{{csrf_token()}}'}, function (ret) {
 						if (ret.status === 'success') {
 							swal.fire({title: ret.message, type: 'success', timer: 1000, showConfirmButton: false})
 								.then(() => window.location.reload())
diff --git a/routes/web.php b/routes/web.php
index 67fb78a4..afe2b0e7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -153,16 +153,16 @@ Route::group(['middleware' => ['isForbidden', 'isAdminLogin', 'isAdmin']], funct
 		Route::group(['prefix' => 'rule'], function() {
 			Route::group(['prefix' => 'group'], function() {
 				Route::get('/', 'RuleGroupController@index')->name('rule.group.index'); // 审计规则分组列表
-				Route::get('/create', 'RuleGroupController@create')->name('rule.group.create'); // 添加审计规则分组页面
+				Route::get('create', 'RuleGroupController@create')->name('rule.group.create'); // 添加审计规则分组页面
 				Route::post('/', 'RuleGroupController@store')->name('rule.group.store'); // 添加审计规则分组
-				Route::get('/{id}/edit', 'RuleGroupController@edit')->name('rule.group.edit'); // 编辑审计规则分组页面
-				Route::put('/{id}', 'RuleGroupController@update')->name('rule.group.update'); // 编辑审计规则分组
-				Route::delete('/{id}', 'RuleGroupController@destroy')->name('rule.group.destroy'); // 删除审计规则分组
-				Route::get('/{id}/assign', 'RuleGroupController@assignNode')->name('rule.group.editNode');
-				Route::put('/{id}/assign', 'RuleGroupController@assign')->name('rule.group.assign'); // 规则分组关联节点
+				Route::get('{id}/edit', 'RuleGroupController@edit')->name('rule.group.edit'); // 编辑审计规则分组页面
+				Route::put('{id}', 'RuleGroupController@update')->name('rule.group.update'); // 编辑审计规则分组
+				Route::delete('{id}', 'RuleGroupController@destroy')->name('rule.group.destroy'); // 删除审计规则分组
+				Route::get('{id}/assign', 'RuleGroupController@assignNode')->name('rule.group.editNode');
+				Route::put('{id}/assign', 'RuleGroupController@assign')->name('rule.group.assign'); // 规则分组关联节点
 			});
-			Route::get('log', 'RuleController@ruleLogList'); // 用户触发审计规则日志
-			Route::post('clear', 'RuleController@clearLog'); // 清除所有审计触发日志
+			Route::get('log', 'RuleController@ruleLogList')->name('rule.log'); // 用户触发审计规则日志
+			Route::post('clear', 'RuleController@clearLog')->name('rule.clear'); // 清除所有审计触发日志
 		});
 		Route::resource('group', 'UserGroupController')->except('show');// 用户分组管理
 	});
diff --git a/sql/db.sql b/sql/db.sql
index 9bd9138e..0a3102f8 100644
--- a/sql/db.sql
+++ b/sql/db.sql
@@ -1254,7 +1254,7 @@ CREATE TABLE `ss_node_ip`
     `user_id`    INT(10) UNSIGNED     NOT NULL DEFAULT '0' COMMENT '用户ID',
     `port`       SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' COMMENT '端口',
     `type`       CHAR(3)              NOT NULL DEFAULT 'tcp' COMMENT '类型：all、tcp、udp',
-    `ip`         TEXT COMMENT '连接IP：每个IP用,号隔开',
+    `ip`         JSON COMMENT '用户连接IP',
     `created_at` INT(10) UNSIGNED     NOT NULL DEFAULT '0' COMMENT '上报时间',
     PRIMARY KEY (`id`),
     KEY `idx_port` (`port`),
diff --git a/sql/mod/20200805.sql b/sql/mod/20200805.sql
index 1eabd698..a95f04b5 100644
--- a/sql/mod/20200805.sql
+++ b/sql/mod/20200805.sql
@@ -1,8 +1,8 @@
--- 必须先运行php artisan updateTextToJson 来转换数据库数据
--- run php artisan updateTextToJson to reformat database data
+-- 不管是否更新数据库，先运行 php artisan updateTextToJson 来转换数据库数据为最新适配的版本
+-- run php artisan updateTextToJson to reformat database even if you aren't going to update the following sql
 
--- 可选性更新，推荐数据库版本5.7及以上 更新
--- Optional Update, recommend for Mysql >=5.7
+-- 可选性更新，推荐数据库版本5.7及以上更新
+-- Optional Update, recommend for Mysql version >=5.7
 
 ALTER TABLE `referral_apply`
     CHANGE `link_logs` `link_logs` JSON NOT NULL COMMENT '关联返利日志ID，例如：1,3,4';
@@ -12,4 +12,7 @@ ALTER TABLE `user_group`
 
 ALTER TABLE `rule_group`
     CHANGE `rules` `rules` JSON DEFAULT NULL COMMENT '关联的规则ID，多个用,号分隔',
-    CHANGE `nodes` `nodes` JSON DEFAULT NULL COMMENT '关联的节点ID，多个用,号分隔';
\ No newline at end of file
+    CHANGE `nodes` `nodes` JSON DEFAULT NULL COMMENT '关联的节点ID，多个用,号分隔';
+
+ALTER TABLE `ss_node_ip`
+    CHANGE `ip` `ip` JSON COMMENT '用户连接IP';
\ No newline at end of file