Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java

@@ -32,7 +32,7 @@ public class ServerController {
 
     @GetMapping("/list")
     public AjaxResult serverList() {
-        return AjaxResult.success(serverMonitorService.getServerMonitorData(Lists.newArrayList("http://localhost:18099")));
+        return AjaxResult.success(serverMonitorService.getServerMonitorData(Lists.newArrayList("http://172.16.196.174:18099")));
     }
 }
 

ruoyi-ui/src/views/monitor/server/index.vue

@@ -110,6 +110,8 @@ function getList() {
       a.name = item.system.primary_ip
       return a
     })
+  }).catch(() => {
+    proxy.$modal.closeLoading();
   });
 }