Ver Fonte

Merge branch 'release/v1.0.1' into 'develop'

Release/v1.0.1

See merge request dcuc-tjdsj/approve-gateway!7
黄资权 há 4 anos atrás
pai
commit
bff18ab8b7
2 ficheiros alterados com 40 adições e 12 exclusões
  1. 39 11
      Jenkinsfile
  2. 1 1
      src/main/assembly/conf/application.yml

+ 39 - 11
Jenkinsfile

@@ -3,9 +3,11 @@
 
 def build = new org.devops.build()
 def color = new org.devops.color()
+def systemtime = new org.devops.systemtime()
 
 def String cpu = "${env.cpu}"
 def String imagePrefix = "${env.imagePrefix}"
+def String buildImage = "${env.buildImage}"
 
 pipeline {
     agent {
@@ -20,25 +22,51 @@ pipeline {
 
     //设定2个参数,根据项目类型不同,修改对应的description name value visibleItemCount  defaultValue 即可
     parameters {
-        extendedChoice description: '请选择CPU架构.可单选/多选/全选', multiSelectDelimiter: ',', name: 'cpu',
-                       quoteValue: true,
-                       saveJSONParameterToFile: false,
-                       type: 'PT_CHECKBOX',
-                       value: 'x86,arm64',
-                       visibleItemCount: 5
-        string defaultValue: 'bus.ga/jzywb/approve/', description: '请填写打的镜像通用前缀名称,注意最后面要加 / ', name: 'imagePrefix', trim: false
+        choice choices: ['false', 'true'], description: '是否需要打镜像包,默认为否', name: 'buildImage'
+        extendedChoice description: '只有在需要打镜像包的情况下,才需要选择CPU架构。可单选/多选/全选', multiSelectDelimiter: ',', name: 'cpu',
+                quoteValue: true,
+                saveJSONParameterToFile: false,
+                type: 'PT_CHECKBOX',
+                value: 'x86,arm64',
+                visibleItemCount: 5
+        // 需修改对应的镜像名称
+        string defaultValue: 'bus.ga/jzywb/dcuc/', description: '只有在需要打镜像包的情况下,才需要填写要打镜像通用前缀名称,注意最后面要加 / ', name: 'imagePrefix', trim: false
     }
-    stages{
+    stages {
         stage('MAVEN-BUILD') {
             steps {
                 script {
-                    color.PrintMes('执行mvn打包','green')
+                    color.PrintMes('执行mvn打包', 'green')
                     //使用mvn方法打包,并传入打包参数.根据实际情况修改打包策略
-                    build.Build('mvn','mvn clean package -DskipTests=true','master')
+                    build.Build('mvn', 'mvn clean deploy -DskipTests=true', 'master')
                 }
             }
+            post {
+                success {
+                    script {
+                        version = build.GetMvnParentVersion()
+                        systime = systemtime.GetSysTime('yyMMdd')
+                        //将打出来的tar包,按照命名规范命名。根据实际情况,修改对应的系统简称和区域标识(DCUC-AUTH-BACK-TJDSJ)
+                        //如果是单模块项目,则直接cd target;如果是多模块项目,则是cd 模块名称/target
+                        sh """cd target
+                            cp approve-gateway-*.tar.gz APPROVE-GATEWAY-TJDSJ-${version}-${env.GIT_COMMIT.take(8)}-BETA-${systime}.tar.gz
+                        """
+                        //将复制的按照命名规范的tar包提取到Jenkins的面板,方便下载。根据实际情况,修改对应的系统简称和区域标识(DCUC-AUTH-BACK-TJDSJ)
+                        //如果是单模块项目,则直接target/xxxxx;如果是多模块项目,则是模块名称/target/xxxx
+                        //多模块写法:archiveArtifacts artifacts: 'dcuc-auth-back/target/DCUC-AUTH-BACK-TJDSJ-*.tar.gz'
+                        //单模块写法:
+                        archiveArtifacts artifacts: 'target/APPROVE-GATEWAY-TJDSJ-*.tar.gz'
+                    }
+                }
+            }
+
         }
         stage('DOCKER-BUILD') {
+            when {
+                expression {
+                    return (buildImage  == 'true')
+                }
+            }
             steps {
                 script {
                     //将cpu架构和模块名称传入方法打镜像包.若在上面定义的参数名称没变,可不修改
@@ -49,7 +77,7 @@ pipeline {
     }
     //构建后的操作,用来显示结果.所有项目都适用,可不改
     post {
-          success {
+        success {
             wrap([$class: 'BuildUser']) {
                 script {
                     currentBuild.description = "Start By ${env.BUILD_USER} And Build Success"

+ 1 - 1
src/main/assembly/conf/application.yml

@@ -62,7 +62,7 @@ duceap:
       jndi: JDBC/DIDS
       filterType: 1
       ##若匹配该地址,则无须过滤
-      noFilterUrl: /v2/api-docs,/api/v1/process-types,api/v1/process-type,api/v1/apply,services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/
+      noFilterUrl: /api/v1/,v1/,v2/api-docs,services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/
     dcuc:
       casServerUrlPrefix: http://192.168.10.2:8877/sso
       serverName: http://10.11.0.59:1645