This is an automated email from the ASF dual-hosted git repository.
likeguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 1c21ed090 fix admin: fix menu name bug (#4805)
1c21ed090 is described below
commit 1c21ed090220d13404a60cd516c8c1f0aed7a46f
Author: lulu <[email protected]>
AuthorDate: Wed Jul 5 22:43:31 2023 +0800
fix admin: fix menu name bug (#4805)
---
db/init/mysql/schema.sql | 4 ++--
db/init/oracle/schema.sql | 4 ++--
db/init/pg/create-table.sql | 4 ++--
db/upgrade/2.4.3-upgrade-2.5.0-mysql.sql | 4 ++--
db/upgrade/2.4.3-upgrade-2.5.0-pg.sql | 4 ++--
shenyu-admin/src/main/resources/sql-script/h2/schema.sql | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index bfba8befd..d89f115f9 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -1488,8 +1488,8 @@ INSERT INTO `resource` VALUES ('1529402639372435659',
'1529402639284355099', 'SH
INSERT INTO `resource` VALUES ('1529402639372435660', '1529402639284355099',
'SHENYU.BUTTON.PLUGIN.RULE.EDIT', '', '', '', 2, 0, '', 1, 0,
'plugin:hystrixRule:edit', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1529402639372435661', '1529402639284355099',
'SHENYU.BUTTON.PLUGIN.RULE.DELETE', '', '', '', 2, 0, '', 1, 0,
'plugin:hystrixRule:delete', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1529402639372435662', '1529402639284355099',
'SHENYU.BUTTON.PLUGIN.SYNCHRONIZE', '', '', '', 2, 0, '', 1, 0,
'plugin:hystrix:modify', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1534577121923309568', '', 'Document', '',
'/document', '', 0, 3, 'file-text', 0, 0, '', 1, '2022-06-09 00:44:32',
'2022-06-09 01:06:45');
-INSERT INTO `resource` VALUES ('1534585430311051264', '1534577121923309568',
'API document', '', '/document/apidoc', '', 1, 0, 'api', 0, 0, '', 1,
'2022-06-09 01:17:32', '2022-06-09 01:17:32');
+INSERT INTO `resource` VALUES ('1534577121923309568', '',
'SHENYU.MENU.DOCUMENT', '', '/document', '', 0, 3, 'file-text', 0, 0, '', 1,
'2022-06-09 00:44:32', '2022-06-09 01:06:45');
+INSERT INTO `resource` VALUES ('1534585430311051264', '1534577121923309568',
'SHENYU.MENU.DOCUMENT.APIDOC', '', '/document/apidoc', '', 1, 0, 'api', 0, 0,
'', 1, '2022-06-09 01:17:32', '2022-06-09 01:17:32');
INSERT INTO `resource` VALUES ('1534585531108564992', '1534585430311051264',
'send', '', '', '', 2, 0, '', 1, 0, 'document:apirun:send', 1, '2022-06-09
01:17:56', '2022-06-09 01:17:56');
INSERT INTO `resource` VALUES ('1534585531108564993', '1346775491550474240',
'loggingAliyunSls', 'loggingAliyunSls', '/plug/loggingAliyunSls',
'loggingAliyunSls', 1, 0, 'pic-center', 0, 0, '', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index 62de126ac..bac84be2a 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -2088,8 +2088,8 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */
INTO "resource" (id,
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status)
VALUES('1357977745889132544','1355163372527050752','SHENYU.BUTTON.RESOURCE.BUTTON.ADD','','','','2','4','','1','0','system:resource:addButton','1');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status)
VALUES('1357977912126177280','1355163372527050752','SHENYU.SYSTEM.EDITOR','','','','2','5','','1','0','system:resource:editButton','1');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status)
VALUES('1357977971827900416','1355163372527050752','SHENYU.SYSTEM.DELETEDATA','','','','2','6','','1','0','system:resource:deleteButton','1');
-INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status) VALUES('1534577121923309568', '', 'Document',
'', '/document', '', 0, 3, 'file-text', 0, 0, '', 1);
-INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status) VALUES('1534585430311051264',
'1534577121923309568', 'API document', '', '/document/apidoc', '', 1, 0, 'api',
0, 0, '', 1);
+INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status) VALUES('1534577121923309568', '',
'SHENYU.MENU.DOCUMENT', '', '/document', '', 0, 3, 'file-text', 0, 0, '', 1);
+INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status) VALUES('1534585430311051264',
'1534577121923309568', 'SHENYU.MENU.DOCUMENT.APIDOC', '', '/document/apidoc',
'', 1, 0, 'api', 0, 0, '', 1);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status) VALUES('1534585531108564992',
'1534585430311051264', 'send', '', '', '', 2, 0, '', 1, 0,
'document:apirun:send', 1);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("resource" (id)) */ INTO "resource"
(id, parent_id, title, name, url, component, resource_type, sort, icon,
is_leaf, is_route, perms, status)VALUES ('1572525965625266176',
'1346777449787125760', 'SHENYU.BUTTON.SYSTEM.RESOURCE', '', '', '', 2, 6, '',
1, 0, 'system:plugin:resource', 1);
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index 145b01091..1dbaaef2c 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -1654,8 +1654,8 @@ INSERT INTO "public"."resource" VALUES
('1529403932881850508', '1529403932781187
INSERT INTO "public"."resource" VALUES ('1529403932881850509',
'1529403932781187099', 'SHENYU.BUTTON.PLUGIN.RULE.EDIT', '', '', '', 2, 0, '',
1, 0, 'plugin:cacheRule:edit', 1, '2022-05-25 18:08:07', '2022-05-25 18:08:07');
INSERT INTO "public"."resource" VALUES ('1529403932881850510',
'1529403932781187099', 'SHENYU.BUTTON.PLUGIN.RULE.DELETE', '', '', '', 2, 0,
'', 1, 0, 'plugin:cacheRule:delete', 1, '2022-05-25 18:08:07', '2022-05-25
18:08:07');
INSERT INTO "public"."resource" VALUES ('1529403932881850511',
'1529403932781187099', 'SHENYU.BUTTON.PLUGIN.SYNCHRONIZE', '', '', '', 2, 0,
'', 1, 0, 'plugin:cache:modify', 1, '2022-05-25 18:08:07', '2022-05-25
18:08:07');
-INSERT INTO "public"."resource" VALUES ('1534577121923309568', '', 'Document',
'', '/document', '', 0, 3, 'file-text', 0, 0, '', 1, '2022-06-09 00:44:32',
'2022-06-09 01:06:45');
-INSERT INTO "public"."resource" VALUES ('1534585430311051264',
'1534577121923309568', 'API document', '', '/document/apidoc', '', 1, 0, 'api',
0, 0, '', 1, '2022-06-09 01:17:32', '2022-06-09 01:17:32');
+INSERT INTO "public"."resource" VALUES ('1534577121923309568', '',
'SHENYU.MENU.DOCUMENT', '', '/document', '', 0, 3, 'file-text', 0, 0, '', 1,
'2022-06-09 00:44:32', '2022-06-09 01:06:45');
+INSERT INTO "public"."resource" VALUES ('1534585430311051264',
'1534577121923309568', 'SHENYU.MENU.DOCUMENT.APIDOC', '', '/document/apidoc',
'', 1, 0, 'api', 0, 0, '', 1, '2022-06-09 01:17:32', '2022-06-09 01:17:32');
INSERT INTO "public"."resource" VALUES ('1534585531108564992',
'1534585430311051264', 'send', '', '', '', 2, 0, '', 1, 0,
'document:apirun:send', 1, '2022-06-09 01:17:56', '2022-06-09 01:17:56');
INSERT INTO "public"."resource" VALUES ('1534585531108564993',
'1346775491550474240', 'loggingAliyunSls', 'loggingAliyunSls',
'/plug/loggingAliyunSls', 'loggingAliyunSls', 1, 0, 'block', 0, 0, '', 1,
'2022-05-25 18:08:07', '2022-05-25 18:08:07');
diff --git a/db/upgrade/2.4.3-upgrade-2.5.0-mysql.sql
b/db/upgrade/2.4.3-upgrade-2.5.0-mysql.sql
index 7755464d6..30f078aea 100644
--- a/db/upgrade/2.4.3-upgrade-2.5.0-mysql.sql
+++ b/db/upgrade/2.4.3-upgrade-2.5.0-mysql.sql
@@ -72,8 +72,8 @@ INSERT INTO `plugin_handle` VALUES ('1529402613204172873',
'11', 'threads', 'thr
INSERT INTO `plugin_handle` VALUES ('1529402613204172874', '11', 'queues',
'queues', 1, 3, 6,
'{\"required\":\"0\",\"defaultValue\":\"0\",\"placeholder\":\"queues\",\"rule\":\"\"}',
'2022-05-25 18:02:53', '2022-05-25 18:02:53');
INSERT INTO `plugin_handle` VALUES ('1529402613204172875', '11', 'threadpool',
'threadpool', 3, 3, 3,
'{\"required\":\"0\",\"defaultValue\":\"default\",\"placeholder\":\"threadpool\",\"rule\":\"\"}',
'2022-05-25 18:02:53', '2022-05-25 18:02:53');
-INSERT INTO `resource` VALUES ('1534577121923309568', '', 'Document', '',
'/document', '', 0, 3, 'file-text', 0, 0, '', 1, '2022-06-09 00:44:32',
'2022-06-09 01:06:45');
-INSERT INTO `resource` VALUES ('1534585430311051264', '1534577121923309568',
'API document', '', '/document/apidoc', '', 1, 0, 'api', 0, 0, '', 1,
'2022-06-09 01:17:32', '2022-06-09 01:17:32');
+INSERT INTO `resource` VALUES ('1534577121923309568', '',
'SHENYU.MENU.DOCUMENT', '', '/document', '', 0, 3, 'file-text', 0, 0, '', 1,
'2022-06-09 00:44:32', '2022-06-09 01:06:45');
+INSERT INTO `resource` VALUES ('1534585430311051264', '1534577121923309568',
'SHENYU.MENU.DOCUMENT.APIDOC', '', '/document/apidoc', '', 1, 0, 'api', 0, 0,
'', 1, '2022-06-09 01:17:32', '2022-06-09 01:17:32');
INSERT INTO `resource` VALUES ('1534585531108564992', '1534585430311051264',
'send', '', '', '', 2, 0, '', 1, 0, 'document:apirun:send', 1, '2022-06-09
01:17:56', '2022-06-09 01:17:56');
INSERT INTO `permission` VALUES ('1534577122279825408', '1346358560427216896',
'1534577121923309568', '2022-06-09 00:44:32', '2022-06-09 00:44:31');
diff --git a/db/upgrade/2.4.3-upgrade-2.5.0-pg.sql
b/db/upgrade/2.4.3-upgrade-2.5.0-pg.sql
index 89ef61aa9..7d00a4688 100644
--- a/db/upgrade/2.4.3-upgrade-2.5.0-pg.sql
+++ b/db/upgrade/2.4.3-upgrade-2.5.0-pg.sql
@@ -82,8 +82,8 @@ INSERT INTO "public"."plugin_handle" VALUES
('1529403902783524918', '11', 'threa
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524919', '11',
'queues', 'queues', 1, 3, 6,
'{"required":"0","defaultValue":"0","placeholder":"queues","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524920', '11',
'threadpool', 'threadpool', 3, 3, 3,
'{"required":"0","defaultValue":"default","placeholder":"threadpool","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
-INSERT INTO "public"."resource" VALUES ('1534577121923309568', '', 'Document',
'', '/document', '', 0, 3, 'file-text', 0, 0, '', 1, '2022-06-09 00:44:32',
'2022-06-09 01:06:45');
-INSERT INTO "public"."resource" VALUES ('1534585430311051264',
'1534577121923309568', 'API document', '', '/document/apidoc', '', 1, 0, 'api',
0, 0, '', 1, '2022-06-09 01:17:32', '2022-06-09 01:17:32');
+INSERT INTO "public"."resource" VALUES ('1534577121923309568', '',
'SHENYU.MENU.DOCUMENT', '', '/document', '', 0, 3, 'file-text', 0, 0, '', 1,
'2022-06-09 00:44:32', '2022-06-09 01:06:45');
+INSERT INTO "public"."resource" VALUES ('1534585430311051264',
'1534577121923309568', 'SHENYU.MENU.DOCUMENT.APIDOC', '', '/document/apidoc',
'', 1, 0, 'api', 0, 0, '', 1, '2022-06-09 01:17:32', '2022-06-09 01:17:32');
INSERT INTO "public"."resource" VALUES ('1534585531108564992',
'1534585430311051264', 'send', '', '', '', 2, 0, '', 1, 0,
'document:apirun:send', 1, '2022-06-09 01:17:56', '2022-06-09 01:17:56');
INSERT INTO "public"."permission" VALUES ('1529403932886044767',
'1346358560427216896', '1534577121923309568', '2022-06-09 00:44:32',
'2022-06-09 00:44:31');
diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
index 57e53d8fd..97e5692ac 100755
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -892,8 +892,8 @@ INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`,
`name`, `url`, `compo
INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`)
VALUES('1357977745889132544','1355163372527050752','SHENYU.BUTTON.RESOURCE.BUTTON.ADD','','','','2','4','','1','0','system:resource:addButton','1');
INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`)
VALUES('1357977912126177280','1355163372527050752','SHENYU.SYSTEM.EDITOR','','','','2','5','','1','0','system:resource:editButton','1');
INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`)
VALUES('1357977971827900416','1355163372527050752','SHENYU.SYSTEM.DELETEDATA','','','','2','6','','1','0','system:resource:deleteButton','1');
-INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`) VALUES ('1534577121923309568', '', 'Document', '', '/document', '',
0, 3, 'file-text', 0, 0, '', 1);
-INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`) VALUES ('1534585430311051264', '1534577121923309568', 'API document',
'', '/document/apidoc', '', 1, 0, 'api', 0, 0, '', 1);
+INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`) VALUES ('1534577121923309568', '', 'SHENYU.MENU.DOCUMENT', '',
'/document', '', 0, 3, 'file-text', 0, 0, '', 1);
+INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`) VALUES ('1534585430311051264', '1534577121923309568',
'SHENYU.MENU.DOCUMENT.APIDOC', '', '/document/apidoc', '', 1, 0, 'api', 0, 0,
'', 1);
INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`) VALUES ('1534585531108564992', '1534585430311051264', 'send', '', '',
'', 2, 0, '', 1, 0, 'document:apirun:send', 1);
