This is an automated email from the ASF dual-hosted git repository.
Aias00 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 34ab4c4851 [type:refactor] externalize Casdoor to plugin-store (#7500)
34ab4c4851 is described below
commit 34ab4c4851b12e5771dddb22b5a33f714391ed4a
Author: cloudbase-ai <[email protected]>
AuthorDate: Fri Oct 9 16:51:43 2026 +0800
[type:refactor] externalize Casdoor to plugin-store (#7500)
* refactor: externalize Casdoor to plugin store
Signed-off-by: cloudbase-ai <[email protected]>
* fix: remove remaining Casdoor H2 seed records
Signed-off-by: cloudbase-ai <[email protected]>
---------
Signed-off-by: cloudbase-ai <[email protected]>
Co-authored-by: cloudbase-ai
<[email protected]>
---
db/init/mysql/schema.sql | 29 ----
db/init/ob/schema.sql | 29 ----
db/init/og/create-table.sql | 9 --
db/init/oracle/schema.sql | 20 ---
db/init/pg/create-table.sql | 29 ----
docs/plugin-store-casdoor.md | 33 +++++
pom.xml | 1 -
.../shenyu/admin/service/impl/EnumServiceImpl.java | 2 +-
.../src/main/resources/sql-script/h2/schema.sql | 9 --
shenyu-bootstrap/pom.xml | 8 -
.../src/main/release-docs/LICENSE | 1 -
shenyu-plugin/shenyu-plugin-security/pom.xml | 1 -
.../shenyu-plugin-casdoor/pom.xml | 41 -----
.../shenyu/plugin/casdoor/CasdoorPlugin.java | 91 ------------
.../plugin/casdoor/config/CasdoorConfig.java | 165 ---------------------
.../casdoor/handle/CasdoorPluginDateHandler.java | 51 -------
.../shenyu/plugin/casdoor/CasdoorPluginTest.java | 142 ------------------
.../plugin/casdoor/config/CasdoorConfigTest.java | 51 -------
.../handle/CasdoorPluginDateHandlerTest.java | 52 -------
.../shenyu-spring-boot-starter-plugin/pom.xml | 1 -
.../pom.xml | 36 -----
.../plugin/casdoor/CasdoorPluginConfiguration.java | 50 -------
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 ---
23 files changed, 34 insertions(+), 835 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 802700a1a7..744ce388e9 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -763,16 +763,6 @@ INSERT INTO `permission` VALUES
('1697146375754190848','1346358560427216896','16
INSERT INTO `permission` VALUES
('1697146617543233536','1346358560427216896','1697146617513873408', '2023-08-31
15:17:39', '2023-08-31 07:17:39');
INSERT INTO `permission` VALUES
('1697146860569595904','1346358560427216896','1697146860540235776', '2023-08-31
15:18:37', '2023-08-31 07:18:37');
-INSERT INTO `permission` VALUES
('1792779493537148928','1346358560427216896','1792749362361954340', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148929','1346358560427216896','1792749362445840411', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148930','1346358560427216896','1792749362445840412', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148931','1346358560427216896','1792749362445840413', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148932','1346358560427216896','1792749362445840414', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148933','1346358560427216896','1792749362445840415', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148934','1346358560427216896','1792749362445840416', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148935','1346358560427216896','1792749362445840417', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148936','1346358560427216896','1792749362445840418', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148937','1346358560427216896','1792749362445840419', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
INSERT INTO `permission` VALUES
('1792779493537148938','1346358560427216896','1792749362361954341', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
INSERT INTO `permission` VALUES
('1792779493537148939','1346358560427216896','1792749362445840420', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
INSERT INTO `permission` VALUES
('1792779493537148940','1346358560427216896','1792749362445840421', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
@@ -962,7 +952,6 @@ INSERT INTO `plugin` VALUES ('5', 'divide',
'{\"multiSelectorHandle\":\"1\",\"mu
INSERT INTO `plugin` VALUES ('6', 'dubbo',
'{\"register\":\"zookeeper://localhost:2181\",\"multiSelectorHandle\":\"1\",\"threadpool\":\"shared\",\"corethreads\":0,\"threads\":2147483647,\"queues\":0}',
'Proxy', 310, 0, '2022-05-25 18:02:53', '2022-05-25 18:02:53',null);
INSERT INTO `plugin` VALUES ('32',
'loggingElasticSearch','{\"host\":\"localhost\", \"port\": \"9200\"}',
'Logging', 190, 0, '2022-06-19 22:00:00', '2022-06-19 22:00:00',null);
INSERT INTO `plugin` VALUES ('33',
'loggingKafka','{\"topic\":\"shenyu-access-logging\",\"namesrvAddr\":\"http://localhost:9092\",\"sampleRate\":\"1\",\"maxResponseBody\":524288,\"maxRequestBody\":524288,\"compressAlg\":\"none\"}',
'Logging', 180, 0, '2022-07-04 22:00:00', '2022-07-02 22:00:00',null);
-INSERT INTO `plugin` VALUES ('39', 'casdoor',
'{\"endpoint\":\"http://localhost:8000\"}', 'Authentication', 40, 0,
'2022-09-11 12:00:00', '2022-09-11 12:00:00',null);
INSERT INTO `plugin` VALUES ('40', 'keyAuth', NULL, 'Authentication', 150, 0,
'2022-07-24 19:00:00', '2022-07-24 19:00:00',null);
INSERT INTO `plugin` VALUES ('42', 'tcp', NULL, 'Proxy', 320, 1, '2023-05-30
18:02:53', '2022-05-30 18:02:53',null);
INSERT INTO `plugin` VALUES ('44', 'basicAuth',
'{\"defaultHandleJson\":\"{\\\"authorization\\\":\\\"test:test123\\\"}\"}',
'Authentication', 150, 0, '2022-07-24 19:00:00', '2022-07-24 19:00:00', null);
@@ -1216,13 +1205,6 @@ INSERT INTO `plugin_handle` VALUES
('1529402613204172754', '32', 'maskStatus', '
INSERT INTO `plugin_handle` VALUES ('1529402613204172755', '33', 'keyword',
'keyword', 2, 2, 0, '{\"required\":\"0\",\"placeholder\":\"please use ‘;’ to
split keyword\",\"rule\":\"\"}', '2022-09-22 00:15:56.158', '2022-09-22
00:23:36.169');
INSERT INTO `plugin_handle` VALUES ('1529402613204172756', '33', 'maskType',
'maskType', 3, 2, 1,
'{\"required\":\"0\",\"defaultValue\":\"dataMaskByMD5\",\"rule\":\"\"}',
'2022-09-22 00:16:27.342', '2022-09-22 00:16:27.342');
INSERT INTO `plugin_handle` VALUES ('1529402613204172757', '33', 'maskStatus',
'maskStatus', 3, 2, 2,
'{\"required\":\"0\",\"defaultValue\":\"false\",\"rule\":\"\"}', '2022-09-22
00:17:21.150', '2022-09-22 00:17:21.150');
-INSERT INTO `plugin_handle` VALUES ('1570590990341775360', '39', 'endpoint',
'casdoor endpoint', 2, 3, 0, '{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27
12:00:00', '2022-09-27 12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591047635968000', '39', 'client_id',
'client_id', 2, 3, 0, '{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27
12:00:00', '2022-09-27 12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591109623586816', '39',
'client_secrect', 'client_secrect', 2, 3, 0,
'{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27 12:00:00', '2022-09-27
12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591165374275584', '39',
'certificate', 'certificate', 2, 3, 0, '{\"required\":\"1\",\"rule\":\"\"}',
'2022-09-27 12:00:00', '2022-09-27 12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591215131303936', '39',
'organization-name', 'organization-name', 2, 3, 0,
'{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27 12:00:00', '2022-09-27
12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591265492312064', '39',
'application-name', 'application-name', 2, 3, 0,
'{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27 12:00:00', '2022-09-27
12:00:00');
-
INSERT INTO `plugin_handle` VALUES ('1678997037438107647', '42',
'discoveryHandler', 'discoveryHandler', 2, 1, 0,
'{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}',
'2023-07-10 14:41:27', '2023-08-17 16:58:25.259000000');
INSERT INTO `plugin_handle` VALUES ('1678997037438107648', '42',
'bossGroupThreadCount', 'bossGroupThreadCount', 2, 1, 1,
'{\"required\":\"0\",\"defaultValue\":\"1\",\"rule\":\"\"}', '2023-01-10
10:08:01.158', '2023-01-10 10:08:01.158');
@@ -1711,16 +1693,6 @@ INSERT INTO `resource` VALUES ('1697145808210333696',
'1697141926247763968', 'SH
INSERT INTO `resource` VALUES ('1697146617513873408', '1697141926247763968',
'SHENYU.BUTTON.SYSTEM.DELETE', '', '', '', 2, 0, 'delete', 1, 0,
'system:alert:delete', 1, '2023-08-31 15:17:39', '2023-08-31 07:22:07');
INSERT INTO `resource` VALUES ('1697146860540235776', '1697141926247763968',
'SHENYU.BUTTON.SYSTEM.EDIT', '', '', '', 2, 0, 'edit', 1, 0,
'system:alert:edit', 1, '2023-08-31 15:18:37', '2023-08-31 07:18:37');
-INSERT INTO `resource` VALUES ('1792749362361954340', '1346775491550474240',
'casdoor', 'casdoor', '/plug/casdoor', 'casdoor', 1, 0, 'safety', 0, 0, '', 1,
'2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840411', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:add', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840412', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.QUERY', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:query', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840413', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.EDIT', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:edit', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840414', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.DELETE', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:delete', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840415', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:add', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840416', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.QUERY', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:query', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840417', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.EDIT', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:edit', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840418', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.DELETE', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:delete', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840419', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SYNCHRONIZE', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoor:modify', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1792749362361954341', '1346775491550474240',
'keyAuth', 'keyAuth', '/plug/keyAuth', 'keyAuth', 1, 0, 'border-bottom', 0, 0,
'', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1792749362445840420', '1792749362361954341',
'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:keyAuthSelector:add', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
@@ -2400,7 +2372,6 @@ INSERT INTO `namespace_plugin_rel`
(`id`,`namespace_id`,`plugin_id`, `config`, `
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822169','649330b6-c2d7-4edc-be8e-8a54df9eb385','31', NULL, 1, 0,
'2022-06-16 14:40:35.000', '2022-06-16 14:40:55.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822170','649330b6-c2d7-4edc-be8e-8a54df9eb385','32',
'{\"host\":\"localhost\", \"port\": \"9200\"}', 190, 0, '2022-06-19
22:00:00.000', '2022-06-19 22:00:00.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822171','649330b6-c2d7-4edc-be8e-8a54df9eb385','33',
'{\"host\":\"localhost\", \"port\": \"9092\"}', 180, 0, '2022-07-04
22:00:00.000', '2022-07-02 22:00:00.000');
-INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822176','649330b6-c2d7-4edc-be8e-8a54df9eb385','39',
'{\"endpoint\":\"http://localhost:8000\"}', 40, 0, '2022-09-11 12:00:00.000',
'2022-09-11 12:00:00.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822177','649330b6-c2d7-4edc-be8e-8a54df9eb385','4',
'{\"master\":\"mymaster\",\"mode\":\"standalone\",\"url\":\"192.168.1.1:6379\",\"password\":\"abc\"}',
60, 0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822178','649330b6-c2d7-4edc-be8e-8a54df9eb385','40', NULL, 150,
0, '2022-07-24 19:00:00.000', '2022-07-24 19:00:00.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822179','649330b6-c2d7-4edc-be8e-8a54df9eb385','42', NULL, 320,
1, '2023-05-30 18:02:53.000', '2022-05-30 18:02:53.000');
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 7c8b23829a..eb9f115e75 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -764,16 +764,6 @@ INSERT INTO `permission` VALUES
('1697146375754190848','1346358560427216896','16
INSERT INTO `permission` VALUES
('1697146617543233536','1346358560427216896','1697146617513873408', '2023-08-31
15:17:39', '2023-08-31 07:17:39');
INSERT INTO `permission` VALUES
('1697146860569595904','1346358560427216896','1697146860540235776', '2023-08-31
15:18:37', '2023-08-31 07:18:37');
-INSERT INTO `permission` VALUES
('1792779493537148928','1346358560427216896','1792749362361954340', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148929','1346358560427216896','1792749362445840411', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148930','1346358560427216896','1792749362445840412', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148931','1346358560427216896','1792749362445840413', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148932','1346358560427216896','1792749362445840414', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148933','1346358560427216896','1792749362445840415', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148934','1346358560427216896','1792749362445840416', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148935','1346358560427216896','1792749362445840417', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148936','1346358560427216896','1792749362445840418', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `permission` VALUES
('1792779493537148937','1346358560427216896','1792749362445840419', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
INSERT INTO `permission` VALUES
('1792779493537148938','1346358560427216896','1792749362361954341', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
INSERT INTO `permission` VALUES
('1792779493537148939','1346358560427216896','1792749362445840420', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
INSERT INTO `permission` VALUES
('1792779493537148940','1346358560427216896','1792749362445840421', '2022-05-25
18:02:58', '2022-05-25 18:02:58');
@@ -934,7 +924,6 @@ INSERT INTO `plugin` VALUES ('5', 'divide',
'{\"multiSelectorHandle\":\"1\",\"mu
INSERT INTO `plugin` VALUES ('6', 'dubbo',
'{\"register\":\"zookeeper://localhost:2181\",\"multiSelectorHandle\":\"1\",\"threadpool\":\"shared\",\"corethreads\":0,\"threads\":2147483647,\"queues\":0}',
'Proxy', 310, 0, '2022-05-25 18:02:53', '2022-05-25 18:02:53',null);
INSERT INTO `plugin` VALUES ('32',
'loggingElasticSearch','{\"host\":\"localhost\", \"port\": \"9200\"}',
'Logging', 190, 0, '2022-06-19 22:00:00', '2022-06-19 22:00:00',null);
INSERT INTO `plugin` VALUES ('33', 'loggingKafka','{\"host\":\"localhost\",
\"port\": \"9092\"}', 'Logging', 180, 0, '2022-07-04 22:00:00', '2022-07-02
22:00:00',null);
-INSERT INTO `plugin` VALUES ('39', 'casdoor',
'{\"endpoint\":\"http://localhost:8000\"}', 'Authentication', 40, 0,
'2022-09-11 12:00:00', '2022-09-11 12:00:00',null);
INSERT INTO `plugin` VALUES ('40', 'keyAuth', NULL, 'Authentication', 150, 0,
'2022-07-24 19:00:00', '2022-07-24 19:00:00',null);
INSERT INTO `plugin` VALUES ('42', 'tcp', NULL, 'Proxy', 320, 1, '2023-05-30
18:02:53', '2022-05-30 18:02:53',null);
INSERT INTO `plugin` VALUES ('44', 'basicAuth',
'{\"defaultHandleJson\":\"{\\\"authorization\\\":\\\"test:test123\\\"}\"}',
'Authentication', 150, 0, '2022-07-24 19:00:00', '2022-07-24 19:00:00', null);
@@ -1184,13 +1173,6 @@ INSERT INTO `plugin_handle` VALUES
('1529402613204172754', '32', 'maskStatus', '
INSERT INTO `plugin_handle` VALUES ('1529402613204172755', '33', 'keyword',
'keyword', 2, 2, 0, '{\"required\":\"0\",\"placeholder\":\"please use ‘;’ to
split keyword\",\"rule\":\"\"}', '2022-09-22 00:15:56.158', '2022-09-22
00:23:36.169');
INSERT INTO `plugin_handle` VALUES ('1529402613204172756', '33', 'maskType',
'maskType', 3, 2, 1,
'{\"required\":\"0\",\"defaultValue\":\"dataMaskByMD5\",\"rule\":\"\"}',
'2022-09-22 00:16:27.342', '2022-09-22 00:16:27.342');
INSERT INTO `plugin_handle` VALUES ('1529402613204172757', '33', 'maskStatus',
'maskStatus', 3, 2, 2,
'{\"required\":\"0\",\"defaultValue\":\"false\",\"rule\":\"\"}', '2022-09-22
00:17:21.150', '2022-09-22 00:17:21.150');
-INSERT INTO `plugin_handle` VALUES ('1570590990341775360', '39', 'endpoint',
'casdoor endpoint', 2, 3, 0, '{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27
12:00:00', '2022-09-27 12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591047635968000', '39', 'client_id',
'client_id', 2, 3, 0, '{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27
12:00:00', '2022-09-27 12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591109623586816', '39',
'client_secrect', 'client_secrect', 2, 3, 0,
'{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27 12:00:00', '2022-09-27
12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591165374275584', '39',
'certificate', 'certificate', 2, 3, 0, '{\"required\":\"1\",\"rule\":\"\"}',
'2022-09-27 12:00:00', '2022-09-27 12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591215131303936', '39',
'organization-name', 'organization-name', 2, 3, 0,
'{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27 12:00:00', '2022-09-27
12:00:00');
-INSERT INTO `plugin_handle` VALUES ('1570591265492312064', '39',
'application-name', 'application-name', 2, 3, 0,
'{\"required\":\"1\",\"rule\":\"\"}', '2022-09-27 12:00:00', '2022-09-27
12:00:00');
-
INSERT INTO `plugin_handle` VALUES ('1678997037438107647', '42',
'discoveryHandler', 'discoveryHandler', 2, 1, 0,
'{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}',
'2023-07-10 14:41:27', '2023-08-17 16:58:25.259000000');
INSERT INTO `plugin_handle` VALUES ('1678997037438107648', '42',
'bossGroupThreadCount', 'bossGroupThreadCount', 2, 1, 1,
'{\"required\":\"0\",\"defaultValue\":\"1\",\"rule\":\"\"}', '2023-01-10
10:08:01.158', '2023-01-10 10:08:01.158');
@@ -1662,16 +1644,6 @@ INSERT INTO `resource` VALUES ('1697145808210333696',
'1697141926247763968', 'SH
INSERT INTO `resource` VALUES ('1697146617513873408', '1697141926247763968',
'SHENYU.BUTTON.SYSTEM.DELETE', '', '', '', 2, 0, 'delete', 1, 0,
'system:alert:delete', 1, '2023-08-31 15:17:39', '2023-08-31 07:22:07');
INSERT INTO `resource` VALUES ('1697146860540235776', '1697141926247763968',
'SHENYU.BUTTON.SYSTEM.EDIT', '', '', '', 2, 0, 'edit', 1, 0,
'system:alert:edit', 1, '2023-08-31 15:18:37', '2023-08-31 07:18:37');
-INSERT INTO `resource` VALUES ('1792749362361954340', '1346775491550474240',
'casdoor', 'casdoor', '/plug/casdoor', 'casdoor', 1, 0, 'safety', 0, 0, '', 1,
'2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840411', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:add', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840412', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.QUERY', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:query', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840413', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.EDIT', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:edit', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840414', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SELECTOR.DELETE', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorSelector:delete', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840415', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:add', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840416', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.QUERY', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:query', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840417', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.EDIT', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:edit', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840418', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.RULE.DELETE', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoorRule:delete', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO `resource` VALUES ('1792749362445840419', '1792749362361954340',
'SHENYU.BUTTON.PLUGIN.SYNCHRONIZE', '', '', '', 2, 0, '', 1, 0,
'plugin:casdoor:modify', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1792749362361954341', '1346775491550474240',
'keyAuth', 'keyAuth', '/plug/keyAuth', 'keyAuth', 1, 0, 'border-bottom', 0, 0,
'', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO `resource` VALUES ('1792749362445840420', '1792749362361954341',
'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0, '', 1, 0,
'plugin:keyAuthSelector:add', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
@@ -2330,7 +2302,6 @@ INSERT INTO `namespace_plugin_rel`
(`id`,`namespace_id`,`plugin_id`, `config`, `
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822169','649330b6-c2d7-4edc-be8e-8a54df9eb385','31', NULL, 1, 0,
'2022-06-16 14:40:35.000', '2022-06-16 14:40:55.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822170','649330b6-c2d7-4edc-be8e-8a54df9eb385','32',
'{\"host\":\"localhost\", \"port\": \"9200\"}', 190, 0, '2022-06-19
22:00:00.000', '2022-06-19 22:00:00.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822171','649330b6-c2d7-4edc-be8e-8a54df9eb385','33',
'{\"host\":\"localhost\", \"port\": \"9092\"}', 180, 0, '2022-07-04
22:00:00.000', '2022-07-02 22:00:00.000');
-INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822176','649330b6-c2d7-4edc-be8e-8a54df9eb385','39',
'{\"endpoint\":\"http://localhost:8000\"}', 40, 0, '2022-09-11 12:00:00.000',
'2022-09-11 12:00:00.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822177','649330b6-c2d7-4edc-be8e-8a54df9eb385','4',
'{\"master\":\"mymaster\",\"mode\":\"standalone\",\"url\":\"192.168.1.1:6379\",\"password\":\"abc\"}',
60, 0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822178','649330b6-c2d7-4edc-be8e-8a54df9eb385','40', NULL, 150,
0, '2022-07-24 19:00:00.000', '2022-07-24 19:00:00.000');
INSERT INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`, `config`,
`sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822179','649330b6-c2d7-4edc-be8e-8a54df9eb385','42', NULL, 320,
1, '2023-05-30 18:02:53.000', '2022-05-30 18:02:53.000');
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index 3da317784e..b0e90bc51f 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -934,7 +934,6 @@ INSERT INTO "public"."plugin" VALUES ('30', 'cache',
'{"cacheType":"memory"}', '
INSERT INTO "public"."plugin" VALUES ('31', 'mock', null, 'Mock', 1, 0,
'2022-06-16 14:40:35', '2022-06-16 14:40:55', null);
INSERT INTO "public"."plugin" VALUES ('32', 'loggingElasticSearch',
'{"host":"localhost", "port": "9200"}', 'Logging', 190, 0, '2022-06-19
22:00:00', '2022-06-19 22:00:00', null);
INSERT INTO "public"."plugin" VALUES ('33', 'loggingKafka',
'{"topic":"shenyu-access-logging", "namesrvAddr": "localhost:9092"}',
'Logging', 180, 0, '2022-07-04 22:00:00', '2022-07-04 22:00:00', null);
-INSERT INTO "public"."plugin" VALUES ('39', 'casdoor',
'{"endpoint":"http://localhost:8000"}', 'Authentication', 40, 0, '2022-09-11
12:00:00', '2022-09-11 12:00:00', null);
INSERT INTO "public"."plugin" VALUES ('40', 'keyAuth', NULL, 'Authentication',
150, 0, '2022-07-24 19:00:00', '2022-07-24 19:00:00', null);
INSERT INTO "public"."plugin" VALUES ('42', 'tcp', null, 'Proxy', 320, 1,
'2022-05-25 18:08:01', '2022-05-25 18:08:01', null);
INSERT INTO "public"."plugin" VALUES ('44', 'basicAuth',
'{"defaultHandleJson":"{"authorization":"test:test123"}"}', 'Authentication',
150, 0, '2022-07-24 19:00:00', '2022-07-24 19:00:00', null);
@@ -1206,13 +1205,6 @@ INSERT INTO "public"."plugin_handle" VALUES
('1529402613204172815', '33', 'keywo
INSERT INTO "public"."plugin_handle" VALUES ('1529402613204172816', '33',
'maskType', 'maskType', 3, 2, 1,
'{"required":"0","defaultValue":"dataMaskByMD5","rule":""}', '2022-09-22
00:16:27.342', '2022-09-22 00:16:27.342');
INSERT INTO "public"."plugin_handle" VALUES ('1529402613204172817', '33',
'maskStatus', 'maskStatus', 3, 2, 2,
'{"required":"0","defaultValue":"false","rule":""}', '2022-09-22 00:17:21.150',
'2022-09-22 00:17:21.150');
-INSERT INTO "public"."plugin_handle" VALUES ('1570590990341775360', '39',
'endpoint', 'casdoor endpoint', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591047635968000', '39',
'client_id', 'client_id', 2, 3, 0, '{"required":"1","rule":""}', '2022-09-16
09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591109623586816', '39',
'client_secrect', 'client_secrect', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591165374275584', '39',
'certificate', 'certificate', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591215131303936', '39',
'organization-name', 'organization-name', 2, 3, 0,
'{"required":"1","rule":""}', '2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591265492312064', '39',
'application-name', 'application-name', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-
INSERT INTO "public"."plugin_handle" VALUES ('1678293333363167232', '42',
'discoveryHandler', 'discoveryHandler', 2, 1, 0,
'{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}');
INSERT INTO "public"."plugin_handle" VALUES ('1678997037438107648', '42',
'bossGroupThreadCount', 'bossGroupThreadCount', 2, 1, 1,
'{"required":"0","defaultValue":"1","rule":""}');
@@ -2536,7 +2528,6 @@ INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822168','64933
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822169','649330b6-c2d7-4edc-be8e-8a54df9eb385','31', NULL, 1, 0,
'2022-06-16 14:40:35.000', '2022-06-16 14:40:55.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822170','649330b6-c2d7-4edc-be8e-8a54df9eb385','32',
'{"host":"localhost", "port": "9200"}', 190, 0, '2022-06-19 22:00:00.000',
'2022-06-19 22:00:00.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822171','649330b6-c2d7-4edc-be8e-8a54df9eb385','33',
'{"host":"localhost", "port": "9092"}', 180, 0, '2022-07-04 22:00:00.000',
'2022-07-02 22:00:00.000');
-INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822176','649330b6-c2d7-4edc-be8e-8a54df9eb385','39',
'{"endpoint":"http://localhost:8000"}', 40, 0, '2022-09-11 12:00:00.000',
'2022-09-11 12:00:00.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822177','649330b6-c2d7-4edc-be8e-8a54df9eb385','4',
'{"master":"mymaster","mode":"standalone","url":"192.168.1.1:6379","password":"abc"}',
60, 0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822178','649330b6-c2d7-4edc-be8e-8a54df9eb385','40', NULL, 150,
0, '2022-07-24 19:00:00.000', '2022-07-24 19:00:00.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822179','649330b6-c2d7-4edc-be8e-8a54df9eb385','42', NULL, 320,
1, '2023-05-30 18:02:53.000', '2022-05-30 18:02:53.000');
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index 9e2f2bd5c0..8fd76af8a6 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -1200,7 +1200,6 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO
plugin (id, name, conf
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, enabled) VALUES ('31', 'mock', 'Mock', 1, 0);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
config, role, sort, enabled) VALUES ('32', 'loggingElasticSearch',
'{"host":"localhost", "port": "9200"}', 'Logging', 190, 0);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
config, role, sort, enabled) VALUES ('33', 'loggingKafka',
'{"topic":"shenyu-access-logging", "namesrvAddr": "localhost:9092"}',
'Logging', 180, 0);
-INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
config, role, sort, enabled) VALUES ('39', 'casdoor',
'{"endpoint":"http://localhost:8000"}' ,'Authentication', 40, '0');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, enabled) VALUES ('40', 'keyAuth', 'Authentication', 150, '0');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, config, enabled) VALUES ('42', 'tcp', 'Proxy', 320, null, '1');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, config, enabled) VALUES ('44', 'basicAuth', 'Authentication', 150,
'{"defaultHandleJson":"{\"authorization\":\"test:test123\"}"}','0');
@@ -1846,24 +1845,6 @@ values ('1518229897214468230', '10',
'flowRuleWarmUpPeriodSec', 'flowRuleWarmUpP
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 ('1518229897214468231', '14', 'addPrefixed', 'addPrefixed', 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 ('1570590990341775360', '39', 'endpoint', 'casdoor endpoint', 2, 3, 0,
'{"required":"1","rule":""}');
-
-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 ('1570591047635968000', '39', 'client_id', 'client_id', 2, 3, 0,
'{"required":"1","rule":""}');
-
-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 ('1570591109623586816', '39', 'client_secrect', 'client_secrect', 2, 3,
0, '{"required":"1","rule":""}');
-
-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 ('1570591165374275584', '39', 'certificate', 'certificate', 2, 3, 0,
'{"required":"1","rule":""}');
-
-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 ('1570591215131303936', '39', 'organization-name', 'organization-name',
2, 3, 0, '{"required":"1","rule":""}');
-
-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 ('1570591265492312064', '39', 'application-name', 'application-name',
2, 3, 0, '{"required":"1","rule":""}');
-
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 ('1518229897214468091', '18', 'keyword', 'keyword', 2, 2, 0,
'{"required":"0","placeholder":"please use ‘;’ to split keyword","rule":""}');
@@ -2701,7 +2682,6 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX
(namespace_plugin_rel(id)) */ INTO namespa
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (namespace_plugin_rel(id)) */ INTO
namespace_plugin_rel (id,namespace_id,plugin_id, config, sort, enabled) VALUES
('1801816010882822169','649330b6-c2d7-4edc-be8e-8a54df9eb385','31', NULL, 1, 0);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (namespace_plugin_rel(id)) */ INTO
namespace_plugin_rel (id,namespace_id,plugin_id, config, sort, enabled) VALUES
('1801816010882822170','649330b6-c2d7-4edc-be8e-8a54df9eb385','32',
'{"host":"localhost", "port": "9200"}', 190, 0);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (namespace_plugin_rel(id)) */ INTO
namespace_plugin_rel (id,namespace_id,plugin_id, config, sort, enabled) VALUES
('1801816010882822171','649330b6-c2d7-4edc-be8e-8a54df9eb385','33',
'{"host":"localhost", "port": "9092"}', 180, 0);
-INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (namespace_plugin_rel(id)) */ INTO
namespace_plugin_rel (id,namespace_id,plugin_id, config, sort, enabled) VALUES
('1801816010882822176','649330b6-c2d7-4edc-be8e-8a54df9eb385','39',
'{"endpoint":"http://localhost:8000"}', 40, 0);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (namespace_plugin_rel(id)) */ INTO
namespace_plugin_rel (id,namespace_id,plugin_id, config, sort, enabled) VALUES
('1801816010882822177','649330b6-c2d7-4edc-be8e-8a54df9eb385','4',
'{"master":"mymaster","mode":"standalone","url":"192.168.1.1:6379","password":"abc"}',
60, 0);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (namespace_plugin_rel(id)) */ INTO
namespace_plugin_rel (id,namespace_id,plugin_id, config, sort, enabled) VALUES
('1801816010882822178','649330b6-c2d7-4edc-be8e-8a54df9eb385','40', NULL, 150,
0);
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (namespace_plugin_rel(id)) */ INTO
namespace_plugin_rel (id,namespace_id,plugin_id, config, sort, enabled) VALUES
('1801816010882822179','649330b6-c2d7-4edc-be8e-8a54df9eb385','42', NULL, 320,
1);
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index c848faf819..cc0fc7f549 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -874,16 +874,6 @@ INSERT INTO "public"."permission" VALUES
('1697146375754129471', '13463585604272
INSERT INTO "public"."permission" VALUES ('1697146617543248162',
'1346358560427216896', '1844025989214130176', '2023-08-31 07:22:07',
'2023-08-31 07:22:07');
INSERT INTO "public"."permission" VALUES ('1697146860569542740',
'1346358560427216896', '1844026099075534848', '2023-08-31 07:18:37',
'2023-08-31 07:18:37');
-INSERT INTO "public"."permission" VALUES ('1792793304205819904',
'1346358560427216896','1792749362361954340', '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304205819905',
'1346358560427216896','1792749362445840411', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304205819906',
'1346358560427216896','1792749362445840412', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304210014208',
'1346358560427216896','1792749362445840413', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304210014209',
'1346358560427216896','1792749362445840414', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304210014210',
'1346358560427216896','1792749362445840415', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304210014211',
'1346358560427216896','1792749362445840416', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304210014212',
'1346358560427216896','1792749362445840417', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304210014213',
'1346358560427216896','1792749362445840418', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."permission" VALUES ('1792793304210014214',
'1346358560427216896','1792749362445840419', '2022-05-25 18:02:58', '2022-05-25
18:02:58');
INSERT INTO "public"."permission" VALUES ('1792793304210014215',
'1346358560427216896','1792749362361954341', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
INSERT INTO "public"."permission" VALUES ('1792793304210014216',
'1346358560427216896','1792749362445840420', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
INSERT INTO "public"."permission" VALUES ('1792793304210014217',
'1346358560427216896','1792749362445840421', '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
@@ -982,7 +972,6 @@ INSERT INTO "public"."plugin" VALUES ('30', 'cache',
'{"cacheType":"memory"}', '
INSERT INTO "public"."plugin" VALUES ('31', 'mock', null, 'Mock', 1, 0,
'2022-06-16 14:40:35', '2022-06-16 14:40:55', null);
INSERT INTO "public"."plugin" VALUES ('32', 'loggingElasticSearch',
'{"host":"localhost", "port": "9200"}', 'Logging', 190, 0, '2022-06-19
22:00:00', '2022-06-19 22:00:00', null);
INSERT INTO "public"."plugin" VALUES ('33', 'loggingKafka',
'{"topic":"shenyu-access-logging", "namesrvAddr": "localhost:9092"}',
'Logging', 180, 0, '2022-07-04 22:00:00', '2022-07-04 22:00:00', null);
-INSERT INTO "public"."plugin" VALUES ('39', 'casdoor',
'{"endpoint":"http://localhost:8000"}', 'Authentication', 40, 0, '2022-09-11
12:00:00', '2022-09-11 12:00:00', null);
INSERT INTO "public"."plugin" VALUES ('40', 'keyAuth', NULL, 'Authentication',
150, 0, '2022-07-24 19:00:00', '2022-07-24 19:00:00', null);
INSERT INTO "public"."plugin" VALUES ('42', 'tcp', null, 'Proxy', 320, 1,
'2022-05-25 18:08:01', '2022-05-25 18:08:01', null);
INSERT INTO "public"."plugin" VALUES ('44', 'basicAuth',
'{"defaultHandleJson":"{\"authorization\":\"test:test123\"}"}',
'Authentication', 150, 0, '2022-07-24 19:00:00', '2022-07-24 19:00:00', null);
@@ -1253,13 +1242,6 @@ INSERT INTO "public"."plugin_handle" VALUES
('1529402613204172815', '33', 'keywo
INSERT INTO "public"."plugin_handle" VALUES ('1529402613204172816', '33',
'maskType', 'maskType', 3, 2, 1,
'{"required":"0","defaultValue":"dataMaskByMD5","rule":""}', '2022-09-22
00:16:27.342', '2022-09-22 00:16:27.342');
INSERT INTO "public"."plugin_handle" VALUES ('1529402613204172817', '33',
'maskStatus', 'maskStatus', 3, 2, 2,
'{"required":"0","defaultValue":"false","rule":""}', '2022-09-22 00:17:21.150',
'2022-09-22 00:17:21.150');
-INSERT INTO "public"."plugin_handle" VALUES ('1570590990341775360', '39',
'endpoint', 'casdoor endpoint', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591047635968000', '39',
'client_id', 'client_id', 2, 3, 0, '{"required":"1","rule":""}', '2022-09-16
09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591109623586816', '39',
'client_secrect', 'client_secrect', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591165374275584', '39',
'certificate', 'certificate', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591215131303936', '39',
'organization-name', 'organization-name', 2, 3, 0,
'{"required":"1","rule":""}', '2022-09-16 09:50:46', '2022-09-16 09:50:46');
-INSERT INTO "public"."plugin_handle" VALUES ('1570591265492312064', '39',
'application-name', 'application-name', 2, 3, 0, '{"required":"1","rule":""}',
'2022-09-16 09:50:46', '2022-09-16 09:50:46');
-
INSERT INTO "public"."plugin_handle" VALUES ('1678293333363167232', '42',
'discoveryHandler', 'discoveryHandler', 2, 1, 0,
'{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}');
INSERT INTO "public"."plugin_handle" VALUES ('1678997037438107648', '42',
'bossGroupThreadCount', 'bossGroupThreadCount', 2, 1, 1,
'{"required":"0","defaultValue":"1","rule":""}');
@@ -1726,16 +1708,6 @@ INSERT INTO "public"."resource" VALUES
('1844025850382667776', '1844015648095666
INSERT INTO "public"."resource" VALUES ('1844025989214130176',
'1844015648095666176', 'SHENYU.BUTTON.SYSTEM.DELETE', '', '', '', 2, 0,
'delete', 1, 0, 'system:scale:delete', 1, '2024-10-09 22:43:50.831000',
'2024-10-09 22:43:50.831705');
INSERT INTO "public"."resource" VALUES ('1844026099075534848',
'1844015648095666176', 'SHENYU.BUTTON.SYSTEM.EDIT', '', '', '', 2, 0, 'edit',
1, 0, 'system:scale:edit', 1, '2024-10-09 22:44:17.024000', '2024-10-09
22:44:17.024555');
-INSERT INTO "public"."resource" VALUES ('1792749362361954340',
'1346775491550474240', 'casdoor', 'casdoor', '/plug/casdoor', 'casdoor', 1, 0,
'safety', 0, 0, '', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840411',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0,
'', 1, 0, 'plugin:casdoorSelector:add', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840412',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.SELECTOR.QUERY', '', '', '', 2, 0,
'', 1, 0, 'plugin:casdoorSelector:query', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840413',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.SELECTOR.EDIT', '', '', '', 2, 0,
'', 1, 0, 'plugin:casdoorSelector:edit', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840414',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.SELECTOR.DELETE', '', '', '', 2,
0, '', 1, 0, 'plugin:casdoorSelector:delete', 1, '2022-05-25 18:02:58',
'2022-05-25 18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840415',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.RULE.ADD', '', '', '', 2, 0, '',
1, 0, 'plugin:casdoorRule:add', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840416',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.RULE.QUERY', '', '', '', 2, 0, '',
1, 0, 'plugin:casdoorRule:query', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840417',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.RULE.EDIT', '', '', '', 2, 0, '',
1, 0, 'plugin:casdoorRule:edit', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840418',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.RULE.DELETE', '', '', '', 2, 0,
'', 1, 0, 'plugin:casdoorRule:delete', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
-INSERT INTO "public"."resource" VALUES ('1792749362445840419',
'1792749362361954340', 'SHENYU.BUTTON.PLUGIN.SYNCHRONIZE', '', '', '', 2, 0,
'', 1, 0, 'plugin:casdoor:modify', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
INSERT INTO "public"."resource" VALUES ('1792749362361954341',
'1346775491550474240', 'keyAuth', 'keyAuth', '/plug/keyAuth', 'keyAuth', 1, 0,
'border-bottom', 0, 0, '', 1, '2022-05-25 18:02:58', '2022-05-25 18:02:58');
INSERT INTO "public"."resource" VALUES ('1792749362445840420',
'1792749362361954341', 'SHENYU.BUTTON.PLUGIN.SELECTOR.ADD', '', '', '', 2, 0,
'', 1, 0, 'plugin:keyAuthSelector:add', 1, '2022-05-25 18:02:58', '2022-05-25
18:02:58');
@@ -2634,7 +2606,6 @@ INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822168','64933
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822169','649330b6-c2d7-4edc-be8e-8a54df9eb385','31', NULL, 1, 0,
'2022-06-16 14:40:35.000', '2022-06-16 14:40:55.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822170','649330b6-c2d7-4edc-be8e-8a54df9eb385','32',
'{"host":"localhost", "port": "9200"}', 190, 0, '2022-06-19 22:00:00.000',
'2022-06-19 22:00:00.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822171','649330b6-c2d7-4edc-be8e-8a54df9eb385','33',
'{"host":"localhost", "port": "9092"}', 180, 0, '2022-07-04 22:00:00.000',
'2022-07-02 22:00:00.000');
-INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822176','649330b6-c2d7-4edc-be8e-8a54df9eb385','39',
'{"endpoint":"http://localhost:8000"}', 40, 0, '2022-09-11 12:00:00.000',
'2022-09-11 12:00:00.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822177','649330b6-c2d7-4edc-be8e-8a54df9eb385','4',
'{"master":"mymaster","mode":"standalone","url":"192.168.1.1:6379","password":"abc"}',
60, 0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822178','649330b6-c2d7-4edc-be8e-8a54df9eb385','40', NULL, 150,
0, '2022-07-24 19:00:00.000', '2022-07-24 19:00:00.000');
INSERT INTO "public"."namespace_plugin_rel" VALUES
('1801816010882822179','649330b6-c2d7-4edc-be8e-8a54df9eb385','42', NULL, 320,
1, '2023-05-30 18:02:53.000', '2022-05-30 18:02:53.000');
diff --git a/docs/plugin-store-casdoor.md b/docs/plugin-store-casdoor.md
new file mode 100644
index 0000000000..b0de9870e0
--- /dev/null
+++ b/docs/plugin-store-casdoor.md
@@ -0,0 +1,33 @@
+<!--
+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.
+-->
+# Casdoor Plugin Store Cutover
+
+The Casdoor authentication runtime plugin and Spring Boot starter are no
longer built or shipped by the main ShenYu repository. Existing deployments
that use Casdoor should add the external plugin-store starter:
+
+```xml
+<dependency>
+ <groupId>org.apache.shenyu</groupId>
+ <artifactId>shenyu-spring-boot-starter-plugin-casdoor</artifactId>
+ <version>2.7.1-SNAPSHOT</version>
+</dependency>
+```
+
+The external plugin keeps the same plugin name, order, plugin-data fields,
callback parameters, and downstream identity headers (`name`, `id`, and
`organization`) used by the former in-tree implementation. Certificates and
secrets remain deployment-owned configuration and must not be committed to
source control.
+
+The main repository keeps `PluginEnum.CASDOOR` as a stable compatibility
contract for the external plugin and existing admin data during the supported
cutover window. The main repository no longer publishes the Casdoor runtime
artifact or includes the Casdoor SDK in the default bootstrap distribution.
+
+Rollback during the cutover window is a dependency-only change: remove the
external starter and return to a ShenYu build that still shipped the in-tree
Casdoor starter. Existing plugin data keeps the same plugin name and
configuration schema.
diff --git a/pom.xml b/pom.xml
index 3c9c83fc44..520fb72d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,6 @@
<lettuce.version>6.1.2.RELEASE</lettuce.version>
<protobuf-java.version>3.25.5</protobuf-java.version>
<jsonpath.version>2.4.0</jsonpath.version>
- <casdoor-java-sdk.version>1.9.0</casdoor-java-sdk.version>
<opengauss-jdbc.version>5.0.0-og</opengauss-jdbc.version>
<chicory.version>1.7.3</chicory.version>
<bcprov-jdk18on.version>1.85</bcprov-jdk18on.version>
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/EnumServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/EnumServiceImpl.java
index ee2bae5cb2..4f095641e3 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/EnumServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/EnumServiceImpl.java
@@ -74,7 +74,7 @@ public class EnumServiceImpl implements EnumService {
.map(paramTypeEnum -> new EnumVO(null,
paramTypeEnum.getName(),
paramTypeEnum.getSupport())).collect(Collectors.toList());
List<EnumVO> pluginEnums = Arrays.stream(PluginEnum.values())
- .filter(pluginEnum -> pluginEnum != PluginEnum.HYSTRIX)
+ .filter(pluginEnum -> pluginEnum != PluginEnum.HYSTRIX &&
pluginEnum != PluginEnum.CASDOOR)
.map(pluginEnum -> new EnumVO(pluginEnum.getCode(),
pluginEnum.getName(), true))
.collect(Collectors.toList());
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 ba1dd07819..f63f93dd3b 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -590,7 +590,6 @@ INSERT IGNORE INTO `plugin` (`id`, `name`, `config`,
`role`, `sort`, `enabled`)
INSERT IGNORE INTO `plugin` (`id`, `name`, `config`, `role`, `sort`,
`enabled`) VALUES ('31', 'mock', null, 'Mock', 1, 0);
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('32', 'loggingElasticSearch', 'Logging',
190,'{"host":"localhost", "port": "9200"}', '0');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('33', 'loggingKafka', 'Logging',
180,'{"topic":"shenyu-access-logging", "namesrvAddr": "localhost:9092"}', '0');
-INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('39', 'casdoor', 'Authentication', 40,
'{"endpoint":"http://localhost:8000"}', '0');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`) VALUES
('40', 'keyAuth', 'Authentication', 150, '0');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`) VALUES
('42','tcp','Proxy', 320, '1');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('44', 'basicAuth', 'Authentication', 150,
'{"defaultHandleJson":"{\"authorization\":\"test:test123\"}"}', '0');
@@ -828,13 +827,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
('1529402613204172943', '33', 'maskType', 'maskType', 3, 2, 1,
'{"required":"0","defaultValue":"dataMaskByMD5","rule":""}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172944', '33', 'maskStatus', 'maskStatus', 3, 2, 2,
'{"required":"0","defaultValue":"false","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570590990341775360', '39', 'endpoint', 'casdoor endpoint', 2, 3, 0,
'{"required":"1","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570591047635968000', '39', 'client_id', 'client_id', 2, 3, 0,
'{"required":"1","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570591109623586816', '39', 'client_secrect', 'client_secrect', 2, 3, 0,
'{"required":"1","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570591165374275584', '39', 'certificate', 'certificate', 2, 3, 0,
'{"required":"1","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570591215131303936', '39', 'organization-name', 'organization-name', 2, 3,
0, '{"required":"1","rule":""}');
-INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570591265492312064', '39', 'application-name', 'application-name', 2, 3, 0,
'{"required":"1","rule":""}');
-
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1678293333363167232', '42', 'discoveryHandler', 'discoveryHandler', 2, 1, 0,
'{"required":"0","defaultValue":"url,protocol,status,weight","rule":""}');
@@ -1344,7 +1336,6 @@ INSERT IGNORE INTO `namespace_plugin_rel`
(`id`,`namespace_id`,`plugin_id`, `con
INSERT IGNORE INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`,
`config`, `sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822169','649330b6-c2d7-4edc-be8e-8a54df9eb385','31', NULL, 1, 0,
'2022-06-16 14:40:35.000', '2022-06-16 14:40:55.000');
INSERT IGNORE INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`,
`config`, `sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822170','649330b6-c2d7-4edc-be8e-8a54df9eb385','32',
'{"host":"localhost", "port": "9200"}', 190, 0, '2022-06-19 22:00:00.000',
'2022-06-19 22:00:00.000');
INSERT IGNORE INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`,
`config`, `sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822171','649330b6-c2d7-4edc-be8e-8a54df9eb385','33',
'{"host":"localhost", "port": "9092"}', 180, 0, '2022-07-04 22:00:00.000',
'2022-07-02 22:00:00.000');
-INSERT IGNORE INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`,
`config`, `sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822176','649330b6-c2d7-4edc-be8e-8a54df9eb385','39',
'{"endpoint":"http://localhost:8000"}', 40, 0, '2022-09-11 12:00:00.000',
'2022-09-11 12:00:00.000');
INSERT IGNORE INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`,
`config`, `sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822177','649330b6-c2d7-4edc-be8e-8a54df9eb385','4',
'{"master":"mymaster","mode":"standalone","url":"192.168.1.1:6379","password":"abc"}',
60, 0, '2022-05-25 18:02:53.000', '2022-05-25 18:02:53.000');
INSERT IGNORE INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`,
`config`, `sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822178','649330b6-c2d7-4edc-be8e-8a54df9eb385','40', NULL, 150,
0, '2022-07-24 19:00:00.000', '2022-07-24 19:00:00.000');
INSERT IGNORE INTO `namespace_plugin_rel` (`id`,`namespace_id`,`plugin_id`,
`config`, `sort`, `enabled`, `date_created`, `date_updated`) VALUES
('1801816010882822179','649330b6-c2d7-4edc-be8e-8a54df9eb385','42', NULL, 320,
1, '2023-05-30 18:02:53.000', '2022-05-30 18:02:53.000');
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index 8e8712b5f8..9d7f776883 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -144,14 +144,6 @@
</dependency>
<!--shenyu jwt end-->
- <!--shenyu casdoor plugin start-->
- <dependency>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-plugin-casdoor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--shenyu auth plugin end-->
-
<!-- shenyu modify response plugin start-->
<dependency>
<groupId>org.apache.shenyu</groupId>
diff --git a/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
b/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
index c585cfe78c..326147be61 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
+++ b/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
@@ -596,7 +596,6 @@ The text of each license is the standard Apache 2.0 license.
jackson-jr-objects 2.10.1: http://wiki.fasterxml.com/JacksonHome, Apache
2.0
elasticsearch-java 8.13.4: https://github.com/elastic/elasticsearch-java,
Apache 2.0
elasticsearch-rest-client 8.2.3: https://github.com/elastic/elasticsearch,
Apache 2.0
- casdoor-java-sdk 1.9.0: https://github.com/casdoor/casdoor-java-sdk,
Apache 2.0
nimbus-jose-jwt 9.10: https://connect2id.com/products/nimbus-jose-jwt,
Apache 2.0
oltu 1.0.2: https://oltu.apache.org/, Apache 2.0
httpclient 4.5.14: https://github.com/apache/httpcomponents-client, Apache
2.0
diff --git a/shenyu-plugin/shenyu-plugin-security/pom.xml
b/shenyu-plugin/shenyu-plugin-security/pom.xml
index a8001b0aa2..7a05c7e2ee 100644
--- a/shenyu-plugin/shenyu-plugin-security/pom.xml
+++ b/shenyu-plugin/shenyu-plugin-security/pom.xml
@@ -27,7 +27,6 @@
<packaging>pom</packaging>
<modules>
- <module>shenyu-plugin-casdoor</module>
<module>shenyu-plugin-jwt</module>
<module>shenyu-plugin-key-auth</module>
<module>shenyu-plugin-oauth2</module>
diff --git a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/pom.xml
b/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/pom.xml
deleted file mode 100644
index 040c22e040..0000000000
--- a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-plugin-security</artifactId>
- <version>2.7.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-plugin-casdoor</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.casbin</groupId>
- <artifactId>casdoor-java-sdk</artifactId>
- <version>${casdoor-java-sdk.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
diff --git
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/CasdoorPlugin.java
b/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/CasdoorPlugin.java
deleted file mode 100644
index 7e0cbafb63..0000000000
---
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/CasdoorPlugin.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shenyu.plugin.casdoor;
-
-import org.apache.shenyu.common.dto.RuleData;
-import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.common.utils.Singleton;
-import org.apache.shenyu.plugin.api.ShenyuPluginChain;
-import org.apache.shenyu.plugin.api.result.ShenyuResultEnum;
-import org.apache.shenyu.plugin.api.result.ShenyuResultWrap;
-import org.apache.shenyu.plugin.api.utils.WebFluxResultUtils;
-import org.apache.shenyu.plugin.base.AbstractShenyuPlugin;
-import org.casbin.casdoor.entity.CasdoorUser;
-import org.casbin.casdoor.service.CasdoorAuthService;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-import java.util.Objects;
-
-/**
- * The type Casdoor plugin.
- */
-public class CasdoorPlugin extends AbstractShenyuPlugin {
-
- @Override
- protected Mono<Void> doExecute(final ServerWebExchange exchange, final
ShenyuPluginChain chain, final SelectorData selector, final RuleData rule) {
- CasdoorAuthService casdoorAuthService =
Singleton.INST.get(CasdoorAuthService.class);
- ServerHttpRequest request = exchange.getRequest();
- String token =
exchange.getRequest().getHeaders().getFirst(HttpHeaders.AUTHORIZATION);
- if (Objects.nonNull(token)) {
- CasdoorUser casdoorUser = casdoorAuthService.parseJwtToken(token);
- if (Objects.nonNull(casdoorUser)) {
- return chain.execute(handleToken(exchange, casdoorUser));
- }
- }
- MultiValueMap<String, String> queryParams = request.getQueryParams();
- String code = queryParams.getFirst("code");
- String state = queryParams.getFirst("state");
- if (Objects.nonNull(code) || Objects.nonNull(state)) {
- token = casdoorAuthService.getOAuthToken(code, state);
- CasdoorUser casdoorUser = casdoorAuthService.parseJwtToken(token);
- if (Objects.nonNull(casdoorUser)) {
- return chain.execute(handleToken(exchange, casdoorUser));
- }
- }
- Object error = ShenyuResultWrap.error(exchange,
ShenyuResultEnum.ERROR_TOKEN);
- return WebFluxResultUtils.result(exchange, error);
- }
-
- @Override
- public int getOrder() {
- return PluginEnum.CASDOOR.getCode();
- }
-
- @Override
- public String named() {
- return PluginEnum.CASDOOR.getName();
- }
-
- @Override
- public boolean skip(final ServerWebExchange exchange) {
- return false;
- }
-
- private ServerWebExchange handleToken(final ServerWebExchange exchange,
final CasdoorUser casdoorUser) {
- ServerHttpRequest.Builder mutate = exchange.getRequest().mutate();
- mutate.header("name", casdoorUser.getName());
- mutate.header("id", casdoorUser.getId());
- mutate.header("organization", casdoorUser.getOwner());
- return exchange.mutate().request(mutate.build()).build();
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/config/CasdoorConfig.java
b/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/config/CasdoorConfig.java
deleted file mode 100644
index 6ec268d096..0000000000
---
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/config/CasdoorConfig.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shenyu.plugin.casdoor.config;
-
-public class CasdoorConfig {
-
- private String endpoint;
-
- private String clientId;
-
- private String clientSecret;
-
- private String certificate;
-
- private String organizationName;
-
- private String applicationName;
-
- public CasdoorConfig(final String endpoint, final String clientId, final
String clientSecret, final String certificate, final String organizationName,
final String applicationName) {
- this.endpoint = endpoint;
- this.clientId = clientId;
- this.clientSecret = clientSecret;
- this.certificate = certificate;
- this.organizationName = organizationName;
- this.applicationName = applicationName;
- }
-
- public CasdoorConfig() {
- }
-
- /**
- * Gets endpoint.
- *
- * @return the endpoint
- */
- public String getEndpoint() {
- return this.endpoint;
- }
-
- /**
- * Gets clientId.
- *
- * @return the clientId
- */
- public String getClientId() {
- return this.clientId;
- }
-
- /**
- * Gets clientSecret.
- *
- * @return the clientSecret
- */
- public String getClientSecret() {
- return this.clientSecret;
- }
-
- /**
- * Gets certificate.
- *
- * @return the certificate
- */
- public String getCertificate() {
- return this.certificate;
- }
-
- /**
- * Gets organizationName.
- *
- * @return the organizationName
- */
- public String getOrganizationName() {
- return this.organizationName;
- }
-
- /**
- * Gets applicationName.
- *
- * @return the applicationName
- */
- public String getApplicationName() {
- return this.applicationName;
- }
-
- /**
- * Sets endpoint.
- *
- * @param endpoint the endpoint
- */
- public void setEndpoint(final String endpoint) {
- this.endpoint = endpoint;
- }
-
- /**
- * Sets clientId.
- *
- * @param clientId the clientId
- */
- public void setClientId(final String clientId) {
- this.clientId = clientId;
- }
-
- /**
- * Sets clientSecret.
- *
- * @param clientSecret the clientSecret
- */
- public void setClientSecret(final String clientSecret) {
- this.clientSecret = clientSecret;
- }
-
- /**
- * Sets certificate.
- *
- * @param certificate the certificate
- */
- public void setCertificate(final String certificate) {
- this.certificate = certificate;
- }
-
- /**
- * Sets organizationName.
- *
- * @param organizationName the organizationName
- */
- public void setOrganizationName(final String organizationName) {
- this.organizationName = organizationName;
- }
-
- /**
- * Sets applicationName.
- *
- * @param applicationName the applicationName
- */
- public void setApplicationName(final String applicationName) {
- this.applicationName = applicationName;
- }
-
- @Override
- public String toString() {
- return "authConfig{"
- + "endpoint='" + endpoint + '\''
- + ", clientId='" + clientId + '\''
- + ", clientSecret='" + clientSecret + '\''
- + ", certificate='" + certificate + '\''
- + ", organizationName='" + organizationName + '\''
- + ", applicationName='" + applicationName + '\''
- + '}';
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/handle/CasdoorPluginDateHandler.java
b/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/handle/CasdoorPluginDateHandler.java
deleted file mode 100644
index 1a48e73326..0000000000
---
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/main/java/org/apache/shenyu/plugin/casdoor/handle/CasdoorPluginDateHandler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shenyu.plugin.casdoor.handle;
-
-import org.apache.shenyu.common.dto.PluginData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.common.utils.Singleton;
-import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.casbin.casdoor.config.CasdoorConfig;
-import org.casbin.casdoor.service.CasdoorAuthService;
-
-import java.util.Map;
-import java.util.Optional;
-
-public class CasdoorPluginDateHandler implements PluginDataHandler {
- @Override
- public void handlerPlugin(final PluginData pluginData) {
- Map<String, String> configMap =
GsonUtils.getInstance().toObjectMap(pluginData.getConfig(), String.class);
- final String endpoint =
Optional.ofNullable(configMap.get("endpoint")).orElse("");
- final String clientSecrect =
Optional.ofNullable(configMap.get("client_secrect")).orElse("");
- final String clientId =
Optional.ofNullable(configMap.get("client_id")).orElse("");
- String certificate =
Optional.ofNullable(configMap.get("certificate")).orElse("");
- certificate = certificate.replace("\\n", "\n");
- String organization =
Optional.ofNullable(configMap.get("organization-name")).orElse("");
- String application =
Optional.ofNullable(configMap.get("application-name")).orElse("");
- CasdoorConfig casdoorConfig = new CasdoorConfig(endpoint, clientId,
clientSecrect, certificate, organization, application);
- CasdoorAuthService casdoorAuthService = new
CasdoorAuthService(casdoorConfig);
- Singleton.INST.single(CasdoorAuthService.class, casdoorAuthService);
- }
-
- @Override
- public String pluginNamed() {
- return PluginEnum.CASDOOR.getName();
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/CasdoorPluginTest.java
b/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/CasdoorPluginTest.java
deleted file mode 100644
index ddc266ad5d..0000000000
---
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/CasdoorPluginTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shenyu.plugin.casdoor;
-
-import org.apache.shenyu.common.dto.PluginData;
-import org.apache.shenyu.common.dto.RuleData;
-import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.common.utils.Singleton;
-import org.apache.shenyu.plugin.api.ShenyuPluginChain;
-import org.apache.shenyu.plugin.api.result.DefaultShenyuResult;
-import org.apache.shenyu.plugin.api.result.ShenyuResult;
-import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.apache.shenyu.plugin.casdoor.handle.CasdoorPluginDateHandler;
-import org.casbin.casdoor.entity.CasdoorUser;
-import org.casbin.casdoor.exception.CasdoorAuthException;
-import org.casbin.casdoor.service.CasdoorAuthService;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.mockito.Mockito;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.http.HttpHeaders;
-import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
-import org.springframework.mock.web.server.MockServerWebExchange;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class CasdoorPluginTest {
- @InjectMocks
- @Spy
- private CasdoorPlugin casdoorPluginTest;
-
- @Spy
- private CasdoorPluginDateHandler casdoorPluginDateHandlerTest;
-
- private ServerWebExchange exchange;
-
- @Mock
- private ShenyuPluginChain chain;
-
- @Mock
- private SelectorData selector;
-
- @Mock
- private RuleData rule;
-
- @BeforeEach
- void setup() {
- ConfigurableApplicationContext context =
mock(ConfigurableApplicationContext.class);
- when(context.getBean(ShenyuResult.class)).thenReturn(new
DefaultShenyuResult());
- SpringBeanUtils springBeanUtils = SpringBeanUtils.getInstance();
- springBeanUtils.setApplicationContext(context);
- MockitoAnnotations.openMocks(this);
- exchange = MockServerWebExchange.from(MockServerHttpRequest
- .get("localshost")
- .header(HttpHeaders.AUTHORIZATION, "token")
- .build());
-
- }
-
- @Test
- void doExecute() {
- final PluginData pluginData = new PluginData("pluginId", "pluginName",
"{\"organization-name\":\"test\",\"application-name\":\"app-test\",\"endpoint\":\"http://localhost:8000\",\"client_secrect\":\"a4209d412a33a842b7a9c05a3446e623cbb7262d\",\"client_id\":\"6e3a84154e73d1fb156a\",\"certificate\":\"-----BEGIN
CERTIFICATE-----\\n\"}", "0", false, null);
- casdoorPluginDateHandlerTest.handlerPlugin(pluginData);
- try {
- CasdoorAuthService casdoorAuthService =
Singleton.INST.get(CasdoorAuthService.class);
- casdoorPluginTest.doExecute(exchange, chain, selector, rule);
- } catch (Exception e) {
- Assumptions.assumeTrue(e instanceof CasdoorAuthException);
- }
-
- CasdoorAuthService casdoorAuthService = mock(CasdoorAuthService.class);
- String token =
exchange.getRequest().getHeaders().getFirst(HttpHeaders.AUTHORIZATION);
- CasdoorUser casdoorUser = new CasdoorUser();
-
Mockito.when(casdoorAuthService.parseJwtToken(token)).thenReturn(casdoorUser);
- Singleton.INST.single(CasdoorAuthService.class, casdoorAuthService);
- when(this.chain.execute(any())).thenReturn(Mono.empty());
- Mono<Void> mono = casdoorPluginTest.doExecute(exchange, chain,
selector, rule);
- StepVerifier.create(mono).expectSubscription().verifyComplete();
-
- exchange = MockServerWebExchange.from(MockServerHttpRequest
- .get("localshost")
- .queryParam("state", "state")
- .queryParam("code", "code")
- .build());
- Mockito.when(casdoorAuthService.getOAuthToken("code",
"state")).thenReturn(token);
- Singleton.INST.single(CasdoorAuthService.class, casdoorAuthService);
- mono = casdoorPluginTest.doExecute(exchange, chain, selector, rule);
- StepVerifier.create(mono).expectSubscription().verifyComplete();
-
- exchange = MockServerWebExchange.from(MockServerHttpRequest
- .get("localshost")
- .build());
- mono = casdoorPluginTest.doExecute(exchange, chain, selector, rule);
- StepVerifier.create(mono).expectSubscription().verifyComplete();
- }
-
- @Test
- public void testNamed() {
- final String result = casdoorPluginTest.named();
- Assertions.assertEquals(PluginEnum.CASDOOR.getName(), result);
- }
-
- @Test
- public void testGetOrder() {
- final int result = casdoorPluginTest.getOrder();
- Assertions.assertEquals(PluginEnum.CASDOOR.getCode(), result);
- }
-
- @Test
- public void skipTest() {
- Assumptions.assumeFalse(casdoorPluginTest.skip(exchange));
- }
-
-}
diff --git
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/config/CasdoorConfigTest.java
b/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/config/CasdoorConfigTest.java
deleted file mode 100644
index 5c70c289c9..0000000000
---
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/config/CasdoorConfigTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shenyu.plugin.casdoor.config;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class CasdoorConfigTest {
-
- @Test
- public void casdoorConfig() {
- CasdoorConfig casdoorConfig = new CasdoorConfig("a", "b", "c", "d",
"e", "f");
- assertEquals("a", casdoorConfig.getEndpoint());
- assertEquals("b", casdoorConfig.getClientId());
- assertEquals("c", casdoorConfig.getClientSecret());
- assertEquals("d", casdoorConfig.getCertificate());
- assertEquals("e", casdoorConfig.getOrganizationName());
- assertEquals("f", casdoorConfig.getApplicationName());
-
- CasdoorConfig casdoorConfig1 = new CasdoorConfig();
- casdoorConfig1.setEndpoint("a");
- casdoorConfig1.setClientId("b");
- casdoorConfig1.setClientSecret("c");
- casdoorConfig1.setCertificate("d");
- casdoorConfig1.setOrganizationName("e");
- casdoorConfig1.setApplicationName("f");
- assertEquals("a", casdoorConfig1.getEndpoint());
- assertEquals("b", casdoorConfig1.getClientId());
- assertEquals("c", casdoorConfig1.getClientSecret());
- assertEquals("d", casdoorConfig1.getCertificate());
- assertEquals("e", casdoorConfig1.getOrganizationName());
- assertEquals("f", casdoorConfig1.getApplicationName());
- assertEquals("authConfig{endpoint='a', clientId='b', clientSecret='c',
certificate='d', organizationName='e', applicationName='f'}",
casdoorConfig1.toString());
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/handle/CasdoorPluginDateHandlerTest.java
b/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/handle/CasdoorPluginDateHandlerTest.java
deleted file mode 100644
index a8df355fc6..0000000000
---
a/shenyu-plugin/shenyu-plugin-security/shenyu-plugin-casdoor/src/test/java/org/apache/shenyu/plugin/casdoor/handle/CasdoorPluginDateHandlerTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shenyu.plugin.casdoor.handle;
-
-import org.apache.shenyu.common.dto.PluginData;
-import org.apache.shenyu.common.enums.PluginEnum;
-import org.apache.shenyu.common.utils.Singleton;
-import org.casbin.casdoor.service.CasdoorAuthService;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class CasdoorPluginDateHandlerTest {
-
- private CasdoorPluginDateHandler casdoorPluginDateHandlerTest;
-
- @BeforeEach
- public void setup() {
- casdoorPluginDateHandlerTest = new CasdoorPluginDateHandler();
- }
-
- @Test
- public void handlerPlugin() {
- final PluginData pluginData = new PluginData("pluginId", "pluginName",
"{\"organization-name\":\"test\",\"application-name\":\"app-test\",\"endpoint\":\"http://localhost:8000\",\"client_secrect\":\"a4209d412a33a842b7a9c05a3446e623cbb7262d\",\"client_id\":\"6e3a84154e73d1fb156a\",\"certificate\":\"-----BEGIN
CERTIFICATE-----\\n\"}", "0", false, null);
- casdoorPluginDateHandlerTest.handlerPlugin(pluginData);
- CasdoorAuthService casdoorAuthService =
Singleton.INST.get(CasdoorAuthService.class);
- String redirect = "http://localhost:9195/http/hi";
- assertEquals(casdoorAuthService.getSigninUrl(redirect),
"http://localhost:8000/login/oauth/authorize?client_id=6e3a84154e73d1fb156a&response_type=code&redirect_uri=http%3A%2F%2Flocalhost%3A9195%2Fhttp%2Fhi&scope=read&state=app-test");
- }
-
- @Test
- public void testPluginNamed() {
- final String result = casdoorPluginDateHandlerTest.pluginNamed();
- assertEquals(PluginEnum.CASDOOR.getName(), result);
- }
-}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
index 0f53999978..046de2beed 100644
--- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
+++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml
@@ -60,7 +60,6 @@
<module>shenyu-spring-boot-starter-plugin-logging-elasticsearch</module>
<module>shenyu-spring-boot-starter-plugin-cache</module>
<module>shenyu-spring-boot-starter-plugin-mock</module>
- <module>shenyu-spring-boot-starter-plugin-casdoor</module>
<module>shenyu-spring-boot-starter-plugin-key-auth</module>
<module>shenyu-spring-boot-starter-plugin-tcp</module>
<module>shenyu-spring-boot-starter-plugin-transform</module>
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/pom.xml
deleted file mode 100644
index d14bb58d97..0000000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-plugin</artifactId>
- <version>2.7.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-spring-boot-starter-plugin-casdoor</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-plugin-casdoor</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/src/main/java/org/apache/shenyu/springboot/starter/plugin/casdoor/CasdoorPluginConfiguration.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/src/main/java/org/apache/shenyu/springboot/starter/plugin/casdoor/CasdoorPluginConfiguration.java
deleted file mode 100644
index 03f33b0587..0000000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/src/main/java/org/apache/shenyu/springboot/starter/plugin/casdoor/CasdoorPluginConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shenyu.springboot.starter.plugin.casdoor;
-
-import org.apache.shenyu.plugin.api.ShenyuPlugin;
-import org.apache.shenyu.plugin.casdoor.CasdoorPlugin;
-import org.apache.shenyu.plugin.casdoor.handle.CasdoorPluginDateHandler;
-import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConditionalOnProperty(value = {"shenyu.plugins.casdoor.enabled"}, havingValue
= "true", matchIfMissing = true)
-public class CasdoorPluginConfiguration {
-
- /**
- * the casdoor plugin.
- * @return the shenyu plugin
- */
- @Bean
- public ShenyuPlugin authPathPlugin() {
- return new CasdoorPlugin();
- }
-
- /**
- * Casdoor plugin data handler.
- *
- * @return the plugin data handler
- */
- @Bean
- public PluginDataHandler authPluginDataHandler() {
- return new CasdoorPluginDateHandler();
- }
-}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 4c6fdb595a..0000000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-casdoor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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.
-#
-
-org.apache.shenyu.springboot.starter.plugin.casdoor.CasdoorPluginConfiguration