Kaynağa Gözat

删除 NodeLog

reghao 2 yıl önce
ebeveyn
işleme
d85ff5cafe

+ 1 - 3
manager/src/main/java/cn/reghao/devops/manager/machine/controller/page/MachineHostPageController.java

@@ -8,7 +8,6 @@ import cn.reghao.devops.manager.machine.model.po.SshAuth;
 import cn.reghao.devops.manager.machine.model.vo.MachineHostVO;
 import cn.reghao.devops.manager.machine.model.vo.MachineInfoVO;
 import cn.reghao.devops.manager.machine.model.vo.MachineSshAuth;
-import cn.reghao.devops.manager.machine.model.vo.NodeLogVo;
 import cn.reghao.devops.manager.machine.service.MachineService;
 import cn.reghao.devops.manager.machine.service.page.MachineHostPage;
 import cn.reghao.devops.manager.machine.util.Keys;
@@ -145,8 +144,7 @@ public class MachineHostPageController {
     @ApiOperation(value = "dagnet 日志页面")
     @GetMapping("/agentlog/{machineId}")
     public String agentLogPage(@PathVariable("machineId") String machineId, Model model) {
-        List<NodeLogVo> nodeLogs = machineHostPage.agentLog(machineId);
-        model.addAttribute("list", nodeLogs);
+        model.addAttribute("list", Collections.emptyList());
         return "/machine/host/agentlog";
     }
 }

+ 0 - 25
manager/src/main/java/cn/reghao/devops/manager/machine/model/po/NodeLog.java

@@ -1,25 +0,0 @@
-package cn.reghao.devops.manager.machine.model.po;
-
-import cn.reghao.jutil.jdk.db.BaseObject;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 节点应用运行时日志
- *
- * @author reghao
- * @date 2021-06-11 09:48:14
- */
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class NodeLog extends BaseObject {
-    private String machineId;
-    private String appId;
-    private long timestamp;
-    private String level;
-    private String threadName;
-    private String loggerName;
-    private String message;
-}

+ 0 - 26
manager/src/main/java/cn/reghao/devops/manager/machine/model/vo/NodeLogVo.java

@@ -1,26 +0,0 @@
-package cn.reghao.devops.manager.machine.model.vo;
-
-import cn.reghao.devops.manager.machine.model.po.NodeLog;
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2021-10-27 16:46:21
- */
-@Data
-public class NodeLogVo {
-    private String logTime;
-    private String level;
-    private String threadName;
-    private String loggerName;
-    private String message;
-
-    public NodeLogVo(NodeLog nodeLog) {
-        this.logTime = DateTimeConverter.format(nodeLog.getTimestamp());
-        this.level = nodeLog.getLevel();
-        this.threadName = nodeLog.getThreadName();
-        this.loggerName = nodeLog.getLoggerName();
-        this.message = nodeLog.getMessage();
-    }
-}

+ 0 - 3
manager/src/main/java/cn/reghao/devops/manager/machine/service/page/MachineHostPage.java

@@ -4,7 +4,6 @@ import cn.reghao.devops.manager.machine.model.po.MachineHost;
 import cn.reghao.devops.manager.machine.model.vo.MachineHostVO;
 import cn.reghao.devops.manager.machine.model.vo.MachineInfoVO;
 import cn.reghao.devops.manager.machine.model.vo.MachineSshAuth;
-import cn.reghao.devops.manager.machine.model.vo.NodeLogVo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
@@ -23,6 +22,4 @@ public interface MachineHostPage {
     MachineInfoVO hostDetailPage(String machineId);
     @Deprecated
     void setNotifyPage(String machineId);
-    @Deprecated
-    List<NodeLogVo> agentLog(String machineId);
 }

+ 0 - 7
manager/src/main/java/cn/reghao/devops/manager/machine/service/page/MachineHostPageImpl.java

@@ -1,6 +1,5 @@
 package cn.reghao.devops.manager.machine.service.page;
 
-import cn.reghao.devops.common.msg.constant.NodeStatus;
 import cn.reghao.devops.manager.machine.db.repository.MachineHostRepository;
 import cn.reghao.devops.manager.machine.db.repository.MachineInfoRepository;
 import cn.reghao.devops.manager.machine.model.po.MachineHost;
@@ -10,7 +9,6 @@ import cn.reghao.devops.manager.machine.model.po.SshAuth;
 import cn.reghao.devops.manager.machine.model.vo.MachineHostVO;
 import cn.reghao.devops.manager.machine.model.vo.MachineInfoVO;
 import cn.reghao.devops.manager.machine.model.vo.MachineSshAuth;
-import cn.reghao.devops.manager.machine.model.vo.NodeLogVo;
 import cn.reghao.devops.manager.machine.service.MachineService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -85,9 +83,4 @@ public class MachineHostPageImpl implements MachineHostPage {
 
         return null;
     }
-
-    @Override
-    public List<NodeLogVo> agentLog(String machineId) {
-        return Collections.emptyList();
-    }
 }