优化Script

This commit is contained in:
王文艳
2026-05-23 22:31:51 +08:00
parent 8c947dbd51
commit 2d79b6cb98
3 changed files with 60 additions and 30 deletions
Vendored
+18 -2
View File
@@ -125,14 +125,30 @@ pipeline {
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')]) { 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} ' sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} '
cd ${cfg.deployBase}/${cfg.composeDir} cd ${cfg.deployBase}/${cfg.composeDir}
docker compose pull docker compose pull
docker compose up -d --no-deps --force-recreate ${cfg.serviceName} docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
docker image prune -f docker image prune -f
' '
""" """
}
} }
} }
} }
+39 -22
View File
@@ -22,6 +22,8 @@
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<!-- 保留:把依赖 jar 复制到 classes/lib -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
@@ -29,9 +31,7 @@
<execution> <execution>
<id>copy-dependencies</id> <id>copy-dependencies</id>
<phase>prepare-package</phase> <phase>prepare-package</phase>
<goals> <goals><goal>copy-dependencies</goal></goals>
<goal>copy-dependencies</goal>
</goals>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/classes/lib</outputDirectory> <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases> <overWriteReleases>false</overWriteReleases>
@@ -41,8 +41,37 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- 新增:打 fat jar,classes + lib + groovy 全部打入 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
<goals><goal>shade</goal></goals>
<configuration>
<shadedArtifactAttached>false</shadedArtifactAttached>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<!-- 排除签名文件,避免 jar 校验失败 -->
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
<resources> <resources>
<!-- 保留:Groovy 源文件和脚本打入 classes -->
<resource> <resource>
<filtering>false</filtering> <filtering>false</filtering>
<directory>${basedir}/src/main/groovy</directory> <directory>${basedir}/src/main/groovy</directory>
@@ -60,10 +89,10 @@
</includes> </includes>
</resource> </resource>
</resources> </resources>
<!-- 保留:m2e Eclipse 配置 -->
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
@@ -73,24 +102,12 @@
<pluginExecutions> <pluginExecutions>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId> <groupId>org.apache.maven.plugins</groupId>
org.apache.maven.plugins <artifactId>maven-dependency-plugin</artifactId>
</groupId> <versionRange>[2.1,)</versionRange>
<artifactId> <goals><goal>copy-dependencies</goal></goals>
maven-dependency-plugin
</artifactId>
<versionRange>
[2.1,)
</versionRange>
<goals>
<goal>
copy-dependencies
</goal>
</goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action><ignore></ignore></action>
<ignore></ignore>
</action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
+2 -5
View File
@@ -1,10 +1,7 @@
#!/bin/bash #!/bin/bash
CLASSPATH=./ # lib/*.jar 换成单个 fat jar,其余不动
for jar in lib/*.jar; do CLASSPATH="./:fangjia-script.jar"
CLASSPATH="$CLASSPATH:$jar"
done
# 把 -Dxxx 分离出来作为 JVM 参数,其余作为 Groovy 脚本路径/参数
JVM_OPTS=() JVM_OPTS=()
GROOVY_ARGS=() GROOVY_ARGS=()
for arg in "$@"; do for arg in "$@"; do