diff --git a/Jenkinsfile b/Jenkinsfile
index dff27279f..3a15bd5d3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -125,14 +125,30 @@ pipeline {
script {
def cfg = PROJECT_CONFIG[params.PROJECT_NAME]
withCredentials([usernamePassword(credentialsId: cfg.sshCredId, usernameVariable: 'SSH_USER', passwordVariable: 'SSH_PASS')]) {
- sh """
+ if(params.PROJECT_NAME == "fangjia-script"){
+ sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' mkdir -p /home/docker/fangjia-script/scripts/fangjia
+ mkdir -p /home/docker/fangjia-script/logs'
+ sh """
+ # 上传 fat jar
+ sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no target/fangjia-script.jar \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/fangjia-script.jar
+ # 上传 groovy 脚本目录(-r 递归)
+ sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -r src/main/groovy/fangjia $SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/scripts/fangjia
+ # 上传 crontab
+ sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no crontab.txt \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/crontab.txt
+ sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' docker kill --signal=SIGHUP ${cfg.serviceName}'
+ """
+
+ }else{
+ sh """
sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} '
cd ${cfg.deployBase}/${cfg.composeDir}
docker compose pull
docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
docker image prune -f
'
- """
+ """
+ }
+
}
}
}
diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml
index db5a70962..571572e71 100644
--- a/projects/fangjia-script/pom.xml
+++ b/projects/fangjia-script/pom.xml
@@ -22,6 +22,8 @@
UTF-8
+
+
org.apache.maven.plugins
maven-dependency-plugin
@@ -29,9 +31,7 @@
copy-dependencies
prepare-package
-
- copy-dependencies
-
+ copy-dependencies
${project.build.directory}/classes/lib
false
@@ -41,8 +41,37 @@
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.5.1
+
+
+ package
+ shade
+
+ false
+
+
+ *:*
+
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
+
false
${basedir}/src/main/groovy
@@ -60,10 +89,10 @@
+
+
-
org.eclipse.m2e
lifecycle-mapping
@@ -73,24 +102,12 @@
-
- org.apache.maven.plugins
-
-
- maven-dependency-plugin
-
-
- [2.1,)
-
-
-
- copy-dependencies
-
-
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ [2.1,)
+ copy-dependencies
-
-
-
+
diff --git a/projects/fangjia-script/run.sh b/projects/fangjia-script/run.sh
index 099030905..851ad3195 100644
--- a/projects/fangjia-script/run.sh
+++ b/projects/fangjia-script/run.sh
@@ -1,10 +1,7 @@
#!/bin/bash
-CLASSPATH=./
-for jar in lib/*.jar; do
- CLASSPATH="$CLASSPATH:$jar"
-done
+# lib/*.jar 换成单个 fat jar,其余不动
+CLASSPATH="./:fangjia-script.jar"
-# 把 -Dxxx 分离出来作为 JVM 参数,其余作为 Groovy 脚本路径/参数
JVM_OPTS=()
GROOVY_ARGS=()
for arg in "$@"; do
@@ -14,4 +11,4 @@ for arg in "$@"; do
esac
done
-exec java "${JVM_OPTS[@]}" -cp "$CLASSPATH" groovy.ui.GroovyMain -c GBK "${GROOVY_ARGS[@]}"
+exec java "${JVM_OPTS[@]}" -cp "$CLASSPATH" groovy.ui.GroovyMain -c GBK "${GROOVY_ARGS[@]}"
\ No newline at end of file