diff --git a/bin/code-generator-0.0.1-SNAPSHOT.jar b/bin/code-generator-0.0.1-SNAPSHOT.jar
index 1fe6849e4c203682498c254276bd6fcc31547a0f..ffc034a99b6b0e006678c4b609d36891ddcb2852 100644
Binary files a/bin/code-generator-0.0.1-SNAPSHOT.jar and b/bin/code-generator-0.0.1-SNAPSHOT.jar differ
diff --git a/bin/example/example.txt b/bin/example/example.txt
index d5562aad878e08cd93fedc5c7cb2dbe88f72abb5..4d417683bfc4fe4a810a30db54428545756dbd59 100644
--- a/bin/example/example.txt
+++ b/bin/example/example.txt
@@ -2,6 +2,6 @@ theme_id
theme_name
organ_id
organ_name
-last_updated:Date
-product_count:Integer
-collect_count:Integer
\ No newline at end of file
+last_updated:datetime
+product_count:int
+collect_count:timestamp
diff --git a/pom.xml b/pom.xml
index b2ae2409e61a7f77247d90b5361e910195bfc9e8..d187912bc1a25dc1fbdd242ceab27373175a6b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,12 @@
guava
27.1-jre
+
+
+ dom4j
+ dom4j
+ 1.6.1
+
diff --git a/src/main/java/org/bravof/analysis/DataProcessor.java b/src/main/java/org/bravof/analysis/DataProcessor.java
index 32e862eaeb5c2cd4ea6dcca91d6b48035ca1058a..674039bffb12949cbe5215b9a5f8955eab8ba5d1 100644
--- a/src/main/java/org/bravof/analysis/DataProcessor.java
+++ b/src/main/java/org/bravof/analysis/DataProcessor.java
@@ -3,11 +3,11 @@ package org.bravof.analysis;
import lombok.extern.log4j.Log4j2;
import org.bravof.common.Constants;
import org.bravof.common.FileTypeEnum;
+import org.bravof.common.PropertyUtil;
import org.bravof.generate.DTOGenerator;
import org.bravof.generate.MapperGenerator;
import org.bravof.generate.POGenerator;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
@@ -23,14 +23,8 @@ import java.util.Map;
@Log4j2
@Component
public class DataProcessor {
- /**
- * 配置文件中获取的文件路径
- */
- @Value("${file_absolute_path}")
- private String fileAbsolutePath;
-
- @Value("${optional_file_type}")
- private String optionalFileType;
+ @Autowired
+ private PropertyUtil propertyUtil;
@Autowired
private POGenerator poGenerator;
@@ -43,62 +37,91 @@ public class DataProcessor {
public void generatorDataMap() {
try {
- FileReader fileReader = new FileReader(new File(fileAbsolutePath));
+ FileReader fileReader = new FileReader(new File(propertyUtil.getSourceFileAbsolutePath()));
BufferedReader bufferedReader = new BufferedReader(fileReader);
- List