[GitHub] [incubator-apisix] moonming commented on a change in pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
moonming commented on a change in pull request #1055: doc: Add doc for 
fault-injection plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055#discussion_r366709782
 
 

 ##
 File path: doc/plugins/fault-injection-cn.md
 ##
 @@ -0,0 +1,139 @@
+
+
+[English](fault-injection.md)
+
+# fault-injection
+
+故障注入插件,该插件可以和其他插件一起使用,并且会在其他插件前被执行,配置 `abort` 参数将直接返回给客户端指定的响应码并且终止其他插件的执行,配置 
`delay` 参数将延迟某个请求,并且还会执行配置的其他插件。
+
+### 参数
+
+|名称|必须|描述|
+|--- |-|--|
+|abort.http_status|是|返回给客户端的 http 状态码|
 
 Review comment:
   I don't think so. This plugin is for `fault` injection, `200` is not fault 
return.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] agile6v commented on a change in pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
agile6v commented on a change in pull request #1055: doc: Add doc for 
fault-injection plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055#discussion_r366710346
 
 

 ##
 File path: doc/plugins/fault-injection-cn.md
 ##
 @@ -0,0 +1,139 @@
+
+
+[English](fault-injection.md)
+
+# fault-injection
+
+故障注入插件,该插件可以和其他插件一起使用,并且会在其他插件前被执行,配置 `abort` 参数将直接返回给客户端指定的响应码并且终止其他插件的执行,配置 
`delay` 参数将延迟某个请求,并且还会执行配置的其他插件。
+
+### 参数
+
+|名称|必须|描述|
+|--- |-|--|
+|abort.http_status|是|返回给客户端的 http 状态码|
+|abort.body|否|返回给客户端的响应数据|
+|delay.duration|是|延迟时间,可以指定小数|
+
+注:参数 abort 和 delay 至少要存在一个
+
+### 示例
+
+ 启用插件
+
+示例1:为特定路由启用 `fault-injection` 插件,并指定 `abort` 参数:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -X PUT -d '
+{
+"plugins": {
+   "fault-injection": {
+   "abort": {
+  "http_status": 200,
+  "body": "Fault Injection!"
+   }
+   }
+},
+"upstream": {
+   "nodes": {
+   "127.0.0.1:1980": 1
+   },
+   "type": "roundrobin"
+},
+"uri": "/hello"
+}'
+```
+
+测试:
+
+```shell
+$ curl http://127.0.0.1:9080/hello -i
+HTTP/1.1 200 OK
+Date: Mon, 13 Jan 2020 13:50:04 GMT
+Content-Type: text/plain
+Transfer-Encoding: chunked
+Connection: keep-alive
+Server: APISIX web server
+
+Fault Injection!
+```
+
+> http status 返回`200`并且响应`body`为`Fault Injection!`,表示该插件已启用。
+
+示例2:为特定路由启用 `fault-injection` 插件,并指定 `delay` 参数:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -X PUT -d '
+{
+"plugins": {
+   "fault-injection": {
+   "delay": {
+  "duration": 3
+   }
+   }
+},
+"upstream": {
 
 Review comment:
   It's necessary for the delay attribute.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] agile6v commented on a change in pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
agile6v commented on a change in pull request #1055: doc: Add doc for 
fault-injection plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055#discussion_r366729968
 
 

 ##
 File path: doc/plugins/fault-injection-cn.md
 ##
 @@ -0,0 +1,139 @@
+
+
+[English](fault-injection.md)
+
+# fault-injection
+
+故障注入插件,该插件可以和其他插件一起使用,并且会在其他插件前被执行,配置 `abort` 参数将直接返回给客户端指定的响应码并且终止其他插件的执行,配置 
`delay` 参数将延迟某个请求,并且还会执行配置的其他插件。
+
+### 参数
+
+|名称|必须|描述|
+|--- |-|--|
+|abort.http_status|是|返回给客户端的 http 状态码|
 
 Review comment:
   If the user specify neither http_status nor body, seems that the readability 
is not good.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] zhangjimmy opened a new issue #1062: can apisix support acl

2020-01-14 Thread GitBox
zhangjimmy opened a new issue #1062: can apisix support acl 
URL: https://github.com/apache/incubator-apisix/issues/1062
 
 
   Implements a basic ACL control that allows to whitelist and blacklist 
consumers to APIs using arbitrary group names. The ACL plugin could be more 
powerful once  has been implemented.
   The documentation on the website has been updated, but it needs an ACL icon .
   support jwt acl  first


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] membphis commented on a change in pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
membphis commented on a change in pull request #1055: doc: Add doc for 
fault-injection plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055#discussion_r366706434
 
 

 ##
 File path: doc/plugins/fault-injection-cn.md
 ##
 @@ -0,0 +1,139 @@
+
+
+[English](fault-injection.md)
+
+# fault-injection
+
+故障注入插件,该插件可以和其他插件一起使用,并且会在其他插件前被执行,配置 `abort` 参数将直接返回给客户端指定的响应码并且终止其他插件的执行,配置 
`delay` 参数将延迟某个请求,并且还会执行配置的其他插件。
+
+### 参数
+
+|名称|必须|描述|
+|--- |-|--|
+|abort.http_status|是|返回给客户端的 http 状态码|
+|abort.body|否|返回给客户端的响应数据|
+|delay.duration|是|延迟时间,可以指定小数|
+
+注:参数 abort 和 delay 至少要存在一个
+
+### 示例
+
+ 启用插件
+
+示例1:为特定路由启用 `fault-injection` 插件,并指定 `abort` 参数:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -X PUT -d '
+{
+"plugins": {
+   "fault-injection": {
+   "abort": {
+  "http_status": 200,
+  "body": "Fault Injection!"
+   }
+   }
+},
+"upstream": {
+   "nodes": {
+   "127.0.0.1:1980": 1
+   },
+   "type": "roundrobin"
+},
+"uri": "/hello"
+}'
+```
+
+测试:
+
+```shell
+$ curl http://127.0.0.1:9080/hello -i
+HTTP/1.1 200 OK
+Date: Mon, 13 Jan 2020 13:50:04 GMT
+Content-Type: text/plain
+Transfer-Encoding: chunked
+Connection: keep-alive
+Server: APISIX web server
+
+Fault Injection!
+```
+
+> http status 返回`200`并且响应`body`为`Fault Injection!`,表示该插件已启用。
+
+示例2:为特定路由启用 `fault-injection` 插件,并指定 `delay` 参数:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -X PUT -d '
+{
+"plugins": {
+   "fault-injection": {
+   "delay": {
+  "duration": 3
+   }
+   }
+},
+"upstream": {
+   "nodes": {
+   "127.0.0.1:1980": 1
+   },
+   "type": "roundrobin"
+},
+"uri": "/hello"
+}'
+```
+
+测试:
+
+```shell
+$ time curl http://127.0.0.1:9080/hello -i
+HTTP/1.1 200 OK
+Content-Type: application/octet-stream
+Content-Length: 6
+Connection: keep-alive
+Server: APISIX web server
+Date: Tue, 14 Jan 2020 14:30:54 GMT
+Last-Modified: Sat, 11 Jan 2020 12:46:21 GMT
+
+hello
+
+real0m3.034s
+user0m0.007s
+sys 0m0.010s
+```
+
+
+ 禁用插件
+
+移除插件配置中相应的 JSON 配置可立即禁用该插件,无需重启服务:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -X PUT -d '
+{
+"uri": "/hello",
+"plugins": {},
+"upstream": {
 
 Review comment:
   ditto


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] membphis commented on a change in pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
membphis commented on a change in pull request #1055: doc: Add doc for 
fault-injection plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055#discussion_r366707093
 
 

 ##
 File path: doc/plugins/fault-injection-cn.md
 ##
 @@ -0,0 +1,139 @@
+
+
+[English](fault-injection.md)
+
+# fault-injection
+
+故障注入插件,该插件可以和其他插件一起使用,并且会在其他插件前被执行,配置 `abort` 参数将直接返回给客户端指定的响应码并且终止其他插件的执行,配置 
`delay` 参数将延迟某个请求,并且还会执行配置的其他插件。
+
+### 参数
+
+|名称|必须|描述|
+|--- |-|--|
+|abort.http_status|是|返回给客户端的 http 状态码|
 
 Review comment:
   I think it can be set a default value 200 if the user not specified.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[incubator-apisix] branch master updated: bugfix: added `/usr/share/lua/5.1/apisix/lua/?.lua; ` to lua path (#1060)

2020-01-14 Thread wenming
This is an automated email from the ASF dual-hosted git repository.

wenming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git


The following commit(s) were added to refs/heads/master by this push:
 new 68d36e1  bugfix: added `/usr/share/lua/5.1/apisix/lua/?.lua;` to lua 
path (#1060)
68d36e1 is described below

commit 68d36e126dbfddca60bb470ce4d1a12d91e38a72
Author: YuanSheng Wang 
AuthorDate: Wed Jan 15 14:19:44 2020 +0800

bugfix: added `/usr/share/lua/5.1/apisix/lua/?.lua;` to lua path (#1060)
---
 bin/apisix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/apisix b/bin/apisix
index b42475c..43282ff 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -102,7 +102,7 @@ worker_shutdown_timeout 3;
 
 {% if stream_proxy then %}
 stream {
-lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;]=]
+lua_package_path  
"$prefix/deps/share/lua/5.1/?.lua;/usr/share/lua/5.1/apisix/lua/?.lua;]=]
   .. [=[{*apisix_lua_home*}/lua/?.lua;;{*lua_path*};";
 lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]
   .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]
@@ -148,7 +148,7 @@ stream {
 {% end %}
 
 http {
-lua_package_path  "$prefix/deps/share/lua/5.1/?.lua;]=]
+lua_package_path  
"$prefix/deps/share/lua/5.1/?.lua;/usr/share/lua/5.1/apisix/lua/?.lua;]=]
   .. [=[{*apisix_lua_home*}/lua/?.lua;;{*lua_path*};";
 lua_package_cpath "$prefix/deps/lib64/lua/5.1/?.so;]=]
   .. [=[$prefix/deps/lib/lua/5.1/?.so;;]=]



[GitHub] [incubator-apisix] membphis opened a new pull request #1063: travis: run a apisix instance which intalled by luarocks.

2020-01-14 Thread GitBox
membphis opened a new pull request #1063: travis: run a apisix instance which 
intalled by luarocks.
URL: https://github.com/apache/incubator-apisix/pull/1063
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] agile6v opened a new pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
agile6v opened a new pull request #1055: doc: Add doc for fault-injection 
plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055
 
 
   ### Issues resolved
   Fix #1052 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] membphis opened a new issue #1057: bug: need to regenerate a new router object after one route expired.

2020-01-14 Thread GitBox
membphis opened a new issue #1057: bug: need to regenerate a new router object 
after one route expired.
URL: https://github.com/apache/incubator-apisix/issues/1057
 
 
   
https://github.com/apache/incubator-apisix/blob/master/doc/admin-api-cn.md#route


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] membphis commented on a change in pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
membphis commented on a change in pull request #1055: doc: Add doc for 
fault-injection plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055#discussion_r366651736
 
 

 ##
 File path: doc/plugins/fault-injection-cn.md
 ##
 @@ -0,0 +1,149 @@
+
+
+[English](fault-injection.md)
+
+# fault-injection
+
+故障注入插件,该插件可以和其他插件一起使用,并且会在其他插件前被执行,配置 `abort` 参数将直接返回给客户端指定的响应码并且终止其他插件的执行,配置 
`delay` 参数将延迟某个请求,并且还会执行配置的其他插件。
+
+### 参数
+
+|名称|必须|描述|
+|--- |-|--|
+|abort|否|参数 http_status :必须,返回给客户端的 http 状态码|
+|||参数 body :可选,返回给客户端的响应数据|
+|delay|否|参数 duration :必须,延迟时间,可以指定小数|
+
+注:参数 abort 和 delay 至少要存在一个
+
+### 示例
+
+ 启用插件
+
+示例1:为特定路由启用 `fault-injection` 插件,并指定 `abort` 参数:
+
+```shell
+curl http://127.0.0.1:9080/apisix/admin/routes/1 -X PUT -d '
+{
+"plugins": {
+  "fault-injection": {
 
 Review comment:
   Replace `tab` with spaces.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] membphis commented on a change in pull request #1055: doc: Add doc for fault-injection plugin.

2020-01-14 Thread GitBox
membphis commented on a change in pull request #1055: doc: Add doc for 
fault-injection plugin.
URL: https://github.com/apache/incubator-apisix/pull/1055#discussion_r366651035
 
 

 ##
 File path: doc/plugins/fault-injection-cn.md
 ##
 @@ -0,0 +1,149 @@
+
+
+[English](fault-injection.md)
+
+# fault-injection
+
+故障注入插件,该插件可以和其他插件一起使用,并且会在其他插件前被执行,配置 `abort` 参数将直接返回给客户端指定的响应码并且终止其他插件的执行,配置 
`delay` 参数将延迟某个请求,并且还会执行配置的其他插件。
+
+### 参数
+
+|名称|必须|描述|
+|--- |-|--|
+|abort|否|参数 http_status :必须,返回给客户端的 http 状态码|
+|||参数 body :可选,返回给客户端的响应数据|
+|delay|否|参数 duration :必须,延迟时间,可以指定小数|
 
 Review comment:
   How about this code style?
   
   |名称|必须|描述|
   |--- |-|--|
   |abort.http_status|可选|返回给客户端的 http 状态码,默认 200|
   |abort.body|可选|返回给客户端的响应数据|
   |delay.duration|可选|延迟时间,可以指定小数|


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] membphis opened a new pull request #1060: bugfix(CLI): added `/usr/share/lua/5.1/apisix/lua/?.lua; ` to lua path,

2020-01-14 Thread GitBox
membphis opened a new pull request #1060: bugfix(CLI): added 
`/usr/share/lua/5.1/apisix/lua/?.lua;` to lua path,
URL: https://github.com/apache/incubator-apisix/pull/1060
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix] moonming merged pull request #1056: doc: capitalize the first letter of the title.

