Jenkinsfile

@@ -30,52 +30,17 @@

            }
        }
        stage('testMaven') {
            steps {
        //stage('testMaven') {
            //steps {

                sh 'mvn clean test -U'
                junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'
                //sh 'mvn clean test -U'
                //junit allowEmptyResults: true, keepLongStdio: true, skipPublishingChecks: true, testResults: 'target/surefire-reports/*.xml'

            }
        }
            //}
        //}
        stage('testFunction') {
            steps {

                sh '''
                    #定义颜色的变量
                    RED_COLOR='\\033[1;31m'   #红
                    GREEN_COLOR='\\E[1;32m' #绿
                    YELOW_COLOR='\\E[1;33m' #黄
                    BLUE_COLOR='\\E[1;34m'  #蓝
                    PINK='\\E[1;35m'        #粉红
                    RES='\\E[0m'

                    #需要使用echo -e,在字符串的最后定义了033[0m，它是用来恢复了默认的文本颜色设置，这样就只会得到一个彩色提示符，而不会影响命令和其输出的颜色显示（即黑底白字）。
                    #一共有8种字体颜色可供选择，它们分别是30 (黑色)、31 (红色)、32 (绿色)、33 (黄色)、34 (蓝色)、35 ( 紫红色)、36 (青色)和37 (白色)。
                    #对于底色也有8种颜色可供选择，例如40黑底、41红底、42绿底、43黄底、44蓝底、45紫底、46天蓝底、47白底。
                    echo -e  "\${RED_COLOR}======red color======\${RES}"
                    echo -e  "\${YELOW_COLOR}======yelow color======\${RES}"
                    echo -e  "\${BLUE_COLOR}======green color======\${RES}"
                    echo -e  "\${GREEN_COLOR}======green color======\${RES}"
                    echo -e  "\${PINK}======pink color======\${RES}"
                    echo -e "\\033[40;37m 黑底白字 \\033[0m"
                    echo -e "\\033[46;37m 天蓝底白字 \\033[0m"
                    echo -e "\\033[47;30m 白底黑字 \\033[0m"
                    echo "#######################################"
                    #直接把echo -e放到变量里面，使用的时候直接输出变量即可
                    SETCOLOR_SUCCESS="echo -en \\033[1;32m"
                    SETCOLOR_FAILURE="echo -en \\033[1;31m"
                    SETCOLOR_WARNING="echo -en \\033[1;33m"
                    SETCOLOR_NORMAL="echo -en \\033[0;39m"
                    echo ----成功了！-----  &&  \$SETCOLOR_SUCCESS
                    echo ----失败了！-----  &&  \$SETCOLOR_FAILURE
                    echo ----需注意！-----  &&  \$SETCOLOR_WARNING
                    echo ----正常的！-----  &&  \$SETCOLOR_NORMAL

                    echo -e "\${GREEN_COLOR}BRANCH ${GIT_BRANCH}\${RES}"
                    printenv
                   '''
                test("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                sh 'echo test'
            }
        }

@@ -84,30 +49,46 @@
            steps {
                sh '''#!/bin/sh
                    ####maven编译部署#####
                    mvn clean package -U
                    ##mvn clean package -U
                    ##处理结果包
                    old_version_all=\$(find . -iname "\${project_name}.java"| xargs sed -nr 's/^[^0-9]*\\"(([0-9]+\\.)*[0-9]+.*-[0-9]+)\\".*;/\\1/p\')
                    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"
                    dir_name=\${project_name}"-"\$old_version_all
                    echo "dir_name \$dir_name"
                    cd target
                    mkdir \$dir_name
                    cp *.war \$dir_name
                    zip -r "\$dir_name.zip" \$dir_name
                    ##cd target
                    ##mkdir \$dir_name
                    ##cp *.war \$dir_name
                    ##zip -r "\$dir_name.zip" \$dir_name
                '''
            }
        }
        stage('version add') {

        stage('master version add') {
            when {
                not {
                    allOf {
                       changeset "**/${project_name}.java"
                    }
                }
                branch 'master'
            }
            steps {
                //http(s)的git链接使用帐号密码，ssh使用 keyFileVariable: 'SSH_KEY'
                echo "todo version add"
                versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                }
        }

        stage('version add develop') {
            when {
                //版本号自动添加逻辑需同时符合下列触发条件：
                //1. 不能在master分支触发
                //2. 有任意浏览器页面资源文件修改
                //3. 不包含[项目名.java]文件的修改
                allOf {
                    not {
                        branch 'master'
                    }
                    anyOf {
                        changeset "**/*.js"
                        changeset "**/*.css"
@@ -119,12 +100,14 @@
                    not {
                        changeset "**/${project_name}.java"
                    }
                    branch 'develop'
                }
            }
            steps {
                versionAddTest("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                versionAddCom("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
            }
        }

        stage('deploy') {
            when { branch 'master' }
            steps {

 README.md

@@ -2,7 +2,7 @@
此项目用于学习，可自由代码推送、tag推送、分支增删等操作
# 学习链接
## 文档
> 1. [知识库文档](http://192.168.1.103:8090/display/devinfo/GIT)
> 1. [知识库文档](http://172.10.3.103:8090/display/devinfo/GIT)
> > [知识库帐号注册链接](http://192.168.1.103:8090/signup.action?token=8715df27f0cfb56a)
> 2. [git 官方文档](https://git-scm.com/book/zh/v2)


 pom.xml

@@ -5,7 +5,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.hbbohua</groupId>
    <artifactId>git_study</artifactId>
    <version>1.0-SNAPSHOT</version>
    <version>1.9.0</version>
    <packaging>war</packaging>
    <dependencies>
        <dependency>
@@ -25,7 +25,7 @@
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
        <!--当前项目版本号-->
        <revision>1.9.0-SNAPSHOT</revision>
        <revision>1.9.0</revision>
        <maven.deploy.skip>true</maven.deploy.skip>
    </properties>
    <build>

 src/main/java/git_study.java

@@ -5,7 +5,7 @@
    /**
     * 保证每次打包发现场部署时增长（目前仅增长末位 +1）
     */
    String version = "1.9.0-SNAPSHOT-1";
    String version = "1.9.0";

    /**
     * 获取版本号。可用于前端资源引用版本化，解决浏览器缓存问题。

 test.js

@@ -1,35 +1 @@
gittest.fsdf

feature1

feature:rebase

develop:123

develop:234

feature:merge


reset:base
  --soft
    123

  --mixed


revert:base
 1
 2_1
 3



//////detached hdead
detached:base
    detached1
    detached2
    detached3
    detached4
11111
111111111
11111111111111111111111111