From d677da5ed41711d86536954369bbf8208cf1fa21 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Thu, 14 Aug 2025 09:57:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A1=B9=E7=9B=AE=E5=A4=96=E5=B1=82p?=
 =?UTF-8?q?om=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 184 ++++++++++++--------------------------------------------
 1 file changed, 40 insertions(+), 144 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6f187b84..dd015e4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
         <module>base-common</module>
         <module>base-webapp</module>
         <module>base-core</module>
-
     </modules>
+
     <groupId>com.hzya.frame</groupId>
     <artifactId>kangarooDataCenterV3</artifactId>
     <description>kangarooDataCenterV3</description>
@@ -16,12 +16,13 @@
     <name>kangarooDataCenterV3</name>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
+
     <properties>
-        <revision>0.0.1-SNAPSHOT</revision>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <revision>0.0.1-SNAPSHOT</revision> <!-- 实际版本号，供子模块继承 -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <!-- 其他版本变量保持不变 -->
         <junit.version>4.12</junit.version>
         <fastjson.version>2.0.33</fastjson.version>
         <spring-boot-starter-web.version>2.7.18</spring-boot-starter-web.version>
@@ -31,10 +32,7 @@
         <zxing.version>3.3.0</zxing.version>
         <hutool.version>5.8.19</hutool.version>
         <druid.version>1.1.22</druid.version>
-        <!--        <mybatis-spring-boot-starter.version>2.2.2</mybatis-spring-boot-starter.version>-->
         <mybatis-plus-boot-starter.version>3.5.6</mybatis-plus-boot-starter.version>
-        <!--        <mysql-connector-j.version>8.0.33</mysql-connector-j.version>-->
-<!--        <mysql-connector-java>5.1.49</mysql-connector-java>-->
         <mysql-connector-java>8.0.13</mysql-connector-java>
         <pagehelper-spring-boot-starter.version>1.4.6</pagehelper-spring-boot-starter.version>
         <spring-boot-starter-cache.version>2.7.18</spring-boot-starter-cache.version>
@@ -66,27 +64,19 @@
         <jimureport.version>1.7.4</jimureport.version>
         <dingtalk-stream-sdk.version>1.3.7</dingtalk-stream-sdk.version>
         <dingtalk-sdk.version>2.1.46</dingtalk-sdk.version>
-<!--        <groovy.version>4.0.15</groovy.version>-->
     </properties>
+
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.7.18</version>
         <relativePath/>
-        <!-- lookup parent from repository -->
     </parent>
 
-    <!-- 统一管理依赖版本-->
+    <!-- 统一管理依赖版本 -->
     <dependencies>
-        <!--            <dependency>-->
-        <!--                <groupId>org.springframework.boot</groupId>-->
-        <!--                <artifactId>spring-boot-dependencies</artifactId>-->
-        <!--                <version>${spring-boot.version}</version>-->
-        <!--                <type>pom</type>-->
-        <!--                <scope>provided</scope>-->
-        <!--            </dependency>-->
-        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache -->
-        <!-- https://mvnrepository.com/artifact/net.sourceforge.jtds/jtds -->
+        <!-- 移除重复的spring-boot-starter-cache依赖（解决版本冲突警告） -->
+        <!-- 保留其他必要依赖 -->
         <dependency>
             <groupId>net.sourceforge.jtds</groupId>
             <artifactId>jtds</artifactId>
@@ -97,13 +87,12 @@
             <artifactId>spring-boot-starter-aop</artifactId>
             <version>${spring-boot-starter-aop.version}</version>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
         </dependency>
