job功能调通

2023-03-10 13:49:46 +08:00
parent a8654d0a35
commit bdf9b6dc5e
23 changed files with 671 additions and 76 deletions
@@ -1,4 +1,4 @@
-package fun.asgc.neutrino.proxy.server.db;
+package fun.asgc.neutrino.proxy.server.base.db;

 import fun.asgc.neutrino.core.aop.Aop;
 import fun.asgc.neutrino.proxy.server.dal.*;
@@ -19,7 +19,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package fun.asgc.neutrino.proxy.server.db;
+package fun.asgc.neutrino.proxy.server.base.db;

 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+import com.google.common.collect.Lists;
+import fun.asgc.neutrino.core.util.BeanManager;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.core.util.StringUtil;
+
+import java.util.List;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public class DefaultJobSource implements IJobSource {
+
+	@Override
+	public List<JobInfo> sourceList() {
+		List<IJobHandler> jobHandlerList = BeanManager.getBeanListBySuperClass(IJobHandler.class);
+		if (CollectionUtil.isEmpty(jobHandlerList)) {
+			return Lists.newArrayList();
+		}
+		List<JobInfo> jobInfoList = Lists.newArrayList();
+		for (IJobHandler jobHandler : jobHandlerList) {
+			JobHandler handler = jobHandler.getClass().getAnnotation(JobHandler.class);
+			if (null == handler || StringUtil.isEmpty(handler.name()) || StringUtil.isEmpty(handler.cron())) {
+				continue;
+			}
+			jobInfoList.add(new JobInfo()
+				.setId(handler.name())
+				.setName(handler.name())
+				.setDesc(handler.desc())
+				.setCron(handler.cron())
+				.setParam(handler.param())
+				.setEnable(true)
+			);
+		}
+		return jobInfoList;
+	}
+
+}
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobCallback {
+
+	/**
+	 * 执行日志
+	 * @param jobInfo
+	 * @param param
+	 * @param throwable
+	 */
+	void executeLog(JobInfo jobInfo, String param, Throwable throwable);
+}
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobExecutor {
+
+	/**
+	 * 初始化
+	 * @throws JobException
+	 */
+	void init() throws JobException;
+
+	/**
+	 * 新增job
+	 * @param jobInfo
+	 */
+	void add(JobInfo jobInfo);
+
+	/**
+	 * 删除job
+	 * @param jobName
+	 */
+	void remove(String jobName);
+
+	/**
+	 * 触发
+	 * @param jobName
+	 * @param param
+	 */
+	void trigger(String jobName, String param);
+}
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobHandler {
+
+	/**
+	 * job执行
+	 * @param param
+	 * @throws Exception
+	 */
+	void execute(String param) throws Exception;
+
+}
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+import java.util.List;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobSource {
+
+	/**
+	 * 获取所有job列表
+	 * @return
+	 */
+	List<JobInfo> sourceList();
+}
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.Solon;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+@Slf4j
+public class JobBean implements Job {
+
+	@Override
+	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+		JobExecutor jobExecutor = Solon.context().getBean(JobExecutor.class);
+		if (null != jobExecutor) {
+			jobExecutor.execute(jobExecutionContext);
+		}
+	}
+
+}
@@ -0,0 +1,31 @@
+/**
+ * Copyright (C) 2018-2022 Zeyi information technology (Shanghai) Co., Ltd.
+ * <p>
+ * All right reserved.
+ * <p>
+ * This software is the confidential and proprietary
+ * information of Zeyi Company of China.
+ * ("Confidential Information"). You shall not disclose
+ * such Confidential Information and shall use it only
+ * in accordance with the terms of the contract agreement
+ * you entered into with Zeyi inc.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+import fun.asgc.neutrino.core.exception.InternalException;
+
+/**
+ *
+ * @author: wen.y
+ * @date: 2022/9/4
+ */
+public class JobException extends InternalException {
+
+	public JobException(String message) {
+		super(message);
+	}
+
+	public JobException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
@@ -0,0 +1,210 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+import com.google.common.collect.Sets;
+import fun.asgc.neutrino.core.base.CustomThreadFactory;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.noear.snack.core.utils.StringUtil;
+import org.noear.solon.Solon;
+import org.noear.solon.core.event.AppLoadEndEvent;
+import org.noear.solon.core.event.EventListener;
+import org.quartz.*;
+import org.quartz.impl.StdSchedulerFactory;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Job执行器
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+@Slf4j
+public class JobExecutor implements IJobExecutor, EventListener<AppLoadEndEvent> {
+	private IJobSource jobSource;
+	private ThreadPoolExecutor threadPoolExecutor;
+	private Map<String, JobInfo> jobInfoMap = new ConcurrentHashMap<>();
+	private SchedulerFactory schedulerFactory;
+	private Scheduler scheduler;
+	private Map<String, IJobHandler> jobHandlerMap = new ConcurrentHashMap<>();
+	private Set<String> runJobSet = Sets.newHashSet();
+	private IJobCallback jobCallback;
+	private Map<String, TriggerKey> triggerKeyMap = new ConcurrentHashMap<>();
+
+	@Override
+	public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
+		start();
+	}
+
+	public void start() {
+		Boolean enableJob = Solon.cfg().getBool("neutrino.job.enable", false);
+		if (!enableJob || null == jobSource) {
+			return;
+		}
+		if (null == threadPoolExecutor) {
+			threadPoolExecutor = new ThreadPoolExecutor(5, 20, 10L, TimeUnit.SECONDS,
+					new LinkedBlockingQueue<>(), new CustomThreadFactory("DefaultJobPool"));
+		}
+
+		List<IJobHandler> jobHandlerList = Solon.context().getBeansOfType(IJobHandler.class);
+		if (!CollectionUtil.isEmpty(jobHandlerList)) {
+			for (IJobHandler item : jobHandlerList) {
+				JobHandler jobHandler = item.getClass().getAnnotation(JobHandler.class);
+				if (null == jobHandler) {
+					continue;
+				}
+				jobHandlerMap.put(jobHandler.name(), item);
+			}
+		}
+
+		try {
+			this.schedulerFactory = new StdSchedulerFactory();
+			this.scheduler = schedulerFactory.getScheduler();
+			this.init();
+		} catch (Exception e){
+			throw new JobException("job初始化异常");
+		}
+	}
+
+	public void setJobSource(IJobSource jobSource) {
+		this.jobSource = jobSource;
+	}
+
+	public void setThreadPoolExecutor(ThreadPoolExecutor threadPoolExecutor) {
+		this.threadPoolExecutor = threadPoolExecutor;
+	}
+
+	public void setJobCallback(IJobCallback jobCallback) {
+		this.jobCallback = jobCallback;
+	}
+
+	@Override
+	public void init() throws JobException {
+		List<JobInfo> jobInfoList = jobSource.sourceList();
+		if (CollectionUtil.isEmpty(jobInfoList)) {
+			return;
+		}
+
+		for (JobInfo jobInfo : jobInfoList) {
+			add(jobInfo);
+		}
+		log.info("Job初始化完成.");
+	}
+
+	@Override
+	public void add(JobInfo jobInfo) throws JobException {
+		if (null == jobInfo || StringUtil.isEmpty(jobInfo.getId()) || StringUtil.isEmpty(jobInfo.getName()) ||
+				StringUtil.isEmpty(jobInfo.getCron())) {
+			return;
+		}
+		synchronized (jobInfo.getId()) {
+			runJobSet.add(jobInfo.getName());
+			jobInfoMap.put(jobInfo.getId(), jobInfo);
+
+			TriggerKey triggerKey = TriggerKey.triggerKey(jobInfo.getId());
+			triggerKeyMap.put(jobInfo.getId(), triggerKey);
+			JobKey jobKey = new JobKey(jobInfo.getName());
+
+			CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(jobInfo.getCron()).withMisfireHandlingInstructionDoNothing();
+			CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
+			JobDetail jobDetail = JobBuilder.newJob(JobBean.class).withIdentity(jobKey).build();
+
+			try {
+				if (jobInfo.isEnable()) {
+					scheduler.scheduleJob(jobDetail, cronTrigger);
+					scheduler.start();
+				}
+			} catch (Exception e) {
+				throw new RuntimeException(String.format("新增job[name=%s]异常", jobInfo.getName()));
+			}
+		}
+	}
+
+	@Override
+	public void remove(String jobId) {
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			return;
+		}
+		synchronized (jobId) {
+			runJobSet.remove(jobInfo.getName());
+			unscheduleJob(jobId);
+		}
+	}
+
+	@Override
+	public void trigger(String jobId, String param) {
+		doExecute(jobId, param);
+	}
+
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		if (null == context || null == context.getTrigger()) {
+			return;
+		}
+		String jobId = context.getTrigger().getKey().getName();
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			unscheduleJob(jobId);
+			return;
+		}
+		doExecute(jobId, jobInfo.getParam());
+	}
+
+	private void unscheduleJob(String jobId) {
+		TriggerKey triggerKey = triggerKeyMap.get(jobId);
+		if (null != triggerKey) {
+			try {
+				scheduler.unscheduleJob(triggerKey);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	private void doExecute(String jobId, String param) {
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			return;
+		}
+		IJobHandler jobHandler =jobHandlerMap.get(jobInfo.getName());
+		if (null == jobHandler) {
+			return;
+		}
+		threadPoolExecutor.submit(() -> {
+			try {
+				jobHandler.execute(param);
+				if (null != jobCallback) {
+					jobCallback.executeLog(jobInfo, param, null);
+				}
+			} catch (Throwable e) {
+				jobCallback.executeLog(jobInfo, param, e);
+			}
+		});
+	}
+}
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JobHandler {
+	String name();
+	String desc() default "";
+	String cron();
+	String param() default "";
+}
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.base.quartz;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+@Accessors(chain = true)
+@Data
+public class JobInfo {
+	private String id;
+	private String name;
+	private String desc;
+	private String cron;
+	private String param;
+	private boolean enable;
+	private Map<String, Object> extension;
+}
@@ -21,23 +21,25 @@
 */
 package fun.asgc.neutrino.proxy.server.base.rest.config;

-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Bean;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.quartz.JobExecutor;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobExecutor;
 import fun.asgc.neutrino.proxy.server.service.JobInfoService;
 import fun.asgc.neutrino.proxy.server.service.JobLogService;
+import org.noear.solon.annotation.Bean;
+import org.noear.solon.annotation.Configuration;
+import org.noear.solon.annotation.Inject;
+import org.noear.solon.core.event.AppLoadEndEvent;
+import org.noear.solon.core.event.EventBus;

 /**
 * 定时任务配置
 * @author: aoshiguchen
 * @date: 2022/9/4
 */
-@Component
+@Configuration
 public class JobConfig {
-	@Autowired
+	@Inject
 	private JobLogService jobLogService;
-	@Autowired
+	@Inject
 	private JobInfoService jobInfoService;

 	@Bean
@@ -45,6 +47,7 @@ public class JobConfig {
 		JobExecutor executor = new JobExecutor();
 		executor.setJobSource(jobInfoService);
 		executor.setJobCallback(jobLogService);
+		EventBus.subscribe(AppLoadEndEvent.class, executor);
 		return executor;
 	}
 }
@@ -22,17 +22,16 @@
 package fun.asgc.neutrino.proxy.server.job;

 import com.alibaba.fastjson.JSONObject;
-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.quartz.IJobHandler;
-import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
 import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobHandler;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobHandler;
 import fun.asgc.neutrino.proxy.server.dal.DataCleanMapper;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;

 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -44,11 +43,10 @@ import java.util.Date;
 * @date: 2022/9/17
 */
@Slf4j
-@NonIntercept
@Component
@JobHandler(name = "DataCleanJob", cron = "0 0 1 * * ?")
 public class DataCleanJob implements IJobHandler {
-    @Autowired
+    @Inject
    private DataCleanMapper dataCleanMapper;
    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
    /**
@@ -21,11 +21,10 @@
 */
 package fun.asgc.neutrino.proxy.server.job;

-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.quartz.IJobHandler;
-import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobHandler;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobHandler;
 import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.annotation.Component;

 /**
 *
@@ -33,7 +32,6 @@ import lombok.extern.slf4j.Slf4j;
 * @date: 2022/9/4
 */
@Slf4j
-@NonIntercept
@Component
@JobHandler(name = "DemoJob", cron = "0/10 * * * * ?", param = "{\"a\":1}")
 public class DemoJob implements IJobHandler {
@@ -21,13 +21,10 @@
 */
 package fun.asgc.neutrino.proxy.server.job;

-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.quartz.IJobHandler;
-import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobHandler;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobHandler;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportDayMapper;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportHourMapper;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
@@ -36,6 +33,8 @@ import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
 import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;

 import java.util.*;

@@ -44,19 +43,18 @@ import java.util.*;
 * @date: 2022/10/28
 */
@Slf4j
-@NonIntercept
@Component
@JobHandler(name = "FlowReportForDayJob", cron = "0 0 1 * * ?", param = "")
 public class FlowReportForDayJob implements IJobHandler {
-    @Autowired
+    @Inject
    private FlowReportService flowReportService;
-    @Autowired
+    @Inject
    private LicenseMapper licenseMapper;
-    @Autowired
+    @Inject
    private FlowReportMinuteMapper flowReportMinuteMapper;
-    @Autowired
+    @Inject
    private FlowReportHourMapper flowReportHourMapper;
-    @Autowired
+    @Inject
    private FlowReportDayMapper flowReportDayMapper;

    @Override
@@ -21,13 +21,10 @@
 */
 package fun.asgc.neutrino.proxy.server.job;

-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.quartz.IJobHandler;
-import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobHandler;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobHandler;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportHourMapper;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
 import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
@@ -35,6 +32,8 @@ import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;

 import java.util.*;

@@ -43,17 +42,16 @@ import java.util.*;
 * @date: 2022/10/28
 */
@Slf4j
-@NonIntercept
@Component
@JobHandler(name = "FlowReportForHourJob", cron = "0 0 */1 * * ?", param = "")
 public class FlowReportForHourJob implements IJobHandler {
-    @Autowired
+    @Inject
    private FlowReportService flowReportService;
-    @Autowired
+    @Inject
    private LicenseMapper licenseMapper;
-    @Autowired
+    @Inject
    private FlowReportMinuteMapper flowReportMinuteMapper;
-    @Autowired
+    @Inject
    private FlowReportHourMapper flowReportHourMapper;

    @Override
@@ -21,19 +21,18 @@
 */
 package fun.asgc.neutrino.proxy.server.job;

-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.quartz.IJobHandler;
-import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobHandler;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobHandler;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
 import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
 import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;

 import java.util.*;
 import java.util.function.Function;
@@ -45,16 +44,15 @@ import java.util.stream.Collectors;
 * @date: 2022/10/24
 */
@Slf4j
-@NonIntercept
@Component
@JobHandler(name = "FlowReportForMinuteJob", cron = "0 */1 * * * ?", param = "")
 public class FlowReportForMinuteJob implements IJobHandler {

-    @Autowired
+    @Inject
    private FlowReportService flowReportService;
-    @Autowired
+    @Inject
    private LicenseMapper licenseMapper;
-    @Autowired
+    @Inject
    private FlowReportMinuteMapper flowReportMinuteMapper;

    @Override
@@ -21,18 +21,17 @@
 */
 package fun.asgc.neutrino.proxy.server.job;

-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.quartz.IJobHandler;
-import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobHandler;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobHandler;
 import fun.asgc.neutrino.proxy.server.dal.*;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMonthDO;
 import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;

 import java.util.*;

@@ -41,21 +40,20 @@ import java.util.*;
 * @date: 2022/10/28
 */
@Slf4j
-@NonIntercept
@Component
@JobHandler(name = "FlowReportForMonthJob", cron = "0 10 0 1 * ?", param = "")
 public class FlowReportForMonthJob implements IJobHandler {
-    @Autowired
+    @Inject
    private FlowReportService flowReportService;
-    @Autowired
+    @Inject
    private LicenseMapper licenseMapper;
-    @Autowired
+    @Inject
    private FlowReportMinuteMapper flowReportMinuteMapper;
-    @Autowired
+    @Inject
    private FlowReportHourMapper flowReportHourMapper;
-    @Autowired
+    @Inject
    private FlowReportDayMapper flowReportDayMapper;
-    @Autowired
+    @Inject
    private FlowReportMonthMapper flowReportMonthMapper;

    @Override
@@ -24,10 +24,10 @@ package fun.asgc.neutrino.proxy.server.service;
 import com.google.common.collect.Lists;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
-import fun.asgc.neutrino.core.quartz.IJobSource;
-import fun.asgc.neutrino.core.quartz.JobExecutor;
-import fun.asgc.neutrino.core.quartz.JobInfo;
 import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobSource;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobExecutor;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobInfo;
 import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
 import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
 import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq;
@@ -23,8 +23,8 @@ package fun.asgc.neutrino.proxy.server.service;

 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
-import fun.asgc.neutrino.core.quartz.IJobCallback;
-import fun.asgc.neutrino.core.quartz.JobInfo;
+import fun.asgc.neutrino.proxy.server.base.quartz.IJobCallback;
+import fun.asgc.neutrino.proxy.server.base.quartz.JobInfo;
 import fun.asgc.neutrino.proxy.server.controller.req.JobLogListReq;
 import fun.asgc.neutrino.proxy.server.controller.res.JobLogListRes;
 import fun.asgc.neutrino.proxy.server.dal.JobLogMapper;
@@ -1,2 +1,2 @@
-solon.plugin=fun.asgc.neutrino.proxy.server.db.MapperPlugin
+solon.plugin=fun.asgc.neutrino.proxy.server.base.db.MapperPlugin
 solon.plugin.priority=3
@@ -18,13 +18,15 @@ neutrino:
      key-store-password: 123456
      key-manager-password: 123456
      jks-path: classpath:/test.jks
-#  data:
-#    db:
-#      type: sqlite
-#      url: jdbc:sqlite:data.db
-#      driver-class: org.sqlite.JDBC
-#      username:
-#      password:
+  data:
+    db:
+      type: sqlite
+      url: jdbc:sqlite:data.db
+      driver-class: org.sqlite.JDBC
+      username:
+      password:
+  job:
+    enable: true

 #添加MIME印射（如果有需要？）
 #是否启用静态文件服务。（可不配，默认为启用）