From d9858e16aa1dab3acb876d16d4d506daf6913aad Mon Sep 17 00:00:00 2001 From: kerwin612 Date: Mon, 14 Aug 2023 21:14:45 +0800 Subject: [PATCH] fixed #950 --- ...SourceCode-Analysis-WebSocket-Data-Sync.md | 5 ++- docs/deployment/deployment-custom.md | 1 + .../property-config/use-data-sync.md | 3 +- ...SourceCode-Analysis-WebSocket-Data-Sync.md | 5 ++- .../current/deployment/deployment-custom.md | 1 + .../current/design/flow-control.md | 41 +++++++++++++++++++ .../property-config/use-data-sync.md | 3 +- .../users-guide/soul-set-up.md | 1 + .../users-guide/use-data-sync.md | 5 ++- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.0/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.1/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.2/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.3/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../property-config/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../property-config/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../property-config/use-data-sync.md | 3 +- .../users-guide/soul-set-up.md | 1 + .../users-guide/use-data-sync.md | 5 ++- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.0/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.1/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.2/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../gateway-property-config.md | 1 + .../version-2.4.3/user-guide/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../property-config/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../property-config/use-data-sync.md | 3 +- .../deployment/deployment-custom.md | 1 + .../property-config/use-data-sync.md | 3 +- 47 files changed, 111 insertions(+), 24 deletions(-) diff --git a/blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md b/blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md index cb1bfe6e2f4..18accbc28ea 100644 --- a/blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md +++ b/blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md @@ -797,8 +797,9 @@ shenyu: dubbo : parameter: multi sync: - websocket : # Use websocket for data synchronization - urls: ws://localhost:9095/websocket # websocket address of admin + websocket : # Use websocket for data synchronization + urls: ws://localhost:9095/websocket # websocket address of admin + allowOrigin: ws://localhost:9195 ``` Add a dependency on websocket in the gateway. diff --git a/docs/deployment/deployment-custom.md b/docs/deployment/deployment-custom.md index 2c948e754f1..4ea65337cd6 100644 --- a/docs/deployment/deployment-custom.md +++ b/docs/deployment/deployment-custom.md @@ -62,4 +62,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/docs/user-guide/property-config/use-data-sync.md b/docs/user-guide/property-config/use-data-sync.md index 5d1d5d466a2..da2dba7a23c 100644 --- a/docs/user-guide/property-config/use-data-sync.md +++ b/docs/user-guide/property-config/use-data-sync.md @@ -35,8 +35,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md b/i18n/zh/docusaurus-plugin-content-blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md index 99b93b6183d..2fcf860f9df 100644 --- a/i18n/zh/docusaurus-plugin-content-blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md +++ b/i18n/zh/docusaurus-plugin-content-blog/DataSync-SourceCode-Analysis-WebSocket-Data-Sync.md @@ -796,8 +796,9 @@ shenyu: dubbo : parameter: multi sync: - websocket : # 使用websocket进行数据同步 - urls: ws://localhost:9095/websocket # admin端的websocket地址 + websocket : # 使用websocket进行数据同步 + urls: ws://localhost:9095/websocket # admin端的websocket地址 + allowOrigin: ws://localhost:9195 ``` 在网关中引入`websocket`的依赖。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-custom.md index ccaee450b0d..d9a3983215e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/deployment/deployment-custom.md @@ -61,6 +61,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/design/flow-control.md b/i18n/zh/docusaurus-plugin-content-docs/current/design/flow-control.md index 26ecab9df6a..f4499de3ee5 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/design/flow-control.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/design/flow-control.md @@ -34,3 +34,44 @@ description: Apache ShenYu 流量控制设计 具体的介绍与使用请看: [选择器与规则管理](../user-guide/admin-usage/selector-and-rule) 。 + + +```mermaid +stateDiagram-v2 + state "插件1..n" as p1 + state pc1 <> + state "选择器1..n" as s1 + state sc1 <> + state "规则1..n" as r1 + state rc1 <> + state "执行规则" as rr1 + state rrc1 <> + + [*] --> p1 + + state p1 { + [*] --> pc1 + pc1 --> [*] : 插件未开启
继续执行下一个插件 + + state s1 { + [*] --> sc1 + sc1 --> [*] : 选择器未匹配
继续匹配下一个选择器 + + state r1 { + [*] --> rc1 + rc1 --> [*] : 规则未匹配
继续匹配下一个规则 + + state rr1 { + [*] --> rrc1 + rrc1 --> [*] : 继续执行下一个插件 + } + rc1 --> rr1 : 规则已匹配
开始执行规则 + } + sc1 --> r1 : 选择器已匹配
开始匹配规则 + note left of r1 : 当选择器类型为《全流量》时
该选择器和其下规则
的条件均无效
取末尾规则执行 + } + pc1 --> s1 : 插件已开启
开始匹配选择器 + note left of s1 : 在一个选择器里，至多只会匹配&执行一条规则 + } + note left of p1 : 在一个插件里，至多只会匹配到一个选择器 +``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/user-guide/property-config/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/current/user-guide/property-config/use-data-sync.md index 4236cf6d353..b4cd79ca4bc 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/user-guide/property-config/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/user-guide/property-config/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : - urls: ws://localhost:9095/websocket # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/soul-set-up.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/soul-set-up.md index 51b4d79d551..947c458ea98 100755 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/soul-set-up.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/soul-set-up.md @@ -180,6 +180,7 @@ soul : sync: websocket : urls: ws://localhost:9095/websocket //设置成你的soul-admin地址 + allowOrigin: ws://localhost:9195 ``` * 你的项目环境搭建完成，启动你的项目。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/use-data-sync.md index e615c37f4b9..a0a3c25d5e6 100755 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.3.0-Legacy/users-guide/use-data-sync.md @@ -34,8 +34,9 @@ description: 使用不同的数据同步策略 soul : sync: websocket : - urls: ws://localhost:9095/websocket - #urls:是指 soul-admin的地址，如果有多个，请使用（,）分割. + # urls:是指 soul-admin的地址，如果有多个，请使用（,）分割. + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` * soul-admin 配置，或在 soul-admin 启动参数中设置 `--soul.sync.websocket=''`，然后重启服务。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-custom.md index a96fa7061d9..75c94b0bd29 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/deployment/deployment-custom.md @@ -60,6 +60,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/property-config/gateway-property-config.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/property-config/gateway-property-config.md index 38428355d42..7e65b5231a5 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/property-config/gateway-property-config.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/property-config/gateway-property-config.md @@ -47,6 +47,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/use-data-sync.md index 7e9403c51f5..d6c6ddc8eea 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.0/user-guide/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : + # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 urls: ws://localhost:9095/websocket - # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-custom.md index 70ea0ec614b..a7c7a3790f0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/deployment/deployment-custom.md @@ -60,6 +60,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/property-config/gateway-property-config.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/property-config/gateway-property-config.md index 884f5aa1ae3..27b6f06f70f 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/property-config/gateway-property-config.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/property-config/gateway-property-config.md @@ -53,6 +53,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/use-data-sync.md index 6a933ccb036..99bec4b25d4 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.1/user-guide/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : - urls: ws://localhost:9095/websocket # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-custom.md index 972773cba11..6059253ff7c 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/deployment/deployment-custom.md @@ -60,6 +60,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/property-config/gateway-property-config.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/property-config/gateway-property-config.md index 8a6bfb9dc58..3e186a12f04 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/property-config/gateway-property-config.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/property-config/gateway-property-config.md @@ -78,6 +78,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/use-data-sync.md index 6a933ccb036..99bec4b25d4 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.2/user-guide/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : - urls: ws://localhost:9095/websocket # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-custom.md index ccaee450b0d..d9a3983215e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/deployment/deployment-custom.md @@ -61,6 +61,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/property-config/gateway-property-config.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/property-config/gateway-property-config.md index 01a563be2b8..804d52210c0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/property-config/gateway-property-config.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/property-config/gateway-property-config.md @@ -85,6 +85,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/use-data-sync.md index 6a933ccb036..99bec4b25d4 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.4.3/user-guide/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : - urls: ws://localhost:9095/websocket # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-custom.md index ccaee450b0d..d9a3983215e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/deployment/deployment-custom.md @@ -61,6 +61,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/user-guide/property-config/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/user-guide/property-config/use-data-sync.md index 4236cf6d353..b4cd79ca4bc 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/user-guide/property-config/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.0/user-guide/property-config/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : - urls: ws://localhost:9095/websocket # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/deployment/deployment-custom.md index ccaee450b0d..d9a3983215e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/deployment/deployment-custom.md @@ -61,6 +61,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/user-guide/property-config/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/user-guide/property-config/use-data-sync.md index 4236cf6d353..b4cd79ca4bc 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/user-guide/property-config/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.1/user-guide/property-config/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : - urls: ws://localhost:9095/websocket # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/deployment/deployment-custom.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/deployment/deployment-custom.md index ccaee450b0d..d9a3983215e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/deployment/deployment-custom.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/deployment/deployment-custom.md @@ -61,6 +61,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //设置成你的 shenyu-admin 地址 + allowOrigin: ws://localhost:9195 ``` diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/user-guide/property-config/use-data-sync.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/user-guide/property-config/use-data-sync.md index 4236cf6d353..b4cd79ca4bc 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/user-guide/property-config/use-data-sync.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6.0/user-guide/property-config/use-data-sync.md @@ -33,8 +33,9 @@ description: 使用不同的数据同步策略 shenyu: sync: websocket : - urls: ws://localhost:9095/websocket # urls:是指 shenyu-admin的地址，如果有多个，请使用（,）分割。 + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.3.0-Legacy/users-guide/soul-set-up.md b/versioned_docs/version-2.3.0-Legacy/users-guide/soul-set-up.md index c445e3068c2..1b0e368e215 100755 --- a/versioned_docs/version-2.3.0-Legacy/users-guide/soul-set-up.md +++ b/versioned_docs/version-2.3.0-Legacy/users-guide/soul-set-up.md @@ -170,6 +170,7 @@ soul : sync: websocket : urls: ws://localhost:9095/websocket // set your soul-admin address + allowOrigin: ws://localhost:9195 ``` * Environment Setup has finished, now your project is launched. diff --git a/versioned_docs/version-2.3.0-Legacy/users-guide/use-data-sync.md b/versioned_docs/version-2.3.0-Legacy/users-guide/use-data-sync.md index 67040782a67..e78aec49189 100755 --- a/versioned_docs/version-2.3.0-Legacy/users-guide/use-data-sync.md +++ b/versioned_docs/version-2.3.0-Legacy/users-guide/use-data-sync.md @@ -32,8 +32,9 @@ description: use different data-sync strategy soul : sync: websocket : - urls: ws://localhost:9095/websocket - #urls: address of soul-admin，multi-address will be splitted with (,). + # urls: address of soul-admin，multi-address will be splitted with (,). + urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 ``` * soul-admin config, enable this parameter `--soul.sync.websocket=''` in soul admin, then restart service. diff --git a/versioned_docs/version-2.4.0/deployment/deployment-custom.md b/versioned_docs/version-2.4.0/deployment/deployment-custom.md index 31f6d124518..d264ffc33b1 100644 --- a/versioned_docs/version-2.4.0/deployment/deployment-custom.md +++ b/versioned_docs/version-2.4.0/deployment/deployment-custom.md @@ -61,4 +61,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.4.0/user-guide/property-config/gateway-property-config.md b/versioned_docs/version-2.4.0/user-guide/property-config/gateway-property-config.md index 6420a972230..b1d0f13e9a2 100644 --- a/versioned_docs/version-2.4.0/user-guide/property-config/gateway-property-config.md +++ b/versioned_docs/version-2.4.0/user-guide/property-config/gateway-property-config.md @@ -47,6 +47,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/versioned_docs/version-2.4.0/user-guide/use-data-sync.md b/versioned_docs/version-2.4.0/user-guide/use-data-sync.md index df096c39d32..662a5fcc872 100644 --- a/versioned_docs/version-2.4.0/user-guide/use-data-sync.md +++ b/versioned_docs/version-2.4.0/user-guide/use-data-sync.md @@ -33,8 +33,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.4.1/deployment/deployment-custom.md b/versioned_docs/version-2.4.1/deployment/deployment-custom.md index b82eb5f960f..0f5963de39c 100644 --- a/versioned_docs/version-2.4.1/deployment/deployment-custom.md +++ b/versioned_docs/version-2.4.1/deployment/deployment-custom.md @@ -61,4 +61,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.4.1/user-guide/property-config/gateway-property-config.md b/versioned_docs/version-2.4.1/user-guide/property-config/gateway-property-config.md index ff72a42ba0d..b99b3e60141 100644 --- a/versioned_docs/version-2.4.1/user-guide/property-config/gateway-property-config.md +++ b/versioned_docs/version-2.4.1/user-guide/property-config/gateway-property-config.md @@ -53,6 +53,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/versioned_docs/version-2.4.1/user-guide/use-data-sync.md b/versioned_docs/version-2.4.1/user-guide/use-data-sync.md index 792b9ac40a6..ba53f64186a 100644 --- a/versioned_docs/version-2.4.1/user-guide/use-data-sync.md +++ b/versioned_docs/version-2.4.1/user-guide/use-data-sync.md @@ -35,8 +35,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.4.2/deployment/deployment-custom.md b/versioned_docs/version-2.4.2/deployment/deployment-custom.md index 6232add9c82..9a57cc4cc61 100644 --- a/versioned_docs/version-2.4.2/deployment/deployment-custom.md +++ b/versioned_docs/version-2.4.2/deployment/deployment-custom.md @@ -61,4 +61,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.4.2/user-guide/property-config/gateway-property-config.md b/versioned_docs/version-2.4.2/user-guide/property-config/gateway-property-config.md index c1cd4dfb90d..6edec93b9a4 100644 --- a/versioned_docs/version-2.4.2/user-guide/property-config/gateway-property-config.md +++ b/versioned_docs/version-2.4.2/user-guide/property-config/gateway-property-config.md @@ -78,6 +78,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/versioned_docs/version-2.4.2/user-guide/use-data-sync.md b/versioned_docs/version-2.4.2/user-guide/use-data-sync.md index 792b9ac40a6..ba53f64186a 100644 --- a/versioned_docs/version-2.4.2/user-guide/use-data-sync.md +++ b/versioned_docs/version-2.4.2/user-guide/use-data-sync.md @@ -35,8 +35,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.4.3/deployment/deployment-custom.md b/versioned_docs/version-2.4.3/deployment/deployment-custom.md index bcd7ed8cfca..e18f772b77d 100644 --- a/versioned_docs/version-2.4.3/deployment/deployment-custom.md +++ b/versioned_docs/version-2.4.3/deployment/deployment-custom.md @@ -62,4 +62,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.4.3/user-guide/property-config/gateway-property-config.md b/versioned_docs/version-2.4.3/user-guide/property-config/gateway-property-config.md index 7f1aaedebb0..1bb01969785 100644 --- a/versioned_docs/version-2.4.3/user-guide/property-config/gateway-property-config.md +++ b/versioned_docs/version-2.4.3/user-guide/property-config/gateway-property-config.md @@ -85,6 +85,7 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket + allowOrigin: ws://localhost:9195 # zookeeper: # url: localhost:2181 # sessionTimeout: 5000 diff --git a/versioned_docs/version-2.4.3/user-guide/use-data-sync.md b/versioned_docs/version-2.4.3/user-guide/use-data-sync.md index 792b9ac40a6..ba53f64186a 100644 --- a/versioned_docs/version-2.4.3/user-guide/use-data-sync.md +++ b/versioned_docs/version-2.4.3/user-guide/use-data-sync.md @@ -35,8 +35,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.5.0/deployment/deployment-custom.md b/versioned_docs/version-2.5.0/deployment/deployment-custom.md index 2c948e754f1..4ea65337cd6 100644 --- a/versioned_docs/version-2.5.0/deployment/deployment-custom.md +++ b/versioned_docs/version-2.5.0/deployment/deployment-custom.md @@ -62,4 +62,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.5.0/user-guide/property-config/use-data-sync.md b/versioned_docs/version-2.5.0/user-guide/property-config/use-data-sync.md index 19bc227ae49..e0ceef37e3d 100644 --- a/versioned_docs/version-2.5.0/user-guide/property-config/use-data-sync.md +++ b/versioned_docs/version-2.5.0/user-guide/property-config/use-data-sync.md @@ -35,8 +35,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.5.1/deployment/deployment-custom.md b/versioned_docs/version-2.5.1/deployment/deployment-custom.md index 2c948e754f1..4ea65337cd6 100644 --- a/versioned_docs/version-2.5.1/deployment/deployment-custom.md +++ b/versioned_docs/version-2.5.1/deployment/deployment-custom.md @@ -62,4 +62,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.5.1/user-guide/property-config/use-data-sync.md b/versioned_docs/version-2.5.1/user-guide/property-config/use-data-sync.md index 19bc227ae49..e0ceef37e3d 100644 --- a/versioned_docs/version-2.5.1/user-guide/property-config/use-data-sync.md +++ b/versioned_docs/version-2.5.1/user-guide/property-config/use-data-sync.md @@ -35,8 +35,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.6.0/deployment/deployment-custom.md b/versioned_docs/version-2.6.0/deployment/deployment-custom.md index 2c948e754f1..4ea65337cd6 100644 --- a/versioned_docs/version-2.6.0/deployment/deployment-custom.md +++ b/versioned_docs/version-2.6.0/deployment/deployment-custom.md @@ -62,4 +62,5 @@ shenyu: sync: websocket: urls: ws://localhost:9095/websocket //set to your shenyu-admin address + allowOrigin: ws://localhost:9195 ``` diff --git a/versioned_docs/version-2.6.0/user-guide/property-config/use-data-sync.md b/versioned_docs/version-2.6.0/user-guide/property-config/use-data-sync.md index 5d1d5d466a2..da2dba7a23c 100644 --- a/versioned_docs/version-2.6.0/user-guide/property-config/use-data-sync.md +++ b/versioned_docs/version-2.6.0/user-guide/property-config/use-data-sync.md @@ -35,8 +35,9 @@ Add these config values in yaml file: shenyu: sync: websocket : + # urls: address of shenyu-admin，multi-address will be separated with (,). urls: ws://localhost:9095/websocket - #urls: address of shenyu-admin，multi-address will be separated with (,). + allowOrigin: ws://localhost:9195 ```