Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dms-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@
<configuration>
<mainClass>com.basedt.dms.DmsApplication</mainClass>
<layout>ZIP</layout>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<jvmArguments>
<jvmArgument>-Dfile.encoding=UTF-8</jvmArgument>
</jvmArguments>
<excludes>
<exclude>
<groupId>org.springframework.boot</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand Down Expand Up @@ -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())));
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/build/dms-backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
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"]