This is an automated email from the ASF dual-hosted git repository.
haiqi 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 8db1b9a1d [type:fix] fix motan (#4953)
8db1b9a1d is described below
commit 8db1b9a1decca9e2ef47da9332b7eef0d0e3d26e
Author: moremind <[email protected]>
AuthorDate: Thu Aug 3 21:42:29 2023 +0800
[type:fix] fix motan (#4953)
---
db/init/mysql/schema.sql | 2 +-
db/init/og/create-table.sql | 2 +-
db/init/oracle/schema.sql | 2 +-
db/init/pg/create-table.sql | 2 +-
db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql | 2 +-
db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql | 2 +-
db/upgrade/2.5.1-upgrade-2.6.0-pg.sql | 2 +-
shenyu-admin/src/main/resources/sql-script/h2/schema.sql | 2 +-
.../shenyu-examples-motan-service/src/main/resources/application.yml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index fd6ff2fb4..1d413f95a 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -974,7 +974,7 @@ INSERT INTO `plugin_handle` VALUES ('1529402613204172830',
'26', 'loadBalance',
INSERT INTO `plugin_handle` VALUES ('1529402613204172831', '26', 'retry',
'retryCount', 1, 2, 1, NULL, '2022-05-25 18:02:53', '2022-05-25 18:02:53');
INSERT INTO `plugin_handle` VALUES ('1529402613204172832', '26', 'timeout',
'timeout', 1, 2, 2, '{\"defaultValue\":\"3000\",\"rule\":\"\"}', '2022-05-25
18:02:53', '2022-05-25 18:02:53');
INSERT INTO `plugin_handle` VALUES ('1529402613204172833', '26',
'multiSelectorHandle', 'multiSelectorHandle', 3, 3, 0, NULL, '2022-05-25
18:02:53', '2022-05-25 18:02:53');
-INSERT INTO `plugin_handle` VALUES ('1529402613204172834', '17',
'registerProtocol', 'registerProtocol', 2, 3, 0,
'{\"required\":\"0\",\"defaultValue\":\"direct\",\"placeholder\":\"registerProtocol\",\"rule\":\"\"}',
'2022-05-25 18:02:53', '2022-05-25 18:02:53');
+INSERT INTO `plugin_handle` VALUES ('1529402613204172834', '17',
'registerProtocol', 'registerProtocol', 2, 3, 0,
'{\"required\":\"0\",\"defaultValue\":\"zk\",\"placeholder\":\"registerProtocol\",\"rule\":\"\"}',
'2022-05-25 18:02:53', '2022-05-25 18:02:53');
INSERT INTO `plugin_handle` VALUES ('1529402613204172835', '17',
'corethreads', 'corethreads', 1, 3, 2,
'{\"required\":\"0\",\"defaultValue\":\"0\",\"placeholder\":\"corethreads\",\"rule\":\"\"}',
'2022-05-25 18:02:53', '2022-05-25 18:02:53');
INSERT INTO `plugin_handle` VALUES ('1529402613204172836', '17', 'threads',
'threads', 1, 3, 3,
'{\"required\":\"0\",\"defaultValue\":\"2147483647\",\"placeholder\":\"threads\",\"rule\":\"\"}',
'2022-05-25 18:02:53', '2022-05-25 18:02:53');
INSERT INTO `plugin_handle` VALUES ('1529402613204172837', '17', 'queues',
'queues', 1, 3, 4,
'{\"required\":\"0\",\"defaultValue\":\"0\",\"placeholder\":\"queues\",\"rule\":\"\"}',
'2022-05-25 18:02:53', '2022-05-25 18:02:53');
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index a3db200a4..13d760ac1 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -1118,7 +1118,7 @@ INSERT INTO "public"."plugin_handle" VALUES
('1529403902783524875', '26', 'loadB
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524876', '26',
'retry', 'retryCount', 1, 2, 1, NULL, '2022-05-25 18:08:01', '2022-05-25
18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524877', '26',
'timeout', 'timeout', 1, 2, 2, '{"defaultValue":"3000","rule":""}', '2022-05-25
18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524878', '26',
'multiSelectorHandle', 'multiSelectorHandle', 3, 3, 0, NULL, '2022-05-25
18:08:01', '2022-05-25 18:08:01');
-INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524879', '17',
'registerProtocol', 'registerProtocol', 2, 3, 0,
'{"required":"0","defaultValue":"direct","placeholder":"registerProtocol","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
+INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524879', '17',
'registerProtocol', 'registerProtocol', 2, 3, 0,
'{"required":"0","defaultValue":"zk","placeholder":"registerProtocol","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1678997557628272641', '17',
'registerAddress', 'registerAddress', 2, 3, 1,
'{"required":"0","defaultValue":"127.0.0.1:2181","placeholder":"registerAddress","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524880', '17',
'corethreads', 'corethreads', 1, 3, 2,
'{"required":"0","defaultValue":"0","placeholder":"corethreads","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524881', '17',
'threads', 'threads', 1, 3, 3,
'{"required":"0","defaultValue":"2147483647","placeholder":"threads","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index e8f879274..22fea3d86 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -1116,7 +1116,7 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO
plugin (id, name, role
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, enabled) VALUES ('14', 'contextPath', 'HttpProcess', 80,'1');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, config, enabled) VALUES ('15', 'grpc', 'Proxy',
310,'{"multiSelectorHandle":"1","multiRuleHandle":"0","threadpool":"shared"}','0');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, enabled) VALUES ('16', 'redirect', 'HttpProcess', 110,'0');
-INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, config, enabled) VALUES ('17', 'motan', 'Proxy',
310,'{"registerProtocol":"direct",registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}','0');
+INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, config, enabled) VALUES ('17', 'motan', 'Proxy',
310,'{"registerProtocol":"zk",registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}','0');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, enabled) VALUES ('18', 'loggingConsole', 'Logging', 160, '0');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, config, enabled) VALUES ('19', 'jwt', 'Authentication', 30,
'{"secretKey":"key"}', '0');
INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX(plugin(id)) */ INTO plugin (id, name,
role, sort, enabled) VALUES ('20', 'request', 'HttpProcess', 120, '0');
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index 5661ea77f..f81b66c1a 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -1117,7 +1117,7 @@ INSERT INTO "public"."plugin_handle" VALUES
('1529403902783524875', '26', 'loadB
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524876', '26',
'retry', 'retryCount', 1, 2, 1, NULL, '2022-05-25 18:08:01', '2022-05-25
18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524877', '26',
'timeout', 'timeout', 1, 2, 2, '{"defaultValue":"3000","rule":""}', '2022-05-25
18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524878', '26',
'multiSelectorHandle', 'multiSelectorHandle', 3, 3, 0, NULL, '2022-05-25
18:08:01', '2022-05-25 18:08:01');
-INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524879', '17',
'registerProtocol', 'registerProtocol', 2, 3, 0,
'{"required":"0","defaultValue":"direct","placeholder":"registerProtocol","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
+INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524879', '17',
'registerProtocol', 'registerProtocol', 2, 3, 0,
'{"required":"0","defaultValue":"zk","placeholder":"registerProtocol","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1678997557628272641', '17',
'registerAddress', 'registerAddress', 2, 3, 1,
'{"required":"0","defaultValue":"127.0.0.1:2181","placeholder":"registerAddress","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524880', '17',
'corethreads', 'corethreads', 1, 3, 2,
'{"required":"0","defaultValue":"0","placeholder":"corethreads","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
INSERT INTO "public"."plugin_handle" VALUES ('1529403902783524881', '17',
'threads', 'threads', 1, 3, 3,
'{"required":"0","defaultValue":"2147483647","placeholder":"threads","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
diff --git a/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql
b/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql
index 26f46c5c5..fd9b322c1 100644
--- a/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql
+++ b/db/upgrade/2.5.1-upgrade-2.6.0-mysql.sql
@@ -170,7 +170,7 @@ INSERT INTO `plugin_handle` VALUES ('1678997277012557824',
'42', 'clientMaxConne
INSERT INTO `plugin_handle` VALUES ('1678997557628272640', '42',
'clientPendingAcquireTimeout', 'clientPendingAcquireTimeout', 2, 1, 5,
'{\"required\":\"0\",\"defaultValue\":\"5\",\"rule\":\"\"}', '2023-01-10
10:08:01.158', '2023-01-10 10:08:01.158');
/* motan rpc */
-UPDATE `plugin` set config =
'{\"registerProtocol\":\"direct\",\"registerAddress\":\"127.0.0.1:8002\",\"corethreads\":0,\"threads\":2147483647,\"queues\":0,\"threadpool\":\"shared\"}'
WHERE id = '17';
+UPDATE `plugin` set config =
'{\"registerProtocol\":\"zk\",\"registerAddress\":\"127.0.0.1:8002\",\"corethreads\":0,\"threads\":2147483647,\"queues\":0,\"threadpool\":\"shared\"}'
WHERE id = '17';
UPDATE `plugin_handle` set field = 'registerProtocol', label =
'registerProtocol', sort = 0, ext_obj =
'{\"required\":\"0\",\"defaultValue\":\"direct\",\"placeholder\":\"registerProtocol\",\"rule\":\"\"}'
WHERE id = '1529402613204172834';
UPDATE `plugin_handle` set sort = 2 where id = '1529402613204172835';
UPDATE `plugin_handle` set sort = 3 where id = '1529402613204172836';
diff --git a/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
b/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
index 7112b19f0..eb2b5710a 100644
--- a/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
+++ b/db/upgrade/2.5.1-upgrade-2.6.0-oracle.sql
@@ -299,7 +299,7 @@ VALUES ('1678997277012557824', '42',
'clientMaxConnections', 'clientMaxConnectio
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 ('1678997557628272640', '42', 'clientPendingAcquireTimeout',
'clientPendingAcquireTimeout', 2, 1, 5,
'{"required":"0","defaultValue":"5","rule":""}');
-UPDATE "public"."plugin" set config =
'{"registerProtocol":"direct",registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}'
WHERE id = '17';
+UPDATE "public"."plugin" set config =
'{"registerProtocol":"zk",registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}'
WHERE id = '17';
UPDATE "public"."plugin_handle" set field = 'registerProtocol', label =
'registerProtocol', sort = 0, ext_obj =
'{"required":"0","defaultValue":"direct","placeholder":"registerProtocol","rule":""}'
where id = '1518229897214468142';
INSERT INTO "public"."plugin_handle" VALUES ('1678997557628272641', '17',
'registerAddress', 'registerAddress', 2, 3, 1,
'{"required":"0","defaultValue":"127.0.0.1:2181","placeholder":"registerAddress","rule":""}',
'2022-05-25 18:08:01', '2022-05-25 18:08:01');
diff --git a/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql
b/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql
index 505359c71..97adba37d 100644
--- a/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql
+++ b/db/upgrade/2.5.1-upgrade-2.6.0-pg.sql
@@ -227,7 +227,7 @@ INSERT INTO "public"."plugin_handle"
(id, plugin_id, field, "label", data_type, "type", sort, ext_obj,
date_created, date_updated)
VALUES('1678997557628272640', '42', 'clientPendingAcquireTimeout',
'clientPendingAcquireTimeout', 2, 1, 5,
'{"required":"0","defaultValue":"5","rule":""}', '2023-07-12 13:19:47.000',
'2023-07-12 13:23:33.253');
-UPDATE "public"."plugin" set config =
'{"registerProtocol":"direct",registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}'
WHERE id = '17';
+UPDATE "public"."plugin" set config =
'{"registerProtocol":"zk",registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}'
WHERE id = '17';
UPDATE "public"."plugin_handle" set field = 'registerProtocol', label =
'registerProtocol', ext_obj =
'{"required":"0","defaultValue":"direct","placeholder":"registerProtocol","rule":""}'
where id = '1529403902783524879';
UPDATE "public"."plugin_handle" set sort = 2 where id = '1529403902783524880';
UPDATE "public"."plugin_handle" set sort = 3 where id = '1529403902783524881';
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 449df6662..02d086b32 100755
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -522,7 +522,7 @@ INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`,
`config`, `enabled`)
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`) VALUES
('14', 'contextPath', 'HttpProcess', 80,'1');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('15', 'grpc', 'Proxy',
310,'{"multiSelectorHandle":"1","multiRuleHandle":"0","threadpool":"shared"}','0');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`) VALUES
('16', 'redirect', 'HttpProcess', 110,'0');
-INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('17', 'motan', 'Proxy',
310,'{"registerProtocol":"direct","registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}','0');
+INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('17', 'motan', 'Proxy',
310,'{"registerProtocol":"zk","registerAddress":"127.0.0.1:2181","corethreads":0,"threads":2147483647,"queues":0,"threadpool":"shared"}','0');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`) VALUES
('18', 'loggingConsole', 'Logging', 160, '0');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `config`,
`enabled`) VALUES ('19', 'jwt', 'Authentication', 30, '{"secretKey":"key"}',
'0');
INSERT IGNORE INTO `plugin` (`id`, `name`, `role`, `sort`, `enabled`) VALUES
('20', 'request', 'HttpProcess', 120, '0');
diff --git
a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/resources/application.yml
b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/resources/application.yml
index c292ad4eb..d9f2b31ed 100644
---
a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/resources/application.yml
+++
b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/resources/application.yml
@@ -43,7 +43,7 @@ shenyu:
motan:
registry:
- protocol: local
+ protocol: zk
address: 127.0.0.1:2181
logging:
