This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 78824fffd [Improve] mysql ddl current_timestamp syntax compatibility
improvement (#3573)
78824fffd is described below
commit 78824fffd57e8ef35526060c661f3dfd2d0a14e5
Author: benjobs <[email protected]>
AuthorDate: Tue Feb 27 09:40:00 2024 +0800
[Improve] mysql ddl current_timestamp syntax compatibility improvement
(#3573)
* [Improve] mysql "current_timestamp" syntax compatibility Improvement
* [Improve] testcase improvement
---------
Co-authored-by: benjobs <[email protected]>
---
.../main/assembly/script/schema/mysql-schema.sql | 66 ++++-----
.../main/assembly/script/schema/pgsql-schema.sql | 66 ++++-----
.../main/assembly/script/upgrade/mysql/2.0.0.sql | 32 ++---
.../main/assembly/script/upgrade/mysql/2.1.0.sql | 8 +-
.../main/assembly/script/upgrade/mysql/2.1.3.sql | 2 +-
.../main/assembly/script/upgrade/pgsql/2.1.0.sql | 8 +-
.../console/core/controller/SettingController.java | 7 -
.../console/core/entity/FlinkCluster.java | 2 +-
.../streampark/console/core/entity/FlinkSql.java | 1 +
.../streampark/console/core/entity/Variable.java | 4 +-
.../core/service/impl/ApplicationServiceImpl.java | 13 +-
.../core/service/impl/ExternalLinkServiceImpl.java | 5 +-
.../core/service/impl/FlinkEnvServiceImpl.java | 1 +
.../core/service/impl/ProjectServiceImpl.java | 5 +-
.../core/service/impl/SavePointServiceImpl.java | 6 +-
.../core/service/impl/SqlCompleteServiceImpl.java | 2 +-
.../core/service/impl/VariableServiceImpl.java | 7 +
.../core/service/impl/YarnQueueServiceImpl.java | 6 +
.../system/controller/AccessTokenController.java | 2 +-
.../streampark/console/system/entity/SysLog.java | 57 --------
.../console/system/service/AccessTokenService.java | 3 +-
.../service/impl/AccessTokenServiceImpl.java | 8 +-
.../system/service/impl/MemberServiceImpl.java | 7 +-
.../system/service/impl/MenuServiceImpl.java | 4 +-
.../system/service/impl/RoleServiceImpl.java | 4 +-
.../system/service/impl/TeamServiceImpl.java | 6 +-
.../system/service/impl/UserServiceImpl.java | 5 +-
.../src/main/resources/db/schema-h2.sql | 156 ++++++++++-----------
.../apache/streampark/console/SpringTestBase.java | 5 +
.../core/service/AccessTokenServiceTest.java | 2 +-
.../src/api/flink/setting/index.ts | 2 -
31 files changed, 243 insertions(+), 259 deletions(-)
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 ac63175c2..7d21dc70f 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 @@ create table `t_app_backup` (
`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 @@ create table `t_flink_app` (
`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,
@@ -120,7 +120,7 @@ create table `t_flink_config` (
`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;
@@ -134,7 +134,7 @@ create table `t_flink_effective` (
`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;
@@ -153,7 +153,7 @@ create table `t_flink_env` (
`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;
@@ -196,8 +196,8 @@ create table `t_flink_project` (
`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;
@@ -215,7 +215,7 @@ create table `t_flink_savepoint` (
`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;
@@ -231,7 +231,7 @@ create table `t_flink_sql` (
`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;
@@ -251,8 +251,8 @@ create table `t_menu` (
`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;
@@ -269,7 +269,7 @@ create table `t_message` (
`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;
@@ -283,8 +283,8 @@ create table `t_team` (
`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;
@@ -301,8 +301,8 @@ create table `t_variable` (
`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;
@@ -314,8 +314,8 @@ drop table if exists `t_role`;
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;
@@ -364,8 +364,8 @@ create table `t_user` (
`login_type` tinyint default 0 comment 'login type 0:password 1:ldap',
`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',
@@ -384,8 +384,8 @@ create table `t_member` (
`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;
@@ -405,7 +405,7 @@ create table `t_app_build_pipe`(
`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;
@@ -435,7 +435,7 @@ create table `t_flink_cluster` (
`resolve_order` int default null,
`exception` longtext 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',
primary key (`id`,`cluster_name`),
unique key `id` (`cluster_id`,`address`,`execution_mode`)
) engine=innodb auto_increment=100000 default charset=utf8mb4
collate=utf8mb4_general_ci;
@@ -452,8 +452,8 @@ create table `t_access_token` (
`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;
@@ -473,8 +473,8 @@ create table `t_alert_config` (
`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;
@@ -488,8 +488,8 @@ CREATE TABLE `t_external_link` (
`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;
-- ----------------------------
@@ -501,8 +501,8 @@ create table `t_yarn_queue` (
`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;
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 2d91ffe3c..5f92121be 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 @@ create table "public"."t_access_token" (
"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 @@ create table "public"."t_alert_config" (
"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 @@ create table "public"."t_app_backup" (
"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 @@ create table "public"."t_app_build_pipe" (
"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 @@ create table "public"."t_flink_app" (
"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,
@@ -290,7 +290,7 @@ create table "public"."t_flink_cluster" (
"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)
)
;
comment on column "public"."t_flink_cluster"."address" is 'url address of
jobmanager';
@@ -329,7 +329,7 @@ create table "public"."t_flink_config" (
"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");
@@ -346,7 +346,7 @@ create table "public"."t_flink_effective" (
"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';
@@ -373,7 +373,7 @@ create table "public"."t_flink_env" (
"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';
@@ -433,8 +433,8 @@ create table "public"."t_flink_project" (
"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");
@@ -457,7 +457,7 @@ create table "public"."t_flink_savepoint" (
"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");
@@ -476,7 +476,7 @@ create table "public"."t_flink_sql" (
"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");
@@ -499,8 +499,8 @@ create table "public"."t_menu" (
"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';
@@ -532,7 +532,7 @@ create table "public"."t_message" (
"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");
@@ -552,8 +552,8 @@ create table "public"."t_team" (
"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';
@@ -578,8 +578,8 @@ create table "public"."t_variable" (
"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';
@@ -608,8 +608,8 @@ create sequence "public"."streampark_t_role_id_seq"
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"
)
;
@@ -672,8 +672,8 @@ create table "public"."t_user" (
"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",
@@ -713,8 +713,8 @@ create table "public"."t_member" (
"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';
@@ -740,8 +740,8 @@ create table "public"."t_external_link" (
"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");
@@ -757,8 +757,8 @@ create table "public"."t_yarn_queue" (
"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 de4e88c82..3516ea43f 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 @@ set foreign_key_checks = 0;
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 @@ create table `t_alert_config` (
`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 @@ alter table `t_flink_app`
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 @@ alter table `t_flink_project`
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 @@ alter table `t_flink_cluster`
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_user` modify `create_time` datetime not
null default current_time
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 @@ create table `t_team` (
`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 @@ alter table `t_member`
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;
@@ -339,8 +339,8 @@ create table `t_variable` (
`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 c744b30eb..e09ce96ba 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 @@ CREATE TABLE `t_external_link` (
`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 @@ create table `t_yarn_queue` (
`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;
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql
b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql
index cb6a6bee9..b942363db 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql
+++
b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.3.sql
@@ -32,7 +32,7 @@ alter table `t_flink_app`
modify column `k8s_jm_pod_template` longtext,
modify column `k8s_tm_pod_template` longtext,
modify column `options` longtext comment 'json form of parameter
collection ',
- modify column `modify_time` datetime not null default current_timestamp
comment 'modify time';
+ modify column `modify_time` datetime default null comment 'modify time';
alter table `t_flink_cluster`
modify column `options` longtext comment 'json form of parameter
collection ',
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 bb7e5d1c2..f8f193fbc 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 @@ create table "public"."t_external_link" (
"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 @@ create table "public"."t_yarn_queue" (
"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/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 5fb9cd14d..82f463696 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 @@ public class SettingController {
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 c16403419..ba3a38be4 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 @@ public class FlinkCluster implements Serializable {
private Integer clusterState;
- private Date createTime = new Date();
+ private Date createTime;
@JsonIgnore
public FlinkK8sRestExposedType getK8sRestExposedTypeEnum() {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java
index c0ca2fbd6..5b732d77d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java
@@ -55,6 +55,7 @@ public class FlinkSql {
private Integer candidate;
private Date createTime;
+
private transient boolean effective = false;
/** sql diff */
private transient boolean sqlDifference = false;
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 7257228b0..5953cf28a 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
@@ -62,9 +62,9 @@ public class Variable implements Serializable {
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/impl/ApplicationServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
index b63194c5a..b2ce49006 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
@@ -786,7 +786,12 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
appParam.setState(FlinkAppState.ADDED.getValue());
appParam.setRelease(ReleaseState.NEED_RELEASE.get());
appParam.setOptionState(OptionState.NONE.getValue());
- appParam.setCreateTime(new Date());
+
+ // createTime & modifyTime
+ Date date = new Date();
+ appParam.setCreateTime(date);
+ appParam.setModifyTime(date);
+
appParam.setDefaultModeIngress(settingService.getIngressModeDefault());
boolean success = validateQueueIfNeeded(appParam);
@@ -880,9 +885,13 @@ public class ApplicationServiceImpl extends
ServiceImpl<ApplicationMapper, Appli
newApp.setState(FlinkAppState.ADDED.getValue());
newApp.setRelease(ReleaseState.NEED_RELEASE.get());
newApp.setOptionState(OptionState.NONE.getValue());
- newApp.setCreateTime(new Date());
newApp.setHotParams(oldApp.getHotParams());
+ // createTime & modifyTime
+ Date date = new Date();
+ newApp.setCreateTime(date);
+ newApp.setModifyTime(date);
+
newApp.setJar(oldApp.getJar());
newApp.setJarCheckSum(oldApp.getJarCheckSum());
newApp.setTags(oldApp.getTags());
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 532d20f12..694afed63 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
@@ -51,8 +51,9 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
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/FlinkEnvServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
index 2e638c7d3..e83bd65bb 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
@@ -43,6 +43,7 @@ public class FlinkEnvServiceImpl extends
ServiceImpl<FlinkEnvMapper, FlinkEnv>
implements FlinkEnvService {
@Autowired private FlinkClusterService flinkClusterService;
+
@Autowired private ApplicationService applicationService;
/**
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 c7b66435c..6df1205f3 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
@@ -100,7 +100,9 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
long count = count(queryWrapper);
RestResponse response = RestResponse.success();
if (count == 0) {
- project.setCreateTime(new Date());
+ Date date = new Date();
+ project.setCreateTime(date);
+ project.setModifyTime(date);
boolean status = save(project);
if (status) {
return response.message("Add project successfully").data(true);
@@ -132,6 +134,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
project.setPom(projectParam.getPom());
project.setDescription(projectParam.getDescription());
project.setBuildArgs(projectParam.getBuildArgs());
+ project.setModifyTime(new Date());
if (project.isSshRepositoryUrl()) {
project.setUserName(null);
} else {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
index 3f132f014..bf6ca3877 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
@@ -340,8 +340,10 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
savePoint.setAppId(application.getId());
savePoint.setLatest(true);
savePoint.setType(CheckPointType.SAVEPOINT.get());
- savePoint.setCreateTime(new Date());
- savePoint.setTriggerTime(new Date());
+
+ Date date = new Date();
+ savePoint.setCreateTime(date);
+ savePoint.setTriggerTime(date);
savePoint.setPath(savePointDir);
this.save(savePoint);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SqlCompleteServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SqlCompleteServiceImpl.java
index 5ce506db8..f01b5df58 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SqlCompleteServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SqlCompleteServiceImpl.java
@@ -56,7 +56,7 @@ public class SqlCompleteServiceImpl implements
SqlCompleteService {
@Override
public List<String> getComplete(String sql) {
- if (sql.length() > 0 && BLACK_SET.contains(sql.charAt(sql.length() - 1))) {
+ if (!sql.isEmpty() && BLACK_SET.contains(sql.charAt(sql.length() - 1))) {
return new ArrayList<>();
}
String[] temp = sql.split("\\s");
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
index 61af7eaaa..62fcc7655 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
@@ -46,6 +46,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -78,6 +79,10 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
throw new ApiAlertException("Sorry, the variable code already exists.");
}
variable.setCreatorId(serviceHelper.getUserId());
+
+ Date date = new Date();
+ variable.setCreateTime(date);
+ variable.setModifyTime(date);
this.save(variable);
}
@@ -130,6 +135,8 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
if (!findVariable.getVariableCode().equals(variable.getVariableCode())) {
throw new ApiAlertException("Sorry, the variable code cannot be
updated.");
}
+
+ variable.setModifyTime(new Date());
this.baseMapper.updateById(variable);
// endregion
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
index 5cafab958..22d4e89ad 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
@@ -48,6 +48,7 @@ import
org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -121,6 +122,9 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
public boolean createYarnQueue(YarnQueue yarnQueue) {
ResponseResult<String> checkResponse = checkYarnQueue(yarnQueue);
ApiAlertException.throwIfFalse(checkResponse.getStatus() == 0,
checkResponse.getMsg());
+ Date date = new Date();
+ yarnQueue.setCreateTime(date);
+ yarnQueue.setModifyTime(date);
return save(yarnQueue);
}
@@ -150,8 +154,10 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
checkNotReferencedByFlinkClusters(queueFromDB.getQueueLabel(), "updating");
+ queueFromDB.setModifyTime(new Date());
queueFromDB.setDescription(yarnQueue.getDescription());
queueFromDB.setQueueLabel(yarnQueue.getQueueLabel());
+
updateById(queueFromDB);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
index fbd647658..4d905d418 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/AccessTokenController.java
@@ -81,7 +81,7 @@ public class AccessTokenController {
String expireTime,
@RequestParam(required = false) String description)
throws InternalException {
- return accessTokenService.generateToken(userId, expireTime, description);
+ return accessTokenService.create(userId, expireTime, description);
}
@Operation(summary = "Verify current user token")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/SysLog.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/SysLog.java
deleted file mode 100644
index 8a0360998..000000000
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/SysLog.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.streampark.console.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Getter
-@Setter
-@TableName("t_log")
-public class SysLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- private String username;
-
- private String operation;
-
- private Long time;
-
- private String method;
-
- private String params;
-
- private String ip;
-
- private Date createTime;
-
- private transient String createTimeFrom;
- private transient String createTimeTo;
-
- private String location;
-}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
index c2611ac6c..12a78b6d2 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/AccessTokenService.java
@@ -27,8 +27,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface AccessTokenService extends IService<AccessToken> {
- RestResponse generateToken(Long userId, String expireTime, String
description)
- throws InternalException;
+ RestResponse create(Long userId, String expireTime, String description)
throws InternalException;
boolean deleteToken(Long id);
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 83bf64efe..904576ef9 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
@@ -56,7 +56,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
@Autowired private UserService userService;
@Override
- public RestResponse generateToken(Long userId, String expireTime, String
description) {
+ public RestResponse create(Long userId, String expireTime, String
description) {
User user = userService.getById(userId);
if (Objects.isNull(user)) {
return RestResponse.success().put("code", 0).message("user not
available");
@@ -74,7 +74,10 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
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);
@@ -122,6 +125,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
AccessToken updateObj = new AccessToken();
updateObj.setStatus(status);
updateObj.setId(tokenId);
+ updateObj.setModifyTime(new Date());
return RestResponse.success(this.updateById(updateObj));
}
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 0ec6a73e5..b007a5d14 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 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
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);
}
@@ -177,6 +179,7 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
new ApiAlertException(
String.format("The roleId [%s] not found",
member.getRoleId())));
oldMember.setRoleId(member.getRoleId());
+ oldMember.setModifyTime(new Date());
updateById(oldMember);
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
index fef5064d2..ed70bc743 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -128,7 +128,9 @@ public class MenuServiceImpl extends
ServiceImpl<MenuMapper, Menu> implements Me
@Override
@Transactional(rollbackFor = Exception.class)
public void createMenu(Menu menu) {
- menu.setCreateTime(new Date());
+ Date date = new Date();
+ menu.setCreateTime(date);
+ menu.setModifyTime(date);
setMenu(menu);
this.save(menu);
}
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 bc8459c05..a5a93ec54 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
@@ -71,7 +71,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@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 966bab4d8..f442ef1c8 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,10 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
"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 35cf49dd4..1a5d126a6 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
@@ -93,7 +93,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,
User> implements Us
@Override
@Transactional(rollbackFor = Exception.class)
public void createUser(User user) {
- user.setCreateTime(new Date());
+ Date date = new Date();
+ user.setCreateTime(date);
+ user.setModifyTime(date);
String salt = ShaHashUtils.getRandomSalt();
String password = ShaHashUtils.encrypt(salt, user.getPassword());
user.setSalt(salt);
@@ -131,6 +133,7 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
String password = ShaHashUtils.encrypt(salt, userParam.getPassword());
user.setSalt(salt);
user.setPassword(password);
+ user.setModifyTime(new Date());
this.baseMapper.updateById(user);
}
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 2e27d73ea..f81e9f1dd 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
@@ -24,10 +24,10 @@ create table if not exists `t_app_backup` (
`sql_id` bigint default null,
`config_id` bigint default null,
`version` int default null,
- `path` varchar(128) 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`)
);
@@ -41,25 +41,25 @@ create table if not exists `t_flink_app` (
`execution_mode` tinyint default null,
`resource_from` tinyint default null,
`project_id` bigint default null,
- `job_name` varchar(255) default null,
- `module` varchar(255) default null,
- `jar` varchar(255) default null,
+ `job_name` varchar(255) default null,
+ `module` varchar(255) default null,
+ `jar` varchar(255) default null,
`jar_check_sum` bigint default null,
- `main_class` varchar(255) default null,
+ `main_class` varchar(255) default null,
`dependency` text,
`args` longtext,
`options` longtext,
`hot_params` text ,
`user_id` bigint default null,
- `app_id` varchar(64) default null,
+ `app_id` varchar(64) default null,
`app_type` tinyint default null,
`duration` bigint default null,
- `job_id` varchar(64) default null,
- `job_manager_url` varchar(255) default null,
+ `job_id` varchar(64) default null,
+ `job_manager_url` varchar(255) default null,
`version_id` bigint default null,
- `cluster_id` varchar(45) default null,
- `k8s_namespace` varchar(63) default null,
- `flink_image` varchar(128) default null,
+ `cluster_id` varchar(45) default null,
+ `k8s_namespace` varchar(63) default null,
+ `flink_image` varchar(128) default null,
`state` int default null,
`restart_size` int default null,
`restart_count` int default null,
@@ -68,7 +68,7 @@ create table if not exists `t_flink_app` (
`cp_failure_rate_interval` int default null,
`cp_failure_action` tinyint default null,
`dynamic_properties` longtext ,
- `description` varchar(255) default null,
+ `description` varchar(255) default null,
`resolve_order` tinyint default null,
`k8s_rest_exposed_type` tinyint default null,
`jm_memory` int default null,
@@ -79,8 +79,8 @@ create table if not exists `t_flink_app` (
`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 on update
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,
@@ -108,7 +108,7 @@ create table if not exists `t_flink_config` (
`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`)
);
@@ -120,7 +120,7 @@ create table if not exists `t_flink_effective` (
`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`)
);
@@ -136,8 +136,8 @@ create table if not exists `t_flink_env` (
`scala_version` varchar(64) not null comment 'scala version of flink',
`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',
+ `description` varchar(255) default null comment 'description',
+ `create_time` datetime default null comment 'create time',
primary key(`id`),
unique (`flink_name`)
);
@@ -148,8 +148,8 @@ create table if not exists `t_flink_env` (
create table if not exists `t_flink_log` (
`id` bigint generated by default as identity not null,
`app_id` bigint default null,
- `yarn_app_id` varchar(64) default null,
- `job_manager_url` varchar(255) default null,
+ `yarn_app_id` varchar(64) default null,
+ `job_manager_url` varchar(255) default null,
`success` tinyint default null,
`exception` text ,
`option_time` datetime default null,
@@ -164,21 +164,21 @@ create table if not exists `t_flink_log` (
create table if not exists `t_flink_project` (
`id` bigint generated by default as identity not null,
`team_id` bigint not null,
- `name` varchar(255) default null,
- `url` varchar(255) default null,
- `branches` varchar(64) default null,
- `user_name` varchar(64) default null,
- `password` varchar(64) default null,
- `prvkey_path` varchar(128) default null,
- `pom` varchar(255) default null,
+ `name` varchar(255) default null,
+ `url` varchar(255) default null,
+ `branches` varchar(64) default null,
+ `user_name` varchar(64) default null,
+ `password` varchar(64) default null,
+ `prvkey_path` varchar(128) default null,
+ `pom` varchar(255) default null,
`build_args` varchar(255) default null,
`type` tinyint default null,
`repository` tinyint default null,
`last_build` datetime default null,
- `description` varchar(255) 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`)
);
@@ -191,10 +191,10 @@ create table if not exists `t_flink_savepoint` (
`app_id` bigint not null,
`chk_id` bigint default null,
`type` tinyint default null,
- `path` varchar(255) default null,
+ `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`)
);
@@ -208,7 +208,7 @@ create table if not exists `t_flink_sql` (
`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`)
);
@@ -219,15 +219,15 @@ create table if not exists `t_menu` (
`menu_id` bigint generated by default as identity not null comment 'menu
button id',
`parent_id` bigint not null comment 'parent menu id',
`menu_name` varchar(64) not null comment 'menu button name',
- `path` varchar(64) default null comment 'routing path',
- `component` varchar(64) default null comment 'routing component component',
- `perms` varchar(64) default null comment 'authority id',
- `icon` varchar(64) default null comment 'icon',
- `type` char(2) default null comment 'type 0:menu 1:button',
+ `path` varchar(64) default null comment 'routing path',
+ `component` varchar(64) default null comment 'routing component component',
+ `perms` varchar(64) default null comment 'authority id',
+ `icon` varchar(64) default null comment 'icon',
+ `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`)
);
@@ -239,10 +239,10 @@ create table if not exists `t_message` (
`app_id` bigint default null,
`user_id` bigint default null,
`type` tinyint default null,
- `title` varchar(255) default null,
+ `title` varchar(255) default null,
`context` longtext ,
`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`)
);
@@ -253,8 +253,8 @@ create table if not exists `t_team` (
`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`)
);
@@ -270,8 +270,8 @@ create table if not exists `t_variable` (
`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`)
);
@@ -282,9 +282,9 @@ create table if not exists `t_variable` (
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',
- `description` varchar(255) default null comment 'description',
+ `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`)
);
@@ -305,9 +305,9 @@ create table if not exists `t_role_menu` (
create table if not exists `t_setting` (
`order_num` int default null,
`setting_key` varchar(64) primary key not null,
- `setting_value` text default null,
- `setting_name` varchar(255) default null,
- `description` varchar(255) default null,
+ `setting_value` text default null,
+ `setting_name` varchar(255) default null,
+ `description` varchar(255) default null,
`type` tinyint not null comment '1: input 2: boolean 3: number'
);
@@ -318,19 +318,19 @@ create table if not exists `t_user` (
`user_id` bigint generated by default as identity not null comment 'user id',
`username` varchar(64) not null comment 'user name',
`nick_name` varchar(64) not null comment 'nick name',
- `salt` varchar(26) default null comment 'salt',
+ `salt` varchar(26) default null comment 'salt',
`password` varchar(64) not null comment 'password',
- `email` varchar(64) default null comment 'email',
+ `email` varchar(64) default null comment 'email',
`user_type` int not null comment 'user type 1:admin 2:user',
`login_type` tinyint default 0 comment 'login type 0:password 1:ldap',
`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',
- `description` varchar(255) default null comment 'description',
+ `sex` char(1) default null comment 'gender 0:male 1:female 2:confidential',
+ `avatar` varchar(128) default null comment 'avatar',
+ `description` varchar(255) default null comment 'description',
primary key(`user_id`),
unique (`username`)
);
@@ -343,8 +343,8 @@ create table if not exists `t_member` (
`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`)
);
@@ -362,7 +362,7 @@ create table if not exists `t_app_build_pipe` (
`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`)
);
@@ -390,7 +390,7 @@ create table if not exists `t_flink_cluster` (
`resolve_order` tinyint default null,
`exception` longtext 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',
primary key(`id`,`cluster_name`),
unique (`cluster_id`,`address`,`execution_mode`)
);
@@ -401,7 +401,7 @@ create table if not exists `t_flink_cluster` (
create table if not exists `t_alert_config` (
`id` bigint generated by default as identity not null,
`user_id` bigint default null,
- `alert_name` varchar(128) default null comment 'alert group name',
+ `alert_name` varchar(128) default null comment 'alert group name',
`alert_type` int default 0 comment 'alert type',
`email_params` varchar(255) comment 'email params',
`sms_params` text comment 'sms params',
@@ -409,8 +409,8 @@ create table if not exists `t_alert_config` (
`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 default null comment 'change time',
primary key(`id`)
);
@@ -425,8 +425,8 @@ create table if not exists `t_access_token` (
`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`)
);
@@ -436,12 +436,12 @@ create table if not exists `t_access_token` (
-- ----------------------------
create table if not exists `t_external_link` (
`id` int generated by default as identity not null comment 'key',
- `badge_label` varchar(64) default null,
- `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',
+ `badge_label` varchar(64) default null,
+ `badge_name` varchar(64) default null,
+ `badge_color` varchar(64) default null,
+ `link_url` varchar(255) default null,
+ `create_time` datetime default null comment 'create time',
+ `modify_time` datetime default null comment 'modify time',
primary key(`id`)
);
@@ -455,8 +455,8 @@ create table if not exists `t_yarn_queue` (
`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`)
);
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/SpringTestBase.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/SpringTestBase.java
index 417a117ce..30043f3e9 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/SpringTestBase.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/SpringTestBase.java
@@ -42,6 +42,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.Date;
/** base tester. */
@Transactional
@@ -107,6 +108,10 @@ public abstract class SpringTestBase {
YarnQueue yarnQueue = new YarnQueue();
yarnQueue.setTeamId(teamId);
yarnQueue.setQueueLabel(queueLabel);
+
+ Date date = new Date();
+ yarnQueue.setCreateTime(date);
+ yarnQueue.setModifyTime(date);
return yarnQueue;
}
}
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
index cdcaa2341..b885053dd 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
@@ -43,7 +43,7 @@ public class AccessTokenServiceTest extends SpringTestBase {
void testCrudToken() throws Exception {
Long mockUserId = 100000L;
String expireTime = "9999-01-01 00:00:00";
- RestResponse restResponse = accessTokenService.generateToken(mockUserId,
expireTime, "");
+ RestResponse restResponse = accessTokenService.create(mockUserId,
expireTime, "");
Assertions.assertNotNull(restResponse);
Assertions.assertInstanceOf(AccessToken.class, restResponse.get("data"));
diff --git
a/streampark-console/streampark-console-webapp/src/api/flink/setting/index.ts
b/streampark-console/streampark-console-webapp/src/api/flink/setting/index.ts
index f8bb300e8..4cc0579c4 100644
---
a/streampark-console/streampark-console-webapp/src/api/flink/setting/index.ts
+++
b/streampark-console/streampark-console-webapp/src/api/flink/setting/index.ts
@@ -19,10 +19,8 @@ import { defHttp } from '/@/utils/http/axios';
enum SETTING_APi {
GET = '/flink/setting/get',
- WEB_URL = '/flink/setting/weburl',
ALL = '/flink/setting/all',
CHECK_HADOOP = '/flink/setting/checkHadoop',
- SYNC = '/flink/setting/sync',
UPDATE = '/flink/setting/update',
}
/**
