job表结构调整.

neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/DefaultJobSource.java

@@ -37,7 +37,7 @@ import java.util.List;
 public class DefaultJobSource implements IJobSource {
 
 	@Override
-	public List<JobInfo> list() {
+	public List<JobInfo> sourceList() {
 		List<IJobHandler> jobHandlerList = BeanManager.getBeanListBySuperClass(IJobHandler.class);
 		if (CollectionUtil.isEmpty(jobHandlerList)) {
 			return Lists.newArrayList();

neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/IJobSource.java

@@ -34,5 +34,5 @@ public interface IJobSource {
 	 * 获取所有job列表
 	 * @return
 	 */
-	List<JobInfo> list();
+	List<JobInfo> sourceList();
 }

neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java

@@ -98,7 +98,7 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 
 	@Override
 	public void init() throws JobException {
-		List<JobInfo> jobInfoList = jobSource.list();
+		List<JobInfo> jobInfoList = jobSource.sourceList();
 		if (CollectionUtil.isEmpty(jobInfoList)) {
 			return;
 		}

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java

@@ -37,16 +37,16 @@ import java.util.Date;
 @ToString
 @Accessors(chain = true)
 @Data
-@Table("job_qrtz_trigger_info")
-public class JobQrtzTriggerInfoDO {
+@Table("job_info")
+public class JobInfoDO {
 	@Id
 	private Integer id;
-	private String jobCron;
-	private String jobDesc;
+	private String cron;
+	private String desc;
 	private String alarmEmail;
 	private String alarmDing;
-	private String executorHandler;
-	private String executorParam;
+	private String handler;
+	private String param;
 	/**
 	 * 启用状态
 	 * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum}

neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java

@@ -37,13 +37,13 @@ import java.util.Date;
 @ToString
 @Accessors(chain = true)
 @Data
-@Table("job_qrtz_trigger_log")
-public class JobQrtzTriggerLog {
+@Table("job_log")
+public class JobLog {
 	@Autowired
 	private Integer id;
 	private Integer jobId;
-	private String executorHandler;
-	private String executorParam;
+	private String handler;
+	private String param;
 	private Integer code;
 	private String msg;
 	private Integer alarmStatus;

neutrino-proxy-server/src/main/resources/sql/init-structure.sql

@@ -74,8 +74,8 @@ CREATE TABLE IF NOT EXISTS `client_connect_record` (
   `ip` VARCHAR(50) NOT NULL,
   `license_id` INTEGER(20) NOT NULL,
   `license_key` VARCHAR(100) NOT NULL,
-  `write_bytes` INTEGER(20),
-  `read_bytes` INTEGER(20),
+  `write_bytes` INTEGER(20) DEFAULT NULL,
+  `read_bytes` INTEGER(20) DEFAULT NULL,
   `type` INTEGER(2) NOT NULL,
   `create_time` INTEGER(20) NOT NULL
 );
@@ -90,38 +90,38 @@ CREATE TABLE IF NOT EXISTS `user_connect_record` (
   `user_id` INTEGER NOT NULL,
   `license_id` INTEGER(20) NOT NULL,
   `license_key` VARCHAR(100) NOT NULL,
-  `write_bytes` INTEGER(20),
-  `read_bytes` INTEGER(20),
+  `write_bytes` INTEGER(20) DEFAULT NULL,
+  `read_bytes` INTEGER(20) DEFAULT NULL,
   `type` INTEGER(2) NOT NULL,
   `create_time` INTEGER(20) NOT NULL
 );
 
 #############################调度管理相关表#############################
 #触发器信息表
-CREATE TABLE IF NOT EXISTS `job_qrtz_trigger_info` (
+CREATE TABLE IF NOT EXISTS `job_info` (
   `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `job_cron` VARCHAR(128) NOT NULL ,
-  `job_desc` VARCHAR(255) NOT NULL,
+  `desc` VARCHAR(255) NOT NULL,
+  `handler` VARCHAR(255) DEFAULT NULL,
+  `cron` VARCHAR(128) NOT NULL ,
+  `param` VARCHAR(512) DEFAULT NULL,
+  `alarm_email` VARCHAR(255) DEFAULT NULL,
+  `alarm_ding` VARCHAR(255) DEFAULT NULL,
+  `enable` INTEGER(2) NOT NULL,
   `create_time` INTEGER(20) NOT NULL,
-  `update_time` INTEGER(20) NOT NULL,
-  `alarm_email` VARCHAR(255),
-  `alarm_ding` VARCHAR(255),
-  `executor_handler` VARCHAR(255) DEFAULT NULL,
-  `executor_param` VARCHAR(512) DEFAULT NULL,
-  `enable` INTEGER(2) NOT NULL
+  `update_time` INTEGER(20) NOT NULL
 );
-CREATE UNIQUE INDEX IF NOT EXISTS I_executor_handler ON `job_qrtz_trigger_info` (`executor_handler` ASC);
+CREATE UNIQUE INDEX IF NOT EXISTS I_handler ON `job_info` (`handler` ASC);
 
 #触发器日志表
-CREATE TABLE IF NOT EXISTS `job_qrtz_trigger_log` (
+CREATE TABLE IF NOT EXISTS `job_log` (
   `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
   `job_id` INTEGER(20) NOT NULL,
-  `executor_handler` VARCHAR(255) NOT NULL,
-  `executor_param` VARCHAR(512) DEFAULT NULL,
-  `create_time` INTEGER(20) NOT NULL,
+  `handler` VARCHAR(255) NOT NULL,
+  `param` VARCHAR(512) DEFAULT NULL,
   `code` INTEGER(20) NOT NULL,
-  `msg` TEXT,
-  `alarm_status` INTEGER(2) NOT NULL DEFAULT '0'
+  `msg` TEXT DEFAULT NULL,
+  `alarm_status` INTEGER(2) NOT NULL DEFAULT '0',
+  `create_time` INTEGER(20) NOT NULL
 );
-CREATE INDEX IF NOT EXISTS I_create_time ON job_qrtz_trigger_log(create_time);
-CREATE INDEX IF NOT EXISTS I_code ON job_qrtz_trigger_log(code);
+CREATE INDEX IF NOT EXISTS I_create_time ON job_log(create_time);
+CREATE INDEX IF NOT EXISTS I_code ON job_log(code);