From 249e8e94d3020029650fa04ac8f52507f909559e Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期四, 29 六月 2023 10:07:30 +0800 Subject: [PATCH] poi、easyexcel、poi-tl升级 ,合并空调中的报表、数据源模块。 --- product-server-web/pom.xml | 107 +++++++++++++++++++++-------------- pom.xml | 46 ++++++++++----- 2 files changed, 94 insertions(+), 59 deletions(-) diff --git a/pom.xml b/pom.xml index 78651cf..1e2d309 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,8 @@ <twelvemonkeys.version>3.4.1</twelvemonkeys.version> <poi.version>4.1.2</poi.version> <pinyin4j.version>2.5.1</pinyin4j.version> + <mybatis.version>3.4.6</mybatis.version> + <mybatis-spring.version>1.3.2</mybatis-spring.version> <commons-fileupload.version>1.3.3</commons-fileupload.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.version>2.0.0-release</project.build.version> @@ -97,16 +99,7 @@ <artifactId>product-server-core</artifactId> <version>2.0.1</version> </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-project-base</artifactId> - <version>${product-module-version}</version> - </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-project-contract</artifactId> - <version>${product-module-version}</version> - </dependency> + <dependency> <groupId>com.lx</groupId> <artifactId>product-server-util</artifactId> @@ -242,6 +235,11 @@ <artifactId>product-server-admin</artifactId> <version>${product-module-version}</version> </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-datasource</artifactId> + <version>${product-module-version}</version> + </dependency> <!--瀛愭ā鍧楋細end--> <!--绗笁鏂逛緷璧栵細start--> @@ -358,6 +356,23 @@ <artifactId>jjwt</artifactId> <version>0.9.1</version> </dependency> + <!-- oracle jdbc --> + <dependency> + <groupId>com.oracle.database.nls</groupId> + <artifactId>orai18n</artifactId> + <version>19.7.0.0</version> + </dependency> + <dependency> + <groupId>com.oracle.database.jdbc</groupId> + <artifactId>ojdbc8</artifactId> + <version>21.1.0.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> <!--绗笁鏂逛緷璧栵細end--> </dependencies> @@ -386,17 +401,14 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.15.0</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.15.0</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-to-slf4j</artifactId> - <version>2.15.0</version> </dependency> <!--鏀寔浣跨敤 JDBC 璁块棶鏁版嵁搴� --> @@ -484,7 +496,6 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.2</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -624,7 +635,7 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml-schemas</artifactId> - <version>3.16</version> + <version>${poi.version}</version> <exclusions> <exclusion> <groupId>org.apache.logging.log4j</groupId> @@ -807,5 +818,10 @@ <artifactId>sigar</artifactId> <version>1.6.4</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml index 0768c1c..ce63699 100644 --- a/product-server-web/pom.xml +++ b/product-server-web/pom.xml @@ -40,14 +40,39 @@ </profiles> <dependencies> + <!--椤圭洰绠$悊妯″潡--> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-project-management</artifactId> + <version>2.0.0-release</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-project-server-base</artifactId> + <version>2.0.0-release</version> + </dependency> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-project-server-contract</artifactId> + <version>2.0.0-release</version> + </dependency> + <!--椤圭洰绠$悊妯″潡end--> + <!--閫氱敤妯″潡锛坲til)--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-common</artifactId> </dependency> + <!--鏁版嵁婧�--> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-datasource</artifactId> + </dependency> + <!--鎵撳嵃锛坵ord鏇挎崲锛�--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-print</artifactId> </dependency> + <!--util--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-util</artifactId> @@ -73,14 +98,10 @@ <groupId>com.lx</groupId> <artifactId>product-server-mq</artifactId> </dependency> + <!--闄勪欢绠$悊銆佹枃妗g鐞�--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-file</artifactId> - </dependency> - - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-email</artifactId> </dependency> <dependency> <groupId>com.lx</groupId> @@ -92,51 +113,44 @@ <artifactId>product-server-core</artifactId> </dependency> <dependency> - <groupId>com.sendgrid</groupId> - <artifactId>sendgrid-java</artifactId> - <version>4.0.1</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>4.1</version> - </dependency> - <dependency> <groupId>com.lx</groupId> <artifactId>product-server-report</artifactId> </dependency> + <!--鏁版嵁瀵煎叆瀵煎嚭--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-data-export-import</artifactId> </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-data-export-import</artifactId> - </dependency> + <!--寮�鍙戝伐鍏�--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-tool-dev</artifactId> </dependency> + <!--娴佺▼寤烘ā--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-tool-flow</artifactId> </dependency> + <!--鍔熻兘寤烘ā--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-tool-mvc</artifactId> </dependency> + <!-- 琛ㄥ崟寤烘ā--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-tool-face</artifactId> + </dependency> + <!--鏁版嵁寤烘ā--> + <dependency> + <groupId>com.lx</groupId> + <artifactId>product-server-tool-table</artifactId> </dependency> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-announcement</artifactId> </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-tool-table</artifactId> - </dependency> + <dependency> <groupId>com.lx</groupId> <artifactId>product-server-data-sync</artifactId> @@ -163,21 +177,16 @@ </dependency> <!--椤圭洰绠$悊妯″潡--> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-server-project-management</artifactId> - <version>2.0.0-release</version> - </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-project-server-base</artifactId> - <version>2.0.0-release</version> - </dependency> - <dependency> - <groupId>com.lx</groupId> - <artifactId>product-project-server-contract</artifactId> - <version>2.0.0-release</version> - </dependency> + <!-- <dependency>--> + <!-- <groupId>com.lx</groupId>--> + <!-- <artifactId>product-project-server-base</artifactId>--> + <!-- <version>1.0.0-SNAPSHOT</version>--> + <!-- </dependency>--> + <!-- <dependency>--> + <!-- <groupId>com.lx</groupId>--> + <!-- <artifactId>product-project-server-contract</artifactId>--> + <!-- <version>1.0.0-SNAPSHOT</version>--> + <!-- </dependency>--> <dependency> <groupId>com.lx</groupId> <artifactId>product-server-customer</artifactId> @@ -191,6 +200,16 @@ <artifactId>spring-server-master</artifactId> </dependency> + <dependency> + <groupId>com.sendgrid</groupId> + <artifactId>sendgrid-java</artifactId> + <version>4.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.1</version> + </dependency> </dependencies> <build> <plugins> @@ -310,7 +329,7 @@ <!-- <target description="run the bat"> <echo>寮�濮嬭繍琛宲acked.bat鍛戒护琛�</echo> <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe"> - <arg line="packed.bat"></arg> + <arg line="packed.bat"></arg> </exec> </target> --> </configuration> @@ -342,11 +361,11 @@ <include name="*.xml"/> </fileset> </copy> - <copy todir="D:/product/workspace/product-server-install/resources/product-server/webapp/web"> - <fileset dir="D:/product/workspace3.0/WEB/V3.0.0/dist"> - <include name="*.*"/> - </fileset> - </copy> + <!-- <copy todir="D:/product/workspace/product-server-install/resources/product-server/webapp/web">--> + <!-- <fileset dir="D:/product/workspace3.0/WEB/V3.0.0/dist">--> + <!-- <include name="*.*"/>--> + <!-- </fileset>--> + <!-- </copy>--> <copy file="${project.build.directory}/product-server-web-2.0.0-release.jar" tofile="D:/product/workspace/product-server-install/resources/product-server/product-server-web-2.0.0-release.jar" overwrite="true"/> -- Gitblit v1.9.2