diff --git a/others/dev/publish_docker_apple_silicon.sh b/others/dev/publish_docker_apple_silicon.sh index 015b0f64..5f37bbe3 100755 --- a/others/dev/publish_docker_apple_silicon.sh +++ b/others/dev/publish_docker_apple_silicon.sh @@ -41,20 +41,31 @@ if [ "$rebuild" = "y" ] || [ "$rebuild" = "Y" ]; then docker rmi -f powerjob/powerjob-worker-samples:$version echo "================== 构建 powerjob-server 镜像(tjqq) ==================" docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-server:$version powerjob-server/docker/. --push || exit - docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-server:latest powerjob-server/docker/. --push || exit echo "================== 构建 powerjob-server 镜像(powerjob) ==================" docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-server:$version powerjob-server/docker/. --push || exit - docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-server:latest powerjob-server/docker/. --push || exit echo "================== 构建 powerjob-agent 镜像(tjqq) ==================" docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-agent:$version powerjob-worker-agent/. --push|| exit - docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-agent:latest powerjob-worker-agent/. --push|| exit echo "================== 构建 powerjob-agent 镜像(powerjob) ==================" docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-agent:$version powerjob-worker-agent/. --push|| exit - docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-agent:latest powerjob-worker-agent/. --push|| exit echo "================== 构建 powerjob-mysql 镜像 ==================" docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-mysql:$version others/. --push|| exit - docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-mysql:latest others/. --push|| exit echo "================== 构建 powerjob-worker-samples 镜像 ==================" docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-worker-samples:$version powerjob-worker-samples/. --push|| exit +fi + +read -r -p "是否推送LATEST(y/n):" push_latest +if [ "$push_latest" = "y" ] || [ "$push_latest" = "Y" ]; then + + echo "================== powerjob-server LATEST (tjqq) ==================" + docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-server:latest powerjob-server/docker/. --push || exit + echo "================== powerjob-server LATEST (powerjob) ==================" + docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-server:latest powerjob-server/docker/. --push || exit + echo "================== powerjob-agent LATEST (tjqq) ==================" + docker buildx build --platform=linux/amd64,linux/arm64 --tag tjqq/powerjob-agent:latest powerjob-worker-agent/. --push|| exit + echo "================== powerjob-agent LATEST (powerjob) ==================" + docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-agent:latest powerjob-worker-agent/. --push|| exit + echo "================== powerjob-mysql LATEST ==================" + docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-mysql:latest others/. --push|| exit + echo "================== powerjob-worker-samples LATEST ==================" docker buildx build --platform=linux/amd64,linux/arm64 --tag powerjob/powerjob-worker-samples:latest powerjob-worker-samples/. --push|| exit fi \ No newline at end of file diff --git a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/VerificationProcessor.java b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/VerificationProcessor.java index 1a905616..82c24f84 100644 --- a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/VerificationProcessor.java +++ b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/VerificationProcessor.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import lombok.*; import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; import tech.powerjob.common.exception.PowerJobException; import tech.powerjob.common.utils.NetUtils; import tech.powerjob.official.processors.CommonBasicProcessor; @@ -35,7 +36,7 @@ public class VerificationProcessor extends CommonBasicProcessor implements MapRe final OmsLogger omsLogger = taskContext.getOmsLogger(); final String paramsStr = CommonUtils.parseParams(taskContext); - final VerificationParam verificationParam = JSONObject.parseObject(paramsStr, VerificationParam.class); + final VerificationParam verificationParam = StringUtils.isEmpty(paramsStr) ? new VerificationParam() : JSONObject.parseObject(paramsStr, VerificationParam.class); final Mode mode = Mode.of(verificationParam.getMode());