From ec2ed600ba8088a291838b0d448dbfd9e2150e2a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 26 十一月 2023 18:12:31 +0800
Subject: [PATCH] 本地日志下载调试linux中运行，修改读取失败问题
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 26 ++++++++++++++------------
Source/UBCS-WEB/src/views/monitor/log/localLog.vue | 13 ++++++++++---
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
index 90d9130..ee2fff4 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
@@ -121,11 +121,18 @@
};
}
},
- methods: {
-
+ methods: {
+ // 鍒ゆ柇瀹㈡埛绔墍鍦ㄧ殑鎿嶄綔绯荤粺骞冲彴
+ isWindows() {
+ return navigator.platform.indexOf('Win') !== -1
+ },
+ // 鏍规嵁鎿嶄綔绯荤粺骞冲彴杩斿洖鐩稿簲鐨勮矾寰勫垎闅旂
+ getPathSeparator() {
+ return this.isWindows() ? '\\' : '/'
+ },
downLoadLogFile(row){
this.downloadLoading = true;
- let logPath = row.hasChildren ? row.logPath:row.logPath+"\\"+row.logName;
+ let logPath = row.hasChildren ? row.logPath:row.logPath+this.getPathSeparator()+row.logName;
downLoadLog(Object.assign({},row,{logFullPaths:logPath})).then(res=>{
func.downloadFileByBlobHandler(res);
this.downloadLoading = false;
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 fb50d00..26c069a 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
@@ -105,18 +105,20 @@
if(dir.getName().contains("ubcs_")){
String fullPath = dir.getPath() + LOGPATH;
File file = new File(fullPath);
- LocalLog localLog = new LocalLog();
- localLog.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
- localLog.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
- localLog.setLogPath(fullPath);
- String serviceId = getServiceId(file.getPath());
- localLog.setServiceId(serviceId);
- String serviceName = getServiceName(serviceId);
- localLog.setServiceName(serviceName);
- localLog.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
- localLog.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
- localLog.setHasChildren(true);
- localLogs.add(localLog);
+ if(file.exists()){
+ LocalLog localLog = new LocalLog();
+ localLog.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
+ localLog.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
+ localLog.setLogPath(fullPath);
+ String serviceId = getServiceId(file.getPath());
+ localLog.setServiceId(serviceId);
+ String serviceName = getServiceName(serviceId);
+ localLog.setServiceName(serviceName);
+ localLog.setLogType(serviceName+"鏃ュ織鐖剁洰褰�");
+ localLog.setLogName(serviceName+"鏃ュ織鐖剁洰褰�");
+ localLog.setHasChildren(true);
+ localLogs.add(localLog);
+ }
}
});
}
--
Gitblit v1.9.3