diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java index 11d50a5b08e1cafb063d204b71134a1d271d31e9..33f6d2e24bf470e0d43373f14ca5524b60d01985 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java @@ -25,7 +25,7 @@ import lombok.Data; import java.util.Date; @Data -@TableName("t_escheduler_access_token") +@TableName("t_ds_access_token") public class AccessToken { @TableId(value="id", type=IdType.AUTO) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java index f5c56656d7c334c097f8592a9de3829eedee0298..d989f82fa25b0172c86e58ef178a2c36c3c61fbc 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java @@ -33,7 +33,7 @@ import java.util.Map; * alert */ @Data -@TableName("t_escheduler_alert") +@TableName("t_ds_alert") public class Alert { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java index 62afb4969ad9cadf608078f38e2c1927d74ff527..2aae4bdc26f2b5ff8e463193f762fc890b59083e 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java @@ -25,7 +25,7 @@ import lombok.Data; import java.util.Date; @Data -@TableName("t_escheduler_alertgroup") +@TableName("t_ds_alertgroup") public class AlertGroup { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java index 2f42dfee0b4b558df8d937e98105f28a2a69db18..c36369aedd87bab5a2d2698c3ecc042bad12d900 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java @@ -29,7 +29,7 @@ import java.util.Date; * command */ @Data -@TableName("t_escheduler_command") +@TableName("t_ds_command") public class Command { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java index f61b8339e860e383b3453b59fdfc63f9f2cbc8bc..433fa2ebbfd0a7b484858b5057b3ce81ab16a555 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java @@ -28,7 +28,7 @@ import lombok.Data; import java.util.Date; @Data -@TableName("t_escheduler_datasource") +@TableName("t_ds_datasource") public class DataSource { /** * id diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java index 85331cf8e2de87540b369acf3aec837365f941cc..805f075bfbe181372b9cdd06cdd3e12f62524791 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java @@ -25,7 +25,7 @@ import java.util.Date; /** * data source user relation */ -@TableName("t_escheduler_relation_datasource_user") +@TableName("t_ds_relation_datasource_user") public class DatasourceUser { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java index ef92bea7b040d1b1c5f5c8e4563638780b341beb..7f3eb387606259e3cb6b27539052feb2265bb0ec 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java @@ -26,7 +26,7 @@ import java.util.Date; /** * command */ -@TableName("t_escheduler_error_command") +@TableName("t_ds_error_command") public class ErrorCommand { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java index a86f0c7c2f47869cf372b9edea06604ff722e714..d3de4123b0c8a2e8df427033341e5a61454f4788 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * process definition */ @Data -@TableName("t_escheduler_process_definition") +@TableName("t_ds_process_definition") public class ProcessDefinition { /** * id diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java index 770cd98e566ac13968838c7c5b98ac44cf91ef72..afc7f7aac4bcc5089cdde96a85343aacf8d40e3e 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java @@ -30,7 +30,7 @@ import java.util.Date; * process instance */ @Data -@TableName("t_escheduler_process_instance") +@TableName("t_ds_process_instance") public class ProcessInstance { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java index 0c6424ec8a00b1e086e521b19c77e6de9659035e..c85a6b73e05735bf24f57c7b438a3069a6634f34 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java @@ -25,7 +25,7 @@ import lombok.Data; * process instance map */ @Data -@TableName("t_escheduler_relation_process_instance") +@TableName("t_ds_relation_process_instance") public class ProcessInstanceMap { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java index 3dcaf4490a4d52ad44175d92a649ba3aa1342b0d..721541fafb3e9ee7afa33c077f184e68ac007178 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java @@ -28,7 +28,7 @@ import java.util.Date; * project */ @Data -@TableName("t_escheduler_project") +@TableName("t_ds_project") public class Project { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java index 0e089d8cbaf9e3fcb984eca1811cbb58b008deff..188749b27e357350fcbe305f9584e63aae26fc25 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java @@ -25,7 +25,7 @@ import lombok.Data; import java.util.Date; @Data -@TableName("t_escheduler_relation_project_user") +@TableName("t_ds_relation_project_user") public class ProjectUser { /** * id diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java index 94f82069146484a92a6913aec3955a6b9477798c..7a2894aa589d7382a5e248f574d696123c7b1e58 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java @@ -27,7 +27,7 @@ import java.util.Date; * queue */ @Data -@TableName("t_escheduler_queue") +@TableName("t_ds_queue") public class Queue { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java index 1ac3f3ef3422a8a475fd931aa1f77b977a77c78a..68ee53aece753607d578ff739fea216b5d7ef0c9 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java @@ -26,7 +26,7 @@ import lombok.Data; import java.util.Date; @Data -@TableName("t_escheduler_resources") +@TableName("t_ds_resources") public class Resource { /** * id diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java index b1d66880e7c79323db861d22e21b5075355c6366..0901153380d3bcdb62e09051dc8c2e355ef4f6ae 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java @@ -27,7 +27,7 @@ import java.util.Date; * resource user relation */ @Data -@TableName("t_escheduler_relation_resources_user") +@TableName("t_ds_relation_resources_user") public class ResourcesUser { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java index ab7cf47d7e9516e33f8b0c535816976c7d768885..65ae4d8e12959d2927935d3cf2fbb2ef5d1c105e 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java @@ -33,7 +33,7 @@ import java.util.Date; * */ @Data -@TableName("t_escheduler_schedules") +@TableName("t_ds_schedules") public class Schedule { @TableId(value="id", type=IdType.AUTO) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java index a5c27b17cd7feedc9db4d8b2db246ff32fe4c3e3..6606d52685ed6403d300e446c5e639e5f275abf9 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java @@ -27,7 +27,7 @@ import java.util.Date; * session */ @Data -@TableName("t_escheduler_session") +@TableName("t_ds_session") public class Session { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java index 41b3fdcfa5916176d8c07168e921aa07734db250..5abb2919d0b2337d4598c570c4dc077c7f449df9 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java @@ -33,7 +33,7 @@ import java.util.Date; * task instance */ @Data -@TableName("t_escheduler_task_instance") +@TableName("t_ds_task_instance") public class TaskInstance { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java index ba8ff2ea3a1bff1e35f55b9f83d8126deecebafa..72ebaaa785224ad6e4ab3a44e78029c8e9fb67d5 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java @@ -28,7 +28,7 @@ import java.util.Date; * tenant */ @Data -@TableName("t_escheduler_tenant") +@TableName("t_ds_tenant") public class Tenant { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java index c89008e9158a0e92c32e15b16107aa961ee5fd40..aea1a40de151f0a37c68f68e12d74660e3c403c3 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java @@ -27,7 +27,7 @@ import java.util.Date; * udf user relation */ @Data -@TableName("t_escheduler_relation_udfs_user") +@TableName("t_ds_relation_udfs_user") public class UDFUser { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java index bf69f02c158892644697c44592f40eeab10661cc..2b2c487b4f0791420aee7c0fe16612d631a51b47 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java @@ -29,7 +29,7 @@ import java.util.Date; * udf function */ @Data -@TableName("t_escheduler_udfs") +@TableName("t_ds_udfs") public class UdfFunc { /** * id diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java index f1a7d4a00996fbb96e0f218165d88684a1fb2621..c4df0679efb7999529db80bfcce1c41cc9180122 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java @@ -32,7 +32,7 @@ import java.util.Date; * user */ @Data -@TableName("t_escheduler_user") +@TableName("t_ds_user") @ApiModel(description = "UserModelDesc") public class User { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java index a79e250ab0f501ea8bc03154197bd32f398a6acc..84742468b6c1f9b0e91bf0396a32182a0d633190 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java @@ -28,7 +28,7 @@ import java.util.Date; * user alert group */ @Data -@TableName("t_escheduler_relation_user_alertgroup") +@TableName("t_ds_relation_user_alertgroup") public class UserAlertGroup { /** diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java index 29532eef83737143de9f349d14b5c00214ea38ba..5c4595b1cf4990635ed25f0aa79a7bb4ec93c6be 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java @@ -27,7 +27,7 @@ import java.util.Date; * worker group for task running */ @Data -@TableName("t_escheduler_worker_group") +@TableName("t_ds_worker_group") public class WorkerGroup { @TableId(value="id", type=IdType.AUTO)