From b1cdccc8ec81fea6e41f280e62f36b37c0aa0242 Mon Sep 17 00:00:00 2001
From: lwch <lwch748@gmail.com>
Date: Thu, 18 Nov 2021 23:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3dashboard=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 +-
 .../dashboard/{h_tunnels.go => h_rules.go}    |  0
 code/client/main.go                           |  2 +-
 html/dashboard/index.html                     | 17 ++++-----
 html/dashboard/js/index.js                    | 38 +++++++++----------
 html/dashboard/js/terminal.js                 | 10 ++---
 6 files changed, 35 insertions(+), 35 deletions(-)
 rename code/client/dashboard/{h_tunnels.go => h_rules.go} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e049677..ace9f84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,4 +62,5 @@
 # v0.6.3
 
 1. bootstrap降版到4.6.1
-2. dashboard页面支持隧道类型筛选
\ No newline at end of file
+2. dashboard页面支持隧道类型筛选
+3. **为遵守中国法律，移除内网穿透功能**
\ No newline at end of file
diff --git a/code/client/dashboard/h_tunnels.go b/code/client/dashboard/h_rules.go
similarity index 100%
rename from code/client/dashboard/h_tunnels.go
rename to code/client/dashboard/h_rules.go
diff --git a/code/client/main.go b/code/client/main.go
index 7ca45a9..3f67044 100644
--- a/code/client/main.go
+++ b/code/client/main.go
@@ -38,7 +38,7 @@ func main() {
 	conf := flag.String("conf", "", "configure file path")
 	ver := flag.Bool("version", false, "show version info")
 	act := flag.String("action", "", "install or uninstall")
-	name := flag.String("name", "", "tunnel name")
+	name := flag.String("name", "", "rule name")
 	vport := flag.Uint("vport", 6155, "vnc worker listen port")
 	vcursor := flag.Bool("vcursor", false, "vnc show cursor")
 	flag.Parse()
diff --git a/html/dashboard/index.html b/html/dashboard/index.html
index a778782..ab96d6e 100644
--- a/html/dashboard/index.html
+++ b/html/dashboard/index.html
@@ -4,10 +4,10 @@
 {{template "aside" .}}
 <script>aside.active_dashboard();</script>
 <style>
-#label-tunnel-type {
+#label-rule-type {
     margin-right: 5px;
 }
-#tunnel-type {
+#rule-type {
     width: 200px;
     display: inline-block;
 }
@@ -32,19 +32,18 @@
             <div class="row"><div class="col-12">
                 <div class="card">
                     <div class="card-header">
-                        <h3 class="card-title">隧道列表</h3>
+                        <h3 class="card-title">终端列表</h3>
                     </div>
                     <div class="card-body">
                         <div class="form-group">
-                            <label id="label-tunnel-type" for="tunnel-type">类型:</label>
-                            <select id="tunnel-type" class="form-control">
+                            <label id="label-rule-type" for="rule-type">类型:</label>
+                            <select id="rule-type" class="form-control">
                                 <option value="all">全部</option>
-                                <option value="reverse">reverse</option>
                                 <option value="shell">shell</option>
                                 <option value="vnc">vnc</option>
                             </select>
                         </div>
-                        <table id="tunnels" class="table table-hover">
+                        <table id="rules" class="table table-hover">
                             <thead><tr>
                                 <th>名称</th>
                                 <th style="width:200px">对端</th>
@@ -52,7 +51,7 @@
                                 <th style="width:120px">虚拟连接数</th>
                                 <th style="width:200px">接收/发送（字节数）</th>
                                 <th style="width:200px">接收/发送（数据包）</th>
-                                <th style="width:200px">操作</th>
+                                <th style="width:120px">操作</th>
                             </tr></thead>
                             <tbody></tbody>
                         </table>
@@ -61,7 +60,7 @@
                 </div>
                 <!-- card -->
             </div></div>
-            <!-- 隧道列表 -->
+            <!-- 终端列表 -->
         </div>
         <!-- container -->
     </section>
