diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml
index dc745cf1..215247f3 100644
--- a/powerjob-server/pom.xml
+++ b/powerjob-server/pom.xml
@@ -17,8 +17,14 @@
2.9.2
2.2.6.RELEASE
3.2.1
+
8.0.19
+ 19.7.0.0
+ 7.4.1.jre8
+ 11.5.0.0
+ 42.2.14
1.4.200
+
2.5.2
5.7.0.202003110725-r
3.0.1
@@ -44,6 +50,30 @@
mysql-connector-java
${mysql.version}
+
+
+ com.oracle.database.jdbc
+ ojdbc8
+ ${ojdbc.version}
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ ${mssql-jdbc.version}
+
+
+
+ com.ibm.db2
+ jcc
+ ${db2-jdbc.version}
+
+
+
+ org.postgresql
+ postgresql
+ ${postgresql.version}
+
com.h2database
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java
index 650c63e7..38bb4442 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/AppInfoDO.java
@@ -17,7 +17,7 @@ import java.util.Date;
public class AppInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
private String appName;
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java
index 6e46e094..eac34574 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ContainerInfoDO.java
@@ -17,7 +17,7 @@ import java.util.Date;
public class ContainerInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
// 所属的应用ID
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java
index 92c83797..54c7a0c4 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/InstanceInfoDO.java
@@ -22,7 +22,7 @@ import java.util.Date;
public class InstanceInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
// 任务ID
@@ -33,7 +33,7 @@ public class InstanceInfoDO {
private Long instanceId;
// 任务实例参数
@Lob
- @Column(columnDefinition="TEXT")
+ @Column
private String instanceParams;
// 该任务实例的类型,普通/工作流(InstanceType)
@@ -46,7 +46,7 @@ public class InstanceInfoDO {
private Integer status;
// 执行结果(允许存储稍大的结果)
@Lob
- @Column(columnDefinition="TEXT")
+ @Column
private String result;
// 预计触发时间
private Long expectedTriggerTime;
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java
index 7b9ed512..71978ae0 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/JobInfoDO.java
@@ -23,7 +23,7 @@ public class JobInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
/* ************************** 任务基本信息 ************************** */
@@ -49,7 +49,7 @@ public class JobInfoDO {
private Integer processorType;
// 执行器信息(可能需要存储整个脚本文件)
@Lob
- @Column(columnDefinition="TEXT")
+ @Column
private String processorInfo;
/* ************************** 运行时配置 ************************** */
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java
index 95949f50..d62bedbc 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/OmsLockDO.java
@@ -19,7 +19,7 @@ import java.util.Date;
public class OmsLockDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
private String lockName;
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java
index 3a6882d4..a248b6fd 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/ServerInfoDO.java
@@ -19,7 +19,7 @@ import java.util.Date;
public class ServerInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
/**
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java
index bed8a473..b7f0bdf8 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/UserInfoDO.java
@@ -17,7 +17,7 @@ import java.util.Date;
public class UserInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
private String username;
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java
index f87f2f99..4134c1ef 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInfoDO.java
@@ -21,7 +21,7 @@ import java.util.Date;
public class WorkflowInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
private String wfName;
@@ -32,7 +32,7 @@ public class WorkflowInfoDO {
// 工作流的DAG图信息(点线式DAG的json)
@Lob
- @Column(columnDefinition="TEXT")
+ @Column
private String peDAG;
/* ************************** 定时参数 ************************** */
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java
index ff9d5651..9090a254 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/model/WorkflowInstanceInfoDO.java
@@ -21,7 +21,7 @@ import java.util.Date;
public class WorkflowInstanceInfoDO {
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
// 任务所属应用的ID,冗余提高查询效率
private Long appId;
@@ -35,10 +35,10 @@ public class WorkflowInstanceInfoDO {
private Integer status;
@Lob
- @Column(columnDefinition="TEXT")
+ @Column
private String dag;
@Lob
- @Column(columnDefinition="TEXT")
+ @Column
private String result;
// 实际触发时间