From ca3092c6859f2cd7dcd071883cce4b8d6e0559bc Mon Sep 17 00:00:00 2001
From: wangdongjun <wangdongjun@wangdongjuns-MacBook-Pro.local>
Date: Thu, 5 Mar 2026 21:26:33 +0800
Subject: [PATCH 1/3] rebuild all

---
 deploy-tools/Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy-tools/Jenkinsfile b/deploy-tools/Jenkinsfile
index 9ae5223..dfada29 100644
--- a/deploy-tools/Jenkinsfile
+++ b/deploy-tools/Jenkinsfile
@@ -35,10 +35,10 @@ node("height_A") {
                   break;
                 case 'master':
                   hostPort = 22
-                  credentialsId = "city-zhxy-deploy"
-                  remoteHost = "192.168.41.228"
-                  namespace = "scj-v3"
-                  profile = "deploy"
+                    credentialsId = "cyweb-dev"
+                    remoteHost = "192.168.43.18"
+                    namespace = "city-zhxy-school-deploy-v3"
+                    profile = "deploy"
                   break;
                 default:
                    error('未配置分支！放弃执行')

From 57085824b6f2a631d21b8be95fe8b41d6cfff116 Mon Sep 17 00:00:00 2001
From: wangdongjun <wangdongjun@wangdongjuns-MacBook-Pro.local>
Date: Thu, 5 Mar 2026 22:43:04 +0800
Subject: [PATCH 2/3] rebuild all

---
 deploy-tools/Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy-tools/Jenkinsfile b/deploy-tools/Jenkinsfile
index dfada29..4716f3a 100644
--- a/deploy-tools/Jenkinsfile
+++ b/deploy-tools/Jenkinsfile
@@ -28,14 +28,14 @@ node("height_A") {
             switch(branch){
                 case 'developer' :
                   hostPort = 22
-                  credentialsId = "scj-v3"
+                  credentialsId = "root-with-key-ubu-70"
                   remoteHost = "192.168.42.127"
                   namespace = "scj-v3"
                   profile = "developer"
                   break;
                 case 'master':
                   hostPort = 22
-                    credentialsId = "cyweb-dev"
+                    credentialsId = "root-with-key-ubu-70"
                     remoteHost = "192.168.43.18"
                     namespace = "city-zhxy-school-deploy-v3"
                     profile = "deploy"
@@ -107,7 +107,7 @@ node("height_A") {
                             remote.host = "${remoteHost}"
                             remote.allowAnyHosts = true
 
-                                withCredentials([sshUserPrivateKey(credentialsId: 'root-with-key-ubu-70', keyFileVariable: 'identity', passphraseVariable: '', usernameVariable: 'username')]) {
+                                withCredentials([sshUserPrivateKey(credentialsId: "${credentialsId}", keyFileVariable: 'identity', passphraseVariable: '', usernameVariable: 'username')]) {
                                 remote.user = "${username}"
                                 remote.port = hostPort
                                 remote.identityFile = identity

From b08890088672a246c850a2f725ff19b1f97db692 Mon Sep 17 00:00:00 2001
From: wangdongjun <wangdongjun@wangdongjuns-MacBook-Pro.local>
Date: Thu, 5 Mar 2026 23:26:43 +0800
Subject: [PATCH 3/3] rebuild all

---
 deploy-tools/Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy-tools/Jenkinsfile b/deploy-tools/Jenkinsfile
index 4716f3a..ecf70f5 100644
--- a/deploy-tools/Jenkinsfile
+++ b/deploy-tools/Jenkinsfile
@@ -122,6 +122,7 @@ node("height_A") {
             }
 
 
+
     }catch(Exception e){
         isSuccess = false
         currentBuild.result = 'FAILURE'