+        <!-- 仅保留一处spring-boot-starter-cache依赖（已在properties中定义版本） -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
@@ -125,20 +114,16 @@
             <artifactId>junit</artifactId>
             <version>${unit.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>${fastjson.version}</version>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/p6spy/p6spy -->
         <dependency>
             <groupId>p6spy</groupId>
             <artifactId>p6spy</artifactId>
             <version>${p6spy.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -149,30 +134,11 @@
             <artifactId>core</artifactId>
             <version>${zxing.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.mybatis.spring.boot/mybatis-spring-boot-starter -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.mybatis.spring.boot</groupId>-->
-        <!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
-        <!--            <version>${mybatis-spring-boot-starter.version}</version>-->
-        <!--            <exclusions>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>org.springframework.boot</groupId>-->
-        <!--                    <artifactId>spring-boot-autoconfigure</artifactId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>org.springframework.boot</groupId>-->
-        <!--                    <artifactId>spring-boot-starter</artifactId>-->
-        <!--                </exclusion>-->
-        <!--            </exclusions>-->
-        <!--        </dependency>-->
-
-        <!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -201,7 +167,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -212,7 +177,6 @@
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
-
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
@@ -246,15 +210,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <!--  添加dm8 jdbc jar 包依赖-->
         <dependency>
             <groupId>com.dameng</groupId>
             <artifactId>Dm8JdbcDriver18</artifactId>
             <version>8.1.1.49</version>
         </dependency>
-
-
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
@@ -265,13 +226,11 @@
             <artifactId>commons-pool2</artifactId>
             <version>${commons.pool2.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${lang3.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -283,44 +242,18 @@
             <artifactId>mssql-jdbc</artifactId>
             <version>6.4.0.jre8</version>
         </dependency>
-        <!--sqlserver-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.microsoft.sqlserver</groupId>-->
-        <!--            <artifactId>mssql-jdbc</artifactId>-->
-        <!--            <version>${sqlserver.version}</version>-->
-        <!--            <exclusions>-->
-        <!--                <exclusion>-->
-        <!--                    <artifactId>bcprov-jdk15on</artifactId>-->
-        <!--                    <groupId>org.bouncycastle</groupId>-->
-        <!--                </exclusion>-->
-        <!--            </exclusions>-->
-        <!--        </dependency>-->
-        <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.bouncycastle</groupId>-->
-        <!--            <artifactId>bcprov-jdk15on</artifactId>-->
-        <!--            <version>1.52</version>-->
-        <!--        </dependency>-->
-
         <!-- pdf转图片 -->
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
             <version>${pdfbox.version}</version>
         </dependency>
-        <!--             oracle依赖-->
-        <!--            <dependency>-->
-        <!--                <groupId>com.oracle.database.jdbc</groupId>-->
-        <!--                <artifactId>ojdbc6</artifactId>-->
-        <!--                <version>${ojdbc6.version}</version>-->
-        <!--            </dependency>-->
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>${ojdbc6.version}</version>
         </dependency>
         <dependency>
-
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
             <version>${quartz.version}</version>
@@ -340,28 +273,19 @@
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
         </dependency>
-
-        <!--  缓存-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
-         <!-- postgresql驱动 -->
+        <!-- postgresql驱动 -->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>${postgresql.version}</version>
             <scope>runtime</scope>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.groovy/groovy-all -->
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>4.0.21</version>
             <type>pom</type>
         </dependency>
-        <!-- flyway依赖包 -->
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
@@ -399,7 +323,7 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.8.0</version> <!-- 这里的版本号可根据实际情况修改 -->
+            <version>3.8.0</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
@@ -410,6 +334,25 @@
 
     <build>
         <plugins>
+            <!-- 添加flatten-maven-plugin：解决${revision}变量解析问题 -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.2.7</version>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode> <!-- 替换${revision}为实际版本 -->
+                </configuration>
+            </plugin>
+
             <!-- 资源文件拷贝插件 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -419,6 +362,7 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+
             <!-- java编译插件 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -437,13 +381,13 @@
                 <version>2.7.18</version>
                 <configuration>
                     <finalName>${project.artifactId}</finalName>
-                    <mainClass>none</mainClass>     <!-- 取消查找本项目下的Main方法：为了解决Unable to find main class的问题 -->
-                    <classifier>execute</classifier>    <!-- 为了解决依赖模块找不到此模块中的类或属性 -->
-                    <skip>true</skip>
+                    <mainClass>none</mainClass> <!-- 父模块无需主类 -->
+                    <classifier>execute</classifier>
+                    <skip>true</skip> <!-- 父模块跳过打包 -->
                 </configuration>
             </plugin>
+
             <plugin>
-                <!--设置maven-war-plugins插件，否则外部依赖无法打进war包-->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
@@ -451,43 +395,11 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>${basedir}/../base-service/src/main/webapp/WEB-INF/lib</directory>
-                            <targetPath>WEB-INF/lib/</targetPath>
-                            <filtering>false</filtering>
-                            <includes>
-                                <!-- 匹配所有jar包 -->
-                                <include>**/*.jar</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/../fw-bip/src/main/webapp/WEB-INF/lib</directory>
-                            <targetPath>WEB-INF/lib/</targetPath>
-                            <filtering>false</filtering>
-                            <includes>
-                                <!-- 匹配所有jar包 -->
-                                <include>**/*.jar</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/../fw-ningbobank/src/main/webapp/WEB-INF/lib</directory>
-                            <targetPath>WEB-INF/lib/</targetPath>
-                            <filtering>false</filtering>
-                            <includes>
-                                <!-- 匹配所有jar包 -->
-                                <include>**/*.jar</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
+
+            <!-- 父模块为pom打包，无需war插件，删除多余配置 -->
         </plugins>
-        <!--加载src/main/java下的xml-->
+
+        <!-- 加载src/main/java下的xml -->
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -505,14 +417,11 @@
                     <include>**/*.xlsx</include>
                     <include>**/*.json</include>
                     <include>**/*.xdb</include>
-                    <!--                    <include>**/*.jpg</include>-->
                     <include>**/*.txt</include>
                     <include>**/*.sql</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
-
-            <!--扫描配置文件所在的目录-->
             <resource>
                 <directory>src/</directory>
                 <includes>
@@ -521,25 +430,14 @@
                     <include>**/*.xml</include>
                     <include>**/*.json</include>
                     <include>**/*.txt</include>
-                    <!--                    <include>**/*.jpg</include>-->
                     <include>**/*.sql</include>
-
                 </includes>
                 <filtering>true</filtering>
             </resource>
         </resources>
     </build>
-    <!--阿里云仓库：仓库优先级为：本地仓库(localRepositories) > profile中的repositories仓库 > POM > mirrors全局仓库 -->
-    <repositories>
-<!--        <repository>-->
-<!--            <id>spring-milestones</id>-->
-<!--            <name>Spring Milestones</name>-->
-<!--            <url>https://repo.spring.io/libs-milestone</url>-->
-<!--            <snapshots>-->
-<!--                <enabled>false</enabled>-->
-<!--            </snapshots>-->
-<!--        </repository>-->
 
+    <repositories>
         <repository>
             <id>aliyun</id>
             <name>aliyun Repository</name>
@@ -556,7 +454,5 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
     </repositories>
-
 </project>