yinruoxi:

修改：
    1.Jenkins脚本管理

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
         // 拉取代码
         stage('Pull Code') {
             steps {
-                checkout([$class: 'GitSCM', branches: [[name: '*/${branch}']], extensions: [], userRemoteConfigs: [[credentialsId: '0f6d6eaa8754e735262afa495fe2828d611fca17', url: 'http://39.105.23.186:3000/develop/digimeta-MultiSaas.git']]])
+                checkout([$class: 'GitSCM', branches: [[name: '${git_version}']], extensions: [], userRemoteConfigs: [[credentialsId: '0f6d6eaa8754e735262afa495fe2828d611fca17', url: 'http://39.105.23.186:3000/develop/digimeta-MultiSaas.git']]])
             }
         }
         // 代码静态检查
@@ -19,13 +19,20 @@ pipeline {
                     sh "which java"
                     echo "打包子目录并进行代码检查 ${project_name}"
                     sh "mvn clean install"
-                    sh "mvn -f ${project_name} clean package -e -U -Dmaven.test.skip=true sonar:sonar"
+                    sh "mvn -f ${project_name} clean package -e -U -Dmaven.test.skip=true -Dsonar.login=admin -Dsonar.password=Digimeta@2023 sonar:sonar"
                 }
             }
         }
         stage('Quality Gate') {
             steps {
-                timeout(time: 1, unit: 'HOURS') {
+                //休息10s等待结果
+                sleep(10)
+                script {
+                    def workspace=pwd()
+                    // 删除所有report报告
+                    sh "find ${workspace} -name report-task.txt | xargs rm -f"
+                }
+                timeout(time: 15, unit: 'MINUTES') {
                     // Parameter indicates whether to set pipeline to UNSTABLE if Quality Gate fails
                     // true = set pipeline to UNSTABLE, false = don't waitForQualityGates abortPipeline: true
                     waitForQualityGate abortPipeline: true
@@ -44,13 +51,13 @@ pipeline {
                     if  ("${project_name}" ==  'digimeta-MultiSaas' ) {
                         echo '仅做代码检查，不打包目录'
                     } else {
-                        echo  "构件微服务 ${modules_name}，并推送到镜像仓库"
+                        echo  "构件微服务 ${module_name}，并推送到镜像仓库"
                         sh """
                             cd ${workspace}/${project_name}
                             docker login --username=缔智元2023 --password=digimeta@2023 ${ali_registry}
-                            docker build --tag ${ali_registry}/digitalman-multisaas/${modules_name}:${version} .
-                            docker push ${ali_registry}/digitalman-multisaas/${modules_name}:${version}
-                            docker rmi ${ali_registry}/digitalman-multisaas/${modules_name}:${version}
+                            docker build --tag ${ali_registry}/digitalman-multisaas/${module_name}:${version} .
+                            docker push ${ali_registry}/digitalman-multisaas/${module_name}:${version}
+                            docker rmi ${ali_registry}/digitalman-multisaas/${module_name}:${version}
                         """
                     }
                 }