2020-01-14 Thread GitBox
moonming merged pull request #1056: doc: capitalize the first letter of the 
title.
URL: https://github.com/apache/incubator-apisix/pull/1056
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[incubator-apisix] branch master updated (361b933 -> 63a7afc)

2020-01-14 Thread wenming
This is an automated email from the ASF dual-hosted git repository.

wenming pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git.


from 361b933  doc: update plugin list and power by companies. (#1054)
 add 63a7afc  release new version 1.0 (#1061)

No new revisions were added by this update.

Summary of changes:
 NOTICE |  2 +-
 doc/how-to-build-cn.md | 14 ++---
 doc/how-to-build.md| 14 ++---
 lua/apisix/core/version.lua|  2 +-
 ...six-master-0.rockspec => apisix-1.0-0.rockspec} |  6 +-
 utils/check-version.sh | 68 ++
 6 files changed, 87 insertions(+), 19 deletions(-)
 copy rockspec/{apisix-master-0.rockspec => apisix-1.0-0.rockspec} (96%)
 create mode 100755 utils/check-version.sh



[incubator-apisix] branch master updated (63a7afc -> 6e4ea15)

2020-01-14 Thread wenming
This is an automated email from the ASF dual-hosted git repository.

wenming pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git.


from 63a7afc  release new version 1.0 (#1061)
 add 6e4ea15  doc: capitalize the first letter of the title. (#1056)

No new revisions were added by this update.

Summary of changes:
 README.md | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)



[GitHub] [incubator-apisix-dashboard] lilien1010 commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
lilien1010 commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366280344
 
 

 ##
 File path: src/views/schema/routes/edit.vue
 ##
 @@ -383,6 +383,7 @@ export default class extends Vue {
   }
 })
 
