From cb378b1473603113cc62e3d55df29d51c3a3eb68 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 25 十一月 2023 23:17:13 +0800
Subject: [PATCH] 日志服务修改
---
/dev/null | 165 -----------------------------------------
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 10 --
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java | 3
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java | 7 -
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java | 2
5 files changed, 4 insertions(+), 183 deletions(-)
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java
deleted file mode 100644
index 0b9022e..0000000
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.vci.ubcs.log.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * @author ludc
- * @date 2023/10/31 15:43
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SystemLog {
-
- /**
- * 鏃ュ織鎵�灞炴湇鍔″悕绉�
- */
- private String serviceName;
-
- /**
- * 鏈嶅姟id
- */
- private String serviceId;
-
- /**
- * 鏃ュ織鏂囦欢鎵�鍦ㄧ殑璺緞
- */
- private String logPath;
-
- /**
- * 鏃ュ織鍚嶇О
- */
- private String logName;
-
- /**
- * 鏃ュ織绫诲瀷
- */
- private String logType;
-
- /**
- * 鏃ュ織鍒涘缓鏃堕棿
- */
- private String createTime;
-
- /**
- * 鏃ュ織鐨勬渶鍚庝慨鏀规椂闂�
- */
- private String lastmodifier;
-
-}
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
similarity index 94%
rename from Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java
rename to Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
index add2fea..0daf80e 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/vo/LocalLogVO.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.log.dto;
+package com.vci.ubcs.log.vo;
import com.vci.ubcs.log.entity.LocalLog;
import javafx.scene.Parent;
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
index 8fea8d4..30e70e8 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
@@ -1,28 +1,23 @@
package com.vci.ubcs.log.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.common.utils.StringUtils;
-import com.vci.ubcs.log.dto.LocalLogVO;
+import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.rmi.ServerException;
import java.util.List;
-import java.util.Map;
/**
* 鏈湴绯荤粺鏃ュ織
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogSystemController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogSystemController.java
deleted file mode 100644
index 49c0e57..0000000
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogSystemController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.vci.ubcs.log.controller;
-
-import com.vci.ubcs.log.service.ILogErrorService;
-import com.vci.ubcs.log.service.ILogSystemService;
-import com.vci.ubcs.log.entity.SystemLog;
-import lombok.AllArgsConstructor;
-import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 鏈湴绯荤粺鏃ュ織
- * @author ludc
- * @date 2023/10/31 15:37
- */
-@NonDS
-@RestController
-@AllArgsConstructor
-@RequestMapping("/systemLog")
-public class LogSystemController {
-
- private final ILogSystemService logSystemService;
-
- @GetMapping("/lazy-list")
- private R<List<SystemLog>> getSystemLogList(@RequestParam String serviceName){
- return R.data(logSystemService.getSystemLogList(serviceName));
- }
-
-
-
-
-}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
index 38a03f0..7180567 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java
@@ -1,13 +1,12 @@
package com.vci.ubcs.log.service;
-import com.vci.ubcs.log.dto.LocalLogVO;
+import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.bo.FileObjectBO;
import org.springblade.core.tool.api.R;
import java.rmi.ServerException;
import java.util.List;
-import java.util.Map;
/**
* 鏈湴绯荤粺鏃ュ織
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogSystemService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogSystemService.java
deleted file mode 100644
index 30d3e30..0000000
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogSystemService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.vci.ubcs.log.service;
-
-import com.vci.ubcs.log.entity.SystemLog;
-import com.vci.ubcs.resource.bo.FileObjectBO;
-
-import java.rmi.ServerException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鏈湴绯荤粺鏃ュ織
- * @author ludc
- * @date 2023/10/31 15:38
- */
-public interface ILogSystemService {
-
- /**
- * 鏌ョ湅锛屾湰鍦扮郴缁熸棩蹇楀垪琛�
- * @param logParentPath
- * @return
- */
- List<SystemLog> getSystemLogList(String logParentPath);
-
- /**
- * 涓嬭浇锛屾牴鎹湇鍔″悕鎵�鍦ㄦ枃浠跺悕鍜屾枃浠跺悕涓嬭浇鏂囦欢
- * @param condition 鏌ヨ鏉′欢map
- * @return 鏂囦欢鐨勪俊鎭�
- */
- FileObjectBO downloadLogByServiceNameAndFileName(Map<String,String> condition) throws ServerException;
-
- /**
- * 鍒犻櫎锛屾牴鎹湇鍔℃墍鍦ㄦ枃浠跺悕锛屽拰鏃ュ織鏂囦欢鍚嶇О鍒犻櫎
- * @param condition 涓婚敭闆嗗悎
- * @return 鎵ц缁撴灉
- */
- void deleteLogFile(Map<String,String> condition) throws ServerException;
-
-}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
index f8ba775..fb50d00 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
@@ -1,14 +1,11 @@
package com.vci.ubcs.log.service.impl;
-import com.vci.ubcs.log.dto.LocalLogVO;
+import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.utils.FileUtil;
import com.vci.ubcs.resource.utils.ZipUtil;
-import com.vci.ubcs.resource.vo.FileObjectVO;
import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.web.util.BeanUtil;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springblade.core.log.exception.ServiceException;
@@ -17,16 +14,11 @@
import com.vci.ubcs.resource.bo.FileObjectBO;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogSystemServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogSystemServiceImpl.java
deleted file mode 100644
index 6f6f4ea..0000000
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogSystemServiceImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.vci.ubcs.log.service.impl;
-
-import com.vci.ubcs.log.service.ILogSystemService;
-import com.vci.ubcs.log.entity.SystemLog;
-import org.springblade.core.log.exception.ServiceException;
-import com.vci.ubcs.omd.cache.EnumCache;
-import com.vci.ubcs.omd.enums.EnumEnum;
-import com.vci.ubcs.resource.bo.FileObjectBO;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.stereotype.Service;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.rmi.ServerException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 鏈湴绯荤粺鏃ュ織
- * @author ludc
- * @date 2023/10/31 15:39
- */
-@Service
-public class LogSystemServiceImpl implements ILogSystemService{
-
- /**
- * 鍚勪釜鏈嶅姟瀛樻斁鐨勭殑鐖惰矾寰�
- */
- private final String parentPath = "/data1/ubcs/ubcs-server";
-
- /**
- * 鍚勪釜鏈嶅姟鐨勬棩蹇楀叿浣撶殑鐩綍璺緞
- */
- //@Value("#{'${ip-whitelist.ip}'.split(',')}")
- private List<String> serviceDirNames = new ArrayList<>(Arrays.asList("/ubcs_code/target/log","/ubcs_omd/target/log","/ubcs_system/target/log"));
-
- /**
- * 鑾峰彇鏈湴鏃ュ織鍒楄〃
- * @param logParentPath
- * @return
- */
- @Override
- public List<SystemLog> getSystemLogList(String logParentPath) {
- List<SystemLog> systemLogs = new ArrayList<>();
- // 涓嶄负绌鸿鏄庢槸鍔犺浇褰撳墠杩欎釜鏈嶅姟璺緞涓嬬殑鏃ュ織鏂囦欢
- if(Func.isNotEmpty(logParentPath)){
- File file = new File(logParentPath);
- if (file.isDirectory()) {
- File[] files = file.listFiles();
- Arrays.stream(files).forEach(item->{
- // 缁勫缓鏃ュ織鏂囦欢瀵硅薄
- SystemLog systemLog = new SystemLog();
- systemLog.setLogName(item.getName());
- systemLog.setLogType(getLogType(item.getName()));
- systemLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
- systemLog.setLastmodifier(getLastModifiedOrCreatTime(true,logParentPath));
- systemLog.setLogPath(logParentPath);
- String serviceId = getServiceId(logParentPath);
- systemLog.setServiceId(serviceId);
- systemLog.setServiceName(getServiceName(serviceId));
- systemLogs.add(systemLog);
- });
- }
- }else {
- serviceDirNames.stream().forEach(serviceDirName->{
- File file = new File(parentPath+serviceDirName);
- SystemLog systemLog = new SystemLog();
- systemLog.setLastmodifier(getLastModifiedOrCreatTime(true,parentPath+serviceDirName));
- systemLog.setCreateTime(getLastModifiedOrCreatTime(false,parentPath+serviceDirName));
- systemLog.setLogPath(parentPath+serviceDirName);
- String serviceId = getServiceId(logParentPath);
- systemLog.setServiceId(serviceId);
- systemLog.setServiceName(getServiceName(serviceId));
- systemLogs.add(systemLog);
- });
- }
- return systemLogs;
- }
-
- /**
- * 鑾峰彇鏂囦欢鏈�鍚庝慨鏀规垨鑰呭垱寤烘椂闂�
- * @param isModifier
- * @return
- */
- private String getLastModifiedOrCreatTime(boolean isModifier,String pathStr) {
- Path path = FileSystems.getDefault().getPath(pathStr);
- String date = "";
- try {
- BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- // 鏄幏鍙栨渶鍚庝慨鏀规椂闂�
- if(isModifier){
- date = dateFormat.format(new Date(attr.lastModifiedTime().toMillis()));
- }else {
- date = dateFormat.format(new Date(attr.creationTime().toMillis()));
- }
- } catch (IOException e) {
- throw new ServiceException("Error reading file date attributes: " + e.getMessage());
- }
- return date;
- }
-
- /**
- * 鑾峰彇鏃ュ織绫诲瀷
- * @param fileName
- * @return
- */
- private String getLogType(String fileName){
- //鍒ゆ柇鏃ュ織鐨勭殑绫诲瀷
- if (fileName.contains("error")) {
- return "Error";
- } else if (fileName.contains("info")) {
- return "Info";
- } else if (fileName.contains("warning")) {
- return "Warning";
- } else {
- return "Unknown";
- }
- }
-
- /**
- * 鑾峰彇鏈嶅姟ID
- * @param servciePath
- * @return
- */
- private String getServiceId(String servciePath){
- String[] parts = servciePath.split("/");
- String extractedString = parts[parts.length - 2];
- return extractedString;
- }
-
- /**
- * 鑾峰彇鏈嶅姟鍚嶇О
- * @param serViceId
- * @return
- */
- private String getServiceName(String serViceId){
- return EnumCache.getValue(EnumEnum.SERCIVE_NAME_ROLE, serViceId);
- }
-
- /**
- * 涓嬭浇鏃ュ織鏂囦欢
- * @param condition 鏌ヨ鏉′欢map
- * @return
- * @throws ServerException
- */
- @Override
- public FileObjectBO downloadLogByServiceNameAndFileName(Map<String, String> condition) throws ServerException {
- return null;
- }
-
- /**
- * 鍒犻櫎鏃ュ織鏂囦欢
- * @param condition 涓婚敭闆嗗悎
- * @throws ServerException
- */
- @Override
- public void deleteLogFile(Map<String, String> condition) throws ServerException {
-
- }
-
-}
--
Gitblit v1.9.3