diff --git a/.gitignore b/.gitignore index c653930..30ee24f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ deploy.bat /pom_bak.xml /deploy_sing.bat +/build/ diff --git a/.gradle/2.7/taskArtifacts/cache.properties b/.gradle/2.7/taskArtifacts/cache.properties new file mode 100644 index 0000000..38f81e8 --- /dev/null +++ b/.gradle/2.7/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Tue Dec 15 22:20:53 CST 2015 diff --git a/.gradle/2.7/taskArtifacts/cache.properties.lock b/.gradle/2.7/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000..fab8d2c Binary files /dev/null and b/.gradle/2.7/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.7/taskArtifacts/fileHashes.bin b/.gradle/2.7/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000..4b6f9f7 Binary files /dev/null and b/.gradle/2.7/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.7/taskArtifacts/fileSnapshots.bin b/.gradle/2.7/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000..c29f2b4 Binary files /dev/null and b/.gradle/2.7/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.7/taskArtifacts/outputFileStates.bin b/.gradle/2.7/taskArtifacts/outputFileStates.bin new file mode 100644 index 0000000..f554e81 Binary files /dev/null and b/.gradle/2.7/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.7/taskArtifacts/taskArtifacts.bin b/.gradle/2.7/taskArtifacts/taskArtifacts.bin new file mode 100644 index 0000000..c94de25 Binary files /dev/null and b/.gradle/2.7/taskArtifacts/taskArtifacts.bin differ diff --git a/.project b/.project index 2a6c952..b656a56 100644 --- a/.project +++ b/.project @@ -6,12 +6,37 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.jdt.core.javabuilder - org.eclipse.m2e.core.maven2Nature + org.springsource.ide.eclipse.gradle.core.nature + org.eclipse.jdt.core.javanature + + + 1464242916850 + + 26 + + org.eclipse.ui.ide.orFilterMatcher + + + org.eclipse.ui.ide.multiFilter + 1.0-projectRelativePath-equals-true-false-easypoi-annotation + + + org.eclipse.ui.ide.multiFilter + 1.0-projectRelativePath-equals-true-false-easypoi-base + + + org.eclipse.ui.ide.multiFilter + 1.0-projectRelativePath-equals-true-false-easypoi-web + + + + + diff --git a/build.gradle b/build.gradle index 77f88e5..3d66316 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ apply plugin : 'eclipse' allprojects { apply plugin: 'maven' - group = 'org.jeecg' version = '2.3.0' } diff --git a/easypoi-annotation/.classpath b/easypoi-annotation/.classpath index c9464c0..31d55c9 100644 --- a/easypoi-annotation/.classpath +++ b/easypoi-annotation/.classpath @@ -6,17 +6,12 @@ - - - - - - + diff --git a/easypoi-annotation/.gitignore b/easypoi-annotation/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/easypoi-annotation/.gitignore @@ -0,0 +1 @@ +/build diff --git a/easypoi-annotation/.project b/easypoi-annotation/.project index 665aeec..bdeea89 100644 --- a/easypoi-annotation/.project +++ b/easypoi-annotation/.project @@ -17,6 +17,7 @@ + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature diff --git a/easypoi-annotation/build.gradle b/easypoi-annotation/build.gradle index 2323840..ebb92ad 100644 --- a/easypoi-annotation/build.gradle +++ b/easypoi-annotation/build.gradle @@ -1,2 +1,7 @@ -apply plugin: "java" +apply plugin : "java" +apply plugin : 'eclipse' + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 +[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' description = '' diff --git a/easypoi-base/.classpath b/easypoi-base/.classpath index c9464c0..4b0065a 100644 --- a/easypoi-base/.classpath +++ b/easypoi-base/.classpath @@ -1,26 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/easypoi-base/.gitignore b/easypoi-base/.gitignore index ea8c4bf..f7e9add 100644 --- a/easypoi-base/.gitignore +++ b/easypoi-base/.gitignore @@ -1 +1,2 @@ /target +/build/ diff --git a/easypoi-base/.project b/easypoi-base/.project index 354e3e6..8946298 100644 --- a/easypoi-base/.project +++ b/easypoi-base/.project @@ -10,14 +10,9 @@ - - org.eclipse.m2e.core.maven2Builder - - - + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature diff --git a/easypoi-base/.settings/org.eclipse.jdt.core.prefs b/easypoi-base/.settings/org.eclipse.jdt.core.prefs index 14f521d..897e37d 100644 --- a/easypoi-base/.settings/org.eclipse.jdt.core.prefs +++ b/easypoi-base/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,13 @@ +# +#Thu May 26 14:01:50 CST 2016 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.debug.lineNumber=generate eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/ExcelCache.class b/easypoi-base/bin/org/jeecgframework/poi/cache/ExcelCache.class new file mode 100644 index 0000000..e9a6bb9 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/ExcelCache.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/HtmlCache$1.class b/easypoi-base/bin/org/jeecgframework/poi/cache/HtmlCache$1.class new file mode 100644 index 0000000..2323fc8 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/HtmlCache$1.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/HtmlCache.class b/easypoi-base/bin/org/jeecgframework/poi/cache/HtmlCache.class new file mode 100644 index 0000000..2ce3250 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/HtmlCache.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/ImageCache$1.class b/easypoi-base/bin/org/jeecgframework/poi/cache/ImageCache$1.class new file mode 100644 index 0000000..1dca33f Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/ImageCache$1.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/ImageCache.class b/easypoi-base/bin/org/jeecgframework/poi/cache/ImageCache.class new file mode 100644 index 0000000..058fe25 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/ImageCache.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/WordCache.class b/easypoi-base/bin/org/jeecgframework/poi/cache/WordCache.class new file mode 100644 index 0000000..463b436 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/WordCache.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/manager/FileLoadeImpl.class b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/FileLoadeImpl.class new file mode 100644 index 0000000..71df38a Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/FileLoadeImpl.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/manager/IFileLoader.class b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/IFileLoader.class new file mode 100644 index 0000000..c7557a5 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/IFileLoader.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/manager/POICacheManager$1.class b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/POICacheManager$1.class new file mode 100644 index 0000000..b477866 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/POICacheManager$1.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/manager/POICacheManager.class b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/POICacheManager.class new file mode 100644 index 0000000..10b5b41 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/manager/POICacheManager.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/cache/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/cache/package-info.class new file mode 100644 index 0000000..835f29e Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/cache/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelExportUtil.class b/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelExportUtil.class new file mode 100644 index 0000000..a8d3e4d Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelExportUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelImportUtil.class b/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelImportUtil.class new file mode 100644 index 0000000..bd9f5e1 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelImportUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelToHtmlUtil.class b/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelToHtmlUtil.class new file mode 100644 index 0000000..0168cb1 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/ExcelToHtmlUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExcelBaseParams.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExcelBaseParams.class new file mode 100644 index 0000000..da0a244 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExcelBaseParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExcelToHtmlParams.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExcelToHtmlParams.class new file mode 100644 index 0000000..3fe371f Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExcelToHtmlParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExportExcelItem.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExportExcelItem.class new file mode 100644 index 0000000..4459a17 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExportExcelItem.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExportParams.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExportParams.class new file mode 100644 index 0000000..de15652 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ExportParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ImportParams.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ImportParams.class new file mode 100644 index 0000000..00cd5d4 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/ImportParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/TemplateExportParams.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/TemplateExportParams.class new file mode 100644 index 0000000..74969b3 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/TemplateExportParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/CellValueType.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/CellValueType.class new file mode 100644 index 0000000..7f4311b Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/CellValueType.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/ExcelStyleType.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/ExcelStyleType.class new file mode 100644 index 0000000..05031ac Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/ExcelStyleType.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/ExcelType.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/ExcelType.class new file mode 100644 index 0000000..4982f77 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/enmus/ExcelType.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.class new file mode 100644 index 0000000..850f7fb Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelCollectionParams.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelCollectionParams.class new file mode 100644 index 0000000..43c2f93 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelCollectionParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.class new file mode 100644 index 0000000..a854503 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelForEachParams.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelForEachParams.class new file mode 100644 index 0000000..6a0a81b Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelForEachParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelImportEntity.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelImportEntity.class new file mode 100644 index 0000000..68021f7 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/ExcelImportEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/MergeEntity.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/MergeEntity.class new file mode 100644 index 0000000..e60c49f Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/params/MergeEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.class new file mode 100644 index 0000000..8f5829e Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/result/ExcelVerifyHanlderResult.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/result/ExcelVerifyHanlderResult.class new file mode 100644 index 0000000..12e7e59 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/result/ExcelVerifyHanlderResult.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/sax/SaxReadCellEntity.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/sax/SaxReadCellEntity.class new file mode 100644 index 0000000..31e6f17 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/sax/SaxReadCellEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/vo/BaseEntityTypeConstants.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/vo/BaseEntityTypeConstants.class new file mode 100644 index 0000000..8299c34 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/vo/BaseEntityTypeConstants.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/entity/vo/PoiBaseConstants.class b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/vo/PoiBaseConstants.class new file mode 100644 index 0000000..889b843 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/entity/vo/PoiBaseConstants.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/ExcelExportServer.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/ExcelExportServer.class new file mode 100644 index 0000000..ca3931d Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/ExcelExportServer.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/base/ExcelExportBase.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/base/ExcelExportBase.class new file mode 100644 index 0000000..fba1a4e Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/base/ExcelExportBase.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/base/ExportBase.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/base/ExportBase.class new file mode 100644 index 0000000..b5eaf68 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/base/ExportBase.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/AbstractExcelExportStyler.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/AbstractExcelExportStyler.class new file mode 100644 index 0000000..54d02dd Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/AbstractExcelExportStyler.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerBorderImpl.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerBorderImpl.class new file mode 100644 index 0000000..ef086a4 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerBorderImpl.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerColorImpl.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerColorImpl.class new file mode 100644 index 0000000..47046eb Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerColorImpl.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerDefaultImpl.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerDefaultImpl.class new file mode 100644 index 0000000..37f85a4 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerDefaultImpl.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/IExcelExportStyler.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/IExcelExportStyler.class new file mode 100644 index 0000000..a489d13 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/styler/IExcelExportStyler.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.class b/easypoi-base/bin/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.class new file mode 100644 index 0000000..eae42df Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.class new file mode 100644 index 0000000..76a9dcd Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.class new file mode 100644 index 0000000..d5331ba Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.class new file mode 100644 index 0000000..2a110c0 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.class new file mode 100644 index 0000000..0628adb Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.class new file mode 100644 index 0000000..5b93273 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.class new file mode 100644 index 0000000..3460a88 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.class new file mode 100644 index 0000000..d11e8b9 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/graph/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/package-info.class new file mode 100644 index 0000000..9d1279e Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/graph/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.class b/easypoi-base/bin/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.class new file mode 100644 index 0000000..f3ff21f Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/CellValueHelper.class b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/CellValueHelper.class new file mode 100644 index 0000000..03278da Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/CellValueHelper.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/MergedRegionHelper.class b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/MergedRegionHelper.class new file mode 100644 index 0000000..b74c3fc Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/MergedRegionHelper.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$HSSFHtmlHelper.class b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$HSSFHtmlHelper.class new file mode 100644 index 0000000..266693c Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$HSSFHtmlHelper.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$HtmlHelper.class b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$HtmlHelper.class new file mode 100644 index 0000000..4ab840a Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$HtmlHelper.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$XSSFHtmlHelper.class b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$XSSFHtmlHelper.class new file mode 100644 index 0000000..557ba64 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper$XSSFHtmlHelper.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper.class b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper.class new file mode 100644 index 0000000..d88006e Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/StylerHelper.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/excelStyle.css b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/excelStyle.css new file mode 100644 index 0000000..42d845f --- /dev/null +++ b/easypoi-base/bin/org/jeecgframework/poi/excel/html/helper/excelStyle.css @@ -0,0 +1,45 @@ +.excelDefaults { + background-color: white; + color: black; + text-decoration: none; + direction: ltr; + text-transform: none; + text-indent: 0; + letter-spacing: 0; + word-spacing: 0; + white-space: normal; + unicode-bidi: normal; + vertical-align: 0; + text-shadow: none; + padding: 0; + margin: 0; + border-collapse: collapse; + white-space: pre-wrap; + word-wrap: break-word; + word-break: break-all; +} + +.excelDefaults td { + padding: 1px 5px; + border: 1px solid silver; + border-color: #000000; + text-align: center; + vertical-align: middle; + font-size: 12pt; +} + +.excelDefaults .colHeader { + background-color: silver; + font-weight: bold; + border: 1px solid black; + text-align: center; + padding: 1px 5px; +} + +.excelDefaults .rowHeader { + background-color: silver; + font-weight: bold; + border: 1px solid black; + text-align: right; + padding: 1px 5px; +} \ No newline at end of file diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/CellValueServer.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/CellValueServer.class new file mode 100644 index 0000000..eeb8d84 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/CellValueServer.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/ExcelImportServer.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/ExcelImportServer.class new file mode 100644 index 0000000..33e1e34 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/ExcelImportServer.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/base/ImportBaseService.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/base/ImportBaseService.class new file mode 100644 index 0000000..74107ec Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/base/ImportBaseService.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/package-info.class new file mode 100644 index 0000000..3f62795 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/SaxReadExcel.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/SaxReadExcel.class new file mode 100644 index 0000000..df7de8c Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/SaxReadExcel.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/SheetHandler.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/SheetHandler.class new file mode 100644 index 0000000..3f8393e Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/SheetHandler.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/parse/ISaxRowRead.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/parse/ISaxRowRead.class new file mode 100644 index 0000000..583daf6 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/parse/ISaxRowRead.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.class b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.class new file mode 100644 index 0000000..789ac08 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/excel/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/excel/package-info.class new file mode 100644 index 0000000..42327e1 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/excel/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/exception/excel/ExcelExportException.class b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/ExcelExportException.class new file mode 100644 index 0000000..fb80d2f Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/ExcelExportException.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/exception/excel/ExcelImportException.class b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/ExcelImportException.class new file mode 100644 index 0000000..3aa0a27 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/ExcelImportException.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.class b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.class new file mode 100644 index 0000000..d02c266 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.class b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.class new file mode 100644 index 0000000..eaa5b08 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/exception/word/WordExportException.class b/easypoi-base/bin/org/jeecgframework/poi/exception/word/WordExportException.class new file mode 100644 index 0000000..62b5ac2 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/exception/word/WordExportException.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/exception/word/enmus/WordExportEnum.class b/easypoi-base/bin/org/jeecgframework/poi/exception/word/enmus/WordExportEnum.class new file mode 100644 index 0000000..4d22919 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/exception/word/enmus/WordExportEnum.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/handler/impl/ExcelDataHandlerDefaultImpl.class b/easypoi-base/bin/org/jeecgframework/poi/handler/impl/ExcelDataHandlerDefaultImpl.class new file mode 100644 index 0000000..6a2dc3b Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/handler/impl/ExcelDataHandlerDefaultImpl.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/handler/impl/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/handler/impl/package-info.class new file mode 100644 index 0000000..5cd0124 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/handler/impl/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelDataHandler.class b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelDataHandler.class new file mode 100644 index 0000000..dd2aa16 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelDataHandler.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelModel.class b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelModel.class new file mode 100644 index 0000000..f7a2df1 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelModel.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelReadRowHanlder.class b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelReadRowHanlder.class new file mode 100644 index 0000000..69b9bcb Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelReadRowHanlder.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelVerifyHandler.class b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelVerifyHandler.class new file mode 100644 index 0000000..834ec03 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/handler/inter/IExcelVerifyHandler.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/handler/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/handler/package-info.class new file mode 100644 index 0000000..5ae39f7 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/handler/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/pdf/PdfExportUtil.class b/easypoi-base/bin/org/jeecgframework/poi/pdf/PdfExportUtil.class new file mode 100644 index 0000000..b4b575b Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/pdf/PdfExportUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/pdf/entity/PdfExportParams.class b/easypoi-base/bin/org/jeecgframework/poi/pdf/entity/PdfExportParams.class new file mode 100644 index 0000000..0a337c6 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/pdf/entity/PdfExportParams.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/pdf/export/PdfExportServer.class b/easypoi-base/bin/org/jeecgframework/poi/pdf/export/PdfExportServer.class new file mode 100644 index 0000000..0f73379 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/pdf/export/PdfExportServer.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/pdf/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/pdf/package-info.class new file mode 100644 index 0000000..7bfefe0 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/pdf/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/pdf/styler/IPdfExportStyler.class b/easypoi-base/bin/org/jeecgframework/poi/pdf/styler/IPdfExportStyler.class new file mode 100644 index 0000000..3ba0d30 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/pdf/styler/IPdfExportStyler.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/pdf/styler/PdfExportStylerDefaultImpl.class b/easypoi-base/bin/org/jeecgframework/poi/pdf/styler/PdfExportStylerDefaultImpl.class new file mode 100644 index 0000000..68f12f8 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/pdf/styler/PdfExportStylerDefaultImpl.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiCellUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiCellUtil.class new file mode 100644 index 0000000..061c484 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiCellUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiElUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiElUtil.class new file mode 100644 index 0000000..529a636 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiElUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiExcelGraphDataUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiExcelGraphDataUtil.class new file mode 100644 index 0000000..851c128 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiExcelGraphDataUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiFunctionUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiFunctionUtil.class new file mode 100644 index 0000000..df74b3b Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiFunctionUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiMergeCellUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiMergeCellUtil.class new file mode 100644 index 0000000..99dcf55 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiMergeCellUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiPublicUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiPublicUtil.class new file mode 100644 index 0000000..3a15c07 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiPublicUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiReflectorUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiReflectorUtil.class new file mode 100644 index 0000000..9b3ad1f Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiReflectorUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiSheetUtility.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiSheetUtility.class new file mode 100644 index 0000000..651c134 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiSheetUtility.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/util/PoiValidationUtil.class b/easypoi-base/bin/org/jeecgframework/poi/util/PoiValidationUtil.class new file mode 100644 index 0000000..d0cbae9 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/util/PoiValidationUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/WordExportUtil.class b/easypoi-base/bin/org/jeecgframework/poi/word/WordExportUtil.class new file mode 100644 index 0000000..6cd6fb8 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/WordExportUtil.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/entity/MyXWPFDocument.class b/easypoi-base/bin/org/jeecgframework/poi/word/entity/MyXWPFDocument.class new file mode 100644 index 0000000..c6da6f2 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/entity/MyXWPFDocument.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/entity/WordImageEntity.class b/easypoi-base/bin/org/jeecgframework/poi/word/entity/WordImageEntity.class new file mode 100644 index 0000000..fdc6794 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/entity/WordImageEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/entity/params/ExcelListEntity.class b/easypoi-base/bin/org/jeecgframework/poi/word/entity/params/ExcelListEntity.class new file mode 100644 index 0000000..cb8ece3 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/entity/params/ExcelListEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/entity/params/ListParamEntity.class b/easypoi-base/bin/org/jeecgframework/poi/word/entity/params/ListParamEntity.class new file mode 100644 index 0000000..b3bc683 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/entity/params/ListParamEntity.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/package-info.class b/easypoi-base/bin/org/jeecgframework/poi/word/package-info.class new file mode 100644 index 0000000..ee74eda Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/package-info.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/parse/ParseWord07.class b/easypoi-base/bin/org/jeecgframework/poi/word/parse/ParseWord07.class new file mode 100644 index 0000000..060dafc Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/parse/ParseWord07.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.class b/easypoi-base/bin/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.class new file mode 100644 index 0000000..84d2ffe Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.class differ diff --git a/easypoi-base/bin/org/jeecgframework/poi/word/parse/excel/ExcelMapParse.class b/easypoi-base/bin/org/jeecgframework/poi/word/parse/excel/ExcelMapParse.class new file mode 100644 index 0000000..39f2152 Binary files /dev/null and b/easypoi-base/bin/org/jeecgframework/poi/word/parse/excel/ExcelMapParse.class differ diff --git a/easypoi-base/build.gradle b/easypoi-base/build.gradle index d0bcc87..9a116a4 100644 --- a/easypoi-base/build.gradle +++ b/easypoi-base/build.gradle @@ -1,11 +1,16 @@ apply plugin: "java" apply plugin: "eclipse" + + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 +[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' description = '' dependencies { compile group: 'org.apache.poi', name: 'poi', version:'3.10-FINAL' compile group: 'org.apache.poi', name: 'poi-ooxml', version:'3.10-FINAL' compile(group: 'org.apache.poi', name: 'poi-ooxml-schemas', version:'3.10-FINAL') { -exclude(module: 'xercesImpl') + exclude(module: 'xercesImpl') } compile group: 'xerces', name: 'xercesImpl', version:'2.9.1' compile group: 'org.apache.poi', name: 'poi-scratchpad', version:'3.10-FINAL' diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java new file mode 100644 index 0000000..d2b99b7 --- /dev/null +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java @@ -0,0 +1,35 @@ +/** + * + */ +package org.jeecgframework.poi.excel.entity; + +import java.util.List; +import java.util.Map; + +import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; + +/** + * @author xfworld + * @since 2016-5-26 + * @version 1.0 + */ +public class ExportExcelItem { + private List entityList; + private List> resultList; + + public List getEntityList() { + return this.entityList; + } + + public void setEntityList(List entityList) { + this.entityList = entityList; + } + + public List> getResultList() { + return this.resultList; + } + + public void setResultList(List> resultList) { + this.resultList = resultList; + } +} diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index 7159d08..4ff265d 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -109,9 +109,13 @@ public class ExcelExportServer extends ExcelExportBase { } try { List excelParams = new ArrayList(); - if (entity.isAddIndex()) { - excelParams.add(indexExcelEntity(entity)); - } + /** + * createSheetMap 中也会判断index字段,会导致重复添加,出现null 情况 + * 这里的代码注释掉 @date 2016-05-27 by xfworld + */ +// if (entity.isAddIndex()) { +// excelParams.add(indexExcelEntity(entity)); +// } // 得到所有字段 Field fileds[] = PoiPublicUtil.getClassFields(pojoClass); ExcelTarget etarget = pojoClass.getAnnotation(ExcelTarget.class); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java index ac9edd1..ee6215a 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java @@ -102,7 +102,8 @@ public abstract class ExcelExportBase extends ExportBase { maxHeight = list.size(); } } else { - Object value = getCellValue(entity, t); + Object value = getCellValue(entity, t); + if (entity.getType() == BaseEntityTypeConstants.StringType) { createStringCell(row, cellNum++, value == null ? "" : value.toString(), index % 2 == 0 ? getStyles(false, entity) : getStyles(true, entity), diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java index d10ea67..bcf40f9 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java @@ -38,218 +38,225 @@ import com.google.common.collect.Lists; * @version 1.0 * */ -public class ExcelChartBuildService { - /** - * - * @param workbook - * @param graphList - * @param build 通过实时数据行来重新计算图形定义 - * @param append - */ - public static void createExcelChart(Workbook workbook, List graphList, - Boolean build, Boolean append) { - if (workbook != null && graphList != null) { - //设定默认第一个sheet为数据项 - Sheet dataSouce = workbook.getSheetAt(0); - if (dataSouce != null) { - buildTitle(dataSouce, graphList); - - if (build) { - PoiExcelGraphDataUtil.buildGraphData(dataSouce, graphList); - } - if (append) { - buildExcelChart(dataSouce, dataSouce, graphList); - } else { - Sheet sheet = workbook.createSheet("图形界面"); - buildExcelChart(dataSouce, sheet, graphList); - } - } - - } - } - - /** - * 构建基础图形 - * @param drawing - * @param anchor - * @param dataSourceSheet - * @param graph - */ - private static void buildExcelChart(Drawing drawing, ClientAnchor anchor, Sheet dataSourceSheet, - ExcelGraph graph) { - Chart chart = drawing.createChart(anchor); - ChartLegend legend = chart.getOrCreateLegend(); - legend.setPosition(LegendPosition.TOP_RIGHT); - - ChartAxis bottomAxis = chart.getChartAxisFactory().createCategoryAxis(AxisPosition.BOTTOM); +public class ExcelChartBuildService +{ + /** + * + * @param workbook + * @param graph + * @param build 通过实时数据行来重新计算图形定义 + * @param append + */ + public static void createExcelChart(Workbook workbook,List graphList,Boolean build,Boolean append) + { + if(workbook!=null&&graphList!=null){ + //设定默认第一个sheet为数据项 + Sheet dataSouce=workbook.getSheetAt(0); + if(dataSouce!=null){ + buildTitle(dataSouce,graphList); + + if(build){ + PoiExcelGraphDataUtil.buildGraphData(dataSouce, graphList); + } + if(append){ + buildExcelChart(dataSouce, dataSouce, graphList); + }else{ + Sheet sheet=workbook.createSheet("图形界面"); + buildExcelChart(dataSouce, sheet, graphList); + } + } + + } + } + + /** + * 构建基础图形 + * @param drawing + * @param anchor + * @param dataSourceSheet + * @param graph + */ + private static void buildExcelChart(Drawing drawing,ClientAnchor anchor,Sheet dataSourceSheet,ExcelGraph graph){ + Chart chart = drawing.createChart(anchor); + ChartLegend legend = chart.getOrCreateLegend(); + legend.setPosition(LegendPosition.TOP_RIGHT); + + ChartAxis bottomAxis = chart.getChartAxisFactory().createCategoryAxis(AxisPosition.BOTTOM); ValueAxis leftAxis = chart.getChartAxisFactory().createValueAxis(AxisPosition.LEFT); leftAxis.setCrosses(AxisCrosses.AUTO_ZERO); - ExcelGraphElement categoryElement = graph.getCategory(); - + ExcelGraphElement categoryElement=graph.getCategory(); + ChartDataSource categoryChart; - if (categoryElement != null - && categoryElement.getElementType() == ExcelGraphElementType.STRING_TYPE) { - categoryChart = DataSources.fromStringCellRange(dataSourceSheet, - new CellRangeAddress(categoryElement.getStartRowNum(), - categoryElement.getEndRowNum(), categoryElement.getStartColNum(), - categoryElement.getEndColNum())); - } else { - categoryChart = DataSources.fromNumericCellRange(dataSourceSheet, - new CellRangeAddress(categoryElement.getStartRowNum(), - categoryElement.getEndRowNum(), categoryElement.getStartColNum(), - categoryElement.getEndColNum())); - } - - List valueList = graph.getValueList(); - List> chartValueList = Lists.newArrayList(); - if (valueList != null && valueList.size() > 0) { - for (ExcelGraphElement ele : valueList) { - ChartDataSource source = DataSources.fromNumericCellRange(dataSourceSheet, - new CellRangeAddress(ele.getStartRowNum(), ele.getEndRowNum(), - ele.getStartColNum(), ele.getEndColNum())); - chartValueList.add(source); - } - } - - if (graph.getGraphType() == ExcelGraphType.LINE_CHART) { - LineChartData data = chart.getChartDataFactory().createLineChartData(); - buildLineChartData(data, categoryChart, chartValueList, graph.getTitle()); - chart.plot(data, bottomAxis, leftAxis); - } else { - ScatterChartData data = chart.getChartDataFactory().createScatterChartData(); - buildScatterChartData(data, categoryChart, chartValueList, graph.getTitle()); - chart.plot(data, bottomAxis, leftAxis); - } - } - - /** - * 构建多个图形对象 - * @param dataSourceSheet - * @param tragetSheet - * @param graphList - */ - private static void buildExcelChart(Sheet dataSourceSheet, Sheet tragetSheet, - List graphList) { - int len = graphList.size(); - if (len == 1) { - buildExcelChart(dataSourceSheet, tragetSheet, graphList.get(0)); - } else { - int drawStart = 0; - int drawEnd = 20; - Drawing drawing = tragetSheet.createDrawingPatriarch(); - for (int i = 0; i < len; i++) { - ExcelGraph graph = graphList.get(i); - ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 0, drawStart, 15, drawEnd); - buildExcelChart(drawing, anchor, dataSourceSheet, graph); - drawStart = drawStart + drawEnd; - drawEnd = drawEnd + drawEnd; - } - } - } - - /** - * 构建图形对象 - * @param dataSourceSheet - * @param tragetSheet - * @param graph - */ - private static void buildExcelChart(Sheet dataSourceSheet, Sheet tragetSheet, - ExcelGraph graph) { - Drawing drawing = tragetSheet.createDrawingPatriarch(); - ClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 0, 0, 15, 20); - buildExcelChart(drawing, anchor, dataSourceSheet, graph); - } - - /** - * 构建Title - * @param sheet - * @param graph - */ - private static void buildTitle(Sheet sheet, ExcelGraph graph) { - int cellTitleLen = graph.getTitleCell().size(); - int titleLen = graph.getTitle().size(); - if (titleLen > 0) { - - } else { - for (int i = 0; i < cellTitleLen; i++) { - ExcelTitleCell titleCell = graph.getTitleCell().get(i); - if (titleCell != null) { - graph.getTitle().add( - PoiCellUtil.getCellValue(sheet, titleCell.getRow(), titleCell.getCol())); - } - } + if(categoryElement!=null&&categoryElement.getElementType()==ExcelGraphElementType.StringType){ + categoryChart=DataSources.fromStringCellRange(dataSourceSheet, new CellRangeAddress(categoryElement.getStartRowNum(),categoryElement.getEndRowNum(),categoryElement.getStartColNum(),categoryElement.getEndColNum())); + }else{ + categoryChart=DataSources.fromNumericCellRange(dataSourceSheet, new CellRangeAddress(categoryElement.getStartRowNum(),categoryElement.getEndRowNum(),categoryElement.getStartColNum(),categoryElement.getEndColNum())); } - } - - /** - * 构建Title - * @param sheet - * @param graphList - */ - private static void buildTitle(Sheet sheet, List graphList) { - if (graphList != null && graphList.size() > 0) { - for (ExcelGraph graph : graphList) { - if (graph != null) { - buildTitle(sheet, graph); - } - } + + List valueList=graph.getValueList(); + List> chartValueList=Lists.newArrayList(); + if(valueList!=null&&valueList.size()>0){ + for(ExcelGraphElement ele:valueList){ + ChartDataSource source=DataSources.fromNumericCellRange(dataSourceSheet, new CellRangeAddress(ele.getStartRowNum(),ele.getEndRowNum(),ele.getStartColNum(),ele.getEndColNum())); + chartValueList.add(source); + } } - } - - /** - * - * @param data - * @param categoryChart - * @param chartValueList - * @param title - */ - private static void buildLineChartData(LineChartData data, ChartDataSource categoryChart, - List> chartValueList, - List title) { - if (chartValueList.size() == title.size()) { - int len = title.size(); - for (int i = 0; i < len; i++) { - data.addSerie(categoryChart, chartValueList.get(i)).setTitle(title.get(i)); - } - } else { - int i = 0; - for (ChartDataSource source : chartValueList) { - String _title = title.get(i); - if (StringUtils.isNotBlank(_title)) { - data.addSerie(categoryChart, source).setTitle(_title); - } else { - data.addSerie(categoryChart, source); - } - } - } - } - - /** - * - * @param data - * @param categoryChart - * @param chartValueList - * @param title - */ - private static void buildScatterChartData(ScatterChartData data, ChartDataSource categoryChart, - List> chartValueList, - List title) { - if (chartValueList.size() == title.size()) { - int len = title.size(); - for (int i = 0; i < len; i++) { - data.addSerie(categoryChart, chartValueList.get(i)).setTitle(title.get(i)); - } - } else { - int i = 0; - for (ChartDataSource source : chartValueList) { - String _title = title.get(i); - if (StringUtils.isNotBlank(_title)) { - data.addSerie(categoryChart, source).setTitle(_title); - } else { - data.addSerie(categoryChart, source); - } - } - } - } - + + if(graph.getGraphType()==ExcelGraphType.LineChart){ + LineChartData data = chart.getChartDataFactory().createLineChartData(); + buildLineChartData(data, categoryChart, chartValueList, graph.getTitle()); + chart.plot(data, bottomAxis, leftAxis); + } + else + { + ScatterChartData data=chart.getChartDataFactory().createScatterChartData(); + buildScatterChartData(data, categoryChart, chartValueList,graph.getTitle()); + chart.plot(data, bottomAxis, leftAxis); + } + } + + + + + /** + * 构建多个图形对象 + * @param dataSourceSheet + * @param tragetSheet + * @param graphList + */ + private static void buildExcelChart(Sheet dataSourceSheet,Sheet tragetSheet,List graphList){ + int len=graphList.size(); + if(len==1) + { + buildExcelChart(dataSourceSheet, tragetSheet, graphList.get(0)); + } + else + { + int drawStart=0; + int drawEnd=20; + Drawing drawing = tragetSheet.createDrawingPatriarch(); + for(int i=0;i0){ + + }else{ + for(int i=0;i graphList){ + if(graphList!=null&&graphList.size()>0){ + for(ExcelGraph graph:graphList){ + if(graph!=null) + { + buildTitle(sheet, graph); + } + } + } + } + + /** + * + * @param data + * @param categoryChart + * @param chartValueList + * @param title + */ + private static void buildLineChartData(LineChartData data,ChartDataSource categoryChart,List> chartValueList,List title){ + if(chartValueList.size()==title.size()) + { + int len=title.size(); + for(int i=0;i source:chartValueList){ + String _title=title.get(i); + if(StringUtils.isNotBlank(_title)){ + data.addSerie(categoryChart, source).setTitle(_title); + }else{ + data.addSerie(categoryChart, source); + } + } + } + } + + /** + * + * @param data + * @param categoryChart + * @param chartValueList + * @param title + */ + private static void buildScatterChartData(ScatterChartData data,ChartDataSource categoryChart,List> chartValueList,List title){ + if(chartValueList.size()==title.size()) + { + int len=title.size(); + for(int i=0;i source:chartValueList){ + String _title=title.get(i); + if(StringUtils.isNotBlank(_title)){ + data.addSerie(categoryChart, source).setTitle(_title); + }else{ + data.addSerie(categoryChart, source); + } + } + } + } + + } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java index 13d6802..db85314 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java @@ -9,9 +9,8 @@ package org.jeecgframework.poi.excel.graph.constant; * @version 1.0 * 定义元素类型 */ -public interface ExcelGraphElementType { - - public static final Integer STRING_TYPE = 1; - - public static final Integer NUMERIC_TYPE = 2; +public interface ExcelGraphElementType +{ + public static final Integer StringType=1; + public static final Integer NumericType=2; } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java index 33a68f1..627797e 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java @@ -9,10 +9,9 @@ package org.jeecgframework.poi.excel.graph.constant; * @version 1.0 * 定义图形类型 */ -public interface ExcelGraphType { - - public static final Integer LINE_CHART = 1; - - public static final Integer SCATTER_CHART = 2; - +public interface ExcelGraphType +{ + public static final Integer LineChart=1; + public static final Integer ScatterChart=2; + } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.java index b70f94a..169f0e2 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.java @@ -9,17 +9,14 @@ import java.util.List; * @author xfworld * @since 2016-1-7 * @version 1.0 - * @see org.jeecgframework.poi.excel.graph.entity.ExcelGraph + * @see com.dawnpro.core.export.excel.model.ExcelGraph * */ -public interface ExcelGraph { - public ExcelGraphElement getCategory(); - - public List getValueList(); - - public Integer getGraphType(); - - public List getTitleCell(); - - public List getTitle(); +public interface ExcelGraph +{ + public ExcelGraphElement getCategory(); + public List getValueList(); + public Integer getGraphType(); + public List getTitleCell(); + public List getTitle(); } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java index f005197..3729c16 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java @@ -15,56 +15,56 @@ import com.google.common.collect.Lists; * @version 1.0 * */ -public class ExcelGraphDefined implements ExcelGraph { - - private ExcelGraphElement category; - - private List valueList = Lists.newArrayList(); - - private List titleCell = Lists.newArrayList(); - - private Integer graphType = ExcelGraphType.LINE_CHART; - - private List title = Lists.newArrayList(); - - public ExcelGraphElement getCategory() { - return category; - } - - public void setCategory(ExcelGraphElement category) { - this.category = category; - } - - public List getValueList() { - return valueList; - } - - public void setValueList(List valueList) { - this.valueList = valueList; - } - - public Integer getGraphType() { - return graphType; - } - - public void setGraphType(Integer graphType) { - this.graphType = graphType; - } - - public List getTitleCell() { - return titleCell; - } - - public void setTitleCell(List titleCell) { - this.titleCell = titleCell; - } - - public List getTitle() { - return title; - } - - public void setTitle(List title) { - this.title = title; - } +public class ExcelGraphDefined implements ExcelGraph +{ + private ExcelGraphElement category; + public List valueList=Lists.newArrayList(); + public List titleCell=Lists.newArrayList(); + private Integer graphType=ExcelGraphType.LineChart; + public List title=Lists.newArrayList(); + + public ExcelGraphElement getCategory() + { + return category; + } + public void setCategory(ExcelGraphElement category) + { + this.category = category; + } + public List getValueList() + { + return valueList; + } + public void setValueList(List valueList) + { + this.valueList = valueList; + } + public Integer getGraphType() + { + return graphType; + } + public void setGraphType(Integer graphType) + { + this.graphType = graphType; + } + public List getTitleCell() + { + return titleCell; + } + public void setTitleCell(List titleCell) + { + this.titleCell = titleCell; + } + public List getTitle() + { + return title; + } + public void setTitle(List title) + { + this.title = title; + } + + + } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java index 6cbd286..2fe5f36 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java @@ -5,61 +5,60 @@ package org.jeecgframework.poi.excel.graph.entity; import org.jeecgframework.poi.excel.graph.constant.ExcelGraphElementType; + /** * @author xfworld * @since 2015-12-30 * @version 1.0 * */ -public class ExcelGraphElement { - - private Integer startRowNum; - - private Integer endRowNum; - - private Integer startColNum; - - private Integer endColNum; - - private Integer elementType = ExcelGraphElementType.STRING_TYPE; - - public Integer getStartRowNum() { - return startRowNum; - } - - public void setStartRowNum(Integer startRowNum) { - this.startRowNum = startRowNum; - } - - public Integer getEndRowNum() { - return endRowNum; - } - - public void setEndRowNum(Integer endRowNum) { - this.endRowNum = endRowNum; - } - - public Integer getStartColNum() { - return startColNum; - } - - public void setStartColNum(Integer startColNum) { - this.startColNum = startColNum; - } - - public Integer getEndColNum() { - return endColNum; - } - - public void setEndColNum(Integer endColNum) { - this.endColNum = endColNum; - } - - public Integer getElementType() { - return elementType; - } - - public void setElementType(Integer elementType) { - this.elementType = elementType; - } +public class ExcelGraphElement +{ + private Integer startRowNum; + private Integer endRowNum; + private Integer startColNum; + private Integer endColNum; + private Integer elementType=ExcelGraphElementType.StringType; + + + public Integer getStartRowNum() + { + return startRowNum; + } + public void setStartRowNum(Integer startRowNum) + { + this.startRowNum = startRowNum; + } + public Integer getEndRowNum() + { + return endRowNum; + } + public void setEndRowNum(Integer endRowNum) + { + this.endRowNum = endRowNum; + } + public Integer getStartColNum() + { + return startColNum; + } + public void setStartColNum(Integer startColNum) + { + this.startColNum = startColNum; + } + public Integer getEndColNum() + { + return endColNum; + } + public void setEndColNum(Integer endColNum) + { + this.endColNum = endColNum; + } + public Integer getElementType() + { + return elementType; + } + public void setElementType(Integer elementType) + { + this.elementType = elementType; + } } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java index ec78f3b..8a90431 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java @@ -9,35 +9,36 @@ package org.jeecgframework.poi.excel.graph.entity; * @version 1.0 * */ -public class ExcelTitleCell { - - private Integer row; - - private Integer col; - - public ExcelTitleCell() { - - } - - public ExcelTitleCell(Integer row, Integer col) { - this.row = row; - this.col = col; - } - - public Integer getRow() { - return row; - } - - public void setRow(Integer row) { - this.row = row; - } - - public Integer getCol() { - return col; - } - - public void setCol(Integer col) { - this.col = col; - } - +public class ExcelTitleCell +{ + private Integer row; + private Integer col; + + public ExcelTitleCell(){ + + } + + public ExcelTitleCell(Integer row,Integer col){ + this.row=row; + this.col=col; + } + + public Integer getRow() + { + return row; + } + public void setRow(Integer row) + { + this.row = row; + } + public Integer getCol() + { + return col; + } + public void setCol(Integer col) + { + this.col = col; + } + + } diff --git a/easypoi-web/.classpath b/easypoi-web/.classpath index c9464c0..31d55c9 100644 --- a/easypoi-web/.classpath +++ b/easypoi-web/.classpath @@ -6,17 +6,12 @@ - - - - - - + diff --git a/easypoi-web/.gitignore b/easypoi-web/.gitignore index ea8c4bf..f7e9add 100644 --- a/easypoi-web/.gitignore +++ b/easypoi-web/.gitignore @@ -1 +1,2 @@ /target +/build/ diff --git a/easypoi-web/.project b/easypoi-web/.project index 6c26a37..d6bfe38 100644 --- a/easypoi-web/.project +++ b/easypoi-web/.project @@ -22,8 +22,9 @@ - org.springframework.ide.eclipse.core.springnature + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature + org.springframework.ide.eclipse.core.springnature org.eclipse.m2e.core.maven2Nature diff --git a/easypoi-web/build.gradle b/easypoi-web/build.gradle index cb7f70b..b3122e3 100644 --- a/easypoi-web/build.gradle +++ b/easypoi-web/build.gradle @@ -1,4 +1,8 @@ apply plugin: "java" +apply plugin: "eclipse" +sourceCompatibility = 1.7 +targetCompatibility = 1.7 +[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' description = '' dependencies { compile group: 'org.springframework', name: 'spring-web', version:'3.1.1.RELEASE' diff --git a/easypoi-web/pom.xml b/easypoi-web/pom.xml index caed046..d9918f5 100644 --- a/easypoi-web/pom.xml +++ b/easypoi-web/pom.xml @@ -7,37 +7,4 @@ 2.3.2-SNAPSHOT easypoi-web - - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - org.springframework - spring-core - - - - javax.servlet - servlet-api - provided - - - - - com.itextpdf - itextpdf - true - - - - org.jeecg - easypoi-base - - \ No newline at end of file