统一管理 - 所有项目使用同一个 SSH 密钥凭证 deploy-server-ssh
This commit is contained in:
Vendored
+73
-55
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
// 每个项目的完整部署配置字典,新增项目只需在此添加一条记录
|
// 每个项目的完整部署配置字典,新增项目只需在此添加一条记录
|
||||||
// buildDir: Maven 构建目录名(deliverables/<buildDir>),默认与 key 同名,不同时显式指定
|
// buildDir: Maven 构建目录名(deliverables/<buildDir>),默认与 key 同名,不同时显式指定
|
||||||
|
// deployUser: SSH 登录用户(默认为 docker),使用 sshagent 密钥认证
|
||||||
def PROJECT_CONFIG = [
|
def PROJECT_CONFIG = [
|
||||||
'fangjiabkoff' : [
|
'fangjiabkoff' : [
|
||||||
imageName : 'fangjia-bkoff',
|
imageName : 'fangjia-bkoff',
|
||||||
@@ -9,7 +10,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'fangjia-bkoff',
|
serviceName : 'fangjia-bkoff',
|
||||||
deployHost : '192.168.0.80',
|
deployHost : '192.168.0.80',
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
'chafangtong' : [
|
'chafangtong' : [
|
||||||
imageName : 'chafangtong',
|
imageName : 'chafangtong',
|
||||||
@@ -17,7 +18,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'chafangtong',
|
serviceName : 'chafangtong',
|
||||||
deployHost : '192.168.0.80',
|
deployHost : '192.168.0.80',
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
'fangjia' : [
|
'fangjia' : [
|
||||||
imageName : 'fangjia-coresite',
|
imageName : 'fangjia-coresite',
|
||||||
@@ -25,7 +26,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'fangjia-coresite',
|
serviceName : 'fangjia-coresite',
|
||||||
deployHost : '192.168.0.80',
|
deployHost : '192.168.0.80',
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
'fangjiapds' : [
|
'fangjiapds' : [
|
||||||
imageName : 'fangjia-pds',
|
imageName : 'fangjia-pds',
|
||||||
@@ -33,7 +34,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'fangjia-pds',
|
serviceName : 'fangjia-pds',
|
||||||
deployHost : '192.168.0.80',
|
deployHost : '192.168.0.80',
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
'fangjiastatic' : [
|
'fangjiastatic' : [
|
||||||
imageName : 'fangjia-static',
|
imageName : 'fangjia-static',
|
||||||
@@ -41,7 +42,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'fangjia-static',
|
serviceName : 'fangjia-static',
|
||||||
deployHost : '192.168.0.80',
|
deployHost : '192.168.0.80',
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
'geluke' : [
|
'geluke' : [
|
||||||
imageName : 'geluke',
|
imageName : 'geluke',
|
||||||
@@ -49,7 +50,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'geluke',
|
serviceName : 'geluke',
|
||||||
deployHost : '192.168.0.80',
|
deployHost : '192.168.0.80',
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
'fangjiaopen' : [
|
'fangjiaopen' : [
|
||||||
imageName : 'fangjia-open',
|
imageName : 'fangjia-open',
|
||||||
@@ -57,7 +58,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'fangjia-open',
|
serviceName : 'fangjia-open',
|
||||||
deployHost : ['192.168.0.36', '192.168.0.18'],
|
deployHost : ['192.168.0.36', '192.168.0.18'],
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
'fangjia-script' : [
|
'fangjia-script' : [
|
||||||
buildDir : 'script', // deliverables/script
|
buildDir : 'script', // deliverables/script
|
||||||
@@ -66,7 +67,7 @@ def PROJECT_CONFIG = [
|
|||||||
serviceName : 'fangjia-script',
|
serviceName : 'fangjia-script',
|
||||||
deployHost : '192.168.0.36',
|
deployHost : '192.168.0.36',
|
||||||
deployBase : '/home/docker',
|
deployBase : '/home/docker',
|
||||||
sshCredId : 'goojia-ssh',
|
deployUser : 'docker',
|
||||||
],
|
],
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -107,7 +108,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Docker Build & Push') {
|
stage('Docker Build & Push') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
@@ -124,64 +125,81 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Docker Compose Deploy') {
|
stage('Docker Compose Deploy') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def cfg = PROJECT_CONFIG[params.PROJECT_NAME]
|
def cfg = PROJECT_CONFIG[params.PROJECT_NAME]
|
||||||
withCredentials([usernamePassword(credentialsId: cfg.sshCredId, usernameVariable: 'SSH_USER', passwordVariable: 'SSH_PASS')]) {
|
def deployUser = cfg.deployUser ?: 'docker'
|
||||||
if (params.PROJECT_NAME == "fangjia-script") {
|
sshagent(credentials: ['deploy-server-ssh']) {
|
||||||
def buildDir = cfg.buildDir ?: params.PROJECT_NAME
|
if (params.PROJECT_NAME == "fangjia-script") {
|
||||||
sh """
|
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
|
ssh -o StrictHostKeyChecking=no \
|
||||||
mkdir -p /home/docker/fangjia-script/logs
|
-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
|
# 上传 fat jar
|
||||||
sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa \
|
scp -o StrictHostKeyChecking=no \
|
||||||
projects/fangjia-script/target/fangjia-script.jar \
|
-o HostKeyAlgorithms=+ssh-rsa \
|
||||||
\$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/fangjia-script.jar
|
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||||
|
projects/fangjia-script/target/fangjia-script.jar \
|
||||||
|
${deployUser}@${cfg.deployHost}:/home/docker/fangjia-script/fangjia-script.jar
|
||||||
|
|
||||||
# 上传 groovy 脚本目录
|
# 上传 groovy 脚本目录
|
||||||
sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -r \
|
scp -o StrictHostKeyChecking=no \
|
||||||
projects/fangjia-script/src/main/groovy/* \
|
-o HostKeyAlgorithms=+ssh-rsa \
|
||||||
\$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/scripts/
|
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||||
|
-r projects/fangjia-script/src/main/groovy/* \
|
||||||
|
${deployUser}@${cfg.deployHost}:/home/docker/fangjia-script/scripts/
|
||||||
|
|
||||||
# 上传 crontab
|
# 上传 crontab
|
||||||
sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa \
|
scp -o StrictHostKeyChecking=no \
|
||||||
projects/fangjia-script/crontab.txt \
|
-o HostKeyAlgorithms=+ssh-rsa \
|
||||||
\$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/crontab.txt
|
-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} '
|
ssh -o StrictHostKeyChecking=no \
|
||||||
docker exec fangjia-script kill -USR2 1
|
-o HostKeyAlgorithms=+ssh-rsa \
|
||||||
'
|
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||||
"""
|
${deployUser}@${cfg.deployHost} '
|
||||||
} else {
|
docker exec fangjia-script kill -USR2 1
|
||||||
|
'
|
||||||
|
"""
|
||||||
|
} else {
|
||||||
if(cfg.deployHost instanceof String){
|
if(cfg.deployHost instanceof String){
|
||||||
sh """
|
sh """
|
||||||
sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${cfg.deployHost} '
|
ssh -o StrictHostKeyChecking=no \
|
||||||
cd ${cfg.deployBase}/${cfg.composeDir}
|
-o HostKeyAlgorithms=+ssh-rsa \
|
||||||
docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
|
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||||
'
|
${deployUser}@${cfg.deployHost} '
|
||||||
"""
|
cd ${cfg.deployBase}/${cfg.composeDir}
|
||||||
|
docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
|
||||||
|
"""
|
||||||
}else{
|
}else{
|
||||||
for(def host in cfg.deployHost){
|
for(def host in cfg.deployHost){
|
||||||
sh """
|
sh """
|
||||||
sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${host} '
|
ssh -o StrictHostKeyChecking=no \
|
||||||
cd ${cfg.deployBase}/${cfg.composeDir}
|
-o HostKeyAlgorithms=+ssh-rsa \
|
||||||
docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
|
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||||
'
|
${deployUser}@${host} '
|
||||||
"""
|
cd ${cfg.deployBase}/${cfg.composeDir}
|
||||||
|
docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
|
||||||
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
post {
|
post {
|
||||||
|
|||||||
+2
-2
@@ -2624,8 +2624,8 @@ public class PropertyController {
|
|||||||
result.add(item);
|
result.add(item);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
List<DistrictSellStat> monthsData = districtSellStatService.getAllWithMonths(model.getCity(),
|
List<DistrictSellStat> monthsData = districtSellStatService.getAllWithMonths(district.getCity(),
|
||||||
model.getDistrict(), model.getName(), model.getPeriodCount());
|
district.getRegion(), district.getName(), model.getPeriodCount());
|
||||||
if (monthsData != null && monthsData.size() > 0) {
|
if (monthsData != null && monthsData.size() > 0) {
|
||||||
for (DistrictSellStat districtStat : monthsData) {
|
for (DistrictSellStat districtStat : monthsData) {
|
||||||
Map<String, Object> item = new LinkedHashMap<String, Object>();
|
Map<String, Object> item = new LinkedHashMap<String, Object>();
|
||||||
|
|||||||
Reference in New Issue
Block a user