From 93c19eae82c0ad89f7fe422241dd4e3814e7046c Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 21 Mar 2021 20:38:51 +0800 Subject: [PATCH] chore: optimize build script --- others/script/build_docker.sh | 3 ++- others/script/jenkins_auto_build.sh | 4 ++-- .../processors/impl/script/AbstractScriptProcessor.java | 2 +- powerjob-server/docker/Dockerfile | 1 + .../java/tech/powerjob/server/common/utils/OmsFileUtils.java | 2 +- .../src/main/resources/logback-product.xml | 2 +- powerjob-worker-agent/src/main/resources/logback.xml | 2 +- .../tech/powerjob/worker/container/OmsContainerFactory.java | 2 +- .../tech/powerjob/worker/persistence/ConnectionFactory.java | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/others/script/build_docker.sh b/others/script/build_docker.sh index 99deabf8..4149668e 100755 --- a/others/script/build_docker.sh +++ b/others/script/build_docker.sh @@ -11,8 +11,9 @@ cd `dirname $0`/../.. || exit read -r -p "是否进行maven构建（y/n）:" needmvn if [ "$needmvn" = "y" ] || [ "$needmvn" = "Y" ]; then echo "================== 构建 jar ==================" + # mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am # -U：强制检查snapshot库 -pl：指定需要构建的模块，多模块逗号分割 -am：同时构建依赖模块，一般与pl连用 -Pxxx：指定使用的配置文件 - mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am + mvn clean package -Pdev -DskipTests -U -e echo "================== 拷贝 jar ==================" /bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar diff --git a/others/script/jenkins_auto_build.sh b/others/script/jenkins_auto_build.sh index f0264770..b92b074c 100755 --- a/others/script/jenkins_auto_build.sh +++ b/others/script/jenkins_auto_build.sh @@ -1,7 +1,7 @@ #!/bin/bash cd `dirname $0`/../.. || exit echo "================== 构建 jar ==================" -mvn clean package -Pdev -DskipTests -U -e -pl powerjob-server,powerjob-worker-agent -am +mvn clean package -Pdev -DskipTests -U -e echo "================== 拷贝 jar ==================" /bin/cp -rf powerjob-server/powerjob-server-starter/target/*.jar powerjob-server/docker/powerjob-server.jar /bin/cp -rf powerjob-worker-agent/target/*.jar powerjob-worker-agent/powerjob-agent.jar @@ -27,7 +27,7 @@ docker run -d \ -p 7700:7700 -p 10086:10086 -p 5001:5005 -p 10001:10000 \ -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \ -e PARAMS="--oms.swagger.enable=true --spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://remotehost:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://remotehost:27017/powerjob-product" \ - -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \ + -v ~/docker/powerjob-server:/root/powerjob/server -v ~/.m2:/root/.m2 \ tjqq/powerjob-server:latest sleep 60 echo "================== 准备启动 powerjob-agent ==================" diff --git a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java index 8c523aa4..b344f703 100644 --- a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java +++ b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java @@ -31,7 +31,7 @@ public abstract class AbstractScriptProcessor extends CommonBasicProcessor { private static final Set DOWNLOAD_PROTOCOL = Sets.newHashSet("http", "https", "ftp"); protected static final String SH_SHELL = "/bin/sh"; - private static final String WORKER_DIR = System.getProperty("user.home") + "/powerjob/official_script_processor/"; + private static final String WORKER_DIR = System.getProperty("user.home") + "/powerjob/worker/official_script_processor/"; @Override protected ProcessResult process0(TaskContext context) throws Exception { diff --git a/powerjob-server/docker/Dockerfile b/powerjob-server/docker/Dockerfile index 8cdc84da..b7fc9d14 100644 --- a/powerjob-server/docker/Dockerfile +++ b/powerjob-server/docker/Dockerfile @@ -26,6 +26,7 @@ EXPOSE 7700 10086 10010 # 创建 docker 文件目录（盲猜这是用户目录） RUN mkdir -p /root/powerjob-server # 挂载数据卷，将文件直接输出到宿主机（注意，此处挂载的是匿名卷，即在宿主机位置随机） +VOLUME /root/powerjob VOLUME /root/powerjob-server # 启动应用 ENTRYPOINT ["sh","-c","java $JVMOPTIONS -jar /powerjob-server.jar $PARAMS"] diff --git a/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/OmsFileUtils.java b/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/OmsFileUtils.java index 412cc7bd..8a78edcf 100644 --- a/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/OmsFileUtils.java +++ b/powerjob-server/powerjob-server-common/src/main/java/tech/powerjob/server/common/utils/OmsFileUtils.java @@ -17,7 +17,7 @@ import java.net.URLEncoder; public class OmsFileUtils { private static final String USER_HOME = System.getProperty("user.home", "oms"); - private static final String COMMON_PATH = USER_HOME + "/powerjob-server/"; + private static final String COMMON_PATH = USER_HOME + "/powerjob/server/"; /** * 获取在线日志的存放路径 diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/logback-product.xml b/powerjob-server/powerjob-server-starter/src/main/resources/logback-product.xml index 9ccddcd9..b1d2b1f4 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/logback-product.xml +++ b/powerjob-server/powerjob-server-starter/src/main/resources/logback-product.xml @@ -12,7 +12,7 @@ Bug recording: Setting `~/logs`, is unable to create folder in user home directory, a folder with the name ~ is created in project folder. --> - + diff --git a/powerjob-worker-agent/src/main/resources/logback.xml b/powerjob-worker-agent/src/main/resources/logback.xml index f841032b..a72c125a 100644 --- a/powerjob-worker-agent/src/main/resources/logback.xml +++ b/powerjob-worker-agent/src/main/resources/logback.xml @@ -6,7 +6,7 @@ 日志路径，注意权限问题，否则无法打印日志。 大坑记录：`~/logs`不会在用户目录下创建文件夹，而是在项目目录下创建名为~的文件夹 --> - + diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsContainerFactory.java b/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsContainerFactory.java index 3f903c2e..6993af34 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsContainerFactory.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsContainerFactory.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; @Slf4j public class OmsContainerFactory { - private static final String CONTAINER_DIR = System.getProperty("user.home") + "/powerjob/container/"; + private static final String CONTAINER_DIR = System.getProperty("user.home") + "/powerjob/worker/container/"; private static final Map CARGO = Maps.newConcurrentMap(); /** diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/persistence/ConnectionFactory.java b/powerjob-worker/src/main/java/tech/powerjob/worker/persistence/ConnectionFactory.java index 9d1858ed..c14876a8 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/persistence/ConnectionFactory.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/persistence/ConnectionFactory.java @@ -24,7 +24,7 @@ public class ConnectionFactory { private volatile DataSource dataSource; - private final String H2_PATH = System.getProperty("user.home") + "/h2/" + CommonUtils.genUUID() + "/"; + private final String H2_PATH = System.getProperty("user.home") + "/worker/h2/" + CommonUtils.genUUID() + "/"; private final String DISK_JDBC_URL = String.format("jdbc:h2:file:%spowerjob_worker_db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false", H2_PATH); private final String MEMORY_JDBC_URL = String.format("jdbc:h2:mem:%spowerjob_worker_db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false", H2_PATH);