This is an automated email from the ASF dual-hosted git repository.
liuhongyu 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 1d665b76c8 fix admin:import comfig error. (#5997)
1d665b76c8 is described below
commit 1d665b76c886a3fa9ca712c0989840113bf89e00
Author: Yu Siheng <[email protected]>
AuthorDate: Tue Apr 8 09:44:45 2025 +0800
fix admin:import comfig error. (#5997)
---
db/init/mysql/schema.sql | 3 ---
db/init/ob/schema.sql | 3 ---
db/init/og/create-table.sql | 3 ---
db/init/oracle/schema.sql | 9 ---------
db/init/pg/create-table.sql | 3 ---
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 2 ++
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 2 ++
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 2 ++
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 2 ++
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 2 ++
.../shenyu/admin/service/impl/PluginHandleServiceImpl.java | 4 ++++
shenyu-admin/src/main/resources/sql-script/h2/schema.sql | 3 ---
12 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index b80037fff1..56cff6b938 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -1322,9 +1322,6 @@ INSERT INTO `plugin_handle` VALUES
('1722804548510507021', '14', 'rewriteContext
INSERT INTO `plugin_handle` VALUES ('1722804548510507022', '14', 'percentage',
'percentage', 1, 2, 3, '{"required":"1","defaultValue":"100"}', '2024-02-07
14:31:49', '2024-02-07 14:31:49');
INSERT INTO `plugin_handle` VALUES ('1722804548510507023', '3',
'rewriteMetaData', 'rewriteMetaData', 3, 2, 3,
'{"required":"1","defaultValue":"false"}', '2024-02-07 14:31:49', '2024-02-07
14:31:49');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507024', '8',
'registerType', 'registerType', 2, 3, 1, NULL, '2024-08-24 09:40:03.293',
'2024-08-24 21:52:27.920');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507025', '8', 'serverLists',
'serverLists', 2, 3, 2, NULL, '2024-08-24 21:52:51.179', '2024-08-24
21:53:27.483');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507026', '8', 'props',
'props', 4, 3, 3, NULL, '2024-08-24 21:53:25.764', '2024-08-24 21:53:30.255');
INSERT INTO `plugin_handle` VALUES ('1722804548510507027', '20',
'preserveHost', 'preserveHost', 3, 2, 0,
'{"required":"0","defaultValue":"false","rule":""}', '2024-12-05 22:00:02.251',
'2024-12-05 22:00:02.251');
INSERT INTO `plugin_handle` VALUES ('1722804548510507028', '20',
'requestHeaderUniqueStrategy', 'requestHeaderUniqueStrategy', 2, 2, 1,
'{"required":"0","rule":""}', '2024-12-13 22:36:54.299', '2024-12-13
22:36:54.299');
INSERT INTO `plugin_handle` VALUES ('1722804548510507029', '20',
'requestUniqueHeaders', 'requestUniqueHeaders', 2, 2, 2,
'{"required":"0","rule":""}', '2024-12-13 22:37:29.959', '2024-12-13
22:37:29.959');
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 971c24f347..98bd70b693 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -1302,9 +1302,6 @@ INSERT INTO `plugin_handle` VALUES
('1722804548510507021', '14', 'rewriteContext
INSERT INTO `plugin_handle` VALUES ('1722804548510507022', '14', 'percentage',
'percentage', 1, 2, 3, '{"required":"1","defaultValue":"100"}', '2024-02-07
14:31:49', '2024-02-07 14:31:49');
INSERT INTO `plugin_handle` VALUES ('1722804548510507023', '3',
'rewriteMetaData', 'rewriteMetaData', 3, 2, 3,
'{"required":"1","defaultValue":"false"}', '2024-02-07 14:31:49', '2024-02-07
14:31:49');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507024', '8',
'registerType', 'registerType', 2, 3, 1, NULL, '2024-08-24 09:40:03.293',
'2024-08-24 21:52:27.920');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507025', '8', 'serverLists',
'serverLists', 2, 3, 2, NULL, '2024-08-24 21:52:51.179', '2024-08-24
21:53:27.483');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507026', '8', 'props',
'props', 4, 3, 3, NULL, '2024-08-24 21:53:25.764', '2024-08-24 21:53:30.255');
INSERT INTO `plugin_handle` VALUES ('1722804548510507027', '20',
'preserveHost', 'preserveHost', 3, 2, 0,
'{"required":"0","defaultValue":"false","rule":""}', '2024-12-05 22:00:02.251',
'2024-12-05 22:00:02.251');
INSERT INTO `plugin_handle` VALUES ('1722804548510507028', '20',
'requestHeaderUniqueStrategy', 'requestHeaderUniqueStrategy', 2, 2, 1,
'{"required":"0","rule":""}', '2024-12-13 22:36:54.299', '2024-12-13
22:36:54.299');
INSERT INTO `plugin_handle` VALUES ('1722804548510507029', '20',
'requestUniqueHeaders', 'requestUniqueHeaders', 2, 2, 2,
'{"required":"0","rule":""}', '2024-12-13 22:37:29.959', '2024-12-13
22:37:29.959');
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index b4ab865232..07f68a55c6 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -1364,9 +1364,6 @@ INSERT INTO "public"."plugin_handle" VALUES
('1722804548510507021', '14', 'rewri
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507022', '14',
'percentage', 'percentage', 1, 2, 3, '{"required":"1","defaultValue":"100"}',
'2024-02-07 14:31:49', '2024-02-07 14:31:49');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507023', '3',
'rewriteMetaData', 'rewriteMetaData', 3, 2, 3,
'{"required":"1","defaultValue":"false"}', '2024-02-07 14:31:49', '2024-02-07
14:31:49');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507024', '8',
'registerType', 'registerType', 2, 3, 1, NULL, '2024-08-24 09:40:03.293',
'2024-08-24 21:52:27.920');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507025', '8',
'serverLists', 'serverLists', 2, 3, 2, NULL, '2024-08-24 21:52:51.179',
'2024-08-24 21:53:27.483');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507026', '8',
'props', 'props', 4, 3, 3, NULL, '2024-08-24 21:53:25.764', '2024-08-24
21:53:30.255');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507027', '20',
'preserveHost', 'preserveHost', 3, 2, 0,
'{"required":"0","defaultValue":"false","rule":""}', '2024-12-05 22:00:02.251',
'2024-12-05 22:00:02.251');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507028', '20',
'requestHeaderUniqueStrategy', 'requestHeaderUniqueStrategy', 2, 2, 1,
'{"required":"0","rule":""}', '2024-12-13 22:36:54.299', '2024-12-13
22:36:54.299');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507029', '20',
'requestUniqueHeaders', 'requestUniqueHeaders', 2, 2, 2,
'{"required":"0","rule":""}', '2024-12-13 22:37:29.959', '2024-12-13
22:37:29.959');
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index f462dbc517..6cb3a29c09 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -2154,15 +2154,6 @@ values ('1722804548510507022', '14', 'percentage',
'percentage', 1, 2, 3, '{"req
insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type))
*/ into plugin_handle (ID, PLUGIN_ID, FIELD, LABEL, DATA_TYPE, TYPE, SORT,
EXT_OBJ)
values ('1722804548510507023', '3', 'rewriteMetaData', 'rewriteMetaData', 3,
2, 3, '{"required":"1","defaultValue":"false"}');
-insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type))
*/ into plugin_handle (ID, PLUGIN_ID, FIELD, LABEL, DATA_TYPE, TYPE, SORT,
EXT_OBJ)
-values ('1722804548510507024', '8', 'registerType', 'registerType', 2, 3, 1,
NULL);
-
-insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type))
*/ into plugin_handle (ID, PLUGIN_ID, FIELD, LABEL, DATA_TYPE, TYPE, SORT,
EXT_OBJ)
-values ('1722804548510507025', '8', 'serverLists', 'serverLists', 2, 3, 2,
NULL);
-
-insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type))
*/ into plugin_handle (ID, PLUGIN_ID, FIELD, LABEL, DATA_TYPE, TYPE, SORT,
EXT_OBJ)
-values ('1722804548510507026', '8', 'props', 'props', 4, 3, 3, NULL);
-
insert /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(plugin_id, field, type))
*/ into plugin_handle (ID, PLUGIN_ID, FIELD, LABEL, DATA_TYPE, TYPE, SORT,
EXT_OBJ)
values ('1722804548510507027', '20', 'preserveHost', 'preserveHost', 3, 2, 0,
'{"required":"0","defaultValue":"false","rule":""}');
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index dcd7f9ea65..55b0a40d81 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -1425,9 +1425,6 @@ INSERT INTO "public"."plugin_handle" VALUES
('1722804548510507021', '14', 'rewri
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507022', '14',
'percentage', 'percentage', 1, 2, 3, '{"required":"1","defaultValue":"100"}',
'2024-02-07 14:31:49', '2024-02-07 14:31:49');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507023', '3',
'rewriteMetaData', 'rewriteMetaData', 3, 2, 3,
'{"required":"1","defaultValue":"false"}', '2024-02-07 14:31:49', '2024-02-07
14:31:49');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507024', '8',
'registerType', 'registerType', 2, 3, 1, NULL, '2024-08-24 09:40:03.293',
'2024-08-24 21:52:27.920');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507025', '8',
'serverLists', 'serverLists', 2, 3, 2, NULL, '2024-08-24 21:52:51.179',
'2024-08-24 21:53:27.483');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507026', '8',
'props', 'props', 4, 3, 3, NULL, '2024-08-24 21:53:25.764', '2024-08-24
21:53:30.255');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507027', '20',
'preserveHost', 'preserveHost', 3, 2, 0,
'{"required":"0","defaultValue":"false","rule":""}', '2024-12-05 22:00:02.251',
'2024-12-05 22:00:02.251');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507028', '20',
'requestHeaderUniqueStrategy', 'requestHeaderUniqueStrategy', 2, 2, 1,
'{"required":"0","rule":""}', '2024-12-13 22:36:54.299', '2024-12-13
22:36:54.299');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507029', '20',
'requestUniqueHeaders', 'requestUniqueHeaders', 2, 2, 2,
'{"required":"0","rule":""}', '2024-12-13 22:37:29.959', '2024-12-13
22:37:29.959');
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
index 23a5003695..7336447859 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
@@ -154,3 +154,5 @@ INSERT INTO `plugin_handle` VALUES ('1899702350766538752',
'51', 'aiTokenLimitKe
INSERT INTO `plugin_handle` VALUES ('1899702411294539776', '51',
'timeWindowSeconds', 'timeWindowSeconds', 1, 2, 1,
'{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12 06:02:04.155', '2025-03-12
06:02:04.155');
INSERT INTO `plugin_handle` VALUES ('1899702472330051584', '51', 'keyName',
'keyName', 2, 2, 2, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
INSERT INTO `plugin_handle` VALUES ('1899702529972371456', '51', 'tokenLimit',
'tokenLimit', 1, 2, 3, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+
+DELETE FROM `plugin_handle` WHERE `plugin_id` = '8';
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
index e43cbb020e..9cd7280b91 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
@@ -152,3 +152,5 @@ INSERT INTO `plugin_handle` VALUES ('1899702350766538752',
'51', 'aiTokenLimitKe
INSERT INTO `plugin_handle` VALUES ('1899702411294539776', '51',
'timeWindowSeconds', 'timeWindowSeconds', 1, 2, 1,
'{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12 06:02:04.155', '2025-03-12
06:02:04.155');
INSERT INTO `plugin_handle` VALUES ('1899702472330051584', '51', 'keyName',
'keyName', 2, 2, 2, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
INSERT INTO `plugin_handle` VALUES ('1899702529972371456', '51', 'tokenLimit',
'tokenLimit', 1, 2, 3, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+
+DELETE FROM `plugin_handle` WHERE `plugin_id` = '8';
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
index d0b746248b..085c732a86 100644
--- a/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
@@ -153,3 +153,5 @@ INSERT INTO "public"."plugin_handle" VALUES
('1899702350766538752', '51', 'aiTok
INSERT INTO "public"."plugin_handle" VALUES ('1899702411294539776', '51',
'timeWindowSeconds', 'timeWindowSeconds', 1, 2, 1,
'{"required":"0","rule":""}', '2025-03-12 06:02:04.155', '2025-03-12
06:02:04.155');
INSERT INTO "public"."plugin_handle" VALUES ('1899702472330051584', '51',
'keyName', 'keyName', 2, 2, 2, '{"required":"0","rule":""}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
INSERT INTO "public"."plugin_handle" VALUES ('1899702529972371456', '51',
'tokenLimit', 'tokenLimit', 1, 2, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+
+DELETE FROM `plugin_handle` WHERE `plugin_id` = '8';
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
index 24230dcf03..6973e732a7 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
@@ -357,3 +357,5 @@ VALUES ('1899702472330051584', '51', 'keyName', 'keyName',
2, 2, 2, '{"required"
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(id)) */ INTO plugin_handle
(id, plugin_id, field, label, data_type, type, sort, ext_obj, date_created,
date_updated)
VALUES ('1899702529972371456', '51', 'tokenLimit', 'tokenLimit', 1, 2, 3,
'{"required":"0","rule":""}', sysdate, sysdate);
+
+delete from plugin_handle where plugin_id = '8';
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
index 90494f87b7..db0f090635 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
@@ -151,3 +151,5 @@ INSERT INTO "public"."plugin_handle" VALUES
('1899702350766538752', '51', 'aiTok
INSERT INTO "public"."plugin_handle" VALUES ('1899702411294539776', '51',
'timeWindowSeconds', 'timeWindowSeconds', 1, 2, 1,
'{"required":"0","rule":""}', '2025-03-12 06:02:04.155', '2025-03-12
06:02:04.155');
INSERT INTO "public"."plugin_handle" VALUES ('1899702472330051584', '51',
'keyName', 'keyName', 2, 2, 2, '{"required":"0","rule":""}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
INSERT INTO "public"."plugin_handle" VALUES ('1899702529972371456', '51',
'tokenLimit', 'tokenLimit', 1, 2, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+
+DELETE FROM "public"."plugin_handle" WHERE plugin_id = '8';
\ No newline at end of file
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
index 004faf208e..9517ed61b7 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
@@ -19,6 +19,7 @@ package org.apache.shenyu.admin.service.impl;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shenyu.admin.aspect.annotation.Pageable;
import org.apache.shenyu.admin.mapper.PluginHandleMapper;
import org.apache.shenyu.admin.mapper.ShenyuDictMapper;
@@ -163,6 +164,9 @@ public class PluginHandleServiceImpl implements
PluginHandleService {
for (Map.Entry<String, List<PluginHandleDTO>> pluginHandleEntry :
importHandleMap.entrySet()) {
// pluginId
String pluginId =
context.getPluginTemplateIdMapping().get(pluginHandleEntry.getKey());
+ if (StringUtils.isEmpty(pluginId)) {
+ continue;
+ }
List<PluginHandleDTO> handles = pluginHandleEntry.getValue();
if (CollectionUtils.isNotEmpty(handles)) {
if (existHandleMap.containsKey(pluginId)) {
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 9390d89d3c..4de6c0a9ca 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -935,9 +935,6 @@ INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507022', '14', 'percentage', 'percentage', 1, 2, 3,
'{"required":"1","defaultValue":"100"}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507023', '3', 'rewriteMetaData', 'rewriteMetaData', 3, 2, 3,
'{"required":"1","defaultValue":"false"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507024', '8', 'registerType', 'registerType', 2, 3, 1, NULL);
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507025', '8', 'serverLists', 'serverLists', 2, 3, 2, NULL);
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507026', '8', 'props', 'props', 4, 3, 3, NULL);
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507027', '20', 'preserveHost', 'preserveHost', 3, 2, 0,
'{"required":"0","defaultValue":"false","rule":""}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507028', '20', 'requestHeaderUniqueStrategy',
'requestHeaderUniqueStrategy', 2, 2, 1, '{"required":"0","rule":""}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507029', '20', 'requestUniqueHeaders', 'requestUniqueHeaders',
2, 2, 2, '{"required":"0","rule":""}');
