From 9b3e931931620deaf97e246eb9148efda5a87e34 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 23 Feb 2022 15:42:59 +0800
Subject: [PATCH] 测试

---
 Jenkinsfile |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c65cea3..3ab4e14 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,14 +51,16 @@
                     ####maven编译部署#####
                     ##mvn clean package -U
                     ##处理结果包
-                    old_version=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*(([0-9]+\\.)*[0-9]+).*;/\\1/p\')
-                    if [ "\$old_version_all" =~ "-" ];then
+                    versionFile=\$(find . -iname "${project_name}.java")
+                    str="-"
+                    old_version_all=\$(cat \$versionFile | sed -nr \'s/^[^0-9]*"([^"]+)".*;/\\1/p\')
+                    echo "old_version_all \$old_version_all"
+                    echo "project_name \$project_name"
+                    if [["\${old_version_all}" =~ "\$str"]];then
                         echo "包含"
                     else
                         echo "不包含"
                     fi
-                    echo "old_version_all \$old_version_all"
-                    echo "project_name \$project_name"
                     dir_name=\${project_name}"-"\$old_version_all
                     echo "dir_name \$dir_name"
                     ##cd target
@@ -81,7 +83,7 @@
             steps {
                 //http(s)的git链接使用帐号密码,ssh使用 keyFileVariable: 'SSH_KEY'
                 echo "todo version add"
-                versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
+                //versionAddDevelop("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                 }
         }
 

--
Gitblit v1.9.1