+delete data['tempPlugin']
 
 Review comment:
   temp['tempPlugin']==null  will not enter the delete logic so I think we can 
keep it this way


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix-dashboard] lilien1010 commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
lilien1010 commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366285269
 
 

 ##
 File path: src/views/schema/upstream/edit.vue
 ##
 @@ -348,6 +410,13 @@ export default class extends Vue {
   .el-input {
 width: 193px;
   }
+  .tip {
+  line-height: 24px;
 
 Review comment:
   ok


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[incubator-apisix-dashboard] branch master updated: Upstream support websocket enable and hashOn select (#118)

2020-01-14 Thread juzhiyuan
This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
 new 9a163b7  Upstream support websocket enable and hashOn select (#118)
9a163b7 is described below

commit 9a163b7a8edf3ae035a1a58dfda359c16245ea3f
Author: Lien 
AuthorDate: Tue Jan 14 19:29:34 2020 +0800

Upstream support websocket enable and hashOn select (#118)

* feature: upstream support enable websocket and hashOn

* fix tips

* add space

* fix format as comment

* fix
---
 src/lang/en.ts |  8 
 src/lang/zh.ts |  8 
 src/views/schema/routes/edit.vue   |  1 +
 src/views/schema/upstream/edit.vue | 77 --
 4 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 784e060..4015730 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -75,5 +75,13 @@ export default {
   inputMultipleValues: 'Input value then press return button',
   propertyHostsTip: 'Any values are supported'
 }
+  },
+  upstream: {
+websocket: {
+  EnabledTip: 'WebSocket enabled',
+  DisabledTip: 'WebSocket disabled'
+},
+keyTip: 'You can edit and input any value here,and press Enter to 
confirm.',
+hashOnTip: 'Select a hash on.'
   }
 }
diff --git a/src/lang/zh.ts b/src/lang/zh.ts
index 83111b6..c594dda 100644
--- a/src/lang/zh.ts
+++ b/src/lang/zh.ts
@@ -83,5 +83,13 @@ export default {
   inputMultipleValues: '输入值后并回车',
   propertyHostsTip: '任何值均可'
 }
+  },
+  upstream: {
+websocket: {
+  EnabledTip: 'WebSocket 打开',
+  DisabledTip: 'WebSocket 关闭'
+},
+keyTip: '你可以编辑并输入任何值,输入值后回车确认。',
+hashOnTip: '选择 chash 参数来源。'
   }
 }
diff --git a/src/views/schema/routes/edit.vue b/src/views/schema/routes/edit.vue
index 24b04e8..890f676 100644
--- a/src/views/schema/routes/edit.vue
+++ b/src/views/schema/routes/edit.vue
@@ -383,6 +383,7 @@ export default class extends Vue {
   }
 })
 
