From cb5205cc91271e7c868931fa911c2bb182d9387a Mon Sep 17 00:00:00 2001
From: wangym <wangyuming11725@gmail.com>
Date: Fri, 8 Sep 2023 10:50:52 +0800
Subject: [PATCH] =?UTF-8?q?--taskid=3DID20230908=20=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84verion=E7=89=88=E6=9C=AC=E5=A3=B0=E6=98=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E5=8F=98=E9=87=8F=E4=B8=8D=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=EF=BC=8C=E9=9C=80=E8=A6=81=E8=A7=84=E8=8C=83=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MavenDependencyVersionReplaceJob.java   | 16 ++++++++++++----
 src/test/resources/pom.xml                       |  7 +++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java b/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java
index c65b3f3..71e30dd 100644
--- a/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java
+++ b/src/main/java/com/wangym/lombok/job/impl/MavenDependencyVersionReplaceJob.java
@@ -121,9 +121,9 @@ private List<Dependency> getDependencyOfDependencyManagement() {
                     .orElse(Collections.emptyList());
         }
         private void processDependency(Dependency d){
-            String a = d.getArtifactId();
+            String artifactId = d.getArtifactId();
             String version = d.getVersion();
-            if(dvService.getHiddenVersionArtifactIdList().contains(a)) {
+            if(dvService.getHiddenVersionArtifactIdList().contains(artifactId)) {
                 // 去除版本号相关声明
                 d.setVersion(null);
                 notifyHasModify();
@@ -137,6 +137,14 @@ private void processDependency(Dependency d){
                     d.setVersion(null);
                     notifyHasModify();
                 }
+                //定义的变量不规范，需要规范化
+                String newVersion = getNewVersion(artifactId);
+                String realVer = getRefVersionValue(d);
+                if (!d.getVersion().equals(newVersion) && StringUtils.isNotEmpty(realVer)) {
+                    unusedVersionKey.add(getRefVersionKey(version));
+                    insertProperty(artifactId, realVer);
+                    d.setVersion(newVersion);
+                }
             } else if (StringUtils.isNotEmpty(version)) {
                 //这种情况，说明是引用了属性的变量，但是不是很规范
                 //需要统一规范一下
@@ -149,8 +157,8 @@ private void processDependency(Dependency d){
                     realVer = version;
                 }
                 // 如果是原始的值类型的版本号才进行处理
-                insertProperty(a, realVer);
-                d.setVersion(getNewVersion(a));
+                insertProperty(artifactId, realVer);
+                d.setVersion(getNewVersion(artifactId));
                 notifyHasModify();
             }
         }
diff --git a/src/test/resources/pom.xml b/src/test/resources/pom.xml
index ea85e29..67860bd 100644
--- a/src/test/resources/pom.xml
+++ b/src/test/resources/pom.xml
@@ -26,6 +26,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <stat-service-api.version>1.44.0</stat-service-api.version>
     </properties>
 
     <dependencies>
@@ -74,6 +75,12 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.5</version>
         </dependency>
+        <!--不标准的定义-->
+        <dependency>
+            <groupId>com.wangym</groupId>
+            <artifactId>stat-services-api</artifactId>
+            <version>${stat-service-api.version}</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>