From 0b59e19fa4947a5b3de9549f08c7fe4da54adcf3 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:52:57 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ,合并空调中的报表、数据源模块。

---
 product-server-web/pom.xml                                    |  151 ++++++++++++++++++++-----------------
 product-server-web/src/main/java/com/product/Application.java |    1 
 pom.xml                                                       |   41 ++++++++--
 3 files changed, 115 insertions(+), 78 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b803ea..52f7d54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
     <name>product-server</name>
     <description>product-server</description>
     <modules>
-        <module>product-server-web</module>
         <module>home-server-admin</module>
+        <module>product-server-web</module>
     </modules>
     <properties>
         <skipTests>true</skipTests>
@@ -38,8 +38,10 @@
         <UserAgentUtils.version>1.21</UserAgentUtils.version>
         <thumbnailator.version>0.4.8</thumbnailator.version>
         <twelvemonkeys.version>3.4.1</twelvemonkeys.version>
-        <poi.version>3.16</poi.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>
@@ -95,6 +97,7 @@
                 <artifactId>product-server-core</artifactId>
                 <version>2.0.1</version>
             </dependency>
+
             <dependency>
                 <groupId>com.lx</groupId>
                 <artifactId>product-server-util</artifactId>
@@ -102,12 +105,12 @@
             </dependency>
             <dependency>
                 <groupId>com.lx</groupId>
-                <artifactId>product-server-tool-table</artifactId>
+                <artifactId>product-server-tool-face</artifactId>
                 <version>${product-module-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.lx</groupId>
-                <artifactId>product-server-tool-face</artifactId>
+                <artifactId>product-server-tool-table</artifactId>
                 <version>${product-module-version}</version>
             </dependency>
             <dependency>
@@ -230,6 +233,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-->
@@ -345,6 +353,23 @@
                 <groupId>io.jsonwebtoken</groupId>
                 <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-->
 
@@ -608,7 +633,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>
@@ -792,9 +817,9 @@
             <version>1.6.4</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>2.2.6</version>
+            <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 e54950a..7df208a 100644
--- a/product-server-web/pom.xml
+++ b/product-server-web/pom.xml
@@ -21,29 +21,41 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
+
         </profile>
+
         <profile>
             <id>test</id>
             <properties>
                 <profileActive>test</profileActive>
             </properties>
         </profile>
+
         <profile>
             <id>prod</id>
             <properties>
                 <profileActive>prod</profileActive>
             </properties>
         </profile>
+
     </profiles>
     <dependencies>
+        <!--閫氱敤妯″潡锛坲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>
@@ -69,63 +81,62 @@
             <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>
             <artifactId>product-server-lucene</artifactId>
         </dependency>
-        <!-- release -->
+        <!-- releases -->
         <dependency>
             <groupId>com.lx</groupId>
             <artifactId>product-server-core</artifactId>
-            <version>2.0.1</version>
-        </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-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>
+            <artifactId>product-server-data-sync</artifactId>
         </dependency>
         <dependency>
             <groupId>com.lx</groupId>
@@ -147,11 +158,18 @@
             <groupId>com.lx</groupId>
             <artifactId>product-server-data-center</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.spring</groupId>
-            <artifactId>spring-server-master</artifactId>
-            <version>1.2.6.6</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>
@@ -161,24 +179,19 @@
             <artifactId>product-server-task</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.lx</groupId>
-            <artifactId>product-server-xining</artifactId>
-            <version>2.0.0-release</version>
+            <groupId>org.spring</groupId>
+            <artifactId>spring-server-master</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sendgrid</groupId>
+            <artifactId>sendgrid-java</artifactId>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
-            <groupId>org.aspose</groupId>
-            <artifactId>cells-line</artifactId>
-            <version>15.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspose</groupId>
-            <artifactId>slides-line</artifactId>
-            <version>15.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspose</groupId>
-            <artifactId>words-line</artifactId>
-            <version>15.9.0</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.1</version>
         </dependency>
     </dependencies>
     <build>
@@ -296,12 +309,12 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target description="run the bat">
+                            <!-- <target description="run the bat">
                                 <echo>寮�濮嬭繍琛宲acked.bat鍛戒护琛�</echo>
-                                <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">
+                               <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">
                                     <arg line="packed.bat"></arg>
                                 </exec>
-                            </target>
+                            </target> -->
                         </configuration>
                     </execution>
                 </executions>
@@ -315,32 +328,32 @@
                         <id>copy</id>
                         <phase>package</phase>
                         <configuration>
-                            <!--
-                                <tasks>
-                                    <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/lib">
-                                        <fileset dir="${project.build.directory}/lib">
-                                            <include name="*.jar"/>
-                                            <exclude name="product-server-core-1.0.0-SNAPSHOT.jar"/>
-                                        </fileset>
-                                    </copy>
-                                    <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/resources">
-                                        <fileset dir="${project.build.directory}/resources">
-                                            <include name="application-prod.properties"/>
-                                            <include name="cache-prod.properties"/>
-                                            <include name="*.txt"/>
-                                            <include name="*.xml"/>
-                                        </fileset>
-                                    </copy>
-                                    <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/web">
-                                        <fileset dir="D:/product/lxworkspaces/product-web/dist">
-                                            <include name="*.*"/>
-                                        </fileset>
-                                    </copy>
-                                    <copy file="${project.build.directory}/product-server-web-1.0.0-SNAPSHOT.jar"
-                                          tofile="D:/product/lxworkspaces/product-server-install/resources/product-server/product-server-web-1.0.0-SNAPSHOT.jar"
-                                          overwrite="true"/>
-                                </tasks>
-                                -->
+                            <tasks>
+                                <copy todir="D:/product/workspace/product-server-install/resources/product-server/lib">
+                                    <fileset dir="${project.build.directory}/lib">
+                                        <include name="*.jar"/>
+                                        <exclude name="product-server-core-1.0.0-SNAPSHOT.jar"/>
+                                        <exclude name="product-server-core-2.0.0-SNAPSHOT.jar"/>
+                                    </fileset>
+                                </copy>
+                                <copy todir="D:/product/workspace/product-server-install/resources/product-server/resources">
+                                    <fileset dir="${project.build.directory}/resources">
+                                        <include name="application-prod.properties"/>
+                                        <include name="cache-prod.properties"/>
+                                        <include name="*.txt"/>
+                                        <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 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"/>
+                            </tasks>
+
                         </configuration>
                         <goals>
                             <goal>run</goal>
diff --git a/product-server-web/src/main/java/com/product/Application.java b/product-server-web/src/main/java/com/product/Application.java
index b79b3b9..27e7d81 100644
--- a/product-server-web/src/main/java/com/product/Application.java
+++ b/product-server-web/src/main/java/com/product/Application.java
@@ -3,7 +3,6 @@
 import com.product.core.spring.context.SpringBeanUtil;
 import com.product.customer.service.CreateSignatureFile;
 import com.product.file.util.PdfConcurrenceUtil;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

--
Gitblit v1.9.2