Переглянути джерело

更新 /home 页面的信息展示

reghao 2 роки тому
батько
коміт
a257cd5ff5

+ 5 - 1
manager/src/main/java/cn/reghao/devops/manager/home/controller/page/HomePageController.java

@@ -1,5 +1,6 @@
 package cn.reghao.devops.manager.home.controller.page;
 
+import cn.reghao.devops.common.machine.Network;
 import cn.reghao.devops.common.util.jvm.JVM;
 import cn.reghao.devops.common.util.jvm.po.JvmInfo;
 import cn.reghao.devops.common.util.jvm.po.JvmStat;
@@ -27,10 +28,12 @@ import java.util.Map;
 public class HomePageController {
     private final HomeService homeService;
     private final JVM jvm;
+    private final Network network;
 
     public HomePageController(HomeService homeService) {
         this.homeService = homeService;
         this.jvm = new JVM();
+        this.network = new Network();
     }
 
     @GetMapping("/")
@@ -55,8 +58,9 @@ public class HomePageController {
         String jvmInfo1 = String.format("%s %s", jvmInfo.getJvmName(), jvmInfo.getJvmVersion());
         int pid = jvmInfo.getJvmPid();
         String startAt = jvmInfo.getJvmStartTime();
-        String processInfo = String.format("%s - %s", pid, startAt);
 
+        String ipv4 = network.detail().get(0).getIpv4();
+        model.addAttribute("hostAddr", ipv4);
         model.addAttribute("osInfo", osInfo);
         model.addAttribute("jvmInfo", jvmInfo1);
         model.addAttribute("pid", pid);

+ 8 - 4
manager/src/main/resources/templates/home/index1.html

@@ -89,6 +89,10 @@
                 <div class="layui-card-body" style="height:200px;">
                     <table class="layui-table timo-detail-table">
                         <tbody>
+                        <tr>
+                            <th>机器地址</th>
+                            <td th:text="${hostAddr}"></td>
+                        </tr>
                         <tr>
                             <th>操作系统</th>
                             <td th:text="${osInfo}"></td>
@@ -97,15 +101,15 @@
                             <th>JVM</th>
                             <td th:text="${jvmInfo}"></td>
                         </tr>
-                        <tr>
-                            <th>PID</th>
-                            <td th:text="${pid}"></td>
-                        </tr>
                         <tr>
                             <th>启动时间</th>
                             <td th:text="${startAt}"></td>
                         </tr>
                         </tbody>
+                        <tr>
+                            <th>PID</th>
+                            <td th:text="${pid}"></td>
+                        </tr>
                     </table>
                 </div>
             </div>