From a92e56be2843d9af64fefc34caf4fc6f33fa50d7 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Thu, 16 Feb 2023 17:25:55 +0800 Subject: [PATCH] =?UTF-8?q?[CI]=20-=20=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E4=B8=BAJDK,=20=E6=96=B9=E4=BE=BF=E4=BD=BF?= =?UTF-8?q?=E7=94=A8arthas=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-push-docker.yml | 18 +++++++++--------- .../service/ExecutionResultDaemonHandler.java | 2 +- .../service/QuartzSchedulerService.java | 2 -- .../service/QuartzSchedulerServiceImpl.java | 14 +------------- .../source/build-my-own-base-image.dockerfile | 3 ++- 5 files changed, 13 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml index 91bdde5..b6ca512 100644 --- a/.github/workflows/build-push-docker.yml +++ b/.github/workflows/build-push-docker.yml @@ -95,15 +95,15 @@ jobs: latest {{date 'YYYY-MM-DD-HH-mm'}} -# - name: Build My Base Image -# uses: docker/build-push-action@v3.2.0 -# with: -# context: ./ -# # Path to the Dockerfile -# file: ./source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile -# platforms: linux/amd64,linux/arm64 -# push: true -# tags: ${{ steps.docker_tags_base.outputs.tags }} + - name: Build My Base Image + uses: docker/build-push-action@v3.2.0 + with: + context: ./ + # Path to the Dockerfile + file: ./source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.docker_tags_base.outputs.tags }} - name: Cache uses: actions/cache@v3.2.0 diff --git a/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java b/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java index 2820d64..1295831 100644 --- a/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java +++ b/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java @@ -23,7 +23,7 @@ import java.util.concurrent.*; * 2. [build the redis stream listener] * 3. [call persistence] */ -@Service +//@Service @Slf4j @Lazy @Deprecated diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java index 3f1870b..eb16fe5 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerService.java @@ -47,7 +47,6 @@ public interface QuartzSchedulerService { * @param jobClass 任务job实现类 * @param jobName 任务job名称（保证唯一性） * @param jobGroupName 任务job组名 - * @param startTime 任务开始时间,单位间隔为秒 * @param cronJobExpression 任务时间表达式 * @param jobData 任务参数 * @return @@ -57,7 +56,6 @@ public interface QuartzSchedulerService { String jobName, String jobGroupName, String jobDescription, - int startTime, String cronJobExpression, Map jobData ); diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java index 526ac1c..c53f3a6 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java @@ -15,7 +15,6 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.quartz.*; -import org.quartz.DateBuilder.IntervalUnit; import org.quartz.impl.matchers.GroupMatcher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.quartz.QuartzJobBean; @@ -71,7 +70,6 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService { scriptSchedulerDTO.getSchedulerUuid(), SCRIPT_SCHEDULE_MISSION_GROUP_NAME, scriptSchedulerDTO.getDescription(), - 0, // 立即开始本次任务 1ms wait scriptSchedulerDTO.getCronExpress(), dataMap @@ -271,14 +269,13 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService { jobName, jobGroupName, null, - startTime, cronJobExpression, jobData ); } @Override - public JobDetail addMission(Class jobClass, String jobName, String jobGroupName, String jobDescription, int startTime, String cronJobExpression, Map jobData) { + public JobDetail addMission(Class jobClass, String jobName, String jobGroupName, String jobDescription, String cronJobExpression, Map jobData) { try { // 创建jobDetail实例，绑定Job实现类 // 指明job的名称，所在组的名称，以及绑定job类 @@ -303,21 +300,12 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService { // 使用cornTrigger规则 // 触发器key // uniform the start time - if (ObjectUtils.isEmpty(startTime)) { - startTime = 1; - } Trigger trigger = newTrigger() .withIdentity( jobName, jobGroupName ) - .startAt( - DateBuilder.futureDate( - startTime, - IntervalUnit.SECOND - ) - ) .withSchedule( CronScheduleBuilder.cronSchedule(cronJobExpression) ) diff --git a/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile b/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile index 595a3c8..222aff6 100644 --- a/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile +++ b/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile @@ -1,4 +1,5 @@ -FROM eclipse-temurin:11-jre-focal +#FROM eclipse-temurin:11-jre-focal +FROM eclipse-temurin:11-jdk-focal MAINTAINER zeaslity@gmail.com