From 1a7f45608964cbf5da06d81277041b8f870f4a49 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 02 二月 2026 16:55:39 +0800
Subject: [PATCH] 版本升级

---
 .gitignore |    1 +
 pom.xml    |   21 ++++++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac88952..a9d3f0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .classpath
 .project
 .settings/
+/.metadata/
diff --git a/pom.xml b/pom.xml
index d496e67..5ef15cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <groupId>com.lx</groupId>
     <artifactId>product-server</artifactId>
-    <version>2.0.0-release</version>
+    <version>2.5.0-release</version>
     <packaging>pom</packaging>
     <name>product-server</name>
     <description>product-server</description>
@@ -76,9 +76,9 @@
         <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>
-        <product-module-version>2.0.0-release</product-module-version>
-        <product-core-version>2.1.3-release</product-core-version>
+        <project.build.version>2.5.0-release</project.build.version>
+        <product-module-version>2.5.0-release</product-module-version>
+        <product-core-version>3.0.0-release</product-core-version>
     </properties>
     <repositories>
         <repository>
@@ -124,7 +124,7 @@
             <dependency>
                 <groupId>org.spring</groupId>
                 <artifactId>spring-server-master</artifactId>
-                <version>1.2.6.7</version>
+                <version>1.2.8.0</version>
             </dependency>
 
             <!--core-->
@@ -138,17 +138,17 @@
             <dependency>
                 <groupId>com.lx</groupId>
                 <artifactId>product-server-device</artifactId>
-                <version>2.1.0-release</version>
+                <version>${product-module-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.lx</groupId>
                 <artifactId>product-server-mobile-core</artifactId>
-                <version>2.1.0-release</version>
+                <version>${product-module-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.lx</groupId>
                 <artifactId>product-server-task</artifactId>
-                <version>2.1.0-release</version>
+                <version>${product-module-version}</version>
             </dependency>
 
 
@@ -160,11 +160,6 @@
             <dependency>
                 <groupId>com.lx</groupId>
                 <artifactId>product-server-system-backup</artifactId>
-                <version>${product-module-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.lx</groupId>
-                <artifactId>product-server-tool-conduct</artifactId>
                 <version>${product-module-version}</version>
             </dependency>
             <dependency>

--
Gitblit v1.9.2