You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by mu...@apache.org on 2023/04/22 14:34:47 UTC
[incubator-streampark] branch dev updated: [Improve] ddl schema column length improvement (#2680)
This is an automated email from the ASF dual-hosted git repository.
muchunjin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new a510e27b9 [Improve] ddl schema column length improvement (#2680)
a510e27b9 is described below
commit a510e27b9e6e14c80ba13707a8ceb1c644cee09b
Author: benjobs <be...@apache.org>
AuthorDate: Sat Apr 22 22:34:41 2023 +0800
[Improve] ddl schema column length improvement (#2680)
* [Improve] ddl schema field length improvement
* [Improve] role column improvement
* [Improve] 2.1.0 mysql upgrade
* [Improve] 2.1.0 pgsql ddl upgrade
* code style improve
* ddl review updated
* h2 ddl updated
* ddl bug fixed.
---
.../src/main/assembly/script/data/mysql-data.sql | 4 +-
.../src/main/assembly/script/data/pgsql-data.sql | 4 +-
.../main/assembly/script/schema/mysql-schema.sql | 90 ++++++------
.../main/assembly/script/schema/pgsql-schema.sql | 91 ++++++------
.../main/assembly/script/upgrade/mysql/2.1.0.sql | 91 ++++++++++--
.../main/assembly/script/upgrade/pgsql/2.1.0.sql | 160 ++++++++++++++++-----
.../streampark/console/system/entity/Role.java | 6 +-
.../streampark/console/system/entity/User.java | 4 -
.../system/service/impl/UserServiceImpl.java | 1 -
.../src/main/resources/db/data-h2.sql | 4 +-
.../src/main/resources/db/schema-h2.sql | 89 ++++++------
.../main/resources/mapper/system/RoleMapper.xml | 3 +-
.../main/resources/mapper/system/UserMapper.xml | 1 -
13 files changed, 348 insertions(+), 200 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
index 1f240db12..71001d79b 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/data/mysql-data.sql
@@ -135,8 +135,8 @@ insert into `t_menu` values (130603, 130600, 'delete yarn queue', null, null, 'y
-- ----------------------------
-- Records of t_role
-- ----------------------------
-insert into `t_role` values (100001, 'developer', 'developer', now(), now(), null);
-insert into `t_role` values (100002, 'team admin', 'Team Admin has all permissions inside the team.', now(), now(), null);
+insert into `t_role` values (100001, 'developer', now(), now(), 'developer');
+insert into `t_role` values (100002, 'team admin', now(), now(), 'Team Admin has all permissions inside the team.');
-- ----------------------------
-- Records of t_role_menu
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
index eed4bd335..968c5ce50 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/data/pgsql-data.sql
@@ -131,8 +131,8 @@ insert into "public"."t_menu" values (130603, 130600, 'delete yarn queue', null,
-- ----------------------------
-- Records of t_role
-- ----------------------------
-insert into "public"."t_role" values (100001, 'developer', 'developer', now(), now(), null);
-insert into "public"."t_role" values (100002, 'team admin', 'Team Admin has all permissions inside the team.', now(), now(), null);
+insert into "public"."t_role" values (100001, 'developer', now(), now(), 'developer');
+insert into "public"."t_role" values (100002, 'team admin', now(), now(), 'Team Admin has all permissions inside the team.');
-- ----------------------------
-- Records of t_role_menu
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 b048e47c1..9c5e3264d 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
@@ -31,7 +31,7 @@ create table `t_app_backup` (
`sql_id` bigint default null,
`config_id` bigint default null,
`version` int default null,
- `path` varchar(255) collate utf8mb4_general_ci 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',
primary key (`id`) using btree
@@ -47,7 +47,7 @@ create table `t_flink_app` (
`job_type` tinyint default null,
`execution_mode` tinyint default null,
`resource_from` tinyint default null,
- `project_id` varchar(64) collate utf8mb4_general_ci default null,
+ `project_id` bigint default null,
`job_name` varchar(255) collate utf8mb4_general_ci default null,
`module` varchar(255) collate utf8mb4_general_ci default null,
`jar` varchar(255) collate utf8mb4_general_ci default null,
@@ -57,16 +57,16 @@ create table `t_flink_app` (
`options` text collate utf8mb4_general_ci,
`hot_params` text collate utf8mb4_general_ci,
`user_id` bigint default null,
- `app_id` varchar(255) collate utf8mb4_general_ci default null,
+ `app_id` varchar(64) collate utf8mb4_general_ci default null,
`app_type` tinyint default null,
`duration` bigint default null,
`job_id` varchar(64) collate utf8mb4_general_ci default null,
`job_manager_url` varchar(255) collate utf8mb4_general_ci default null,
`version_id` bigint default null,
- `cluster_id` varchar(255) collate utf8mb4_general_ci default null,
- `k8s_namespace` varchar(255) collate utf8mb4_general_ci default null,
- `flink_image` varchar(255) collate utf8mb4_general_ci default null,
- `state` varchar(50) collate utf8mb4_general_ci default null,
+ `cluster_id` varchar(45) collate utf8mb4_general_ci default null,
+ `k8s_namespace` varchar(63) collate utf8mb4_general_ci default null,
+ `flink_image` varchar(128) collate utf8mb4_general_ci default null,
+ `state` int default null,
`restart_size` int default null,
`restart_count` int default null,
`cp_threshold` int default null,
@@ -102,7 +102,6 @@ create table `t_flink_app` (
`default_mode_ingress` text collate utf8mb4_general_ci,
`tags` varchar(500) default null,
primary key (`id`) using btree,
- key `inx_state` (`state`) using btree,
key `inx_job_type` (`job_type`) using btree,
key `inx_track` (`tracking`) using btree,
index `inx_team` (`team_id`) using btree
@@ -148,8 +147,8 @@ create table `t_flink_env` (
`id` bigint not null auto_increment comment 'id',
`flink_name` varchar(128) collate utf8mb4_general_ci not null comment 'flink instance name',
`flink_home` varchar(255) collate utf8mb4_general_ci not null comment 'flink home path',
- `version` varchar(50) collate utf8mb4_general_ci not null comment 'flink version',
- `scala_version` varchar(50) collate utf8mb4_general_ci not null comment 'scala version of flink',
+ `version` varchar(64) collate utf8mb4_general_ci not null comment 'flink version',
+ `scala_version` varchar(64) collate utf8mb4_general_ci not null comment 'scala version of flink',
`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',
@@ -166,7 +165,7 @@ drop table if exists `t_flink_log`;
create table `t_flink_log` (
`id` bigint not null auto_increment,
`app_id` bigint default null,
- `yarn_app_id` varchar(50) collate utf8mb4_general_ci default null,
+ `yarn_app_id` varchar(64) collate utf8mb4_general_ci default null,
`job_manager_url` varchar(255) collate utf8mb4_general_ci default null,
`success` tinyint default null,
`exception` text collate utf8mb4_general_ci,
@@ -185,11 +184,11 @@ create table `t_flink_project` (
`team_id` bigint not null,
`name` varchar(255) collate utf8mb4_general_ci default null,
`git_credential` tinyint not null,
- `url` varchar(1000) collate utf8mb4_general_ci default null,
- `branches` varchar(1000) collate utf8mb4_general_ci default null,
- `user_name` varchar(255) collate utf8mb4_general_ci default null,
- `password` varchar(255) collate utf8mb4_general_ci default null,
- `prvkey_path` varchar(255) collate utf8mb4_general_ci default null,
+ `url` varchar(255) collate utf8mb4_general_ci default null,
+ `branches` varchar(64) collate utf8mb4_general_ci default null,
+ `user_name` varchar(64) collate utf8mb4_general_ci default null,
+ `password` varchar(64) collate utf8mb4_general_ci default null,
+ `prvkey_path` varchar(128) collate utf8mb4_general_ci default null,
`pom` varchar(255) collate utf8mb4_general_ci default null,
`build_args` varchar(255) default null,
`type` tinyint default null,
@@ -213,7 +212,7 @@ create table `t_flink_savepoint` (
`app_id` bigint not null,
`chk_id` bigint default null,
`type` tinyint default null,
- `path` varchar(1024) collate utf8mb4_general_ci default null,
+ `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',
@@ -244,11 +243,11 @@ drop table if exists `t_menu`;
create table `t_menu` (
`menu_id` bigint not null auto_increment comment 'menu/button id',
`parent_id` bigint not null comment 'parent menu id',
- `menu_name` varchar(50) collate utf8mb4_general_ci not null comment 'menu button name',
- `path` varchar(255) collate utf8mb4_general_ci default null comment 'routing path',
- `component` varchar(255) collate utf8mb4_general_ci default null comment 'routing component component',
- `perms` varchar(50) collate utf8mb4_general_ci default null comment 'authority id',
- `icon` varchar(50) collate utf8mb4_general_ci default null comment 'icon',
+ `menu_name` varchar(64) collate utf8mb4_general_ci not null comment 'menu button name',
+ `path` varchar(64) collate utf8mb4_general_ci default null comment 'routing path',
+ `component` varchar(64) collate utf8mb4_general_ci default null comment 'routing component component',
+ `perms` varchar(64) collate utf8mb4_general_ci default null comment 'authority id',
+ `icon` varchar(64) collate utf8mb4_general_ci default null comment 'icon',
`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',
@@ -282,7 +281,7 @@ create table `t_message` (
drop table if exists `t_team`;
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',
+ `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',
@@ -296,7 +295,7 @@ create table `t_team` (
drop table if exists `t_variable`;
create table `t_variable` (
`id` bigint not null auto_increment,
- `variable_code` varchar(100) collate utf8mb4_general_ci not null comment 'Variable code is used for parameter names passed to the program or as placeholders',
+ `variable_code` varchar(128) collate utf8mb4_general_ci not null comment 'Variable code is used for parameter names passed to the program or as placeholders',
`variable_value` text collate utf8mb4_general_ci not null comment 'The specific value corresponding to the variable',
`description` text collate utf8mb4_general_ci default null comment 'More detailed description of variables',
`creator_id` bigint collate utf8mb4_general_ci not null comment 'user id of creator',
@@ -314,11 +313,10 @@ create table `t_variable` (
drop table if exists `t_role`;
create table `t_role` (
`role_id` bigint not null auto_increment comment 'user id',
- `role_name` varchar(50) collate utf8mb4_general_ci not null comment 'user name',
- `remark` varchar(100) collate utf8mb4_general_ci default null comment 'remark',
+ `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',
- `role_code` varchar(255) collate utf8mb4_general_ci default null comment 'role code',
+ `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;
@@ -342,7 +340,7 @@ create table `t_role_menu` (
drop table if exists `t_setting`;
create table `t_setting` (
`order_num` int default null,
- `setting_key` varchar(50) collate utf8mb4_general_ci not null,
+ `setting_key` varchar(64) collate utf8mb4_general_ci not null,
`setting_value` text collate utf8mb4_general_ci default null,
`setting_name` varchar(255) collate utf8mb4_general_ci default null,
`description` varchar(255) collate utf8mb4_general_ci default null,
@@ -357,11 +355,11 @@ create table `t_setting` (
drop table if exists `t_user`;
create table `t_user` (
`user_id` bigint not null auto_increment comment 'user id',
- `username` varchar(50) collate utf8mb4_general_ci not null comment 'user name',
- `nick_name` varchar(50) collate utf8mb4_general_ci not null comment 'nick name',
- `salt` varchar(64) collate utf8mb4_general_ci default null comment 'salt',
+ `username` varchar(64) collate utf8mb4_general_ci not null comment 'user name',
+ `nick_name` varchar(64) collate utf8mb4_general_ci not null comment 'nick name',
+ `salt` varchar(26) collate utf8mb4_general_ci default null comment 'salt',
`password` varchar(64) collate utf8mb4_general_ci not null comment 'password',
- `email` varchar(128) collate utf8mb4_general_ci default null comment 'email',
+ `email` varchar(64) collate utf8mb4_general_ci 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',
@@ -370,8 +368,8 @@ create table `t_user` (
`modify_time` datetime not null default current_timestamp on update current_timestamp 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(100) collate utf8mb4_general_ci default null comment 'avatar',
- `description` varchar(100) collate utf8mb4_general_ci default null comment 'description',
+ `avatar` varchar(128) collate utf8mb4_general_ci default null comment 'avatar',
+ `description` varchar(255) collate utf8mb4_general_ci default null comment 'description',
primary key (`user_id`) using btree,
unique key `un_username` (`username`) using btree
) engine=innodb auto_increment=100000 default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -419,17 +417,17 @@ drop table if exists `t_flink_cluster`;
create table `t_flink_cluster` (
`id` bigint not null auto_increment,
`address` varchar(150) default null comment 'url address of jobmanager',
- `cluster_id` varchar(100) default null comment 'clusterid of session mode(yarn-session:application-id,k8s-session:cluster-id)',
- `cluster_name` varchar(100) not null comment 'cluster name',
+ `cluster_id` varchar(45) default null comment 'clusterid of session mode(yarn-session:application-id,k8s-session:cluster-id)',
+ `cluster_name` varchar(128) not null comment 'cluster name',
`options` text comment 'json form of parameter collection ',
- `yarn_queue` varchar(100) default null comment 'the yarn queue where the task is located',
+ `yarn_queue` varchar(128) default null comment 'the yarn queue where the task is located',
`execution_mode` tinyint not null default 1 comment 'k8s execution session mode(1:remote,3:yarn-session,5:kubernetes-session)',
`version_id` bigint not null comment 'flink version id',
- `k8s_namespace` varchar(255) default 'default' comment 'k8s namespace',
- `service_account` varchar(50) default null comment 'k8s service account',
+ `k8s_namespace` varchar(63) default 'default' comment 'k8s namespace',
+ `service_account` varchar(64) default null comment 'k8s service account',
`description` varchar(255) default null,
`user_id` bigint default null,
- `flink_image` varchar(255) default null comment 'flink image',
+ `flink_image` varchar(128) default null comment 'flink image',
`dynamic_properties` text comment 'allows specifying multiple generic configuration options',
`k8s_rest_exposed_type` tinyint default 2 comment 'k8s export(0:loadbalancer,1:clusterip,2:nodeport)',
`k8s_hadoop_integration` tinyint default 0,
@@ -452,7 +450,7 @@ create table `t_access_token` (
`user_id` bigint,
`token` varchar(1024) character set utf8mb4 collate utf8mb4_general_ci default null comment 'token',
`expire_time` datetime default null comment 'expiration',
- `description` varchar(512) character set utf8mb4 collate utf8mb4_general_ci default null comment 'description',
+ `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',
@@ -486,10 +484,10 @@ create table `t_alert_config` (
drop table if exists `t_external_link`;
CREATE TABLE `t_external_link` (
`id` bigint not null auto_increment primary key,
- `badge_label` varchar(100) collate utf8mb4_general_ci default null,
- `badge_name` varchar(100) collate utf8mb4_general_ci default null,
- `badge_color` varchar(100) collate utf8mb4_general_ci default null,
- `link_url` varchar(1000) collate utf8mb4_general_ci default null,
+ `badge_label` varchar(64) collate utf8mb4_general_ci default null,
+ `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'
) engine = innodb default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -502,7 +500,7 @@ create table `t_yarn_queue` (
`id` bigint not null primary key auto_increment comment 'queue id',
`team_id` bigint not null comment 'team id',
`queue_label` varchar(128) collate utf8mb4_general_ci not null comment 'queue label expression',
- `description` varchar(256) collate utf8mb4_general_ci default null comment 'description of the queue label',
+ `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',
unique key `unq_team_id_queue_label` (`team_id`, `queue_label`) using btree
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 1182bc4d0..a86f81f38 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
@@ -93,7 +93,7 @@ create table "public"."t_access_token" (
"user_id" int8,
"token" varchar(1024) collate "pg_catalog"."default",
"expire_time" timestamp(6),
- "description" varchar(512) collate "pg_catalog"."default",
+ "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)
@@ -157,7 +157,7 @@ create table "public"."t_app_backup" (
"sql_id" int8,
"config_id" int8,
"version" int4,
- "path" varchar(255) collate "pg_catalog"."default",
+ "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)
)
@@ -205,15 +205,15 @@ create table "public"."t_flink_app" (
"options" text collate "pg_catalog"."default",
"hot_params" text collate "pg_catalog"."default",
"user_id" int8,
- "app_id" varchar(255) collate "pg_catalog"."default",
+ "app_id" varchar(64) collate "pg_catalog"."default",
"app_type" int2,
"duration" int8,
"job_id" varchar(64) collate "pg_catalog"."default",
"job_manager_url" varchar(255) collate "pg_catalog"."default",
"version_id" int8,
- "cluster_id" varchar(255) collate "pg_catalog"."default",
- "k8s_namespace" varchar(255) collate "pg_catalog"."default",
- "flink_image" varchar(255) collate "pg_catalog"."default",
+ "cluster_id" varchar(45) collate "pg_catalog"."default",
+ "k8s_namespace" varchar(63) collate "pg_catalog"."default",
+ "flink_image" varchar(128) collate "pg_catalog"."default",
"state" int2,
"restart_size" int4,
"restart_count" int4,
@@ -255,9 +255,6 @@ alter table "public"."t_flink_app" add constraint "t_flink_app_pkey" primary key
create index "inx_job_type" on "public"."t_flink_app" using btree (
"job_type" "pg_catalog"."int2_ops" asc nulls last
);
-create index "inx_state" on "public"."t_flink_app" using btree (
- "state" "pg_catalog"."int2_ops" asc nulls last
-);
create index "inx_track" on "public"."t_flink_app" using btree (
"tracking" "pg_catalog"."int2_ops" asc nulls last
);
@@ -274,17 +271,17 @@ create sequence "public"."streampark_t_flink_cluster_id_seq"
create table "public"."t_flink_cluster" (
"id" int8 not null default nextval('streampark_t_flink_cluster_id_seq'::regclass),
"address" varchar(150) collate "pg_catalog"."default",
- "cluster_id" varchar(100) collate "pg_catalog"."default",
- "cluster_name" varchar(100) collate "pg_catalog"."default" not null,
+ "cluster_id" varchar(45) collate "pg_catalog"."default",
+ "cluster_name" varchar(128) collate "pg_catalog"."default" not null,
"options" text collate "pg_catalog"."default",
- "yarn_queue" varchar(100) collate "pg_catalog"."default",
+ "yarn_queue" varchar(128) collate "pg_catalog"."default",
"execution_mode" int2 not null default 1,
"version_id" int8 not null,
- "k8s_namespace" varchar(255) collate "pg_catalog"."default",
- "service_account" varchar(50) collate "pg_catalog"."default",
+ "k8s_namespace" varchar(63) collate "pg_catalog"."default",
+ "service_account" varchar(64) collate "pg_catalog"."default",
"description" varchar(255) collate "pg_catalog"."default",
"user_id" int8,
- "flink_image" varchar(255) collate "pg_catalog"."default",
+ "flink_image" varchar(128) collate "pg_catalog"."default",
"dynamic_properties" text collate "pg_catalog"."default",
"k8s_rest_exposed_type" int2 default 2,
"k8s_hadoop_integration" boolean default false,
@@ -370,8 +367,8 @@ create table "public"."t_flink_env" (
"id" int8 not null default nextval('streampark_t_flink_env_id_seq'::regclass),
"flink_name" varchar(128) collate "pg_catalog"."default" not null,
"flink_home" varchar(255) collate "pg_catalog"."default" not null,
- "version" varchar(50) collate "pg_catalog"."default" not null,
- "scala_version" varchar(50) collate "pg_catalog"."default" not null,
+ "version" varchar(64) collate "pg_catalog"."default" not null,
+ "scala_version" varchar(64) collate "pg_catalog"."default" not null,
"flink_conf" text collate "pg_catalog"."default" not null,
"is_default" boolean not null default false,
"description" varchar(255) collate "pg_catalog"."default",
@@ -402,7 +399,7 @@ create sequence "public"."streampark_t_flink_log_id_seq"
create table "public"."t_flink_log" (
"id" int8 not null default nextval('streampark_t_flink_log_id_seq'::regclass),
"app_id" int8,
- "yarn_app_id" varchar(50) collate "pg_catalog"."default",
+ "yarn_app_id" varchar(64) collate "pg_catalog"."default",
"job_manager_url" varchar(255) collate "pg_catalog"."default",
"success" boolean,
"exception" text collate "pg_catalog"."default",
@@ -424,11 +421,11 @@ create table "public"."t_flink_project" (
"team_id" int8,
"name" varchar(255) collate "pg_catalog"."default",
"git_credential" int2,
- "url" varchar(1000) collate "pg_catalog"."default",
- "branches" varchar(1000) collate "pg_catalog"."default",
- "user_name" varchar(255) collate "pg_catalog"."default",
- "password" varchar(255) collate "pg_catalog"."default",
- "prvkey_path" varchar(255) collate "pg_catalog"."default",
+ "url" varchar(255) collate "pg_catalog"."default",
+ "branches" varchar(64) collate "pg_catalog"."default",
+ "user_name" varchar(64) collate "pg_catalog"."default",
+ "password" varchar(64) collate "pg_catalog"."default",
+ "prvkey_path" varchar(128) collate "pg_catalog"."default",
"pom" varchar(255) collate "pg_catalog"."default",
"build_args" varchar(255) collate "pg_catalog"."default",
"type" int2,
@@ -457,7 +454,7 @@ create table "public"."t_flink_savepoint" (
"app_id" int8 not null,
"chk_id" int8,
"type" int2,
- "path" varchar(1024) collate "pg_catalog"."default",
+ "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)
@@ -494,11 +491,11 @@ create sequence "public"."streampark_t_menu_id_seq"
create table "public"."t_menu" (
"menu_id" int8 not null default nextval('streampark_t_menu_id_seq'::regclass),
"parent_id" int8 not null,
- "menu_name" varchar(50) collate "pg_catalog"."default" not null,
- "path" varchar(255) collate "pg_catalog"."default",
- "component" varchar(255) collate "pg_catalog"."default",
- "perms" varchar(50) collate "pg_catalog"."default",
- "icon" varchar(50) collate "pg_catalog"."default",
+ "menu_name" varchar(64) collate "pg_catalog"."default" not null,
+ "path" varchar(64) collate "pg_catalog"."default",
+ "component" varchar(64) collate "pg_catalog"."default",
+ "perms" varchar(64) collate "pg_catalog"."default",
+ "icon" varchar(64) collate "pg_catalog"."default",
"type" int2,
"display" boolean not null default true,
"order_num" float8,
@@ -553,7 +550,7 @@ create sequence "public"."streampark_t_team_id_seq"
create table "public"."t_team" (
"id" int8 not null default nextval('streampark_t_team_id_seq'::regclass),
- "team_name" varchar(50) collate "pg_catalog"."default" not null,
+ "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)
@@ -575,7 +572,7 @@ create sequence "public"."streampark_t_variable_id_seq"
create table "public"."t_variable" (
"id" int8 not null default nextval('streampark_t_variable_id_seq'::regclass),
- "variable_code" varchar(100) collate "pg_catalog"."default" not null,
+ "variable_code" varchar(128) collate "pg_catalog"."default" not null,
"variable_value" text collate "pg_catalog"."default" not null,
"description" text collate "pg_catalog"."default" default null,
"creator_id" int8 not null,
@@ -610,19 +607,17 @@ 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(50) collate "pg_catalog"."default" not null,
- "remark" varchar(100) collate "pg_catalog"."default",
+ "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),
- "role_code" varchar(255) collate "pg_catalog"."default"
+ "description" varchar(255) collate "pg_catalog"."default"
)
;
comment on column "public"."t_role"."role_id" is 'role id';
comment on column "public"."t_role"."role_name" is 'role name';
-comment on column "public"."t_role"."remark" is 'role description';
+comment on column "public"."t_role"."description" is 'role description';
comment on column "public"."t_role"."create_time" is 'creation time';
comment on column "public"."t_role"."modify_time" is 'modify time';
-comment on column "public"."t_role"."role_code" is 'role code';
alter table "public"."t_role" add constraint "t_role_pkey" primary key ("role_id");
@@ -650,7 +645,7 @@ create index "un_role_menu_inx" on "public"."t_role_menu" using btree (
-- ----------------------------
create table "public"."t_setting" (
"order_num" int4,
- "setting_key" varchar(50) collate "pg_catalog"."default" not null,
+ "setting_key" varchar(64) collate "pg_catalog"."default" not null,
"setting_value" text collate "pg_catalog"."default",
"setting_name" varchar(255) collate "pg_catalog"."default",
"description" varchar(255) collate "pg_catalog"."default",
@@ -668,11 +663,11 @@ create sequence "public"."streampark_t_user_id_seq"
create table "public"."t_user" (
"user_id" int8 not null default nextval('streampark_t_user_id_seq'::regclass),
- "username" varchar(50) collate "pg_catalog"."default" not null,
- "nick_name" varchar(50) collate "pg_catalog"."default" not null,
- "salt" varchar(64) collate "pg_catalog"."default",
+ "username" varchar(64) collate "pg_catalog"."default" not null,
+ "nick_name" varchar(64) collate "pg_catalog"."default" not null,
+ "salt" varchar(26) collate "pg_catalog"."default",
"password" varchar(64) collate "pg_catalog"."default" not null,
- "email" varchar(128) collate "pg_catalog"."default",
+ "email" varchar(64) collate "pg_catalog"."default",
"user_type" int4,
"login_type" int2 default 0,
"last_team_id" int8,
@@ -681,8 +676,8 @@ create table "public"."t_user" (
"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
"last_login_time" timestamp(6),
"sex" char(1) collate "pg_catalog"."default",
- "avatar" varchar(100) collate "pg_catalog"."default",
- "description" varchar(100) collate "pg_catalog"."default"
+ "avatar" varchar(128) collate "pg_catalog"."default",
+ "description" varchar(255) collate "pg_catalog"."default"
)
;
comment on column "public"."t_user"."user_id" is 'user id';
@@ -741,10 +736,10 @@ create sequence "public"."streampark_t_external_link_id_seq"
create table "public"."t_external_link" (
"id" int8 not null default nextval('streampark_t_external_link_id_seq'::regclass),
- "badge_label" varchar(100) collate "pg_catalog"."default",
- "badge_name" varchar(100) collate "pg_catalog"."default",
- "badge_color" varchar(100) collate "pg_catalog"."default",
- "link_url" varchar(1000) collate "pg_catalog"."default",
+ "badge_label" varchar(64) collate "pg_catalog"."default",
+ "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))
;
@@ -761,7 +756,7 @@ create table "public"."t_yarn_queue" (
"id" int8 not null default nextval('streampark_t_yarn_queue_id_seq'::regclass),
"team_id" int8 not null,
"queue_label" varchar(128) not null collate "pg_catalog"."default",
- "description" varchar(256) 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)
)
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 e31ecb6c8..c744b30eb 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
@@ -23,10 +23,10 @@ set foreign_key_checks = 0;
drop table if exists `t_external_link`;
CREATE TABLE `t_external_link` (
`id` bigint not null auto_increment primary key,
- `badge_label` varchar(100) collate utf8mb4_general_ci default null,
- `badge_name` varchar(100) collate utf8mb4_general_ci default null,
- `badge_color` varchar(100) collate utf8mb4_general_ci default null,
- `link_url` varchar(1000) collate utf8mb4_general_ci default null,
+ `badge_label` varchar(64) collate utf8mb4_general_ci default null,
+ `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'
) engine = innodb default charset=utf8mb4 collate=utf8mb4_general_ci;
@@ -36,7 +36,7 @@ create table `t_yarn_queue` (
`id` bigint not null primary key auto_increment comment 'queue id',
`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(256) collate utf8mb4_general_ci default null comment 'description of the queue label',
+ `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',
unique key `unq_team_id_queue_label` (`team_id`, `queue_label`) using btree
@@ -44,10 +44,83 @@ create table `t_yarn_queue` (
drop table if exists t_flink_tutorial;
-alter table `t_user` add column `login_type` tinyint default 0 after `user_type`;
-alter table `t_flink_app` change column `launch` `release` tinyint default 1;
-alter table `t_flink_log` add column `option_name` tinyint default null;
-alter table `t_flink_savepoint` modify column `path` varchar(1024) collate utf8mb4_general_ci default null;
+-- type change
+alter table `t_app_backup` modify column `path` varchar(128) collate utf8mb4_general_ci default null;
+
+alter table `t_flink_app`
+ change column `launch` `release` tinyint default 1,
+ modify column `project_id` bigint default null,
+ modify column `app_id` varchar(64) collate utf8mb4_general_ci default null,
+ modify column `cluster_id` varchar(45) collate utf8mb4_general_ci default null,
+ modify column `k8s_namespace` varchar(63) collate utf8mb4_general_ci default null,
+ modify column `flink_image` varchar(128) collate utf8mb4_general_ci default null,
+ modify column `state` int default null,
+ drop index `inx_state`;
+
+alter table `t_flink_env`
+ modify column `version` varchar(64) collate utf8mb4_general_ci not null comment 'flink version',
+ modify column `scala_version` varchar(64) collate utf8mb4_general_ci not null comment 'scala version of flink';
+
+alter table `t_flink_log`
+ modify column `yarn_app_id` varchar(64) collate utf8mb4_general_ci default null,
+ add column `option_name` tinyint default null;
+
+alter table `t_flink_project`
+ modify column `url` varchar(255) collate utf8mb4_general_ci default null,
+ modify column `branches` varchar(64) collate utf8mb4_general_ci default null,
+ modify column `user_name` varchar(64) collate utf8mb4_general_ci default null,
+ modify column `password` varchar(64) collate utf8mb4_general_ci default null,
+ modify column `prvkey_path` varchar(128) collate utf8mb4_general_ci default null;
+
+alter table `t_flink_savepoint`
+ modify column `path` varchar(255) collate utf8mb4_general_ci default null;
+
+
+alter table `t_menu`
+ modify column `menu_name` varchar(64) collate utf8mb4_general_ci not null comment 'menu button name',
+ modify column `path` varchar(64) collate utf8mb4_general_ci default null comment 'routing path',
+ modify column `component` varchar(64) collate utf8mb4_general_ci default null comment 'routing component component',
+ modify column `perms` varchar(64) collate utf8mb4_general_ci default null comment 'authority id',
+ modify column `icon` varchar(64) collate utf8mb4_general_ci default null comment 'icon';
+
+alter table `t_team`
+ modify column `team_name` varchar(64) collate utf8mb4_general_ci not null comment 'team name';
+
+alter table `t_variable`
+ modify column `variable_code` varchar(128) collate utf8mb4_general_ci not null comment 'Variable code is used for parameter names passed to the program or as placeholders';
+
+alter table `t_role`
+ modify column `role_name` varchar(64) collate utf8mb4_general_ci not null comment 'role name',
+ change column `remark` `description` varchar(255) collate utf8mb4_general_ci default null comment 'description',
+ drop column `role_code`;
+
+alter table `t_setting`
+ modify column `setting_key` varchar(64) collate utf8mb4_general_ci not null;
+
+alter table `t_user`
+ modify column `username` varchar(64) collate utf8mb4_general_ci not null comment 'user name',
+ modify column `nick_name` varchar(64) collate utf8mb4_general_ci not null comment 'nick name',
+ modify column `salt` varchar(26) collate utf8mb4_general_ci default null comment 'salt',
+ modify column `password` varchar(64) collate utf8mb4_general_ci not null comment 'password',
+ modify column `email` varchar(64) collate utf8mb4_general_ci default null comment 'email',
+ modify column `description` varchar(255) collate utf8mb4_general_ci default null comment 'description',
+ add column `login_type` tinyint default 0 after `user_type`,
+ drop column `avatar`;
+
+alter table `t_flink_cluster`
+ modify column `cluster_id` varchar(45) default null comment 'clusterid of session mode(yarn-session:application-id,k8s-session:cluster-id)',
+ modify column `cluster_name` varchar(128) not null comment 'cluster name',
+ modify column `options` text comment 'json form of parameter collection ',
+ modify column `yarn_queue` varchar(128) default null comment 'the yarn queue where the task is located',
+ modify column `k8s_namespace` varchar(63) default 'default' comment 'k8s namespace',
+ modify column `service_account` varchar(64) default null comment 'k8s service account',
+ modify column `description` varchar(255) default null,
+ modify column `user_id` bigint default null,
+ modify column `flink_image` varchar(128) default null comment 'flink image';
+
+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`;
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 e22b4149a..bb7e5d1c2 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
@@ -1,34 +1,32 @@
/*
- * 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.
- */
-
-alter table "public"."t_flink_savepoint" alter column "path" type varchar(1024) collate "pg_catalog"."default";
-alter table "public"."t_flink_app" rename "launch" to "release";
+* 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.
+*/
+
drop table if exists "public"."t_external_link";
drop sequence if exists "public"."streampark_t_external_link_id_seq";
create sequence "public"."streampark_t_external_link_id_seq" increment 1 start 10000 cache 1 minvalue 10000 maxvalue 9223372036854775807;
create table "public"."t_external_link" (
- "id" int8 not null default nextval('streampark_t_external_link_id_seq'::regclass),
- "badge_label" varchar(100) collate "pg_catalog"."default",
- "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)
+"id" int8 not null default nextval('streampark_t_external_link_id_seq'::regclass),
+"badge_label" varchar(100) collate "pg_catalog"."default",
+"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)
);
alter table "public"."t_external_link" add constraint "t_external_link_pkey" primary key ("id");
@@ -38,12 +36,12 @@ drop sequence if exists "public"."streampark_t_yarn_queue_id_seq";
create sequence "public"."streampark_t_yarn_queue_id_seq" increment 1 start 10000 cache 1 minvalue 10000 maxvalue 9223372036854775807;
create table "public"."t_yarn_queue" (
- "id" int8 not null default nextval('streampark_t_yarn_queue_id_seq'::regclass),
- "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)
+"id" int8 not null default nextval('streampark_t_yarn_queue_id_seq'::regclass),
+"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)
);
comment on column "public"."t_yarn_queue"."id" is 'queue id';
comment on column "public"."t_yarn_queue"."team_id" is 'team id';
@@ -54,12 +52,106 @@ comment on column "public"."t_yarn_queue"."modify_time" is 'modify time';
alter table "public"."t_yarn_queue" add constraint "t_yarn_queue_pkey" primary key ("id");
alter table "public"."t_yarn_queue" add constraint "unique_team_id_queue_label" unique("team_id", "queue_label");
-alter table "public"."t_flink_log" add column "option_name" int2;
-alter table "public"."t_user" add column "login_type" int2 default 0;
-ALTER TABLE public.t_flink_app ALTER COLUMN state TYPE int4 USING state::int4;
+
drop table if exists "public"."t_flink_tutorial";
+-- type change
+alter table "public"."t_app_backup" alter column "path" TYPE varchar(128) collate "pg_catalog"."default";
+
+alter table "public"."t_flink_app" rename column "launch" to "release";
+
+alter table "public"."t_flink_app"
+ alter column "state" TYPE int4 USING state::int4,
+ alter column "app_id" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "cluster_id" TYPE varchar(45) collate "pg_catalog"."default",
+ alter column "k8s_namespace" TYPE varchar(63) collate "pg_catalog"."default",
+ alter column "flink_image" TYPE varchar(128) collate "pg_catalog"."default";
+
+alter table "public"."t_flink_env"
+ alter column "version" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "scala_version" TYPE varchar(64) collate "pg_catalog"."default";
+
+alter table "public"."t_flink_env" alter column "version" set not null;
+alter table "public"."t_flink_env" alter column "scala_version" set not null;
+
+alter table "public"."t_flink_log"
+ alter column "yarn_app_id" TYPE varchar(64) collate "pg_catalog"."default",
+ add column "option_name" int2;
+
+
+alter table "public"."t_flink_project"
+ alter column "url" TYPE varchar(255) collate "pg_catalog"."default",
+ alter column "branches" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "user_name" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "password" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "prvkey_path" TYPE varchar(128) collate "pg_catalog"."default";
+
+
+alter table "public"."t_flink_savepoint"
+ alter column "path" TYPE varchar(255) collate "pg_catalog"."default";
+
+
+alter table "public"."t_menu"
+ alter column "menu_name" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "path" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "component" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "perms" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "icon" TYPE varchar(64) collate "pg_catalog"."default";
+
+alter table "public"."t_menu" alter column "menu_name" set not null;
+
+alter table "public"."t_team" alter column "team_name" TYPE varchar(64) collate "pg_catalog"."default";
+alter table "public"."t_team" alter column "team_name" set not null;
+
+alter table "public"."t_variable" alter column "variable_code" TYPE varchar(128) collate "pg_catalog"."default";
+alter table "public"."t_variable" alter column "variable_code" set not null;
+
+alter table "public"."t_role" alter column "role_name" TYPE varchar(64) collate "pg_catalog"."default";
+alter table "public"."t_role" rename column "remark" to "description";
+alter table "public"."t_role" drop column "role_code";
+
+alter table "public"."t_role" alter column "role_name" set not null;
+
+alter table "public"."t_role" alter column "description" TYPE varchar(255) collate "pg_catalog"."default";
+
+alter table "public"."t_setting"
+ alter column "setting_key" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "setting_value" TYPE text collate "pg_catalog"."default";
+
+alter table "public"."t_setting" alter column "setting_key" set not null;
+
+alter table "public"."t_user"
+ alter column "username" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "nick_name" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "salt" TYPE varchar(26) collate "pg_catalog"."default",
+ alter column "password" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "email" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "description" TYPE varchar(255) collate "pg_catalog"."default",
+ add column "login_type" int2 default 0,
+ drop column "avatar";
+
+alter table "public"."t_user"
+ alter column "username" set not null,
+ alter column "nick_name" set not null,
+ alter column "salt" set not null,
+ alter column "password" set not null;
+
+alter table "public"."t_flink_cluster"
+ alter column "cluster_id" TYPE varchar(45) collate "pg_catalog"."default",
+ alter column "cluster_name" TYPE varchar(128) collate "pg_catalog"."default",
+ alter column "yarn_queue" TYPE varchar(128) collate "pg_catalog"."default",
+ alter column "k8s_namespace" TYPE varchar(63) collate "pg_catalog"."default",
+ alter column "service_account" TYPE varchar(64) collate "pg_catalog"."default",
+ alter column "flink_image" TYPE varchar(128) collate "pg_catalog"."default",
+ alter column "description" TYPE varchar(255) collate "pg_catalog"."default";
+
+alter table "public"."t_flink_cluster" alter column "cluster_name" set not null;
+
+alter table "public"."t_access_token"
+ alter column "description" TYPE varchar(255) collate "pg_catalog"."default";
+
+
delete from "public"."t_menu";
insert into "public"."t_menu" values (110000, 0, 'menu.system', '/system', 'PageView', null, 'desktop', '0', '1', 1, now(), now());
insert into "public"."t_menu" values (120000, 0, 'StreamPark', '/flink', 'PageView', null, 'build', '0', '1', 2, now(), now());
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java
index 6dbb84269..16d853b30 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java
@@ -41,10 +41,8 @@ public class Role implements Serializable {
@Size(max = 10, message = "{noMoreThan}")
private String roleName;
- private String roleCode;
-
- @Size(max = 50, message = "{noMoreThan}")
- private String remark;
+ @Size(max = 255, message = "{noMoreThan}")
+ private String description;
private Date createTime;
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
index 2e1e27e87..bb6d02fba 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
@@ -43,8 +43,6 @@ public class User implements Serializable {
public static final String STATUS_LOCK = "0";
- public static final String DEFAULT_AVATAR = "default.jpg";
-
public static final String SEX_MALE = "0";
public static final String SEX_FEMALE = "1";
@@ -84,8 +82,6 @@ public class User implements Serializable {
@Size(max = 100, message = "{noMoreThan}")
private String description;
- private String avatar;
-
private transient String oldPassword;
private transient String sortField;
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 531a1e3a7..9ab5f9599 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
@@ -96,7 +96,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
@Transactional(rollbackFor = Exception.class)
public void createUser(User user) {
user.setCreateTime(new Date());
- user.setAvatar(User.DEFAULT_AVATAR);
String salt = ShaHashUtils.getRandomSalt();
String password = ShaHashUtils.encrypt(salt, user.getPassword());
user.setSalt(salt);
diff --git a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
index d936511f8..77494579a 100644
--- a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
+++ b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
@@ -130,8 +130,8 @@ insert into `t_menu` values (130603, 130600, 'delete yarn queue', null, null, 'y
-- ----------------------------
-- Records of t_role
-- ----------------------------
-insert into `t_role` values (100001, 'developer', 'developer', now(), now(), null);
-insert into `t_role` values (100002, 'team admin', 'Team Admin has all permissions inside the team.', now(), now(), null);
+insert into `t_role` values (100001, 'developer', now(), now(), 'developer');
+insert into `t_role` values (100002, 'team admin', now(), now(), 'Team Admin has all permissions inside the team.');
-- ----------------------------
-- Records of t_role_menu
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 68b475257..3f7025a83 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,7 +24,7 @@ create table if not exists `t_app_backup` (
`sql_id` bigint default null,
`config_id` bigint default null,
`version` int default null,
- `path` varchar(255) 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',
@@ -40,7 +40,7 @@ create table if not exists `t_flink_app` (
`job_type` tinyint default null,
`execution_mode` tinyint default null,
`resource_from` tinyint default null,
- `project_id` varchar(64) default null,
+ `project_id` bigint default null,
`job_name` varchar(255) default null,
`module` varchar(255) default null,
`jar` varchar(255) default null,
@@ -50,16 +50,16 @@ create table if not exists `t_flink_app` (
`options` text,
`hot_params` text ,
`user_id` bigint default null,
- `app_id` varchar(255) 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,
`version_id` bigint default null,
- `cluster_id` varchar(255) default null,
- `k8s_namespace` varchar(255) default null,
- `flink_image` varchar(255) default null,
- `state` varchar(50) 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,
`cp_threshold` int default null,
@@ -131,8 +131,8 @@ create table if not exists `t_flink_env` (
`id` bigint generated by default as identity not null,
`flink_name` varchar(128) not null comment 'flink instance name',
`flink_home` varchar(255) not null comment 'flink home path',
- `version` varchar(50) not null comment 'flink version',
- `scala_version` varchar(50) not null comment 'scala version of flink',
+ `version` varchar(64) not null comment 'flink version',
+ `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',
@@ -147,7 +147,7 @@ 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(50) default null,
+ `yarn_app_id` varchar(64) default null,
`job_manager_url` varchar(255) default null,
`success` tinyint default null,
`exception` text ,
@@ -165,11 +165,11 @@ create table if not exists `t_flink_project` (
`team_id` bigint not null,
`name` varchar(255) default null,
`git_credential` tinyint not null,
- `url` varchar(1000) default null,
- `branches` varchar(1000) default null,
- `user_name` varchar(255) default null,
- `password` varchar(255) default null,
- `prvkey_path` 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,
@@ -191,7 +191,7 @@ create table if not exists `t_flink_savepoint` (
`app_id` bigint not null,
`chk_id` bigint default null,
`type` tinyint default null,
- `path` varchar(1024) 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',
@@ -218,11 +218,11 @@ create table if not exists `t_flink_sql` (
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(50) not null comment 'menu button name',
- `path` varchar(255) default null comment 'routing path',
- `component` varchar(255) default null comment 'routing component component',
- `perms` varchar(50) default null comment 'authority id',
- `icon` varchar(50) default null comment 'icon',
+ `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',
`display` tinyint not null default 0 comment 'whether the menu is displayed',
`order_num` int default null comment 'sort',
@@ -251,7 +251,7 @@ create table if not exists `t_message` (
-- ----------------------------
create table if not exists `t_team` (
`id` bigint generated by default as identity not null comment 'team id',
- `team_name` varchar(50) not null comment 'team name',
+ `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',
@@ -264,7 +264,7 @@ create table if not exists `t_team` (
-- ----------------------------
create table if not exists `t_variable` (
`id` bigint generated by default as identity not null comment 'variable id',
- `variable_code` varchar(100) not null comment 'Variable code is used for parameter names passed to the program or as placeholders',
+ `variable_code` varchar(128) not null comment 'Variable code is used for parameter names passed to the program or as placeholders',
`variable_value` text not null comment 'The specific value corresponding to the variable',
`description` text default null comment 'More detailed description of variables, only for display, not involved in program logic',
`creator_id` bigint not null comment 'user id of creator',
@@ -281,11 +281,10 @@ 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(50) not null comment 'user name',
- `remark` varchar(100) default null comment 'remark',
+ `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',
- `role_code` varchar(255) default null comment 'role code',
+ `description` varchar(255) default null comment 'description',
primary key(`role_id`)
);
@@ -305,7 +304,7 @@ create table if not exists `t_role_menu` (
-- ----------------------------
create table if not exists `t_setting` (
`order_num` int default null,
- `setting_key` varchar(50) primary key not 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,
@@ -317,11 +316,11 @@ create table if not exists `t_setting` (
-- ----------------------------
create table if not exists `t_user` (
`user_id` bigint generated by default as identity not null comment 'user id',
- `username` varchar(50) not null comment 'user name',
- `nick_name` varchar(50) not null comment 'nick name',
- `salt` varchar(64) default null comment 'salt',
+ `username` varchar(64) not null comment 'user name',
+ `nick_name` varchar(64) not null comment 'nick name',
+ `salt` varchar(26) default null comment 'salt',
`password` varchar(64) not null comment 'password',
- `email` varchar(128) 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',
@@ -330,8 +329,8 @@ create table if not exists `t_user` (
`modify_time` datetime not null default current_timestamp on update current_timestamp 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(100) default null comment 'avatar',
- `description` varchar(100) default null comment 'description',
+ `avatar` varchar(128) default null comment 'avatar',
+ `description` varchar(255) default null comment 'description',
primary key(`user_id`),
unique (`username`)
);
@@ -373,17 +372,17 @@ create table if not exists `t_app_build_pipe` (
create table if not exists `t_flink_cluster` (
`id` bigint generated by default as identity not null,
`address` varchar(150) default null comment 'url address of jobmanager',
- `cluster_id` varchar(100) default null comment 'clusterId of session mode(yarn-session:application-id,k8s-session:cluster-id)',
- `cluster_name` varchar(100) not null comment 'cluster name',
+ `cluster_id` varchar(45) default null comment 'clusterId of session mode(yarn-session:application-id,k8s-session:cluster-id)',
+ `cluster_name` varchar(128) not null comment 'cluster name',
`options` text comment 'json form of parameter collection ',
- `yarn_queue` varchar(100) default null comment 'the yarn queue where the task is located',
+ `yarn_queue` varchar(128) default null comment 'the yarn queue where the task is located',
`execution_mode` tinyint not null default 1 comment 'k8s execution session mode(1:remote,3:yarn-session,5:kubernetes-session)',
`version_id` bigint not null comment 'flink version id',
- `k8s_namespace` varchar(255) default 'default' comment 'k8s namespace',
- `service_account` varchar(50) default null comment 'k8s service account',
+ `k8s_namespace` varchar(63) default 'default' comment 'k8s namespace',
+ `service_account` varchar(64) default null comment 'k8s service account',
`description` varchar(255) default null,
`user_id` bigint default null,
- `flink_image` varchar(255) default null comment 'flink image',
+ `flink_image` varchar(128) default null comment 'flink image',
`dynamic_properties` text comment 'allows specifying multiple generic configuration options',
`k8s_rest_exposed_type` tinyint default 2 comment 'k8s export(0:loadbalancer,1:clusterip,2:nodeport)',
`k8s_hadoop_integration` tinyint default 0,
@@ -424,7 +423,7 @@ create table if not exists `t_access_token` (
`user_id` bigint,
`token` varchar(1024) default null comment 'token',
`expire_time` datetime default null comment 'expiration',
- `description` varchar(512) default null comment 'description',
+ `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',
@@ -437,10 +436,10 @@ 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(100) default null,
- `badge_name` varchar(100) default null,
- `badge_color` varchar(100) default null,
- `link_url` varchar(1000) default null,
+ `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',
primary key(`id`)
@@ -455,7 +454,7 @@ create table if not exists `t_yarn_queue` (
`id` bigint generated by default as identity not null comment 'queue id',
`team_id` bigint not null comment 'team id',
`queue_label` varchar(128) not null comment 'queue label expression',
- `description` varchar(256) default null comment 'description of the queue label',
+ `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',
unique key (`team_id`,`queue_label`),
diff --git a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
index cb8db11ab..e49a07bdf 100644
--- a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
+++ b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
@@ -20,10 +20,9 @@
<resultMap id="roleMap" type="org.apache.streampark.console.system.entity.Role">
<result column="role_id" jdbcType="BIGINT" property="roleId"/>
<result column="role_name" jdbcType="VARCHAR" property="roleName"/>
- <result column="role_code" jdbcType="VARCHAR" property="roleCode"/>
- <result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
+ <result column="description" jdbcType="VARCHAR" property="description"/>
</resultMap>
<select id="findRole" resultType="org.apache.streampark.console.system.entity.Role" parameterType="org.apache.streampark.console.system.entity.Role">
diff --git a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
index e59fa3472..aeec2eb4f 100644
--- a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
+++ b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
@@ -29,7 +29,6 @@
<result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
<result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime"/>
<result column="sex" jdbcType="CHAR" property="sex"/>
- <result column="avatar" jdbcType="VARCHAR" property="avatar"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="last_team_id" jdbcType="BIGINT" property="lastTeamId"/>
<result column="login_type" jdbcType="INTEGER" property="loginType"/>