diff --git a/html/dashboard/js/index.js b/html/dashboard/js/index.js
index f7bfa06..c15111b 100644
--- a/html/dashboard/js/index.js
+++ b/html/dashboard/js/index.js
@@ -1,63 +1,63 @@
 var page = {
     init: function() {
-        $('#tunnel-type').change(page.render);
+        $('#rule-type').change(page.render);
         page.render();
         setInterval(page.render, 5000);
     },
     render: function() {
         page.render_cards();
-        page.render_tunnels();
+        page.render_rules();
     },
     render_cards: function() {
         $.get('/api/info', function(ret) {
             $('#cards').empty();
-            page.add_card('隧道总数', ret.tunnels);
+            page.add_card('规则总数', ret.rules);
             page.add_card('物理连接数', ret.physical_links);
             page.add_card('虚拟连接数', ret.virtual_links);
             page.add_card('终端会话', ret.sessions);
         });
     },
-    render_tunnels: function() {
-        $.get('/api/tunnels', function(ret) {
-            $('#tunnels tbody').empty();
-            var type = $('#tunnel-type').val();
-            $.each(ret, function(_, tunnel) {
-                if (type != 'all' && tunnel.type != type) {
+    render_rules: function() {
+        $.get('/api/rules', function(ret) {
+            $('#rules tbody').empty();
+            var type = $('#rule-type').val();
+            $.each(ret, function(_, rule) {
+                if (type != 'all' && rule.type != type) {
                     return;
                 }
                 var send_bytes = 0;
                 var send_packet = 0;
                 var recv_bytes = 0;
                 var recv_packet = 0;
-                $.each(tunnel.links, function(_, link) {
+                $.each(rule.links, function(_, link) {
                     send_bytes += link.send_bytes;
                     send_packet += link.send_packet;
                     recv_bytes += link.recv_bytes;
                     recv_packet += link.recv_packet;
                 });
                 var op = '';
-                switch (tunnel.type) {
+                switch (rule.type) {
                 case 'reverse':
                     op = `
-                    <a href="http://${location.hostname}:${tunnel.port}" target="_blank">http</a>
-                    <a href="https://${location.hostname}:${tunnel.port}" target="_blank">https</a>`;
+                    <a href="http://${location.hostname}:${rule.port}" target="_blank">http</a>
+                    <a href="https://${location.hostname}:${rule.port}" target="_blank">https</a>`;
                     break;
                 case 'shell':
                 case 'vnc':
-                    op = `<a href="http://${location.host}/terminal.html?name=${tunnel.name}" target="_blank">连接</a>`;
+                    op = `<a href="http://${location.host}/terminal.html?name=${rule.name}" target="_blank">连接</a>`;
                     break;
                 }
                 var str = `
                 <tr>
-                    <td>${tunnel.name}</td>
-                    <td>${tunnel.remote}</td>
-                    <td>${tunnel.type}</td>
-                    <td>${tunnel.links?tunnel.links.length:0}</td>
+                    <td>${rule.name}</td>
+                    <td>${rule.remote}</td>
+                    <td>${rule.type}</td>
+                    <td>${rule.links?rule.links.length:0}</td>
                     <td>${humanize.bytes(recv_bytes)}/${humanize.bytes(send_bytes)}</td>
                     <td>${recv_packet}/${send_packet}</td>
                     <td>${op}</td>
                 </tr>`;
-                $('#tunnels tbody').append($(str));
+                $('#rules tbody').append($(str));
             });
         });
     },
diff --git a/html/dashboard/js/terminal.js b/html/dashboard/js/terminal.js
index 7bcc5f9..7093cd4 100644
--- a/html/dashboard/js/terminal.js
+++ b/html/dashboard/js/terminal.js
@@ -11,14 +11,14 @@ var page = {
     },
     load: function(cb) {
         if (!cb) cb = function(){};
-        $.get('/api/tunnels', function(ret) {
+        $.get('/api/rules', function(ret) {
             $('#terms').empty();
-            $.each(ret, function(_, tunnel) {
-                if (tunnel.type != 'shell' &&
-                    tunnel.type != 'vnc') {
+            $.each(ret, function(_, rule) {
+                if (rule.type != 'shell' &&
+                    rule.type != 'vnc') {
                     return;
                 }
-                $('#terms').append($(`<option value="${tunnel.port}">${tunnel.name}</option>`));
+                $('#terms').append($(`<option value="${rule.port}">${rule.name}</option>`));
             });
             cb();
         });