From 996786a7b7c12883183fe9ea3ea2b6811cad5743 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Tue, 26 Sep 2023 19:02:31 +0800
Subject: [PATCH] update_dev

---
 class/core/firewall_api.py            | 2 +-
 route/static/app/firewall.js          | 1 +
 route/templates/default/firewall.html | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py
index 278e6739c..670f8b098 100755
--- a/class/core/firewall_api.py
+++ b/class/core/firewall_api.py
@@ -392,7 +392,7 @@ class firewall_api:
 
         start = (page - 1) * limit
 
-        _list = mw.M('firewall').field('id,port,ps,addtime').limit(
+        _list = mw.M('firewall').field('id,port,protocol,ps,addtime').limit(
             str(start) + ',' + str(limit)).order('id desc').select()
         data = {}
         data['data'] = _list
diff --git a/route/static/app/firewall.js b/route/static/app/firewall.js
index dbbacee10..10f6e1471 100755
--- a/route/static/app/firewall.js
+++ b/route/static/app/firewall.js
@@ -298,6 +298,7 @@ function showAccept(page,search) {
 			}
 			body += "<tr>\
 						<td><em class='dlt-num'>" + data.data[i].id + "</em></td>\
+						<td>" + data.data[i].protocol + "</td>\
 						<td>" + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + "</td>\
 						<td>" + status + "</td>\
 						<td>" + data.data[i].addtime + "</td>\
diff --git a/route/templates/default/firewall.html b/route/templates/default/firewall.html
index 5934d746b..e0b1e5224 100755
--- a/route/templates/default/firewall.html
+++ b/route/templates/default/firewall.html
@@ -94,14 +94,18 @@
 							</select>
 							<input type="text" class="bt-input-text mr5" style="width: 117px;" id="AcceptPort" placeholder="端口">
 							<input type="text" class="bt-input-text mr5" id="Ps" placeholder="备注/说明">
+							<select class="bt-input-text c5 mr5" name="protocol" style="width:80px;">
+								<option value="tcp">tcp</option>
+								<option value="udp">udp</option>
+								<option value="tcp/udp">tcp/udp</option>
+							</select>
 							<button id="toAccept" onclick="addAcceptPort();" class="btn btn-default btn-sm va0" type="button">放行</button>
 							<span id="f-ps" class="c9" style="margin-left: 10px;">说明: 支持放行端口范围，如: 3000:3500</span>
 						</div>
                         <div class="tablescroll">
                             <table id="firewallBody" class="table table-hover" style="min-width: 640px;border: 0 none;"></table>
                         </div>
-                        <div id="firewallPage" class="dataTables_paginate paging_bootstrap page firewallBody" style="margin-bottom:0">            
-                        </div>
+                        <div id="firewallPage" class="dataTables_paginate paging_bootstrap page firewallBody" style="margin-bottom:0"></div>
                     </div>
                 </div>
             </div>