diff --git a/dms-api/pom.xml b/dms-api/pom.xml index d0be421..c71a4f7 100644 --- a/dms-api/pom.xml +++ b/dms-api/pom.xml @@ -77,7 +77,9 @@ com.basedt.dms.DmsApplication ZIP - -Dfile.encoding=UTF-8 + + -Dfile.encoding=UTF-8 + org.springframework.boot diff --git a/dms-service/dms-service-workspace/src/main/java/com/basedt/dms/service/workspace/impl/DmsDataTaskServiceImpl.java b/dms-service/dms-service-workspace/src/main/java/com/basedt/dms/service/workspace/impl/DmsDataTaskServiceImpl.java index bdf833b..8b90042 100644 --- a/dms-service/dms-service-workspace/src/main/java/com/basedt/dms/service/workspace/impl/DmsDataTaskServiceImpl.java +++ b/dms-service/dms-service-workspace/src/main/java/com/basedt/dms/service/workspace/impl/DmsDataTaskServiceImpl.java @@ -156,6 +156,9 @@ public void createImportTask(Long taskId, DmsImportTaskVO dmsImportTaskVO, Strin this.logDataTaskService.insert(new LogDataTaskDTO(taskId, "data import task start...")); //get file String tmpFilePath = System.getProperty("java.io.tmpdir"); + if (!tmpFilePath.endsWith(File.separator)) { + tmpFilePath += File.separator; + } tmpFilePath += "dms" + File.separator + "import" + File.separator + taskId; FileUtil.mkdir(tmpFilePath); this.logDataTaskService.insert(new LogDataTaskDTO(taskId, StrUtil.format("local temp file folder is {}", tmpFilePath))); @@ -207,6 +210,8 @@ public void createImportTask(Long taskId, DmsImportTaskVO dmsImportTaskVO, Strin this.logDataTaskService.insert(new LogDataTaskDTO(taskId, "data import completed.")); FileUtil.del(tmpFilePath); dmsDataTaskDTO.setTaskStatus(TaskStatus.SUCCESS.toDict()); + } catch (Exception e) { + this.logDataTaskService.insert(new LogDataTaskDTO(taskId, StrUtil.format("[{}] exception:{}", e.getMessage()))); } } catch (Exception e) { this.logDataTaskService.insert(new LogDataTaskDTO(taskId, StrUtil.format("[{}] exception:{}", e.getMessage()))); @@ -223,6 +228,9 @@ public void createExportTask(Long taskId, String script) throws SQLException { dmsDataTaskDTO.setSqlScript(script); // 1. create local tmp folder String tmpFilePath = System.getProperty("java.io.tmpdir"); + if (!tmpFilePath.endsWith(File.separator)) { + tmpFilePath += File.separator; + } tmpFilePath += "dms" + File.separator + "export" + File.separator + taskId; FileUtil.mkdir(tmpFilePath); //2.set task status running diff --git a/scripts/docker/build/dms-backend/Dockerfile b/scripts/docker/build/dms-backend/Dockerfile index 3c09d7a..a7a08bd 100644 --- a/scripts/docker/build/dms-backend/Dockerfile +++ b/scripts/docker/build/dms-backend/Dockerfile @@ -5,4 +5,4 @@ COPY ./dms-api/target/dms-api.jar . COPY ./scripts/docker/build/dms-backend/application-docker.yml . EXPOSE 8080 -ENTRYPOINT ["sh","-c","java -jar -Dspring.profiles.active=docker $DMS_HOME/dms/dms-api.jar --spring.config.location=$DMS_HOME/dms/application-docker.yml --add-opens java.base/java.nio=ALL-UNNAMED"] \ No newline at end of file +ENTRYPOINT ["sh","-c","java -jar -Dspring.profiles.active=docker $DMS_HOME/dms/dms-api.jar --spring.config.location=$DMS_HOME/dms/application-docker.yml --add-opens java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"] \ No newline at end of file