diff --git a/pom.xml b/pom.xml index f53e193..94eed1b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.tccn excel - 0.1.1 + 0.1.0 jar @@ -27,9 +27,7 @@ - JExcel - src - test + excel-kit res @@ -39,9 +37,10 @@ org.apache.maven.plugins maven-compiler-plugin + 3.11.0 - 14 - 14 + 1.8 + 1.8 diff --git a/src/net/tccn/kit/poi/ExcelExportKit.java b/src/main/java/net/tccn/kit/poi/ExcelExportKit.java similarity index 100% rename from src/net/tccn/kit/poi/ExcelExportKit.java rename to src/main/java/net/tccn/kit/poi/ExcelExportKit.java diff --git a/src/net/tccn/kit/poi/ExcelKit.java b/src/main/java/net/tccn/kit/poi/ExcelKit.java similarity index 100% rename from src/net/tccn/kit/poi/ExcelKit.java rename to src/main/java/net/tccn/kit/poi/ExcelKit.java diff --git a/test/net/tccn/excel/test/ExcelKitTest.java b/src/test/java/test/ExcelKitTest.java similarity index 98% rename from test/net/tccn/excel/test/ExcelKitTest.java rename to src/test/java/test/ExcelKitTest.java index 1b35036..a2b1b7a 100644 --- a/test/net/tccn/excel/test/ExcelKitTest.java +++ b/src/test/java/test/ExcelKitTest.java @@ -1,8 +1,7 @@ -package net.tccn.excel.test; +package test; import net.tccn.kit.poi.ExcelKit; import org.apache.poi.ss.usermodel.Workbook; -import org.junit.Test; import java.io.File; import java.io.FileOutputStream; @@ -17,7 +16,7 @@ import static java.util.Arrays.asList; */ public class ExcelKitTest { - @Test + //@Test public void mapExport() { // 数据List T可以是map,也可以是某个Javabean Map m1 = new HashMap(); @@ -49,7 +48,7 @@ public class ExcelKitTest { } //read excel by fields - @Test + //@Test public void readTest() throws IOException { /*String sql1 = "select a, b, c from Sheet1"; String sql2 = "select a, b, c from Sheet1 where a=1 order by b"; @@ -75,7 +74,7 @@ public class ExcelKitTest { } //read excel no fields - @Test + //@Test public void readTest2() throws IOException { // 在不传 String[] fields 会把值从左到右分别赋值给 a...z,这样的key上 List list = ExcelKit.readExcel(new File("target/abx.xls")); @@ -137,7 +136,7 @@ public class ExcelKitTest { /** * 通用数据导入 */ - @Test + //@Test public void importTest() { String key = "user"; // 假定使用业务实体表名作为key diff --git a/test/net/tccn/excel/test/ExportKitTest.java b/src/test/java/test/ExportKitTest.java similarity index 99% rename from test/net/tccn/excel/test/ExportKitTest.java rename to src/test/java/test/ExportKitTest.java index 078da85..dfbb9ae 100644 --- a/test/net/tccn/excel/test/ExportKitTest.java +++ b/src/test/java/test/ExportKitTest.java @@ -1,4 +1,4 @@ -package net.tccn.excel.test; +package test; import net.tccn.kit.poi.ExcelExportKit; import org.junit.Test; @@ -168,7 +168,7 @@ public class ExportKitTest { response.finish(buf.toString().getBytes()); } */ - @Test + //@Test public void t() { Object t = new Person(); ((Person) t).setAge(20); @@ -206,7 +206,7 @@ public class ExportKitTest { } - @Test + //@Test public void t2() { Person person = new Person(); /*person.setName("dsafd''s'f"); diff --git a/test/net/tccn/excel/test/Person.java b/src/test/java/test/Person.java similarity index 96% rename from test/net/tccn/excel/test/Person.java rename to src/test/java/test/Person.java index 1a23504..c73724f 100644 --- a/test/net/tccn/excel/test/Person.java +++ b/src/test/java/test/Person.java @@ -1,4 +1,4 @@ -package net.tccn.excel.test; +package test; import java.util.Date; diff --git a/test/resource/import.txt b/src/test/resource/import.txt similarity index 100% rename from test/resource/import.txt rename to src/test/resource/import.txt diff --git a/test/resource/userData.xlsx b/src/test/resource/userData.xlsx similarity index 100% rename from test/resource/userData.xlsx rename to src/test/resource/userData.xlsx