From a95fe5ee7b2512c17370ba2001f8521e63a2ae55 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 10 Jan 2024 15:16:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml       |  6 ++---
 core/core-frontend/pom.xml      |  2 +-
 core/pom.xml                    |  2 +-
 de-xpack                        |  2 +-
 pom.xml                         | 45 ++++++++++++++++++++++++++++++---
 sdk/api/api-base/pom.xml        |  2 +-
 sdk/api/api-permissions/pom.xml |  2 +-
 sdk/api/pom.xml                 |  2 +-
 sdk/common/pom.xml              |  2 +-
 sdk/distributed/pom.xml         |  2 +-
 sdk/pom.xml                     |  2 +-
 11 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 0e20a0bb5f..1e43ec1d51 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,12 +16,12 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>api-base</artifactId>
-            <version>${project.version}</version>
+            <version>${dataease.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>api-permissions</artifactId>
-            <version>${project.version}</version>
+            <version>${dataease.version}</version>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
diff --git a/core/core-frontend/pom.xml b/core/core-frontend/pom.xml
index 39feb12c59..4bb88670f4 100644
--- a/core/core-frontend/pom.xml
+++ b/core/core-frontend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>io.dataease</groupId>
-    <version>2.2.0</version>
+    <version>${dataease.version}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/pom.xml b/core/pom.xml
index bebdccc5a4..304f829475 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/de-xpack b/de-xpack
index e2a179cff0..d17d3775de 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e2a179cff0c86af963a77520e332d962b02a77a8
+Subproject commit d17d3775defcb7bbe2603121a417982a0811af4f
diff --git a/pom.xml b/pom.xml
index ce1f115337..017a46cfd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dataease</groupId>
     <artifactId>dataease</artifactId>
-    <version>2.2.0</version>
+    <version>${dataease.version}</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -13,7 +13,7 @@
     </modules>
 
     <properties>
-        <dataease.version>2.2.0</dataease.version>
+        <dataease.version>2.3.0</dataease.version>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud-alibaba.version>2022.0.0.0-RC1</spring-cloud-alibaba.version>
@@ -40,6 +40,9 @@
         <easyexcel.version>3.3.2</easyexcel.version>
         <maven.surefire.version>3.1.2</maven.surefire.version>
         <maven.clean.version>3.2.0</maven.clean.version>
+        <flatten-maven.version>1.3.0</flatten-maven.version>
+        <maven.resources.version>3.3.1</maven.resources.version>
+        <maven.exec.version>3.1.0</maven.exec.version>
     </properties>
 
     <dependencyManagement>
@@ -164,10 +167,46 @@
                     <artifactId>maven-clean-plugin</artifactId>
                     <version>${maven.clean.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven.resources.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>${maven.exec.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${flatten-maven.version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten-clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
 
-
 </project>
diff --git a/sdk/api/api-base/pom.xml b/sdk/api/api-base/pom.xml
index 5aa9989230..7ebba2167d 100644
--- a/sdk/api/api-base/pom.xml
+++ b/sdk/api/api-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/api/api-permissions/pom.xml b/sdk/api/api-permissions/pom.xml
index 5c98b7f05e..7efab60ca8 100644
--- a/sdk/api/api-permissions/pom.xml
+++ b/sdk/api/api-permissions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/api/pom.xml b/sdk/api/pom.xml
index cafa0c48dd..58186de6bd 100644
--- a/sdk/api/pom.xml
+++ b/sdk/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/common/pom.xml b/sdk/common/pom.xml
index b77d061fa4..1356fbc994 100644
--- a/sdk/common/pom.xml
+++ b/sdk/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/distributed/pom.xml b/sdk/distributed/pom.xml
index 9216b4b9a4..bc0a6f8603 100644
--- a/sdk/distributed/pom.xml
+++ b/sdk/distributed/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/pom.xml b/sdk/pom.xml
index d8d4c0ee68..36ca599108 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.2.0</version>
+        <version>${dataease.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>