From f6f02a550b68777b2319881bba173322645f36d8 Mon Sep 17 00:00:00 2001
From: zmm623 <744797400@qq.com>
Date: Sun, 22 Dec 2019 09:56:08 +0800
Subject: [PATCH 1/6] update jekinsfile-online

---
 Jenkinsfile-online | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 67c8a7f20..14e9b131d 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -14,8 +14,8 @@ pipeline {
         GITHUB_CREDENTIAL_ID = 'github-id'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'zmm623'
+        GITHUB_ACCOUNT = 'zmm623'
         APP_NAME = 'devops-java-sample'
         SONAR_CREDENTIAL_ID= 'sonar-token'
     }

From e3d7451a552e4695e884a91e27aef55efaed7b1a Mon Sep 17 00:00:00 2001
From: zmm623 <744797400@qq.com>
Date: Sun, 22 Dec 2019 10:13:12 +0800
Subject: [PATCH 2/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 14e9b131d..1ca39a935 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -11,7 +11,7 @@ pipeline {
 
     environment {
         DOCKER_CREDENTIAL_ID = 'dockerhub-id'
-        GITHUB_CREDENTIAL_ID = 'github-id'
+        GITHUB_CREDENTIAL_ID = 'github-a0688a'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'zmm623'

From ae4b4f3bd4b37de845f13935def455420e87a79b Mon Sep 17 00:00:00 2001
From: zmm623 <744797400@qq.com>
Date: Sun, 22 Dec 2019 10:34:16 +0800
Subject: [PATCH 3/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 1ca39a935..14e9b131d 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -11,7 +11,7 @@ pipeline {
 
     environment {
         DOCKER_CREDENTIAL_ID = 'dockerhub-id'
-        GITHUB_CREDENTIAL_ID = 'github-a0688a'
+        GITHUB_CREDENTIAL_ID = 'github-id'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'zmm623'

From b8d31dff728bd2c96d4eca9550b9c96134d9c9f6 Mon Sep 17 00:00:00 2001
From: zmm623 <744797400@qq.com>
Date: Mon, 23 Dec 2019 09:06:31 +0800
Subject: [PATCH 4/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 14e9b131d..66c6ff540 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -107,7 +107,7 @@ pipeline {
         stage('deploy to production') {
           when{
             expression{
-              return params.TAG_NAME =~ /v.*/
+               return params.TAG_NAME =~ /v.*/
             }
           }
           steps {

From dedff1cf44381499b8b8262706f55e95d60ab723 Mon Sep 17 00:00:00 2001
From: zmm623 <744797400@qq.com>
Date: Mon, 23 Dec 2019 09:47:16 +0800
Subject: [PATCH 5/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 66c6ff540..631e88f6a 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -6,7 +6,7 @@ pipeline {
   }
 
     parameters {
-        string(name:'TAG_NAME',defaultValue: '',description:'')
+        string(name:'TAG_NAME',defaultValue: '1.0',description:'')
     }
 
     environment {
@@ -94,8 +94,8 @@ pipeline {
               container ('maven') {
                 input(id: 'release-image-with-tag', message: 'release image with tag?')
                   withCredentials([usernamePassword(credentialsId: "$GITHUB_CREDENTIAL_ID", passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
-                    sh 'git config --global user.email "kubesphere@yunify.com" '
-                    sh 'git config --global user.name "kubesphere" '
+                    sh 'git config --global user.email "zmm623@163.com" '
+                    sh 'git config --global user.name "zmm623" '
                     sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '
                     sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4'
                   }

From 2c478a2421724c614cd2ff7c91535c3a1ef36e69 Mon Sep 17 00:00:00 2001
From: zmm623 <744797400@qq.com>
Date: Mon, 23 Dec 2019 10:20:39 +0800
Subject: [PATCH 6/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 631e88f6a..6a32f1b44 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -6,7 +6,7 @@ pipeline {
   }
 
     parameters {
-        string(name:'TAG_NAME',defaultValue: '1.0',description:'')
+        string(name:'TAG_NAME',defaultValue: '',description:'')
     }
 
     environment {