From 92875113080baeadf27d453c033d729ab759693f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Fri, 14 Aug 2026 16:29:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE=E4=BD=BF=E7=94=A8=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=20SSH=20=E5=AF=86=E9=92=A5=E5=87=AD=E8=AF=81?= =?UTF-8?q?=20deploy-server-ssh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 128 ++++++++++-------- .../open/controllers/PropertyController.java | 4 +- 2 files changed, 75 insertions(+), 57 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c0fde7f2..3203077f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,7 @@ // 每个项目的完整部署配置字典,新增项目只需在此添加一条记录 // buildDir: Maven 构建目录名(deliverables/),默认与 key 同名,不同时显式指定 +// deployUser: SSH 登录用户(默认为 docker),使用 sshagent 密钥认证 def PROJECT_CONFIG = [ 'fangjiabkoff' : [ imageName : 'fangjia-bkoff', @@ -9,7 +10,7 @@ def PROJECT_CONFIG = [ serviceName : 'fangjia-bkoff', deployHost : '192.168.0.80', deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], 'chafangtong' : [ imageName : 'chafangtong', @@ -17,7 +18,7 @@ def PROJECT_CONFIG = [ serviceName : 'chafangtong', deployHost : '192.168.0.80', deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], 'fangjia' : [ imageName : 'fangjia-coresite', @@ -25,7 +26,7 @@ def PROJECT_CONFIG = [ serviceName : 'fangjia-coresite', deployHost : '192.168.0.80', deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], 'fangjiapds' : [ imageName : 'fangjia-pds', @@ -33,7 +34,7 @@ def PROJECT_CONFIG = [ serviceName : 'fangjia-pds', deployHost : '192.168.0.80', deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], 'fangjiastatic' : [ imageName : 'fangjia-static', @@ -41,7 +42,7 @@ def PROJECT_CONFIG = [ serviceName : 'fangjia-static', deployHost : '192.168.0.80', deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], 'geluke' : [ imageName : 'geluke', @@ -49,7 +50,7 @@ def PROJECT_CONFIG = [ serviceName : 'geluke', deployHost : '192.168.0.80', deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], 'fangjiaopen' : [ imageName : 'fangjia-open', @@ -57,7 +58,7 @@ def PROJECT_CONFIG = [ serviceName : 'fangjia-open', deployHost : ['192.168.0.36', '192.168.0.18'], deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], 'fangjia-script' : [ buildDir : 'script', // deliverables/script @@ -66,7 +67,7 @@ def PROJECT_CONFIG = [ serviceName : 'fangjia-script', deployHost : '192.168.0.36', deployBase : '/home/docker', - sshCredId : 'goojia-ssh', + deployUser : 'docker', ], ] @@ -107,7 +108,7 @@ pipeline { } } } - + stage('Docker Build & Push') { steps { script { @@ -124,64 +125,81 @@ pipeline { } } - stage('Docker Compose Deploy') { - steps { - script { - def cfg = PROJECT_CONFIG[params.PROJECT_NAME] - withCredentials([usernamePassword(credentialsId: cfg.sshCredId, usernameVariable: 'SSH_USER', passwordVariable: 'SSH_PASS')]) { - if (params.PROJECT_NAME == "fangjia-script") { - def buildDir = cfg.buildDir ?: params.PROJECT_NAME - sh """ - # 确保目录存在 - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${cfg.deployHost} ' - mkdir -p /home/docker/fangjia-script/scripts/fangjia - mkdir -p /home/docker/fangjia-script/logs - ' + stage('Docker Compose Deploy') { + steps { + script { + def cfg = PROJECT_CONFIG[params.PROJECT_NAME] + def deployUser = cfg.deployUser ?: 'docker' + sshagent(credentials: ['deploy-server-ssh']) { + if (params.PROJECT_NAME == "fangjia-script") { + def buildDir = cfg.buildDir ?: params.PROJECT_NAME + sh """ + # 确保目录存在 + ssh -o StrictHostKeyChecking=no \ + -o HostKeyAlgorithms=+ssh-rsa \ + -o PubkeyAcceptedKeyTypes=+ssh-rsa \ + ${deployUser}@${cfg.deployHost} ' + mkdir -p /home/docker/fangjia-script/scripts/fangjia + mkdir -p /home/docker/fangjia-script/logs + ' - # 上传 fat jar - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa \ - projects/fangjia-script/target/fangjia-script.jar \ - \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/fangjia-script.jar + # 上传 fat jar + scp -o StrictHostKeyChecking=no \ + -o HostKeyAlgorithms=+ssh-rsa \ + -o PubkeyAcceptedKeyTypes=+ssh-rsa \ + projects/fangjia-script/target/fangjia-script.jar \ + ${deployUser}@${cfg.deployHost}:/home/docker/fangjia-script/fangjia-script.jar - # 上传 groovy 脚本目录 - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -r \ - projects/fangjia-script/src/main/groovy/* \ - \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/scripts/ + # 上传 groovy 脚本目录 + scp -o StrictHostKeyChecking=no \ + -o HostKeyAlgorithms=+ssh-rsa \ + -o PubkeyAcceptedKeyTypes=+ssh-rsa \ + -r projects/fangjia-script/src/main/groovy/* \ + ${deployUser}@${cfg.deployHost}:/home/docker/fangjia-script/scripts/ - # 上传 crontab - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa \ - projects/fangjia-script/crontab.txt \ - \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/crontab.txt + # 上传 crontab + scp -o StrictHostKeyChecking=no \ + -o HostKeyAlgorithms=+ssh-rsa \ + -o PubkeyAcceptedKeyTypes=+ssh-rsa \ + projects/fangjia-script/crontab.txt \ + ${deployUser}@${cfg.deployHost}:/home/docker/fangjia-script/crontab.txt - # 热重载 - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${cfg.deployHost} ' - docker exec fangjia-script kill -USR2 1 - ' - """ - } else { + # 热重载 + ssh -o StrictHostKeyChecking=no \ + -o HostKeyAlgorithms=+ssh-rsa \ + -o PubkeyAcceptedKeyTypes=+ssh-rsa \ + ${deployUser}@${cfg.deployHost} ' + docker exec fangjia-script kill -USR2 1 + ' + """ + } else { if(cfg.deployHost instanceof String){ sh """ - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${cfg.deployHost} ' - cd ${cfg.deployBase}/${cfg.composeDir} - docker compose up -d --no-deps --force-recreate ${cfg.serviceName} - ' - """ + ssh -o StrictHostKeyChecking=no \ + -o HostKeyAlgorithms=+ssh-rsa \ + -o PubkeyAcceptedKeyTypes=+ssh-rsa \ + ${deployUser}@${cfg.deployHost} ' + cd ${cfg.deployBase}/${cfg.composeDir} + docker compose up -d --no-deps --force-recreate ${cfg.serviceName} + """ }else{ for(def host in cfg.deployHost){ sh """ - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${host} ' - cd ${cfg.deployBase}/${cfg.composeDir} - docker compose up -d --no-deps --force-recreate ${cfg.serviceName} - ' - """ + ssh -o StrictHostKeyChecking=no \ + -o HostKeyAlgorithms=+ssh-rsa \ + -o PubkeyAcceptedKeyTypes=+ssh-rsa \ + ${deployUser}@${host} ' + cd ${cfg.deployBase}/${cfg.composeDir} + docker compose up -d --no-deps --force-recreate ${cfg.serviceName} + """ } } - } - } - } - } - } + } + } + } + } + } } post { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index e25d59dfb..a3636307f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -2624,8 +2624,8 @@ public class PropertyController { result.add(item); } } else { - List monthsData = districtSellStatService.getAllWithMonths(model.getCity(), - model.getDistrict(), model.getName(), model.getPeriodCount()); + List monthsData = districtSellStatService.getAllWithMonths(district.getCity(), + district.getRegion(), district.getName(), model.getPeriodCount()); if (monthsData != null && monthsData.size() > 0) { for (DistrictSellStat districtStat : monthsData) { Map item = new LinkedHashMap();