更新 HomePageController, 删除无用代码

common/src/main/java/cn/reghao/devops/common/version/AppVersion.java

@@ -58,9 +58,7 @@ public class AppVersion implements Serializable {
             String commitTime = props.get("commitTime").toString();
             String buildTime = props.get("buildTime").toString();
             return new AppVersion(repo, branch, commitId, commitTime, buildTime);
-
-        } catch (IOException e) {
-            //
+        } catch (IOException ignore) {
         }
         return null;
     }

manager/src/main/java/cn/reghao/devops/manager/home/service/HomeService.java → manager/src/main/java/cn/reghao/devops/manager/account/service/IndexService.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.home.service;
+package cn.reghao.devops.manager.account.service;
 
 import cn.reghao.devops.manager.account.db.query.RoleQuery;
 import cn.reghao.devops.manager.account.model.po.Menu;
@@ -12,10 +12,10 @@ import java.util.*;
  * @date 2021-04-04 23:36:10
  */
 @Service
-public class HomeService {
+public class IndexService {
     private final RoleQuery roleQuery;
 
-    public HomeService(RoleQuery roleQuery) {
+    public IndexService(RoleQuery roleQuery) {
         this.roleQuery = roleQuery;
     }
 

manager/src/main/java/cn/reghao/devops/manager/home/controller/HomePageController.java

@@ -0,0 +1,64 @@
+package cn.reghao.devops.manager.home.controller;
+
+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;
+import cn.reghao.devops.common.version.AppVersion;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author reghao
+ * @date 2021-04-04 21:24:18
+ */
+@Api(tags = "home 页面")
+@Controller
+public class HomePageController {
+    private final JVM jvm;
+    private final Network network;
+    private final AppVersion appVersion;
+
+    public HomePageController() {
+        this.jvm = new JVM();
+        this.network = new Network();
+        this.appVersion = AppVersion.getVersion();
+    }
+
+    @GetMapping("/home")
+    public String home(Model model) {
+        String commitId = "N/A";
+        if (appVersion != null) {
+            commitId = appVersion.getCommitId();
+        }
+
+        JvmInfo jvmInfo = jvm.info();
+        //JvmStat jvmStat = jvm.stat();
+        String osInfo = String.format("%s %s", jvmInfo.getOsName(), jvmInfo.getOsVersion());
+        String jvmInfo1 = String.format("%s %s", jvmInfo.getJvmName(), jvmInfo.getJvmVersion());
+        int pid = jvmInfo.getJvmPid();
+        String startAt = jvmInfo.getJvmStartTime();
+        String ipv4 = network.detail().get(0).getIpv4();
+
+        model.addAttribute("managerVersion", commitId);
+        model.addAttribute("hostAddr", ipv4);
+        model.addAttribute("osInfo", osInfo);
+        model.addAttribute("jvmInfo", jvmInfo1);
+        model.addAttribute("pid", pid);
+        model.addAttribute("startAt", startAt);
+        //model.addAttribute("jvmStat", jvmStat);
+
+        String template = "/home/index";
+        template = "/home/index1";
+        return template;
+    }
+
+    @ApiOperation(value = "系统实时日志页面")
+    @GetMapping("/sys/log")
+    public String logPage() {
+        return "/sys/syslog";
+    }
+}

manager/src/main/java/cn/reghao/devops/manager/home/controller/VersionController.java

@@ -1,37 +0,0 @@
-package cn.reghao.devops.manager.home.controller;
-
-import cn.reghao.devops.common.version.AppVersion;
-import cn.reghao.jutil.jdk.result.WebResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-
-/**
- * @author reghao
- * @date 2022-05-11 21:49:35
- */
-@Api(tags = "应用版本接口")
-@RequestMapping("/api/sys/version")
-@RestController
-public class VersionController {
-    private AppVersion appVersion;
-
-    @ApiOperation("manager 版本信息")
-    @GetMapping(value = "/manager")
-    public String managerVersion() throws IOException {
-        if (appVersion == null) {
-            appVersion = AppVersion.getVersion();
-        }
-        return WebResult.success(appVersion);
-    }
-
-    @ApiOperation("agent 版本信息")
-    @GetMapping(value = "/agent")
-    public String agentVersion() {
-        return WebResult.success("暂未实现");
-    }
-}

manager/src/main/java/cn/reghao/devops/manager/home/controller/page/AppEnvPageController.java

@@ -1,22 +0,0 @@
-package cn.reghao.devops.manager.home.controller.page;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author reghao
- * @date 2022-05-12 10:51:13
- */
-@Api(tags = "应用环境页面")
-@Controller
-@RequestMapping("/sys")
-public class AppEnvPageController {
-    @ApiOperation(value = "系统实时日志页面")
-    @GetMapping("/log")
-    public String logPage() {
-        return "/sys/syslog";
-    }
-}

manager/src/main/java/cn/reghao/devops/manager/home/controller/page/HomePageController.java

@@ -1,89 +0,0 @@
-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;
-import cn.reghao.devops.manager.home.service.HomeService;
-import cn.reghao.devops.manager.account.model.po.Menu;
-import cn.reghao.devops.manager.account.model.po.User;
-import cn.reghao.devops.manager.util.UserContext;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2021-04-04 21:24:18
- */
-@Api(tags = "home 页面")
-@Controller
-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("/")
-    public String index(Model model) throws Exception {
-        User user = UserContext.getUser();
-        if (user == null) {
-            throw new Exception("未登录");
-        }
-
-        List<Menu> menus = homeService.userMenus(user.getRole());
-        Map<Integer, Menu> treeMenu = homeService.treeMenu(menus);
-
-        model.addAttribute("user", user);
-        model.addAttribute("treeMenu", treeMenu);
-        return "/main";
-    }
-
-    @GetMapping("/home")
-    public String home(@RequestParam(name = "env", required = false) String env, Model model) {
-        JvmInfo jvmInfo = jvm.info();
-        String osInfo = String.format("%s %s", jvmInfo.getOsName(), jvmInfo.getOsVersion());
-        String jvmInfo1 = String.format("%s %s", jvmInfo.getJvmName(), jvmInfo.getJvmVersion());
-        int pid = jvmInfo.getJvmPid();
-        String startAt = jvmInfo.getJvmStartTime();
-
-        String ipv4 = network.detail().get(0).getIpv4();
-        model.addAttribute("hostAddr", ipv4);
-        model.addAttribute("osInfo", osInfo);
-        model.addAttribute("jvmInfo", jvmInfo1);
-        model.addAttribute("pid", pid);
-        model.addAttribute("startAt", startAt);
-        String template = "/home/index";
-        template = "/home/index1";
-        return template;
-    }
-
-    @ApiOperation(value = "JVM 状态页面")
-    @GetMapping("/sys/jvmstatus")
-    public String jvmStatusPage(Model model) {
-        JvmInfo jvmInfo = jvm.info();
-        JvmStat jvmStat = jvm.stat();
-
-        model.addAttribute("jvmInfo", jvmInfo);
-        model.addAttribute("jvmStat", jvmStat);
-        return "/sys/jvmstatus";
-    }
-
-    @ApiOperation(value = "manager 日志页面")
-    @GetMapping("/sys/managerlog/{machineId}")
-    public String managerlogPage(@PathVariable("machineId") String machineId, Model model) {
-        return "/sys/jvmstatus";
-    }
-}

manager/src/main/resources/templates/home/index1.html

@@ -86,9 +86,13 @@
                 <span><i class="fa fa-table"></i> 系统信息</span>
             </div>
             <div class="layui-card-body">
-                <div class="layui-card-body" style="height:200px;">
+                <div class="layui-card-body" style="height:240px;">
                     <table class="layui-table timo-detail-table">
                         <tbody>
+                        <tr>
+                            <th>系统版本</th>
+                            <td th:text="${managerVersion}"></td>
+                        </tr>
                         <tr>
                             <th>机器地址</th>
                             <td th:text="${hostAddr}"></td>