Update

1. Optimize code 2. TODO: Adding server list
LittleJake · Oct 29, 2024 · d0ef796 · d0ef796
1 parent 89822f3
commit d0ef796
Show file tree

Hide file tree

Showing 13 changed files with 303 additions and 197 deletions.
diff --git a/.env.example b/.env.example
@@ -1,3 +1,6 @@
+[MONITOR]
+OFFLINE_THRESHOLD = 600
+
 [REDIS]
 HOST = ''
 PORT = 6027

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
@@ -4,6 +4,8 @@
 
 use app\admin\validate\LoginTokenValidate;
 use app\common\lib\SystemMonitor;
+use think\facade\Request;
+
 class Index extends Base
 {
     /**
@@ -15,15 +17,19 @@ public function index()
     {
         if (!session('?is_login'))
             $this->redirect('admin/index/login');
+
         $uuids = SystemMonitor::getUUIDs();
-        $ip = SystemMonitor::fetchIPInfo(array_values($uuids));
+        $data = SystemMonitor::getInfo(array_keys($uuids));
         $hide = array_flip(SystemMonitor::getHide());
         $names = SystemMonitor::getDisplayName(array_keys($uuids));
         asort($uuids);
         $this->assign("names", $names);
         $this->assign("uuids", $uuids);
         $this->assign("hide", $hide);
-        $this->assign("ip", $ip);
+        $this->assign("data", $data);
+
+        if(Request::isAjax())
+            return  $this->fetch('index_ajax');
         return $this->fetch();
     }
 

diff --git a/application/admin/controller/Info.php b/application/admin/controller/Info.php
@@ -16,7 +16,7 @@ public function index($uuid){
 
         if ($this->request->isPatch()){
             if (!empty($this->request->patch('display')))
-                SystemMonitor::setDisplay($uuid, $this->request->patch('display'));
+                SystemMonitor::setHide($uuid, $this->request->patch('display'));
             if (!empty($this->request->patch('rename')))
                 SystemMonitor::setDisplayName($uuid, $this->request->patch('rename'));
             return json(['status' => 200, 'message' => "ok"]);

diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
@@ -27,8 +27,7 @@
             <div class="mdui-panel-item-header">
                 <div class="mdui-panel-item-title">Control</div>
             </div>
-            <div class="mdui-panel-item-body">
-                {include file='admin@index/index_ajax' /}
+            <div class="mdui-panel-item-body" id="ajax">
             </div>
         </div>
     </div>
@@ -42,36 +41,10 @@
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mdui/1.0.2/js/mdui.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
 <script>
-    $('.delete').on('click', function(){
-        var parent = $(this.parentNode.parentNode.parentNode), btn = $(this);
-        mdui.confirm("Are you sure to delete node: "+btn.attr("data-ip")+"?", function(){
-            $.ajax({
-                url: btn.attr("data-href"), 'type': 'DELETE', 'data': {},
-                success: function (resp) {mdui.snackbar({message: 'Node deleted.', position: 'bottom'});parent.addClass("mdui-hidden");},
-                error: function (data, status, e) {mdui.snackbar({message: e, position: 'bottom'})}
-            });
-        });
-    });
-    $('.rename').on('click', function(){
-        var parent = $(this.parentNode.parentNode.parentNode), btn = $(this);
-        mdui.prompt('Renaming node',
-            function (value){
-                $.ajax({
-                    url: btn.attr("data-href"), 'type': 'PATCH', 'data': {'rename': value},
-                    success: function (resp) {mdui.snackbar({message: 'Node renamed.', position: 'bottom'});},
-                    error: function (data, status, e) {mdui.snackbar({message: e, position: 'bottom'})}
-                });
-            }
-        );
-    });
-    $('.switch').on('click', function(){
-        var message = 'Hide.', btn = $(this), display = this.checked;
-        if (display){message = 'Display.'}
-        $.ajax({
-            url: btn.attr("data-href"), 'type': 'PATCH', 'data': {'display': display?1:0},
-            success: function (resp) {mdui.snackbar({message: message, position: 'bottom'})},
-            error: function (data, status, e) {mdui.snackbar({message: e, position: 'bottom'})}
-        });
+    $.ajax({
+        url: window.location,
+        success: function(data){$('#ajax').html(data);mdui.mutation(); },
+        error: function (data, status, e){mdui.snackbar({message: e});}
     });
 </script>
 </body>

diff --git a/application/admin/view/index/index_ajax.html b/application/admin/view/index/index_ajax.html
@@ -2,13 +2,13 @@
     <ul class="mdui-list word-wrap">
         {volist name="uuids" id="vo"}
         <div class="mdui-list-item mdui-ripple mdui-p-l-0">
-            <span class="mdui-list-item-icon flag-icon flag-icon-{:empty($ip[$vo]['countryCode'])?'none':strtolower($ip[$vo]['countryCode'])}"></span>
+            <span class="mdui-list-item-icon flag-icon flag-icon-{:empty($data[$key]['Country Code'])?'none':strtolower($data[$key]['Country Code'])}"></span>
             <div class="mdui-list-item-content ajax-load" data-href="{:url('admin/info/index',['uuid'=>$key])}">
                 <div class="mdui-list-item-title">
                     {:empty($names[$key])?$vo:$names[$key]}
                 </div>
                 <div class="mdui-list-item-text mdui-list-item-one-line">
-                    {:empty($ip[$vo]['countryCode'])?"Private":$ip[$vo]['country']}
+                    {:empty($data[$key]['Country Code'])?"Private":$data[$key]['Country']}
                 </div>
             </div>
             <div class="mdui-divide"></div>
@@ -46,4 +46,48 @@
         </div>
         {/volist}
     </ul>
-</div>
+</div>
+<script>
+    var reload_list = function(){
+        var url = window.location;
+        $.ajax({
+            url: url,
+            success: function(data){$('#ajax').html(data);mdui.mutation(); },
+            error: function (data, status, e){mdui.snackbar({message: e});window.location = url;}
+        });
+    };
+
+    $('.delete').on('click', function(){
+        var parent = $(this.parentNode.parentNode.parentNode), btn = $(this);
+        mdui.confirm("Are you sure to delete node: "+btn.attr("data-ip")+"?", function(){
+            $.ajax({
+                url: btn.attr("data-href"), 'type': 'DELETE', 'data': {},
+                success: function (resp) {mdui.snackbar({message: 'Node deleted.', position: 'bottom'});parent.addClass("mdui-hidden");reload_list();},
+                error: function (data, status, e) {mdui.snackbar({message: e, position: 'bottom'})}
+            });
+        });
+    });
+    $('.rename').on('click', function(){
+        var parent = $(this.parentNode.parentNode.parentNode), btn = $(this);
+        mdui.prompt('Renaming node',
+            function (value){
+                $.ajax({
+                    url: btn.attr("data-href"), 'type': 'PATCH', 'data': {'rename': value},
+                    success: function (resp) {mdui.snackbar({message: 'Node renamed.', position: 'bottom'});reload_list();},
+                    error: function (data, status, e) {mdui.snackbar({message: e, position: 'bottom'})}
+                });
+            }
+        );
+    });
+    $('.switch').on('click', function(){
+        var message = 'Hide.', btn = $(this), display = this.checked;
+        if (display){message = 'Display.'}
+        $.ajax({
+            url: btn.attr("data-href"), 'type': 'PATCH', 'data': {'display': display?1:0},
+            success: function (resp) {mdui.snackbar({message: message, position: 'bottom'});},
+            error: function (data, status, e) {mdui.snackbar({message: e, position: 'bottom'});reload_list();}
+        });
+    });
+
+
+</script>