[Improve] mysql ddl current_timestamp syntax compatibility improvement (#3572)
Co-authored-by: tianzhu.wen <tianzhu.wen@clickzetta.com>
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
index a067c2e..ac4e5f2 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
@@ -33,7 +33,7 @@
`version` int default null,
`path` varchar(128) collate utf8mb4_general_ci default null,
`description` varchar(255) collate utf8mb4_general_ci default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key (`id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -86,8 +86,8 @@
`available_slot` int default null,
`option_state` tinyint default null,
`tracking` tinyint default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
`option_time` datetime default null,
`release` tinyint default 1,
`build` tinyint default 1,
@@ -122,7 +122,7 @@
`version` int not null,
`latest` tinyint not null default 0,
`content` text collate utf8mb4_general_ci not null,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key (`id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -136,7 +136,7 @@
`app_id` bigint not null,
`target_type` tinyint not null comment '1) config 2) flink sql',
`target_id` bigint not null comment 'configid or sqlid',
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key (`id`) using btree,
unique key `un_effective_inx` (`app_id`,`target_type`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -155,7 +155,7 @@
`flink_conf` text collate utf8mb4_general_ci not null comment 'flink-conf',
`is_default` tinyint not null default 0 comment 'whether default version or not',
`description` varchar(255) collate utf8mb4_general_ci default null comment 'description',
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key (`id`) using btree,
unique key `un_env_name` (`flink_name`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -198,8 +198,8 @@
`last_build` datetime default null,
`description` varchar(255) collate utf8mb4_general_ci default null,
`build_state` tinyint default -1,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
index `inx_team` (`team_id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -217,7 +217,7 @@
`path` varchar(255) collate utf8mb4_general_ci default null,
`latest` tinyint not null default 1,
`trigger_time` datetime default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key (`id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -234,7 +234,7 @@
`dependency` text collate utf8mb4_general_ci,
`version` int default null,
`candidate` tinyint not null default 1,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key (`id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -254,8 +254,8 @@
`type` char(2) collate utf8mb4_general_ci default null comment 'type 0:menu 1:button',
`display` tinyint collate utf8mb4_general_ci not null default 1 comment 'whether the menu is displayed',
`order_num` int default null comment 'sort',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`menu_id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -272,7 +272,7 @@
`title` varchar(255) collate utf8mb4_general_ci default null,
`context` text collate utf8mb4_general_ci,
`is_read` tinyint default 0,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key (`id`) using btree,
key `inx_mes_user` (`user_id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -286,8 +286,8 @@
`id` bigint not null auto_increment comment 'team id',
`team_name` varchar(64) collate utf8mb4_general_ci not null comment 'team name',
`description` varchar(255) collate utf8mb4_general_ci default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
unique key `team_name_idx` (`team_name`) using btree
) engine = innodb default charset = utf8mb4 collate = utf8mb4_general_ci;
@@ -304,8 +304,8 @@
`creator_id` bigint collate utf8mb4_general_ci not null comment 'user id of creator',
`team_id` bigint collate utf8mb4_general_ci not null comment 'team id',
`desensitization` tinyint not null default 0 comment '0 is no desensitization, 1 is desensitization, if set to desensitization, it will be replaced by * when displayed',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
unique key `un_team_vcode_inx` (`team_id`,`variable_code`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -324,8 +324,8 @@
`description` text collate utf8mb4_general_ci default null comment 'More detailed description of resource',
`creator_id` bigint collate utf8mb4_general_ci not null comment 'user id of creator',
`team_id` bigint collate utf8mb4_general_ci not null comment 'team id',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
unique key `un_team_vcode_inx` (`team_id`,`resource_name`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -337,8 +337,8 @@
create table `t_role` (
`role_id` bigint not null auto_increment comment 'user id',
`role_name` varchar(64) collate utf8mb4_general_ci not null comment 'role name',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
`description` varchar(255) collate utf8mb4_general_ci default null comment 'description',
primary key (`role_id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -387,8 +387,8 @@
`login_type` tinyint default 0 comment 'login type 0:password 1:ldap 2:sso',
`last_team_id` bigint default null comment 'last team id',
`status` char(1) collate utf8mb4_general_ci not null comment 'status 0:locked 1:active',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
`last_login_time` datetime default null comment 'last login time',
`sex` char(1) collate utf8mb4_general_ci default null comment 'gender 0:male 1:female 2:confidential',
`avatar` varchar(128) collate utf8mb4_general_ci default null comment 'avatar',
@@ -407,8 +407,8 @@
`team_id` bigint not null comment 'team id',
`user_id` bigint not null comment 'user id',
`role_id` bigint not null comment 'role id',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
unique key `un_user_team_role_inx` (`user_id`,`team_id`,`role_id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -428,7 +428,7 @@
`steps_status_ts` text,
`error` text,
`build_result` text,
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`app_id`) using btree
) engine = innodb auto_increment=100000 default charset = utf8mb4 collate = utf8mb4_general_ci;
@@ -459,7 +459,7 @@
`resolve_order` int default null,
`exception` text comment 'exception information',
`cluster_state` tinyint default 0 comment 'cluster status (0: created but not started, 1: started, 2: stopped)',
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
`start_time` datetime default null comment 'start time',
`end_time` datetime default null comment 'end time',
`alert_id` bigint default null comment 'alert id',
@@ -479,8 +479,8 @@
`expire_time` datetime default null comment 'expiration',
`description` varchar(255) character set utf8mb4 collate utf8mb4_general_ci default null comment 'description',
`status` tinyint default null comment '1:enable,0:disable',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -500,8 +500,8 @@
`we_com_params` varchar(255) collate utf8mb4_general_ci comment 'wechat params',
`http_callback_params` text collate utf8mb4_general_ci comment 'http callback params',
`lark_params` text collate utf8mb4_general_ci comment 'lark params',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
index `inx_alert_user` (`user_id`) using btree
) engine = innodb default charset = utf8mb4 collate = utf8mb4_general_ci;
@@ -515,8 +515,8 @@
`badge_name` varchar(64) collate utf8mb4_general_ci default null,
`badge_color` varchar(64) collate utf8mb4_general_ci default null,
`link_url` varchar(255) collate utf8mb4_general_ci default null,
- `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
- `modify_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'modify time'
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'modify time'
) engine = innodb default charset=utf8mb4 collate=utf8mb4_general_ci;
-- ----------------------------
@@ -528,8 +528,8 @@
`team_id` bigint not null comment 'team id',
`queue_label` varchar(128) collate utf8mb4_general_ci not null comment 'queue label expression',
`description` varchar(255) collate utf8mb4_general_ci default null comment 'description of the queue label',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
unique key `unq_team_id_queue_label` (`team_id`, `queue_label`) using btree
) engine = innodb default charset = utf8mb4 collate = utf8mb4_general_ci;
@@ -552,8 +552,8 @@
`connector_required_options` text default null,
`connector_optional_options` text default null,
`team_id` bigint not null comment 'team id',
-`create_time` datetime not null default current_timestamp comment 'create time',
-`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time'
+`create_time` datetime default null comment 'create time',
+`modify_time` datetime not null default current_timestamp comment 'modify time'
);
set foreign_key_checks = 1;
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
index b0888bb..3b4608b 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
@@ -95,8 +95,8 @@
"expire_time" timestamp(6),
"description" varchar(255) collate "pg_catalog"."default",
"status" int2,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
);
comment on column "public"."t_access_token"."id" is 'key';
comment on column "public"."t_access_token"."token" is 'token';
@@ -125,8 +125,8 @@
"we_com_params" varchar(255) collate "pg_catalog"."default",
"http_callback_params" text collate "pg_catalog"."default",
"lark_params" text collate "pg_catalog"."default",
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
comment on column "public"."t_alert_config"."alert_name" is 'alert name';
@@ -159,7 +159,7 @@
"version" int4,
"path" varchar(128) collate "pg_catalog"."default",
"description" varchar(255) collate "pg_catalog"."default",
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6)
)
;
alter table "public"."t_app_backup" add constraint "t_app_backup_pkey" primary key ("id");
@@ -178,7 +178,7 @@
"steps_status_ts" text collate "pg_catalog"."default",
"error" text collate "pg_catalog"."default",
"build_result" text collate "pg_catalog"."default",
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "modify_time" timestamp(6)
)
;
alter table "public"."t_app_build_pipe" add constraint "t_app_build_pipe_pkey" primary key ("app_id");
@@ -234,8 +234,8 @@
"available_slot" int4,
"option_state" int2,
"tracking" int2,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6),
"option_time" timestamp(6),
"release" int2 default 1,
"build" boolean default true,
@@ -293,7 +293,7 @@
"resolve_order" int4,
"exception" text collate "pg_catalog"."default",
"cluster_state" int2 default 0,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
+ "create_time" timestamp(6),
"start_time" timestamp(6),
"end_time" timestamp(6),
"alert_id" int8
@@ -339,7 +339,7 @@
"version" int4 not null,
"latest" boolean not null default false,
"content" text collate "pg_catalog"."default" not null,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6)
)
;
alter table "public"."t_flink_config" add constraint "t_flink_config_pkey" primary key ("id");
@@ -356,7 +356,7 @@
"app_id" int8 not null,
"target_type" int2 not null,
"target_id" int8 not null,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6)
)
;
comment on column "public"."t_flink_effective"."target_type" is '1) config 2) flink sql';
@@ -383,7 +383,7 @@
"flink_conf" text collate "pg_catalog"."default" not null,
"is_default" boolean not null default false,
"description" varchar(255) collate "pg_catalog"."default",
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6)
)
;
comment on column "public"."t_flink_env"."id" is 'id';
@@ -443,8 +443,8 @@
"last_build" timestamp(6),
"description" varchar(255) collate "pg_catalog"."default",
"build_state" int2 default -1,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
alter table "public"."t_flink_project" add constraint "t_flink_project_pkey" primary key ("id");
@@ -467,7 +467,7 @@
"path" varchar(255) collate "pg_catalog"."default",
"latest" boolean not null default true,
"trigger_time" timestamp(6),
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6)
)
;
alter table "public"."t_flink_savepoint" add constraint "t_flink_savepoint_pkey" primary key ("id");
@@ -487,7 +487,7 @@
"dependency" text collate "pg_catalog"."default",
"version" int4,
"candidate" int2 default 1 not null,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6)
)
;
alter table "public"."t_flink_sql" add constraint "t_flink_sql_pkey" primary key ("id");
@@ -510,8 +510,8 @@
"type" int2,
"display" boolean not null default true,
"order_num" float8,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
comment on column "public"."t_menu"."menu_id" is 'menu button id';
@@ -543,7 +543,7 @@
"title" varchar(255) collate "pg_catalog"."default",
"context" text collate "pg_catalog"."default",
"is_read" boolean default false,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6)
)
;
alter table "public"."t_message" add constraint "t_message_pkey" primary key ("id");
@@ -563,8 +563,8 @@
"id" int8 not null default nextval('streampark_t_team_id_seq'::regclass),
"team_name" varchar(64) collate "pg_catalog"."default" not null,
"description" varchar(255) collate "pg_catalog"."default" default null,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
comment on column "public"."t_team"."id" is 'team id';
@@ -590,8 +590,8 @@
"creator_id" int8 not null,
"team_id" int8 not null,
"desensitization" boolean not null default false,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
comment on column "public"."t_variable"."id" is 'variable id';
@@ -629,8 +629,8 @@
"connector_required_options" text default null,
"connector_optional_options" text default null,
"team_id" int8 not null,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
comment on column "public"."t_resource"."id" is 'Resource id';
@@ -660,8 +660,8 @@
create table "public"."t_role" (
"role_id" int8 not null default nextval('streampark_t_role_id_seq'::regclass),
"role_name" varchar(64) collate "pg_catalog"."default" not null,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6),
"description" varchar(255) collate "pg_catalog"."default"
)
;
@@ -724,8 +724,8 @@
"login_type" int2 default 0,
"last_team_id" int8,
"status" int2,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6),
"last_login_time" timestamp(6),
"sex" char(1) collate "pg_catalog"."default",
"avatar" varchar(128) collate "pg_catalog"."default",
@@ -765,8 +765,8 @@
"team_id" int8,
"user_id" int8,
"role_id" int8,
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
comment on column "public"."t_member"."team_id" is 'team id';
@@ -792,8 +792,8 @@
"badge_name" varchar(64) collate "pg_catalog"."default",
"badge_color" varchar(64) collate "pg_catalog"."default",
"link_url" varchar(255) collate "pg_catalog"."default",
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone))
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6))
;
alter table "public"."t_external_link" add constraint "t_external_link_pkey" primary key ("id");
@@ -809,8 +809,8 @@
"team_id" int8 not null,
"queue_label" varchar(128) not null collate "pg_catalog"."default",
"description" varchar(255) collate "pg_catalog"."default",
- "create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
- "modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+ "create_time" timestamp(6),
+ "modify_time" timestamp(6)
)
;
comment on column "public"."t_yarn_queue"."id" is 'queue id';
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.0.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.0.0.sql
index de4e88c..19f15c2 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.0.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.0.0.sql
@@ -23,7 +23,7 @@
drop table if exists `t_alert_config`;
create table `t_alert_config` (
`id` bigint not null auto_increment primary key,
- `user_id` bigint default null,
+ `user_id` bigint default null,
`alert_name` varchar(128) collate utf8mb4_general_ci default null comment 'alert group name',
`alert_type` int default 0 comment 'alert type',
`email_params` varchar(255) collate utf8mb4_general_ci comment 'email params',
@@ -32,8 +32,8 @@
`we_com_params` varchar(255) collate utf8mb4_general_ci comment 'wechat params',
`http_callback_params` text collate utf8mb4_general_ci comment 'http callback params',
`lark_params` text collate utf8mb4_general_ci comment 'lark params',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
index `inx_user_id` (`user_id`) using btree
) engine = innodb default charset = utf8mb4 collate = utf8mb4_general_ci;
@@ -67,7 +67,7 @@
add column `option_time` datetime default null after `create_time`,
add column `ingress_template` text collate utf8mb4_general_ci comment 'ingress模版文件',
add column `default_mode_ingress` text collate utf8mb4_general_ci comment '配置ingress的域名',
- add column `modify_time` datetime not null default current_timestamp on update current_timestamp after `create_time`,
+ add column `modify_time` datetime default null after `create_time`,
add column `tags` varchar(500) default null;
alter table `t_flink_log` add column `job_manager_url` varchar(255) default null after `yarn_app_id`;
@@ -78,7 +78,7 @@
add column `team_id` bigint not null comment 'team id' default 100000 after `id`,
add column `git_credential` tinyint not null default 1 after `id`,
add column `prvkey_path` varchar(255) collate utf8mb4_general_ci default null after `password`,
- add column `modify_time` datetime not null default current_timestamp on update current_timestamp after `create_time`,
+ add column `modify_time` datetime default null after `create_time`,
add index `inx_team` (`team_id`) using btree;
update `t_flink_project` set git_credential=1 where url like 'http%';
@@ -89,7 +89,7 @@
change column `dynamic_options` `dynamic_properties` text comment 'allows specifying multiple generic configuration options';
-- change `update_time` to `modify_time`
-alter table `t_app_build_pipe` change column `update_time` `modify_time` datetime not null default current_timestamp on update current_timestamp;
+alter table `t_app_build_pipe` change column `update_time` `modify_time` datetime default null on update current_timestamp;
-- change `readed` to `is_read`
@@ -119,10 +119,10 @@
alter table `t_flink_cluster` modify `create_time` datetime not null default current_timestamp;
alter table `t_access_token` modify `create_time` datetime not null default current_timestamp;
-alter table `t_access_token` modify `modify_time` datetime not null default current_timestamp on update current_timestamp;
-alter table `t_menu` modify `modify_time` datetime not null default current_timestamp on update current_timestamp;
-alter table `t_role` modify `modify_time` datetime not null default current_timestamp on update current_timestamp;
-alter table `t_user` modify `modify_time` datetime not null default current_timestamp on update current_timestamp;
+alter table `t_access_token` modify `modify_time` datetime default null on update current_timestamp;
+alter table `t_menu` modify `modify_time` datetime default null on update current_timestamp;
+alter table `t_role` modify `modify_time` datetime default null on update current_timestamp;
+alter table `t_user` modify `modify_time` datetime default null on update current_timestamp;
-- add new modules to the menu
delete from `t_menu`;
@@ -262,8 +262,8 @@
`id` bigint not null auto_increment comment 'team id',
`team_name` varchar(50) collate utf8mb4_general_ci not null comment 'team name',
`description` varchar(255) collate utf8mb4_general_ci default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
unique key `team_name_idx` (`team_name`) using btree
) engine = innodb default charset = utf8mb4 collate = utf8mb4_general_ci;
@@ -297,8 +297,8 @@
add column `team_id` bigint not null comment 'team id' default 100000 after `id`,
modify column `user_id` bigint not null comment 'user id',
modify column `role_id` bigint not null comment 'role id',
-add column `create_time` datetime not null default current_timestamp comment 'create time',
-add column `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+add column `create_time` datetime default null comment 'create time',
+add column `modify_time` datetime default null comment 'modify time',
drop index `UN_INX`,
add unique key `un_user_team_role_inx` (`user_id`,`team_id`,`role_id`) using btree;
@@ -316,9 +316,9 @@
change column `TYPE` `type` tinyint not null comment '1: input 2: boolean 3: number',
add primary key (`setting_key`);
-insert into `t_setting` values (14, 'docker.register.namespace', null, 'Docker Register Image namespace', 'Docker命名空间', 1);
-insert into `t_setting` values (15, 'streampark.maven.settings', null, 'Maven Settings File Path', 'Maven Settings.xml 完整路径', 1);
-insert into `t_setting` values (16, 'ingress.mode.default', null, 'Automatically generate an nginx-based ingress by passing in a domain name', 'Ingress域名地址', 1);
+insert into `t_setting` values (14, 'docker.register.namespace', null, 'Docker namespace', 'Namespace for docker image used in docker building env and target image register', 1);
+insert into `t_setting` values (15, 'streampark.maven.settings', null, 'Maven Settings File Path', 'Maven Settings.xml full path', 1);
+insert into `t_setting` values (16, 'ingress.mode.default', null, 'Ingress domain address', 'Automatically generate an nginx-based ingress by passing in a domain name', 1);
update t_setting set setting_key = replace(setting_key, 'streamx', 'streampark') where setting_key like 'streamx%';
@@ -339,8 +339,8 @@
`creator_id` bigint collate utf8mb4_general_ci not null comment 'user id of creator',
`team_id` bigint collate utf8mb4_general_ci not null comment 'team id',
`desensitization` tinyint not null default 0 comment '0 is no desensitization, 1 is desensitization, if set to desensitization, it will be replaced by * when displayed',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
unique key `un_team_vcode_inx` (`team_id`,`variable_code`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
index 042b09a..e09ce96 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
@@ -27,8 +27,8 @@
`badge_name` varchar(64) collate utf8mb4_general_ci default null,
`badge_color` varchar(64) collate utf8mb4_general_ci default null,
`link_url` varchar(255) collate utf8mb4_general_ci default null,
- `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
- `modify_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'modify time'
+ `create_time` datetime default null COMMENT 'create time',
+ `modify_time` datetime default null COMMENT 'modify time'
) engine = innodb default charset=utf8mb4 collate=utf8mb4_general_ci;
drop table if exists `t_yarn_queue`;
@@ -37,8 +37,8 @@
`team_id` bigint not null comment 'team id',
`queue_label` varchar(128) collate utf8mb4_general_ci not null comment 'queue and label expression',
`description` varchar(255) collate utf8mb4_general_ci default null comment 'description of the queue label',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
unique key `unq_team_id_queue_label` (`team_id`, `queue_label`) using btree
) engine = innodb default charset = utf8mb4 collate = utf8mb4_general_ci;
@@ -121,6 +121,7 @@
alter table `t_access_token`
modify column `description` varchar(255) character set utf8mb4 collate utf8mb4_general_ci default null comment 'description';
+
-- menu script
delete from `t_menu`;
-- menu level 1
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql
index c35c13c..355f1b0 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.2.0.sql
@@ -34,8 +34,8 @@
`description` text collate utf8mb4_general_ci default null comment 'More detailed description of resource',
`creator_id` bigint collate utf8mb4_general_ci not null comment 'user id of creator',
`team_id` bigint collate utf8mb4_general_ci not null comment 'team id',
-`create_time` datetime not null default current_timestamp comment 'create time',
-`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+`create_time` datetime default null comment 'create time',
+`modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree,
unique key `un_team_vcode_inx` (`team_id`,`resource_name`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -87,8 +87,8 @@
`description` text collate utf8mb4_general_ci default null comment 'More detailed description of resource',
`gateway_type` int not null comment 'The type of the gateway',
`address` varchar(150) default null comment 'url address of gateway endpoint',
-`create_time` datetime not null default current_timestamp comment 'create time',
-`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+`create_time` datetime default null comment 'create time',
+`modify_time` datetime default null comment 'modify time',
primary key (`id`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql
index bb7e5d1..f8f193f 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql
@@ -25,8 +25,8 @@
"badge_name" varchar(100) collate "pg_catalog"."default",
"badge_color" varchar(100) collate "pg_catalog"."default",
"link_url" varchar(1000) collate "pg_catalog"."default",
-"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
-"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+"create_time" timestamp(6),
+"modify_time" timestamp(6)
);
alter table "public"."t_external_link" add constraint "t_external_link_pkey" primary key ("id");
@@ -40,8 +40,8 @@
"team_id" int8 not null,
"queue_label" varchar(128) not null collate "pg_catalog"."default",
"description" varchar(256) collate "pg_catalog"."default",
-"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
-"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+"create_time" timestamp(6),
+"modify_time" timestamp(6)
);
comment on column "public"."t_yarn_queue"."id" is 'queue id';
comment on column "public"."t_yarn_queue"."team_id" is 'team id';
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.0.sql
index 8e78a37..a2add60 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.2.0.sql
@@ -34,8 +34,8 @@
"connector_required_options" text default null,
"connector_optional_options" text default null,
"team_id" int8 not null,
-"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
-"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+"create_time" timestamp(6),
+"modify_time" timestamp(6)
);
comment on column "public"."t_resource"."id" is 'Resource id';
@@ -99,8 +99,8 @@
"description" text collate "pg_catalog"."default" default null,
"gateway_type" int4,
"address" varchar(150) collate "pg_catalog"."default",
-"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
-"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
+"create_time" timestamp(6),
+"modify_time" timestamp(6)
);
comment on column "public"."t_flink_gateway"."id" is 'The id of the gateway';
comment on column "public"."t_flink_gateway"."gateway_name" is 'The name of the gateway';
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java
index 5fb9cd1..82f4636 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SettingController.java
@@ -62,13 +62,6 @@
return RestResponse.success(setting);
}
- @Operation(summary = "Get streampark address")
- @PostMapping("weburl")
- public RestResponse webUrl() {
- String url = settingService.getStreamParkAddress();
- return RestResponse.success(url == null ? null : url.trim());
- }
-
@Operation(summary = "Update setting")
@PostMapping("update")
@RequiresPermissions("setting:update")
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
index 9b415af..6763744 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
@@ -103,7 +103,7 @@
private Integer clusterState;
- private Date createTime = new Date();
+ private Date createTime;
private Date startTime;
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java
index 6053ca7..e30960c 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java
@@ -75,9 +75,9 @@
@NotNull(message = "{required}")
private Long teamId;
- private transient Date createTime;
+ private Date createTime;
- private transient Date modifyTime;
+ private Date modifyTime;
private transient String connector;
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java
index 35e7789..f289ab8 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java
@@ -60,9 +60,9 @@
private Boolean desensitization;
- private transient Date createTime;
+ private Date createTime;
- private transient Date modifyTime;
+ private Date modifyTime;
public void dataMasking() {
if (desensitization) {
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
index e96a54b..102e073 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java
@@ -323,8 +323,9 @@
appParam.setState(FlinkAppStateEnum.ADDED.getValue());
appParam.setRelease(ReleaseStateEnum.NEED_RELEASE.get());
appParam.setOptionState(OptionStateEnum.NONE.getValue());
- appParam.setCreateTime(new Date());
- appParam.setModifyTime(appParam.getCreateTime());
+ Date date = new Date();
+ appParam.setCreateTime(date);
+ appParam.setModifyTime(date);
appParam.setDefaultModeIngress(settingService.getIngressModeDefault());
boolean success = validateQueueIfNeeded(appParam);
@@ -432,8 +433,9 @@
newApp.setState(FlinkAppStateEnum.ADDED.getValue());
newApp.setRelease(ReleaseStateEnum.NEED_RELEASE.get());
newApp.setOptionState(OptionStateEnum.NONE.getValue());
- newApp.setCreateTime(new Date());
- newApp.setModifyTime(new Date());
+ Date date = new Date();
+ newApp.setCreateTime(date);
+ newApp.setModifyTime(date);
newApp.setHotParams(oldApp.getHotParams());
newApp.setJar(oldApp.getJar());
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
index 1cc365c..1a88494 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
@@ -53,8 +53,9 @@
if (!this.check(externalLink)) {
return;
}
- externalLink.setCreateTime(new Date());
- externalLink.setModifyTime(new Date());
+ Date date = new Date();
+ externalLink.setCreateTime(date);
+ externalLink.setModifyTime(date);
externalLink.setId(null);
this.save(externalLink);
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index fe8ec49..092a70d 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -95,7 +95,9 @@
ApiAlertException.throwIfTrue(count > 0, "project name already exists, add project failed");
- project.setCreateTime(new Date());
+ Date date = new Date();
+ project.setCreateTime(date);
+ project.setModifyTime(date);
boolean status = save(project);
if (status) {
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
index c72dc9e..44e1eb9 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/security/impl/AuthenticatorImpl.java
@@ -109,7 +109,9 @@
private User newUserCreate(LoginTypeEnum loginTypeEnum, String username) throws Exception {
User newUser = new User();
- newUser.setCreateTime(new Date());
+ Date date = new Date();
+ newUser.setCreateTime(date);
+ newUser.setModifyTime(date);
newUser.setUsername(username);
newUser.setNickName(username);
newUser.setLoginType(loginTypeEnum);
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index b87656f..3b98228 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -74,7 +74,9 @@
accessToken.setUserId(user.getUserId());
accessToken.setDescription(description);
accessToken.setExpireTime(DateUtils.stringToDate(jwtToken.getExpireAt()));
- accessToken.setCreateTime(new Date());
+ Date date = new Date();
+ accessToken.setCreateTime(date);
+ accessToken.setModifyTime(date);
accessToken.setStatus(AccessToken.STATUS_ENABLE);
this.save(accessToken);
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
index 4c231a6..90f7975 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
@@ -144,8 +144,10 @@
member.setId(null);
member.setUserId(user.getUserId());
- member.setCreateTime(new Date());
- member.setModifyTime(team.getCreateTime());
+
+ Date date = new Date();
+ member.setCreateTime(date);
+ member.setModifyTime(date);
this.save(member);
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
index 66c1001..ed272fb 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -72,7 +72,9 @@
@Override
public void createRole(Role role) {
- role.setCreateTime(new Date());
+ Date date = new Date();
+ role.setCreateTime(date);
+ role.setModifyTime(date);
this.save(role);
String[] menuIds = role.getMenuId().split(StringPool.COMMA);
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index 263eb16..d7079a3 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
@@ -85,8 +85,9 @@
"Team name [%s] exists already. Create team failed. Please rename and try again.",
team.getTeamName()));
team.setId(null);
- team.setCreateTime(new Date());
- team.setModifyTime(team.getCreateTime());
+ Date date = new Date();
+ team.setCreateTime(date);
+ team.setModifyTime(date);
this.save(team);
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index c638d16..1ae53fe 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -111,7 +111,9 @@
@Override
public void createUser(User user) {
- user.setCreateTime(new Date());
+ Date date = new Date();
+ user.setCreateTime(date);
+ user.setModifyTime(date);
if (StringUtils.isNoneBlank(user.getPassword())) {
String salt = ShaHashUtils.getRandomSalt();
String password = ShaHashUtils.encrypt(salt, user.getPassword());
diff --git a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
index 8ddbda8..c666f50 100644
--- a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
+++ b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
@@ -26,8 +26,8 @@
`version` int default null,
`path` varchar(128) default null,
`description` varchar(255) default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`id`)
);
@@ -79,8 +79,8 @@
`available_slot` int default null,
`option_state` tinyint default null,
`tracking` tinyint default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
`option_time` datetime default null,
`release` tinyint default 1,
`build` tinyint default 1,
@@ -110,7 +110,7 @@
`version` int not null,
`latest` tinyint not null default 0,
`content` text not null,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key(`id`)
);
@@ -122,7 +122,7 @@
`app_id` bigint not null,
`target_type` tinyint not null comment '1) config 2) flink sql',
`target_id` bigint not null comment 'configId or sqlId',
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key(`id`),
unique (`app_id`,`target_type`)
);
@@ -139,7 +139,7 @@
`flink_conf` text not null comment 'flink-conf',
`is_default` tinyint not null default 0 comment 'whether default version or not',
`description` varchar(255) default null comment 'description',
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key(`id`),
unique (`flink_name`)
);
@@ -180,8 +180,8 @@
`last_build` datetime default null,
`description` varchar(255) default null,
`build_state` tinyint default -1,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`id`)
);
@@ -197,7 +197,7 @@
`path` varchar(255) default null,
`latest` tinyint not null default 1,
`trigger_time` datetime default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key(`id`)
);
@@ -212,7 +212,7 @@
`dependency` text ,
`version` int default null,
`candidate` tinyint not null default 1,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key(`id`)
);
@@ -232,8 +232,8 @@
`connector_required_options` text default null,
`connector_optional_options` text default null,
`team_id` bigint not null comment 'team id',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`)
);
@@ -251,8 +251,8 @@
`type` char(2) default null comment 'type 0:menu 1:button',
`display` tinyint not null default 0 comment 'whether the menu is displayed',
`order_num` int default null comment 'sort',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`menu_id`)
);
@@ -267,7 +267,7 @@
`title` varchar(255) default null,
`context` text ,
`is_read` tinyint default 0,
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
primary key(`id`)
);
@@ -278,8 +278,8 @@
`id` bigint generated by default as identity not null comment 'team id',
`team_name` varchar(64) not null comment 'team name',
`description` varchar(255) default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`),
unique (`team_name`)
);
@@ -295,8 +295,8 @@
`creator_id` bigint not null comment 'user id of creator',
`team_id` bigint not null comment 'team id',
`desensitization` tinyint not null default 0 comment '0 is no desensitization, 1 is desensitization, if set to desensitization, it will be replaced by * when displayed',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key (`id`),
unique (`team_id`, `variable_code`)
);
@@ -307,8 +307,8 @@
create table if not exists `t_role` (
`role_id` bigint generated by default as identity not null comment 'user id',
`role_name` varchar(64) not null comment 'user name',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
`description` varchar(255) default null comment 'description',
primary key(`role_id`)
);
@@ -350,8 +350,8 @@
`login_type` tinyint default 0 comment 'login type 0:password 1:ldap 2:sso',
`last_team_id` bigint default null comment 'last team id',
`status` char(1) not null comment 'status 0:locked 1:active',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
`last_login_time` datetime default null comment 'last login time',
`sex` char(1) default null comment 'gender 0:male 1:female 2:confidential',
`avatar` varchar(128) default null comment 'avatar',
@@ -368,8 +368,8 @@
`team_id` bigint not null comment 'team id',
`user_id` bigint not null comment 'user id',
`role_id` bigint not null comment 'role id',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`id`),
unique (`team_id`, `user_id`,`role_id`)
);
@@ -387,7 +387,7 @@
`steps_status_ts` text,
`error` text,
`build_result` text,
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`app_id`)
);
@@ -416,7 +416,7 @@
`resolve_order` tinyint default null,
`exception` text comment 'exception information',
`cluster_state` tinyint default 0 comment 'cluster status (0: created but not started, 1: started, 2: stopped)',
- `create_time` datetime not null default current_timestamp comment 'create time',
+ `create_time` datetime default null comment 'create time',
`start_time` datetime default null comment 'start time',
`end_time` datetime default null comment 'end time',
`alert_id` bigint default null comment 'alert id',
@@ -438,8 +438,8 @@
`we_com_params` varchar(255) comment 'wechat params',
`http_callback_params` text comment 'http callback params',
`lark_params` text comment 'lark params',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'change time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime not null default current_timestamp comment 'change time',
primary key(`id`)
);
@@ -454,8 +454,8 @@
`expire_time` datetime default null comment 'expiration',
`description` varchar(255) default null comment 'description',
`status` tinyint default null comment '1:enable,0:disable',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`id`)
);
@@ -469,8 +469,8 @@
`badge_name` varchar(64) default null,
`badge_color` varchar(64) default null,
`link_url` varchar(255) default null,
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`id`)
);
@@ -484,8 +484,8 @@
`team_id` bigint not null comment 'team id',
`queue_label` varchar(128) not null comment 'queue label expression',
`description` varchar(255) default null comment 'description of the queue label',
- `create_time` datetime not null default current_timestamp comment 'create time',
- `modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
unique key (`team_id`,`queue_label`),
primary key (`id`)
);
