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 374d7d1152 fix plugin-ai-request-transformer :fix UI error (#6035)
374d7d1152 is described below
commit 374d7d11523c6eb34063c8faf638d0ab33210884
Author: Yu Siheng <[email protected]>
AuthorDate: Mon Jun 9 19:04:19 2025 +0800
fix plugin-ai-request-transformer :fix UI error (#6035)
* fix : UI error
* fix : update sql
* fix
* fix some bug
---
db/init/mysql/schema.sql | 10 +++++-----
db/init/ob/schema.sql | 10 +++++-----
db/init/og/create-table.sql | 10 +++++-----
db/init/oracle/schema.sql | 10 +++++-----
db/init/pg/create-table.sql | 10 +++++-----
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 10 +++++-----
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 10 +++++-----
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 10 +++++-----
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 10 +++++-----
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 10 +++++-----
shenyu-admin/src/main/resources/sql-script/h2/schema.sql | 11 +++++------
.../request/handler/AiRequestTransformerPluginHandler.java | 12 +++++-------
12 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 68f8fe4fdf..f88987dc86 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -1378,11 +1378,11 @@ INSERT INTO `plugin_handle` VALUES
('1899702411294539776', '51', 'timeWindowSeco
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');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 2, 0, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 2, 1, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 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 ('1722804548510507243', '53', 'model',
'model', 2, 2, 3, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 2, 4, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12 06:01:49.725',
'2025-03-12 06:07:49.856');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12 06:02:04.155',
'2025-03-12 06:02:04.155');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12 06:02:18.707',
'2025-03-12 06:02:18.707');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507243', '53', 'model',
'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
-- ----------------------------
-- Table structure for resource
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 6dc34af75b..aae8b89047 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -1351,11 +1351,11 @@ INSERT INTO `plugin_handle` VALUES
('1722804548510507055', '51', 'minIdle', 'min
INSERT INTO `plugin_handle` VALUES ('1722804548510507056', '51', 'maxActive',
'maxActive', 1, 3, 9,
'{\"required\":\"0\",\"defaultValue\":\"8\",\"rule\":\"\"}', '2022-05-25
18:02:53', '2022-05-25 18:02:53');
INSERT INTO `plugin_handle` VALUES ('1722804548510507057', '51', 'maxWait',
'maxWait', 3, 3, 10,
'{\"required\":\"0\",\"defaultValue\":\"-1\",\"rule\":\"\"}', '2022-05-25
18:02:53', '2022-05-25 18:02:53');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 2, 0, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 2, 1, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 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 ('1722804548510507243', '53', 'model',
'model', 2, 2, 3, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 2, 4, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12 06:01:49.725',
'2025-03-12 06:07:49.856');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12 06:02:04.155',
'2025-03-12 06:02:04.155');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12 06:02:18.707',
'2025-03-12 06:02:18.707');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507243', '53', 'model',
'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
-- ----------------------------
-- Table structure for resource
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index 1e7a1f4be8..61a5e23469 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -1392,11 +1392,11 @@ INSERT INTO "public"."plugin_handle" VALUES
('1722804548510507055', '51', 'minId
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507056', '51',
'maxActive', 'maxActive', 1, 3, 9,
'{"required":"0","defaultValue":"8","rule":""}', '2022-05-25 18:02:53',
'2022-05-25 18:02:53');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507057', '51',
'maxWait', 'maxWait', 3, 3, 10,
'{"required":"0","defaultValue":"-1","rule":""}', '2022-05-25 18:02:53',
'2022-05-25 18:02:53');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 2, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 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 ('1722804548510507242', '53',
'apiKey', 'apiKey', 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 ('1722804548510507243', '53',
'model', 'model', 2, 2, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 2, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507242', '53',
'apiKey', 'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507243', '53',
'model', 'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-- ----------------------------
-- Table structure for resource
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index 22a045ce76..74f03f5b54 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -3444,16 +3444,16 @@ INSERT /*+
IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(id)) */ INTO permission (id,
VALUES ('1697146860569742760', '1346358560427216896', '1844026099075564868');
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 ('1722804548510507240', '53', 'provider', 'provider', 3, 2, 0,
'{"required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507240', '53', 'provider', 'provider', 3, 3, 0,
'{"required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507241', '53', 'baseUrl', 'baseUrl', 2, 2, 1,
'{required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507241', '53', 'baseUrl', 'baseUrl', 2, 3, 1,
'{required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507242', '53', 'apiKey', 'apiKey', 2, 2, 2,
'{"required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507242', '53', 'apiKey', 'apiKey', 2, 3, 2,
'{"required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507243', '53', 'model', 'model', 2, 2, 3,
'{"required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507243', '53', 'model', 'model', 2, 3, 3,
'{"required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507244', '53', 'content', 'content', 2, 2, 4,
'{"required":"0","rule":""}', sysdate, sysdate);
\ No newline at end of file
+VALUES ('1722804548510507244', '53', 'content', 'content', 2, 3, 4,
'{"required":"0","rule":""}', sysdate, sysdate);
\ No newline at end of file
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index 928367f0bc..df6cc0297a 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -1453,11 +1453,11 @@ INSERT INTO "public"."plugin_handle" VALUES
('1722804548510507055', '51', 'minId
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507056', '51',
'maxActive', 'maxActive', 1, 3, 9,
'{"required":"0","defaultValue":"8","rule":""}', '2022-05-25 18:02:53',
'2022-05-25 18:02:53');
INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507057', '51',
'maxWait', 'maxWait', 3, 3, 10,
'{"required":"0","defaultValue":"-1","rule":""}', '2022-05-25 18:02:53',
'2022-05-25 18:02:53');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 2, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 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 ('1722804548510507242', '53',
'apiKey', 'apiKey', 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 ('1722804548510507243', '53',
'model', 'model', 2, 2, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 2, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507242', '53',
'apiKey', 'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507243', '53',
'model', 'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-- ----------------------------
-- Table structure for resource
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 6193834209..edb4801dcb 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
@@ -159,11 +159,11 @@ INSERT INTO `plugin` VALUES ('53',
'aiRequestTransformer', NULL, 'Ai', 65, 0, '2
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822190','649330b6-c2d7-4edc-be8e-8a54df9eb385','53', NULL, 65,
0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 2, 0, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 2, 1, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 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 ('1722804548510507243', '53', 'model',
'model', 2, 2, 3, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 2, 4, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12 06:01:49.725',
'2025-03-12 06:07:49.856');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12 06:02:04.155',
'2025-03-12 06:02:04.155');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12 06:02:18.707',
'2025-03-12 06:02:18.707');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507243', '53', 'model',
'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
INSERT INTO `resource` VALUES ('1844026099075564859', '1346775491550474240',
'aiRequestTransformer', 'aiRequestTransformer', '/plug/aiRequestTransformer',
'aiRequestTransformer', 1, 0, 'pic-center', 0, 0, '', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1844026099075564860', '1844026099075564859',
'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:aiRequestTransformerSelector:add', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
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 026788b077..58bd209e9e 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
@@ -157,11 +157,11 @@ INSERT INTO `plugin` VALUES ('53',
'aiRequestTransformer', NULL, 'Ai', 65, 0, '2
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822190','649330b6-c2d7-4edc-be8e-8a54df9eb385','53', NULL, 65,
0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 2, 0, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 2, 1, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 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 ('1722804548510507243', '53', 'model',
'model', 2, 2, 3, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 2, 4, '{\"required\":\"0\",\"rule\":\"\"}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507240', '53', 'provider',
'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12 06:01:49.725',
'2025-03-12 06:07:49.856');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507241', '53', 'baseUrl',
'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12 06:02:04.155',
'2025-03-12 06:02:04.155');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507242', '53', 'apiKey',
'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12 06:02:18.707',
'2025-03-12 06:02:18.707');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507243', '53', 'model',
'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
+INSERT INTO `plugin_handle` VALUES ('1722804548510507244', '53', 'content',
'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12 06:02:32.450',
'2025-03-12 06:02:32.450');
INSERT INTO `resource` VALUES ('1844026099075564859', '1346775491550474240',
'aiRequestTransformer', 'aiRequestTransformer', '/plug/aiRequestTransformer',
'aiRequestTransformer', 1, 0, 'pic-center', 0, 0, '', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1844026099075564860', '1844026099075564859',
'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:aiRequestTransformerSelector:add', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
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 03953f8376..e2bef06ac0 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
@@ -158,11 +158,11 @@ INSERT INTO "public"."plugin" VALUES ('53',
'aiRequestTransformer', NULL, 'Ai',
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822190','649330b6-c2d7-4edc-be8e-8a54df9eb385','53', NULL, 65,
0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 2, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 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 ('1722804548510507242', '53',
'apiKey', 'apiKey', 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 ('1722804548510507243', '53',
'model', 'model', 2, 2, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 2, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507242', '53',
'apiKey', 'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507243', '53',
'model', 'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
INSERT INTO "public"."resource" VALUES ('1844026099075564859',
'1346775491550474240', 'aiRequestTransformer', 'aiRequestTransformer',
'/plug/aiRequestTransformer', 'aiRequestTransformer', 1, 0, 'pic-center', 0, 0,
'', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO "public"."resource" VALUES ('1844026099075564860',
'1844026099075564859', 'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0,
'', 1, 0, 'plugin:aiRequestTransformerSelector:add', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
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 aa3b983293..3b95582edf 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
@@ -424,18 +424,18 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin_handle(id))
*/ INTO permission (id,
VALUES ('1697146860569742760', '1346358560427216896', '1844026099075564868');
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 ('1722804548510507240', '53', 'provider', 'provider', 3, 2, 0,
'{"required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507240', '53', 'provider', 'provider', 3, 3, 0,
'{"required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507241', '53', 'baseUrl', 'baseUrl', 2, 2, 1,
'{required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507241', '53', 'baseUrl', 'baseUrl', 2, 3, 1,
'{required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507242', '53', 'apiKey', 'apiKey', 2, 2, 2,
'{"required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507242', '53', 'apiKey', 'apiKey', 2, 3, 2,
'{"required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507243', '53', 'model', 'model', 2, 2, 3,
'{"required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507243', '53', 'model', 'model', 2, 3, 3,
'{"required":"0","rule":""}', sysdate, sysdate);
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 ('1722804548510507244', '53', 'content', 'content', 2, 2, 4,
'{"required":"0","rule":""}', sysdate, sysdate);
+VALUES ('1722804548510507244', '53', 'content', 'content', 2, 3, 4,
'{"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 023f099602..27e66cd524 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
@@ -156,11 +156,11 @@ INSERT INTO "public"."plugin" VALUES ('53',
'aiRequestTransformer', NULL, 'Ai',
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822190','649330b6-c2d7-4edc-be8e-8a54df9eb385','53', NULL, 65,
0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 2, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 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 ('1722804548510507242', '53',
'apiKey', 'apiKey', 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 ('1722804548510507243', '53',
'model', 'model', 2, 2, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
-INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 2, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507240', '53',
'provider', 'provider', 3, 3, 0, '{"required":"0","rule":""}', '2025-03-12
06:01:49.725', '2025-03-12 06:07:49.856');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507241', '53',
'baseUrl', 'baseUrl', 2, 3, 1, '{"required":"0","rule":""}', '2025-03-12
06:02:04.155', '2025-03-12 06:02:04.155');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507242', '53',
'apiKey', 'apiKey', 2, 3, 2, '{"required":"0","rule":""}', '2025-03-12
06:02:18.707', '2025-03-12 06:02:18.707');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507243', '53',
'model', 'model', 2, 3, 3, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
+INSERT INTO "public"."plugin_handle" VALUES ('1722804548510507244', '53',
'content', 'content', 2, 3, 4, '{"required":"0","rule":""}', '2025-03-12
06:02:32.450', '2025-03-12 06:02:32.450');
INSERT INTO "public"."resource" VALUES ('1844026099075564859',
'1346775491550474240', 'aiRequestTransformer', 'aiRequestTransformer',
'/plug/aiRequestTransformer', 'aiRequestTransformer', 1, 0, 'pic-center', 0, 0,
'', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO "public"."resource" VALUES ('1844026099075564860',
'1844026099075564859', 'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0,
'', 1, 0, 'plugin:aiRequestTransformerSelector:add', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
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 e02d079eb4..91b7747646 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -982,12 +982,11 @@ 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
('1899702472330051584', '51', 'keyName', 'keyName', 2, 2, 2,
'{\"required\":\"0\",\"rule\":\"\"}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1899702529972371456', '51', 'tokenLimit', 'tokenLimit', 1, 2, 3,
'{\"required\":\"0\",\"rule\":\"\"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507240', '53', 'provider', 'provider', 3, 2, 0,
'{\"required\":\"0\",\"rule\":\"\"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507241', '53', 'baseUrl', 'baseUrl', 2, 2, 1,
'{\"required\":\"0\",\"rule\":\"\"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507242', '53', 'apiKey', 'apiKey', 2, 2, 2,
'{\"required\":\"0\",\"rule\":\"\"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507243', '53', 'model', 'model', 2, 2, 3,
'{\"required\":\"0\",\"rule\":\"\"}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507244', '53', 'content', 'content', 2, 2, 4,
'{\"required\":\"0\",\"rule\":\"\"}');
-
+INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507240', '53', 'provider', 'provider', 3, 3, 0,
'{"required":"0","rule":""}');
+INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507241', '53', 'baseUrl', 'baseUrl', 2, 3, 1,
'{"required":"0","rule":""}');
+INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507242', '53', 'apiKey', 'apiKey', 2, 3, 2,
'{"required":"0","rule":""}');
+INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507243', '53', 'model', 'model', 2, 3, 3,
'{"required":"0","rule":""}');
+INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1722804548510507244', '53', 'content', 'content', 2, 3, 4,
'{"required":"0","rule":""}');
/** insert resource for resource */
INSERT IGNORE INTO `resource` (`id`, `parent_id`, `title`, `name`, `url`,
`component`, `resource_type`, `sort`, `icon`, `is_leaf`, `is_route`, `perms`,
`status`)
VALUES('1346775491550474240','','SHENYU.MENU.PLUGIN.LIST','plug','/plug','PluginList','0','0','dashboard','0','0','','1');
diff --git
a/shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-request-transformer/src/main/java/org/apache/shenyu/plugin/ai/transformer/request/handler/AiRequestTransformerPluginHandler.java
b/shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-request-transformer/src/main/java/org/apache/shenyu/plugin/ai/transformer/request/handler/AiRequestTransformerPluginHandler.java
index b18bc3576a..b84308d54a 100644
---
a/shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-request-transformer/src/main/java/org/apache/shenyu/plugin/ai/transformer/request/handler/AiRequestTransformerPluginHandler.java
+++
b/shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-request-transformer/src/main/java/org/apache/shenyu/plugin/ai/transformer/request/handler/AiRequestTransformerPluginHandler.java
@@ -61,7 +61,7 @@ public class AiRequestTransformerPluginHandler implements
PluginDataHandler {
}
AiModelFactory factory =
aiModelFactoryRegistry.getFactory(AiModelProviderEnum.getByName(aiRequestTransformerConfig.getProvider()));
ChatClientCache.getInstance().init("default",
factory.createAiModel(convertConfig(aiRequestTransformerConfig)));
- Singleton.INST.single(AiCommonConfig.class,
aiRequestTransformerConfig);
+ Singleton.INST.single(AiRequestTransformerConfig.class,
aiRequestTransformerConfig);
}
}
@@ -88,12 +88,10 @@ public class AiRequestTransformerPluginHandler implements
PluginDataHandler {
public static AiCommonConfig convertConfig(final
AiRequestTransformerConfig aiRequestTransformerConfig) {
AiCommonConfig aiCommonConfig = new AiCommonConfig();
-
Optional.ofNullable(aiCommonConfig.getBaseUrl()).ifPresent(aiCommonConfig::setBaseUrl);
-
Optional.ofNullable(aiCommonConfig.getProvider()).ifPresent(aiCommonConfig::setProvider);
-
Optional.ofNullable(aiCommonConfig.getTemperature()).ifPresent(aiCommonConfig::setTemperature);
-
Optional.ofNullable(aiCommonConfig.getModel()).ifPresent(aiCommonConfig::setModel);
-
Optional.ofNullable(aiCommonConfig.getApiKey()).ifPresent(aiCommonConfig::setApiKey);
-
Optional.ofNullable(aiCommonConfig.getMaxTokens()).ifPresent(aiCommonConfig::setMaxTokens);
+
Optional.ofNullable(aiRequestTransformerConfig.getBaseUrl()).ifPresent(aiCommonConfig::setBaseUrl);
+
Optional.ofNullable(aiRequestTransformerConfig.getProvider()).ifPresent(aiCommonConfig::setProvider);
+
Optional.ofNullable(aiRequestTransformerConfig.getModel()).ifPresent(aiCommonConfig::setModel);
+
Optional.ofNullable(aiRequestTransformerConfig.getApiKey()).ifPresent(aiCommonConfig::setApiKey);
return aiCommonConfig;
}
}
