This is an automated email from the ASF dual-hosted git repository.
benjobs 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 f2d611365 [Feature] Add the team_admin role (#1843)
f2d611365 is described below
commit f2d611365eac76f2d3404c4f48ab1cdc49ac76fa
Author: fanrui <[email protected]>
AuthorDate: Sat Oct 15 22:35:06 2022 +0800
[Feature] Add the team_admin role (#1843)
---
.../src/assembly/script/data/mysql-data.sql | 28 +++++++++++++++++++
.../src/assembly/script/data/pgsql-data.sql | 28 +++++++++++++++++++
.../src/assembly/script/upgrade/mysql/1.2.4.sql | 31 ++++++++++++++++++++++
.../src/main/resources/db/data-h2.sql | 31 +++++++++++++++++++++-
4 files changed, 117 insertions(+), 1 deletion(-)
diff --git
a/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql
b/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql
index 9829c036c..e44962f46 100644
---
a/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql
+++
b/streampark-console/streampark-console-service/src/assembly/script/data/mysql-data.sql
@@ -110,6 +110,7 @@ insert into `t_menu` values (100053, 100001, 'types', null,
null, 'user:types',
-- 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);
-- ----------------------------
-- Records of t_role_menu
@@ -133,6 +134,33 @@ insert into `t_role_menu` values (100056, 100001, 100032);
insert into `t_role_menu` values (100057, 100001, 100033);
insert into `t_role_menu` values (100058, 100001, 100013);
insert into `t_role_menu` values (100059, 100001, 100015);
+insert into `t_role_menu` values (100060, 100002, 100014);
+insert into `t_role_menu` values (100061, 100002, 100016);
+insert into `t_role_menu` values (100062, 100002, 100017);
+insert into `t_role_menu` values (100063, 100002, 100018);
+insert into `t_role_menu` values (100064, 100002, 100019);
+insert into `t_role_menu` values (100065, 100002, 100020);
+insert into `t_role_menu` values (100066, 100002, 100021);
+insert into `t_role_menu` values (100067, 100002, 100022);
+insert into `t_role_menu` values (100068, 100002, 100025);
+insert into `t_role_menu` values (100069, 100002, 100026);
+insert into `t_role_menu` values (100070, 100002, 100027);
+insert into `t_role_menu` values (100071, 100002, 100028);
+insert into `t_role_menu` values (100072, 100002, 100029);
+insert into `t_role_menu` values (100073, 100002, 100030);
+insert into `t_role_menu` values (100074, 100002, 100031);
+insert into `t_role_menu` values (100075, 100002, 100032);
+insert into `t_role_menu` values (100076, 100002, 100033);
+insert into `t_role_menu` values (100077, 100002, 100013);
+insert into `t_role_menu` values (100079, 100002, 100015);
+insert into `t_role_menu` values (100080, 100002, 100000);
+insert into `t_role_menu` values (100081, 100002, 100037);
+insert into `t_role_menu` values (100082, 100002, 100048);
+insert into `t_role_menu` values (100083, 100002, 100049);
+insert into `t_role_menu` values (100084, 100002, 100050);
+insert into `t_role_menu` values (100085, 100002, 100051);
+insert into `t_role_menu` values (100086, 100002, 100052);
+insert into `t_role_menu` values (100087, 100002, 100053);
-- ----------------------------
diff --git
a/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql
b/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql
index 6560bd8db..348ad8885 100644
---
a/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql
+++
b/streampark-console/streampark-console-service/src/assembly/script/data/pgsql-data.sql
@@ -106,6 +106,7 @@ insert into "public"."t_menu" values (100053, 100001,
'types', null, null, 'user
-- 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);
-- ----------------------------
-- Records of t_role_menu
@@ -129,6 +130,33 @@ insert into "public"."t_role_menu" values (100056, 100001,
100032);
insert into "public"."t_role_menu" values (100057, 100001, 100033);
insert into "public"."t_role_menu" values (100058, 100001, 100013);
insert into "public"."t_role_menu" values (100059, 100001, 100015);
+insert into "public"."t_role_menu" values (100060, 100002, 100014);
+insert into "public"."t_role_menu" values (100061, 100002, 100016);
+insert into "public"."t_role_menu" values (100062, 100002, 100017);
+insert into "public"."t_role_menu" values (100063, 100002, 100018);
+insert into "public"."t_role_menu" values (100064, 100002, 100019);
+insert into "public"."t_role_menu" values (100065, 100002, 100020);
+insert into "public"."t_role_menu" values (100066, 100002, 100021);
+insert into "public"."t_role_menu" values (100067, 100002, 100022);
+insert into "public"."t_role_menu" values (100068, 100002, 100025);
+insert into "public"."t_role_menu" values (100069, 100002, 100026);
+insert into "public"."t_role_menu" values (100070, 100002, 100027);
+insert into "public"."t_role_menu" values (100071, 100002, 100028);
+insert into "public"."t_role_menu" values (100072, 100002, 100029);
+insert into "public"."t_role_menu" values (100073, 100002, 100030);
+insert into "public"."t_role_menu" values (100074, 100002, 100031);
+insert into "public"."t_role_menu" values (100075, 100002, 100032);
+insert into "public"."t_role_menu" values (100076, 100002, 100033);
+insert into "public"."t_role_menu" values (100077, 100002, 100013);
+insert into "public"."t_role_menu" values (100079, 100002, 100015);
+insert into "public"."t_role_menu" values (100080, 100002, 100000);
+insert into "public"."t_role_menu" values (100081, 100002, 100037);
+insert into "public"."t_role_menu" values (100082, 100002, 100048);
+insert into "public"."t_role_menu" values (100083, 100002, 100049);
+insert into "public"."t_role_menu" values (100084, 100002, 100050);
+insert into "public"."t_role_menu" values (100085, 100002, 100051);
+insert into "public"."t_role_menu" values (100086, 100002, 100052);
+insert into "public"."t_role_menu" values (100087, 100002, 100053);
-- ----------------------------
diff --git
a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
index 7682f51c4..39a991762 100644
---
a/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
+++
b/streampark-console/streampark-console-service/src/assembly/script/upgrade/mysql/1.2.4.sql
@@ -162,6 +162,37 @@ delete from t_role_menu where role_id = 100000;
delete from t_role where role_id = 100000;
delete from `t_user_role` where role_id = 100000;
+-- Add team admin
+insert into `t_role` values (100002, 'team admin', 'Team Admin has all
permissions inside the team.', now(), now(), null);
+
+insert into `t_role_menu` values (100060, 100002, 100014);
+insert into `t_role_menu` values (100061, 100002, 100016);
+insert into `t_role_menu` values (100062, 100002, 100017);
+insert into `t_role_menu` values (100063, 100002, 100018);
+insert into `t_role_menu` values (100064, 100002, 100019);
+insert into `t_role_menu` values (100065, 100002, 100020);
+insert into `t_role_menu` values (100066, 100002, 100021);
+insert into `t_role_menu` values (100067, 100002, 100022);
+insert into `t_role_menu` values (100068, 100002, 100025);
+insert into `t_role_menu` values (100069, 100002, 100026);
+insert into `t_role_menu` values (100070, 100002, 100027);
+insert into `t_role_menu` values (100071, 100002, 100028);
+insert into `t_role_menu` values (100072, 100002, 100029);
+insert into `t_role_menu` values (100073, 100002, 100030);
+insert into `t_role_menu` values (100074, 100002, 100031);
+insert into `t_role_menu` values (100075, 100002, 100032);
+insert into `t_role_menu` values (100076, 100002, 100033);
+insert into `t_role_menu` values (100077, 100002, 100013);
+insert into `t_role_menu` values (100079, 100002, 100015);
+insert into `t_role_menu` values (100080, 100002, 100000);
+insert into `t_role_menu` values (100081, 100002, 100037);
+insert into `t_role_menu` values (100082, 100002, 100048);
+insert into `t_role_menu` values (100083, 100002, 100049);
+insert into `t_role_menu` values (100084, 100002, 100050);
+insert into `t_role_menu` values (100085, 100002, 100051);
+insert into `t_role_menu` values (100086, 100002, 100052);
+insert into `t_role_menu` values (100087, 100002, 100053);
+
-- alter t_role_user to t_member and update the schema
alter table `t_user_role` rename `t_member`;
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 529c317df..31d55ad20 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
@@ -105,6 +105,7 @@ insert into `t_menu` values (100053, 100001, 'types', null,
null, 'user:types',
-- 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);
-- ----------------------------
-- Records of t_role_menu
@@ -128,6 +129,33 @@ insert into `t_role_menu` values (100056, 100001, 100032);
insert into `t_role_menu` values (100057, 100001, 100033);
insert into `t_role_menu` values (100058, 100001, 100013);
insert into `t_role_menu` values (100059, 100001, 100015);
+insert into `t_role_menu` values (100060, 100002, 100014);
+insert into `t_role_menu` values (100061, 100002, 100016);
+insert into `t_role_menu` values (100062, 100002, 100017);
+insert into `t_role_menu` values (100063, 100002, 100018);
+insert into `t_role_menu` values (100064, 100002, 100019);
+insert into `t_role_menu` values (100065, 100002, 100020);
+insert into `t_role_menu` values (100066, 100002, 100021);
+insert into `t_role_menu` values (100067, 100002, 100022);
+insert into `t_role_menu` values (100068, 100002, 100025);
+insert into `t_role_menu` values (100069, 100002, 100026);
+insert into `t_role_menu` values (100070, 100002, 100027);
+insert into `t_role_menu` values (100071, 100002, 100028);
+insert into `t_role_menu` values (100072, 100002, 100029);
+insert into `t_role_menu` values (100073, 100002, 100030);
+insert into `t_role_menu` values (100074, 100002, 100031);
+insert into `t_role_menu` values (100075, 100002, 100032);
+insert into `t_role_menu` values (100076, 100002, 100033);
+insert into `t_role_menu` values (100077, 100002, 100013);
+insert into `t_role_menu` values (100079, 100002, 100015);
+insert into `t_role_menu` values (100080, 100002, 100000);
+insert into `t_role_menu` values (100081, 100002, 100037);
+insert into `t_role_menu` values (100082, 100002, 100048);
+insert into `t_role_menu` values (100083, 100002, 100049);
+insert into `t_role_menu` values (100084, 100002, 100050);
+insert into `t_role_menu` values (100085, 100002, 100051);
+insert into `t_role_menu` values (100086, 100002, 100052);
+insert into `t_role_menu` values (100087, 100002, 100053);
-- ----------------------------
-- Records of t_setting
@@ -160,6 +188,7 @@ insert into `t_user` values (100003, 'test3', '',
'rh8b1ojwog777yrg0daesf04gk',
-- Records of t_member
-- ----------------------------
insert into `t_member` values (100000, 100000, 100001, 100001, now(), now());
-- test_user1 is the developer of the default team
-insert into `t_member` values (100001, 100001, 100001, 100001, now(), now());
-- test_user1 is the developer of the test team
+insert into `t_member` values (100001, 100001, 100001, 100002, now(), now());
-- test_user1 is the team admin of the test team
insert into `t_member` values (100002, 100000, 100002, 100001, now(), now());
-- test_user2 is the developer of the test team
insert into `t_member` values (100003, 100001, 100003, 100001, now(), now());
-- test_user3 is the developer of the test team
+insert into `t_member` values (100004, 100000, 100000, 100001, now(), now());
-- admin is the developer of the default team
