1.将 /home mapping 放到 AccountAuthController 中

2.调整包结构
3.删除无用代码

manager/src/main/java/cn/reghao/devops/manager/account/controller/AccountAuthController.java

@@ -1,8 +1,13 @@
 package cn.reghao.devops.manager.account.controller;
 
+import cn.reghao.devops.common.machine.Network;
+import cn.reghao.devops.common.util.NotAvailable;
+import cn.reghao.devops.common.util.jvm.JVM;
+import cn.reghao.devops.common.util.jvm.po.JvmInfo;
+import cn.reghao.devops.common.version.AppVersion;
 import cn.reghao.devops.manager.account.model.po.Menu;
 import cn.reghao.devops.manager.account.model.po.User;
-import cn.reghao.devops.manager.account.service.IndexService;
+import cn.reghao.devops.manager.account.service.HomeService;
 import cn.reghao.devops.manager.account.service.UserContext;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -21,10 +26,16 @@ import java.util.Map;
 @Api(tags = "登录页和首页")
 @Controller
 public class AccountAuthController {
-    private final IndexService indexService;
-    
-    public AccountAuthController(IndexService indexService) {
-        this.indexService = indexService;
+    private final JVM jvm;
+    private final Network network;
+    private final AppVersion appVersion;
+    private final HomeService homeService;
+
+    public AccountAuthController(HomeService homeService) {
+        this.jvm = new JVM();
+        this.network = new Network();
+        this.appVersion = AppVersion.getVersion();
+        this.homeService = homeService;
     }
     
     @GetMapping("/login")
@@ -40,10 +51,38 @@ public class AccountAuthController {
             throw new Exception("未登录");
         }
 
-        List<Menu> menus = indexService.userMenus(user.getRole());
-        Map<Integer, Menu> treeMenu = indexService.treeMenu(menus);
+        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(Model model) {
+        String commitId = NotAvailable.na.getDesc();
+        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;
+    }
 }

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

@@ -12,10 +12,10 @@ import java.util.*;
  * @date 2021-04-04 23:36:10
  */
 @Service
-public class IndexService {
+public class HomeService {
     private final RoleQuery roleQuery;
 
-    public IndexService(RoleQuery roleQuery) {
+    public HomeService(RoleQuery roleQuery) {
         this.roleQuery = roleQuery;
     }
 

manager/src/main/java/cn/reghao/devops/manager/app/model/vo/AppDeployingVO.java

@@ -1,7 +1,6 @@
 package cn.reghao.devops.manager.app.model.vo;
 
 import cn.reghao.devops.common.util.NotAvailable;
-import cn.reghao.devops.manager.app.model.po.AppBuilding;
 import cn.reghao.devops.manager.app.model.po.AppDeploying;
 import cn.reghao.devops.manager.app.model.po.log.BuildLog;
 import cn.reghao.devops.manager.machine.model.po.MachineHost;

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

@@ -1,64 +0,0 @@
-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/model/NameValue.java

@@ -1,13 +0,0 @@
-package cn.reghao.devops.manager.home.model;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author reghao
- * @date 2023-03-10 19:48:19
- */
-@AllArgsConstructor
-public class NameValue {
-    private String name;
-    private int value;
-}

manager/src/main/java/cn/reghao/devops/manager/sys/controller/SysPageController.java

@@ -0,0 +1,20 @@
+package cn.reghao.devops.manager.sys.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author reghao
+ * @date 2021-04-04 21:24:18
+ */
+@Api(tags = "系统页面")
+@Controller
+public class SysPageController {
+    @ApiOperation(value = "系统实时日志页面")
+    @GetMapping("/sys/log")
+    public String logPage() {
+        return "/sys/syslog";
+    }
+}