From 6284dcac25ffb84fa2f6a9007a36655856e24e46 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期四, 14 十一月 2024 17:04:17 +0800
Subject: [PATCH] 调整模块，简化模块。将poi和base合并为base。
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelColumn.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/constant/ExcelLangCodeConstant.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/DownloadTempOption.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/aspose/words/zzZLS.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/util/WordUtil.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelRefer.java | 0
Source/plt-web/plt-web-parent/plt-web-api/pom.xml | 4 -
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/ExcelUtil.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiTemplateProcesser.java | 0
Source/plt-web/plt-web-parent/plt-web-base/pom.xml | 31 ++++++++++
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelTitle.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ExcelColumnMap.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiImportProcesser.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciCellStyle.java | 0
Source/plt-web/plt-web-parent/plt-web/pom.xml | 18 ------
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetDataSet.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciPoiFont.java | 0
Source/plt-web/plt-web-parent/pom.xml | 16 +++--
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeStartTableDataBO.java | 0
/dev/null | 53 -----------------
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeListDataSource.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/AppendDataExcelOption.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ReadExcelOption.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetRowData.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelOption.java | 0
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java | 0
26 files changed, 40 insertions(+), 82 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-poi/pom.xml b/Source/plt-web/plt-web-parent/plt-poi/pom.xml
deleted file mode 100644
index 6f12e73..0000000
--- a/Source/plt-web/plt-web-parent/plt-poi/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.vci</groupId>
- <artifactId>plt-web-parent</artifactId>
- <version>2024.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>plt-poi</artifactId>
-
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <poi.version>4.1.0</poi.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.aspose</groupId>
- <artifactId>aspose-words</artifactId>
- <version>18.10.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>plt-web-base</artifactId>
- </dependency>
- <dependency><!--闇�瑕佽鍙杄xcel-->
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${poi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-excelant</artifactId>
- <version>${poi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- <version>${poi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/pom.xml b/Source/plt-web/plt-web-parent/plt-web-api/pom.xml
index db24f31..96950ad 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/pom.xml
+++ b/Source/plt-web/plt-web-parent/plt-web-api/pom.xml
@@ -22,10 +22,6 @@
<artifactId>plt-web-base</artifactId>
</dependency>
<dependency>
- <groupId>com.vci</groupId>
- <artifactId>plt-poi</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.8.2</version>
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/pom.xml b/Source/plt-web/plt-web-parent/plt-web-base/pom.xml
index 880a7ba..3fa76c7 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/pom.xml
+++ b/Source/plt-web/plt-web-parent/plt-web-base/pom.xml
@@ -15,6 +15,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <poi.version>4.1.0</poi.version>
</properties>
<dependencies>
@@ -90,6 +91,36 @@
<artifactId>jackson-core</artifactId>
<version>2.13.3</version>
</dependency>
+
+ <!--璇诲彇work-->
+ <dependency>
+ <groupId>com.aspose</groupId>
+ <artifactId>aspose-words</artifactId>
+ <version>18.10.RELEASE</version>
+ </dependency>
+
+ <!--闇�瑕佽鍙杄xcel-->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-excelant</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/aspose/words/zzZLS.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/aspose/words/zzZLS.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/aspose/words/zzZLS.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/aspose/words/zzZLS.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/annotation/ExcelColumn.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelColumn.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/annotation/ExcelColumn.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelColumn.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/annotation/ExcelRefer.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelRefer.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/annotation/ExcelRefer.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelRefer.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/annotation/ExcelTitle.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelTitle.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/annotation/ExcelTitle.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelTitle.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/AppendDataExcelOption.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/AppendDataExcelOption.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/AppendDataExcelOption.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/AppendDataExcelOption.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/DownloadTempOption.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/DownloadTempOption.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/DownloadTempOption.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/DownloadTempOption.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/ExcelColumnMap.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ExcelColumnMap.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/ExcelColumnMap.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ExcelColumnMap.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/ReadExcelOption.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ReadExcelOption.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/ReadExcelOption.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ReadExcelOption.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/SheetDataSet.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetDataSet.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/SheetDataSet.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetDataSet.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/SheetRowData.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetRowData.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/SheetRowData.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetRowData.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/VciCellStyle.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciCellStyle.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/VciCellStyle.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciCellStyle.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/VciPoiFont.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciPoiFont.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/VciPoiFont.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciPoiFont.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelOption.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelOption.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/bo/WriteExcelOption.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelOption.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/constant/ExcelLangCodeConstant.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/constant/ExcelLangCodeConstant.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/constant/ExcelLangCodeConstant.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/constant/ExcelLangCodeConstant.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/ExcelUtil.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/PoiImportProcesser.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiImportProcesser.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/PoiImportProcesser.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiImportProcesser.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/PoiTemplateProcesser.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiTemplateProcesser.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/poi/util/PoiTemplateProcesser.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiTemplateProcesser.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/word/bo/WordMergeListDataSource.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeListDataSource.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/word/bo/WordMergeListDataSource.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeListDataSource.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/word/bo/WordMergeStartTableDataBO.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeStartTableDataBO.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/word/bo/WordMergeStartTableDataBO.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeStartTableDataBO.java
diff --git a/Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/word/util/WordUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/util/WordUtil.java
similarity index 100%
rename from Source/plt-web/plt-web-parent/plt-poi/src/main/java/com/vci/starter/word/util/WordUtil.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/util/WordUtil.java
diff --git a/Source/plt-web/plt-web-parent/plt-web/pom.xml b/Source/plt-web/plt-web-parent/plt-web/pom.xml
index a35b80a..5f6386a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/pom.xml
+++ b/Source/plt-web/plt-web-parent/plt-web/pom.xml
@@ -39,24 +39,6 @@
<groupId>com.vci</groupId>
<artifactId>plt-web-base</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.vci</groupId>
- <artifactId>plt-poi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>plt-poi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.vci</groupId>
- <artifactId>plt-web-base</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/Source/plt-web/plt-web-parent/pom.xml b/Source/plt-web/plt-web-parent/pom.xml
index 7896881..d51b5da 100644
--- a/Source/plt-web/plt-web-parent/pom.xml
+++ b/Source/plt-web/plt-web-parent/pom.xml
@@ -13,7 +13,6 @@
<module>plt-web</module>
<module>plt-starter</module>
<module>plt-web-base</module>
- <module>plt-poi</module>
<module>plt-web-api</module>
</modules>
@@ -156,11 +155,6 @@
<artifactId>plt-web-base</artifactId>
<version>2024.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>plt-poi</artifactId>
- <version>2024.1-SNAPSHOT</version>
- </dependency>
<!--spring鐩稿叧-->
<dependency>
@@ -196,13 +190,21 @@
<!-- Maven鍒嗗彂鏋勪欢鐨勪綅缃紝绉佹湇鍦板潃 -->
<distributionManagement>
- <repository>
+ <!--<repository>
<id>rdc-releases</id>
<url>http://dev.yunkeruida.top:9000/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>rdc-snapshots</id>
<url>http://dev.yunkeruida.top:9000/repository/maven-snapshots/</url>
+ </snapshotRepository>-->
+ <repository>
+ <id>rdc-releases</id>
+ <url>http://192.168.0.66:9000/repository/maven-releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>rdc-snapshots</id>
+ <url>http://192.168.0.66:9000/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
--
Gitblit v1.9.3