From 35dcdb5c3a914b4b0354aa5dc4d76800d40de28b Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 01 八月 2024 17:05:19 +0800
Subject: [PATCH] 修改core的版本

---
 pom.xml |   99 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec0a909..0e641dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,6 @@
     <description>product-server</description>
     <modules>
         <module>product-server-web</module>
-        <module>product-server-core</module>
     </modules>
     <properties>
         <skipTests>true</skipTests>
@@ -38,8 +37,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>
@@ -93,9 +94,18 @@
             <dependency>
                 <groupId>com.lx</groupId>
                 <artifactId>product-server-core</artifactId>
-                <version>2.0.1</version>
+                <version>2.1.0-release</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.lx</groupId>
+                <artifactId>product-server-device</artifactId>
+                <version>2.1.0-release</version>
+            </dependency>
+            <dependency>
+                <groupId>com.lx</groupId>
+                <artifactId>product-server-mobile-core</artifactId>
+                <version>${product-module-version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.lx</groupId>
                 <artifactId>product-server-util</artifactId>
@@ -231,9 +241,24 @@
                 <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-->
+            <dependency>
+                <groupId>e-iceblue</groupId>
+                <artifactId>spire.doc.free</artifactId>
+                <version>5.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.deepoove</groupId>
+                <artifactId>poi-tl</artifactId>
+                <version>1.10.5</version>
+            </dependency>
             <dependency>
                 <groupId>cn.hutool</groupId>
                 <artifactId>hutool-all</artifactId>
@@ -307,12 +332,65 @@
                 <version>${twelvemonkeys.version}</version>
             </dependency>
             <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.2</version>
+            </dependency>
+            <!--logo4j-->
+            <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>
+            <dependency>
+                <groupId>com.itextpdf</groupId>
+                <artifactId>itextpdf</artifactId>
+                <version>5.5.13</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.pdfbox</groupId>
+                <artifactId>pdfbox</artifactId>
+                <version>2.0.25</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.pdfbox</groupId>
+                <artifactId>pdfbox-app</artifactId>
+                <version>2.0.25</version>
+            </dependency>
+            <dependency>
                 <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-->
-	        
+
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -339,17 +417,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 璁块棶鏁版嵁搴� -->
@@ -437,7 +512,6 @@
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
@@ -577,7 +651,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>
@@ -760,5 +834,10 @@
             <artifactId>sigar</artifactId>
             <version>1.6.4</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

--
Gitblit v1.9.2