+delete data['tempPlugin']
 if (this.isEditMode) {
   await updateRouter(this.$route.params.id, data)
 } else {
diff --git a/src/views/schema/upstream/edit.vue 
b/src/views/schema/upstream/edit.vue
index f54fef0..7994700 100644
--- a/src/views/schema/upstream/edit.vue
+++ b/src/views/schema/upstream/edit.vue
@@ -54,6 +54,28 @@
   
 
   
+
+  
+
+
+  {{ $t('upstream.hashOnTip') }}
+
+  
+
+  
 
 
+
+  {{ $t('upstream.keyTip') }}
+
+  
+
+  
+
+
+  {{ form.enable_websocket ? $t('upstream.websocket.EnabledTip') : 
$t('upstream.websocket.DisabledTip') }}
+
   
 
   

[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
juzhiyuan commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366242791
 
 

 ##
 File path: src/lang/zh.ts
 ##
 @@ -83,5 +83,12 @@ export default {
   inputMultipleValues: '输入值后并回车',
   propertyHostsTip: '任何值均可'
 }
+  },
+  upstream: {
+websocket: {
+  EnabledTips: 'WebSocket 打开',
+  DisabledTips: 'WebSocket 关闭'
+},
+keyTips: '你可以编辑并输入任何值,输入值后 回车确认。'
 
 Review comment:
   任何值,输
   
   输入值后回车确认。


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
juzhiyuan commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366244230
 
 

 ##
 File path: src/views/schema/upstream/edit.vue
 ##
 @@ -73,6 +93,23 @@
 :value="item.value"
   />
 
+
+  {{ $t('upstream.keyTips') }}
+
+  
+
+  
+

[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
juzhiyuan commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366249597
 
 

 ##
 File path: src/views/schema/upstream/edit.vue
 ##
 @@ -348,6 +410,13 @@ export default class extends Vue {
   .el-input {
 width: 193px;
   }
+  .tip {
+  line-height: 24px;
+  font-size: 12px;
+  margin: 0;
+  color: #8e8c8c;
+  display:inline;
 
 Review comment:
   space 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
juzhiyuan commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366242275
 
 

 ##
 File path: src/lang/en.ts
 ##
 @@ -75,5 +75,12 @@ export default {
   inputMultipleValues: 'Input value then press return button',
   propertyHostsTip: 'Any values are supported'
 }
+  },
+  upstream: {
+websocket: {
+  EnabledTips: 'WebSocket enabled',
 
 Review comment:
   Please use tip instead of tips 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
juzhiyuan commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366243618
 
 

 ##
 File path: src/views/schema/upstream/edit.vue
 ##
 @@ -53,6 +53,26 @@
 
   
 
+  
+

[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
juzhiyuan commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366244458
 
 

 ##
 File path: src/views/schema/upstream/edit.vue
 ##
 @@ -73,6 +93,23 @@
 :value="item.value"
   />
 
+
+  {{ $t('upstream.keyTips') }}
+
+  
+
+  
+
+
+  {{ 
form.enable_websocket?$t('upstream.websocket.EnabledTips'):$t('upstream.websocket.DisabledTips')
 }}
 
 Review comment:
   space 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
juzhiyuan commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366249521
 
 

 ##
 File path: src/views/schema/upstream/edit.vue
 ##
 @@ -348,6 +410,13 @@ export default class extends Vue {
   .el-input {
 width: 193px;
   }
+  .tip {
+  line-height: 24px;
 
 Review comment:
   2 spaces


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [incubator-apisix-dashboard] lilien1010 commented on a change in pull request #118: Upstream support websocket enable and hashOn select

2020-01-14 Thread GitBox
lilien1010 commented on a change in pull request #118: Upstream support 
websocket enable and hashOn select
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/118#discussion_r366271461
 
 

 ##
 File path: src/lang/en.ts
 ##
 @@ -75,5 +75,12 @@ export default {
   inputMultipleValues: 'Input value then press return button',
   propertyHostsTip: 'Any values are supported'
 }
+  },
+  upstream: {
+websocket: {
+  EnabledTips: 'WebSocket enabled',
+  DisabledTips: 'WebSocket disabled'
+},
+keyTips: 'You can edit and input any value here,press Enter to confirm.'
 
 Review comment:
   ok


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services