[GitHub] [incubator-apisix-dashboard] ko-han opened a new pull request #286: tooltip and cancel button in plugin dialog
ko-han opened a new pull request #286: URL: https://github.com/apache/incubator-apisix-dashboard/pull/286 1. Add tooltip if property has a description message. 1. Add a button to cancel the add plugin operation. 1. Make the plugin's dialog compatible with the incoming plugin-data parameter is null 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
[incubator-apisix-website] branch master updated: Update index.en.md
This is an automated email from the ASF dual-hosted git repository. agile6v pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/master by this push: new 5564be8 Update index.en.md 5564be8 is described below commit 5564be80c3281998fd2d1e937e15ec9ed6110fb5 Author: agile6v AuthorDate: Mon Jun 29 17:01:17 2020 +0800 Update index.en.md --- content/contribute/release/index.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/contribute/release/index.en.md b/content/contribute/release/index.en.md index 4020900..19aede7 100644 --- a/content/contribute/release/index.en.md +++ b/content/contribute/release/index.en.md @@ -157,7 +157,7 @@ include_footer: true send announce https://lists.apache.org/thread.html/r67093ed9a5fbe106dc5066c283f225544f5ae14248df061019d1062e%40%3Cgeneral.incubator.apache.org%3E";>Click here to view the reference email send announce email to d...@apisix.apache.org and gene...@incubator.apache.org move package from dev to dist -Remove `rc` from the package name, and move to https://dist.apache.org/repos/dist/release/incubator/apisix/";> +Remove `rc` from the package name, and move to https://dist.apache.org/repos/dist/release/incubator/apisix/";> address update download page update http://apisix.apache.org/downloads/";> address , source repo is https://github.com/apache/incubator-apisix-website
[incubator-apisix-website] branch asf-site updated: Deploy to GitHub pages
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 12dbf52 Deploy to GitHub pages 12dbf52 is described below commit 12dbf52c40156449a2c7f81d3a77029aa5508d0c Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Jun 29 09:01:43 2020 + Deploy to GitHub pages --- contribute/release/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/release/index.html b/contribute/release/index.html index 00b7cb8..3f8419f 100644 --- a/contribute/release/index.html +++ b/contribute/release/index.html @@ -609,7 +609,7 @@ GnuPG-2.x： send announce https://lists.apache.org/thread.html/r67093ed9a5fbe106dc5066c283f225544f5ae14248df061019d1062e%40%3Cgeneral.incubator.apache.org%3E";>Click here to view the reference email send announce email to d...@apisix.apache.org and gene...@incubator.apache.org move package from dev to dist -Remove `rc` from the package name, and move to https://dist.apache.org/repos/dist/release/incubator/apisix/";> +Remove `rc` from the package name, and move to https://dist.apache.org/repos/dist/release/incubator/apisix/";> address update download page update http://apisix.apache.org/downloads/";> address , source repo is https://github.com/apache/incubator-apisix-website
[GitHub] [incubator-apisix-dashboard] gxthrj opened a new pull request #287: use put method when update route in apisix
gxthrj opened a new pull request #287: URL: https://github.com/apache/incubator-apisix-dashboard/pull/287 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
[incubator-apisix-dashboard] branch master-vue updated: tooltip and cancel button in plugin dialog (#286)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master-vue
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/master-vue by this push:
new ca9c960 tooltip and cancel button in plugin dialog (#286)
ca9c960 is described below
commit ca9c96086a0fc3f5c24d74dbd8491cd4c568a817
Author: ko han
AuthorDate: Mon Jun 29 17:05:29 2020 +0800
tooltip and cancel button in plugin dialog (#286)
* feat: show property's description in plugin dialog
* fix: plugin data is nullable
* feat: add a button to cancel adding plugin
* fix: if there is an add operation, disable the add plugin button
* fix: only show tooltip if there is a description message
---
src/components/PluginDialog/index.vue | 42 ++-
src/views/schema/routes/edit.vue | 27 ++
2 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/src/components/PluginDialog/index.vue
b/src/components/PluginDialog/index.vue
index c47d3f3..14bf494 100644
--- a/src/components/PluginDialog/index.vue
+++ b/src/components/PluginDialog/index.vue
@@ -94,6 +94,18 @@
label-width="160px"
:prop="key"
>
+
+{{ key }}
+
+ {{ schema.properties[key].description
}}
+
+
+
+
- {{ $t('button.delete') }}
+{{ $t('button.delete') }}
@@ -325,7 +337,7 @@ export default class extends Vue {
case 'object':
schemaKeys[key] = {}
this.objectPropertiesArray[key] = []
- if (this.pluginData[key]) {
+ if (this.pluginData && this.pluginData[key]) {
Object.keys(this.pluginData[key]).map(item => {
this.objectPropertiesArray[key].push({
key: item,
@@ -395,18 +407,18 @@ export default class extends Vue {
})
}
-/**
+ /**
* Add item to array property
* @param key
*/
-private addArrayItem(key: any) {
- if (this.data[key].length < this.schema.properties[key].maxItems) {
-this.data[key].push("")
-this.$forceUpdate()
- } else {
-this.$message.warning(`${this.$t('message.cannotAddMoreItems')}`)
- }
+ private addArrayItem(key: any) {
+if (this.data[key].length < this.schema.properties[key].maxItems) {
+ this.data[key].push('')
+ this.$forceUpdate()
+} else {
+ this.$message.warning(`${this.$t('message.cannotAddMoreItems')}`)
}
+ }
/**
* Delete item to array property
* @param key
diff --git a/src/views/schema/routes/edit.vue b/src/views/schema/routes/edit.vue
index 80c5ded..9123bbd 100644
--- a/src/views/schema/routes/edit.vue
+++ b/src/views/schema/routes/edit.vue
@@ -148,9 +148,9 @@
+
+
+ {{ $t('button.cancel') }}
+
{{ $t('button.add_plugin') }}
@@ -227,7 +236,7 @@
:show="showPluginDialog"
:name="pluginName"
:plugin-data="form.plugins[pluginName]"
- @hidePlugin="showPluginDialog = false"
+ @hidePlugin="onHidePlugin(pluginName)"
@save="onPluginSave"
/>
@@ -492,6 +501,11 @@ export default class extends Vue {
this.form.plugins[name] = data
}
+ private onHidePlugin(name: string) {
+this.showPluginDialog = false
+delete this.form.plugins['tempPlugin']
+ }
+
private async addPlugin() {
if (this.form.plugins.hasOwnProperty('tempPlugin')) return
@@ -501,6 +515,11 @@ export default class extends Vue {
}
}
+ private async cancelAddPlugin() {
+delete this.form.plugins['tempPlugin']
+this.$forceUpdate()
+ }
+
private removePlugin(name: any) {
this.$confirm(`Do you want to remove ${name} plugin?`, 'Warning', {
confirmButtonText: 'Confirm',
[incubator-apisix-dashboard] branch master updated: use put method when update route in apisix (#287)
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 3084980 use put method when update route in apisix (#287)
3084980 is described below
commit 30849809d6e5b361b089303bf01bb0afae9de8ad
Author: kv
AuthorDate: Mon Jun 29 17:05:11 2020 +0800
use put method when update route in apisix (#287)
---
api/service/route.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/api/service/route.go b/api/service/route.go
index ce518d4..e140455 100644
--- a/api/service/route.go
+++ b/api/service/route.go
@@ -102,7 +102,7 @@ func (arr *ApisixRouteRequest) Update(rid string)
(*ApisixRouteResponse, error)
return nil, err
} else {
fmt.Println(string(b))
- if resp, err := utils.Patch(url, b); err != nil {
+ if resp, err := utils.Put(url, b); err != nil {
logger.Error(err.Error())
return nil, err
} else {
[GitHub] [incubator-apisix-dashboard] juzhiyuan merged pull request #287: use put method when update route in apisix
juzhiyuan merged pull request #287: URL: https://github.com/apache/incubator-apisix-dashboard/pull/287 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
[GitHub] [incubator-apisix-dashboard] juzhiyuan merged pull request #286: tooltip and cancel button in plugin dialog
juzhiyuan merged pull request #286: URL: https://github.com/apache/incubator-apisix-dashboard/pull/286 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
[GitHub] [incubator-apisix-dashboard] ko-han opened a new pull request #288: fix logo missing problem
ko-han opened a new pull request #288: URL: https://github.com/apache/incubator-apisix-dashboard/pull/288 1. Changing logo url path depends on node environment. This should avoid logo missing in production environment. 1. Little changes on login and logout behaviour. 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
[GitHub] [incubator-apisix-website] sshniro opened a new pull request #50: Adding 1.4 release
sshniro opened a new pull request #50: URL: https://github.com/apache/incubator-apisix-website/pull/50 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
[GitHub] [incubator-apisix-dashboard] juzhiyuan merged pull request #288: fix logo missing problem
juzhiyuan merged pull request #288: URL: https://github.com/apache/incubator-apisix-dashboard/pull/288 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
[incubator-apisix-dashboard] branch master-vue updated: fix logo missing problem (#288)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master-vue
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/master-vue by this push:
new edfd447 fix logo missing problem (#288)
edfd447 is described below
commit edfd447750a18594aef95dd37275c2d02201003e
Author: ko han
AuthorDate: Tue Jun 30 08:17:19 2020 +0800
fix logo missing problem (#288)
* fix: miss logo in production environment
* fix: login and logout
---
package.json | 2 +-
src/layout/components/Sidebar/SidebarLogo.vue | 5 +++--
src/store/modules/user.ts | 32 +--
src/utils/request.ts | 3 ---
src/views/login/index.vue | 7 +++---
5 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/package.json b/package.json
index b769c33..60c8e3a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"scripts": {
"serve": "concurrently \"vue-cli-service serve\"",
"lint": "vue-cli-service lint",
-"build:prod": "vue-cli-service build"
+"build:prod": "NODE_ENV=production vue-cli-service build"
},
"dependencies": {
"axios": "^0.19.0",
diff --git a/src/layout/components/Sidebar/SidebarLogo.vue
b/src/layout/components/Sidebar/SidebarLogo.vue
index 4ddf188..dc045cc 100644
--- a/src/layout/components/Sidebar/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/SidebarLogo.vue
@@ -37,7 +37,7 @@
to="/"
>
@@ -48,7 +48,7 @@
to="/"
>
@@ -69,6 +69,7 @@ export default class extends Vue {
@Prop({ required: true }) private collapse!: boolean
private title = 'APISIX'
+ private logoURL = process.env.NODE_ENV === 'production' ?
'/apisix/dashboard/favicon.ico' : '/favicon.ico'
}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 95d4785..42dd340 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -23,12 +23,12 @@
*/
import { VuexModule, Module, Action, Mutation, getModule } from
'vuex-module-decorators'
-// import { login, logout, getUserInfo } from '@/api/users'
import { getToken, setToken, removeToken } from '@/utils/cookies'
import router, { resetRouter } from '@/router'
import { PermissionModule } from './permission'
import { TagsViewModule } from './tags-view'
import store from '@/store'
+import request from '@/utils/request'
export interface IUserState {
token: string
@@ -39,9 +39,15 @@ export interface IUserState {
email: string
}
+const TOKEN_KEY= "GLOBAL_APISIX_API_KEY"
+
+if (localStorage.getItem(TOKEN_KEY)) {
+ request.defaults.headers["X-API-KEY"] = localStorage.getItem(TOKEN_KEY)
+}
+
@Module({ dynamic: true, store, name: 'user' })
class User extends VuexModule implements IUserState {
- public token = getToken() || ''
+ public token = localStorage.getItem(TOKEN_KEY) || ''
public name = ''
public avatar = ''
public introduction = ''
@@ -79,23 +85,18 @@ class User extends VuexModule implements IUserState {
}
@Action
- public async Login(userInfo: { username: string, password: string}) {
-let { username, password } = userInfo
-username = username.trim()
-// TEMP: 在此处绕过登录
-// const { data } = await login({ username, password })
-
-const data = {
- accessToken: username + '-token'
-}
-
-setToken(data.accessToken)
-this.SET_TOKEN(data.accessToken)
+ public async Login(token: string) {
+setToken(token)
+localStorage.setItem(TOKEN_KEY, token)
+this.SET_TOKEN(token)
+request.defaults.headers["X-API-KEY"] = token
}
@Action
public ResetToken() {
removeToken()
+localStorage.removeItem(TOKEN_KEY)
+delete request.defaults.headers["X-API-KEY"]
this.SET_TOKEN('')
this.SET_ROLES([])
}
@@ -161,8 +162,7 @@ class User extends VuexModule implements IUserState {
// await logout()
removeToken()
resetRouter()
-this.SET_TOKEN('')
-this.SET_ROLES([])
+this.ResetToken()
}
}
diff --git a/src/utils/request.ts b/src/utils/request.ts
index e730d5f..2d9bb50 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -28,9 +28,6 @@ import { Message } from 'element-ui'
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
timeout: 5000,
- headers: {
-'X-API-KEY': localStorage.getItem('GLOBAL_API_KEY')
- }
})
service.interceptors.request.use(
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3efe7c9..2679224 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -49,7 +49,7 @@
placeholder="Please input API KEY here"
name="apikey"
type="text"
- autocomplete="on"
+ autocomplete="off"
/>
@@ -98,9
[GitHub] [incubator-apisix-dashboard] juzhiyuan commented on pull request #288: fix logo missing problem
juzhiyuan commented on pull request #288: URL: https://github.com/apache/incubator-apisix-dashboard/pull/288#issuecomment-651437256 @ko-han Hi, would you like to have a try on the latest dashboard which is built with React and Ant Design? it's on the master branch. 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
[GitHub] [incubator-apisix-website] juzhiyuan merged pull request #50: Adding 1.4 release
juzhiyuan merged pull request #50: URL: https://github.com/apache/incubator-apisix-website/pull/50 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
[incubator-apisix-website] branch master updated: Adding 1.4 release (#50)
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-website.git The following commit(s) were added to refs/heads/master by this push: new e830d8d Adding 1.4 release (#50) e830d8d is described below commit e830d8d7534629ff0df33bb16e699744be5f78f5 Author: Nirojan Selvanathan AuthorDate: Tue Jun 30 02:26:40 2020 +0200 Adding 1.4 release (#50) * Adding 1.4 release * Adding 1.4 release --- content/downloads/index.en.md | 14 +- content/downloads/index.zh.md | 14 +- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/content/downloads/index.en.md b/content/downloads/index.en.md index f64b27e..e35c1ff 100644 --- a/content/downloads/index.en.md +++ b/content/downloads/index.en.md @@ -77,6 +77,18 @@ include_footer: true ) + + 1.4 + 2020 June 29 + + https://downloads.apache.org/incubator/apisix/1.4/";>source + ( + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.asc";>asc + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.sha512";>sha512 + ) + + @@ -145,4 +157,4 @@ include_footer: true completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. - \ No newline at end of file + diff --git a/content/downloads/index.zh.md b/content/downloads/index.zh.md index adbdbf1..c3fe2a1 100644 --- a/content/downloads/index.zh.md +++ b/content/downloads/index.zh.md @@ -77,6 +77,18 @@ include_footer: true ) + +1.4 +2020 June 29 + + https://downloads.apache.org/incubator/apisix/1.4/";>source + ( + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.asc";>asc + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.sha512";>sha512 + ) + + @@ -145,4 +157,4 @@ include_footer: true completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. - \ No newline at end of file +
[incubator-apisix-website] branch asf-site updated: Deploy to GitHub pages
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 4876241 Deploy to GitHub pages 4876241 is described below commit 487624139e6f19eb6effbc53b28d25b67435b608 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 30 00:26:59 2020 + Deploy to GitHub pages --- downloads/index.html| 12 zh/downloads/index.html | 12 2 files changed, 24 insertions(+) diff --git a/downloads/index.html b/downloads/index.html index 1adcc6e..ad79209 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -297,6 +297,18 @@ ) + + 1.4 + 2020 June 29 + + https://downloads.apache.org/incubator/apisix/1.4/";>source + ( + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.asc";>asc + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.sha512";>sha512 + ) + + diff --git a/zh/downloads/index.html b/zh/downloads/index.html index 428043a..a1ba1bd 100644 --- a/zh/downloads/index.html +++ b/zh/downloads/index.html @@ -297,6 +297,18 @@ ) + +1.4 +2020 June 29 + + https://downloads.apache.org/incubator/apisix/1.4/";>source + ( + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.asc";>asc + https://downloads.apache.org/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz.sha512";>sha512 + ) + +
[GitHub] [incubator-apisix] membphis commented on pull request #1777: feature: support new field for Service object
membphis commented on pull request #1777: URL: https://github.com/apache/incubator-apisix/pull/1777#issuecomment-651465727 @Donghui0 pls add more test cases about this feature 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
[GitHub] [incubator-apisix] qianglu1989 opened a new issue #1778: bug: 使用proxy-rewrite 插件添加regex_uri js报错
qianglu1989 opened a new issue #1778: URL: https://github.com/apache/incubator-apisix/issues/1778 ### Issue description 使用proxy-rewrite 插件添加regex_uri js报错  ### Environment * apisix version (cmd: `apisix version`): 1.3 * OS: linux ### Minimal test code / Steps to reproduce the issue 1. 2. 3. ### What's the actual result? (including assertion message & call stack if applicable) ### What's the expected result? 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
[GitHub] [incubator-apisix] membphis commented on pull request #1777: feature: support new field for Service object
membphis commented on pull request #1777: URL: https://github.com/apache/incubator-apisix/pull/1777#issuecomment-651466588 We need to update the router `http/router/radixtree_uri.lua` too. 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
[GitHub] [incubator-apisix] membphis commented on issue #1778: bug: 使用proxy-rewrite 插件添加regex_uri js报错
membphis commented on issue #1778: URL: https://github.com/apache/incubator-apisix/issues/1778#issuecomment-651466991 BTW, pls use English in public channel. 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
[GitHub] [incubator-apisix] membphis commented on issue #1778: bug: 使用proxy-rewrite 插件添加regex_uri js报错
membphis commented on issue #1778: URL: https://github.com/apache/incubator-apisix/issues/1778#issuecomment-651466888 you should report to https://github.com/apache/incubator-apisix-dashboard/issues 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
[GitHub] [incubator-apisix] membphis edited a comment on issue #1778: bug: 使用proxy-rewrite 插件添加regex_uri js报错
membphis edited a comment on issue #1778: URL: https://github.com/apache/incubator-apisix/issues/1778#issuecomment-651466991 BTW, pls use English in the public channels. 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
[GitHub] [incubator-apisix] membphis commented on issue #1712: Rate limit API calls based on consumers
membphis commented on issue #1712: URL: https://github.com/apache/incubator-apisix/issues/1712#issuecomment-651468873 @houshunwei you can take a look at: https://github.com/apache/incubator-apisix/blob/master/doc/plugins/limit-req.md#attributes 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
[GitHub] [incubator-apisix] griffenliu commented on issue #1667: bug: global-rule error when enable_debug=true
griffenliu commented on issue #1667:
URL:
https://github.com/apache/incubator-apisix/issues/1667#issuecomment-651482750
I think i know the reason of this error(guess). Because no routes are set.
So the request ends prematurely, causing the header information to fail to be
set later. the code:
```
# init.lua
# _M.http_access_phase()
if not route then
return core.response.exit(404,
{error_msg = "failed to match any routes"})
end
# plugin.lua
# _M.http_body_filter_phase()
if local_conf.apisix.enable_debug then
local t = {}
for i = 1, #plugins, 2 do
core.table.insert(t, plugins[i].name)
end
core.response.set_header("Apisix-Plugins", core.table.concat(t, ",
"))
end
```
I don't know if that's a problem.
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
[GitHub] [incubator-apisix] ko-han opened a new pull request #1779: The 'get_plugin_list' API sorts the return list base on priority
ko-han opened a new pull request #1779: URL: https://github.com/apache/incubator-apisix/pull/1779 ### Summary It's a quiet useful to get the plugin priority information in the `get_plugin_list` API. This helps the plugin manager to know more clearly how plugins works. ### Full changelog * feature: The 'get_plugin_list' API sorts the return list base on priority 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
[GitHub] [incubator-apisix] griffenliu edited a comment on issue #1667: bug: global-rule error when enable_debug=true
griffenliu edited a comment on issue #1667:
URL:
https://github.com/apache/incubator-apisix/issues/1667#issuecomment-651482750
I think i know the reason of this error(guess).
The reason is that no routes are set. Here is the code:
```
# init.lua
# _M.http_access_phase()
if not route then
return core.response.exit(404,
{error_msg = "failed to match any routes"})
end
# plugin.lua
# _M.http_body_filter_phase()
if local_conf.apisix.enable_debug then
local t = {}
for i = 1, #plugins, 2 do
core.table.insert(t, plugins[i].name)
end
core.response.set_header("Apisix-Plugins", core.table.concat(t, ",
"))
end
```
I don't know if that's a problem.
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
[GitHub] [incubator-apisix] moonming closed issue #1778: bug: 使用proxy-rewrite 插件添加regex_uri js报错
moonming closed issue #1778: URL: https://github.com/apache/incubator-apisix/issues/1778 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
[GitHub] [incubator-apisix] moonming commented on pull request #1779: The 'get_plugin_list' API sorts the return list base on priority
moonming commented on pull request #1779: URL: https://github.com/apache/incubator-apisix/pull/1779#issuecomment-651549496 @ko-han please fix test case in `t/admin/plugins.t ` 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
[GitHub] [incubator-apisix] moonming merged pull request #1764: doc: remove router `r3` .
moonming merged pull request #1764: URL: https://github.com/apache/incubator-apisix/pull/1764 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
[incubator-apisix] branch master updated: doc: remove router `r3` . (#1764)
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 0d58ba7 doc: remove router `r3` . (#1764) 0d58ba7 is described below commit 0d58ba7710e4811b6b3c8e64db58c59f549567e1 Author: YuanSheng Wang AuthorDate: Tue Jun 30 13:33:35 2020 +0800 doc: remove router `r3` . (#1764) --- doc/README.md | 4 ++-- doc/zh-cn/README.md | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/README.md b/doc/README.md index 256c436..c9a8f95 100644 --- a/doc/README.md +++ b/doc/README.md @@ -16,6 +16,7 @@ # limitations under the License. # --> + [Chinese](./zh-cn/README.md) Reference Documentation @@ -27,8 +28,7 @@ Reference Documentation * [Getting Started Guide](getting-started.md) * [How to build Apache APISIX](how-to-build.md) * [Health Check](health-check.md): Enable health check on the upstream node, and will automatically filter unhealthy nodes during load balancing to ensure system stability. -* Router -* [radixtree](router-radixtree.md) +* [Router radixtree](router-radixtree.md) * [Stand Alone Model](stand-alone.md): Supports to load route rules from local yaml file, it is more friendly such as under the kubernetes(k8s). * [Stream Proxy](stream-proxy.md) * [Admin API](admin-api.md) diff --git a/doc/zh-cn/README.md b/doc/zh-cn/README.md index ab5992b..88966ee 100644 --- a/doc/zh-cn/README.md +++ b/doc/zh-cn/README.md @@ -26,9 +26,7 @@ * [压力测试](benchmark.md) * [如何构建 Apache APISIX](how-to-build.md) * [健康检查](health-check.md): 支持对上游节点的主动和被动健康检查，在负载均衡时自动过滤掉不健康的节点。 -* Router(路由) -* [radixtree](../router-radixtree.md) -* [r3](router-r3.md) +* [路由 radixtree](../router-radixtree.md) * [独立运行模型](stand-alone.md): 支持从本地 yaml 格式的配置文件启动，更适合 Kubernetes(k8s) 体系。 * [TCP/UDP 动态代理](stream-proxy.md) * [管理 API](admin-api.md)
[incubator-apisix] branch master updated: release: released 1.4-0 version (#1742)
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 d787cbd release: released 1.4-0 version (#1742)
d787cbd is described below
commit d787cbd55e18420ca89748a012231ad074bda737
Author: Nirojan Selvanathan
AuthorDate: Tue Jun 30 07:34:00 2020 +0200
release: released 1.4-0 version (#1742)
---
CHANGELOG.md | 19 +++
CHANGELOG_CN.md| 18 ++
apisix/core/version.lua| 2 +-
doc/how-to-build.md| 14
doc/zh-cn/how-to-build.md | 14
rockspec/apisix-1.4-0.rockspec | 74 ++
6 files changed, 126 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 495919c..8770248 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
# Table of Contents
+- [1.4.0](#140)
- [1.3.0](#130)
- [1.2.0](#120)
- [1.1.0](#110)
@@ -28,6 +29,24 @@
- [0.7.0](#070)
- [0.6.0](#060)
+## 1.4.0
+
+### Core
+- Admin API: Support unique names for routes
[1655](https://github.com/apache/incubator-apisix/pull/1655)
+- Optimization of log buffer size and flush time
[1570](https://github.com/apache/incubator-apisix/pull/1570)
+
+### New plugins
+- :sunrise: **Apache Skywalking plugin**
[1241](https://github.com/apache/incubator-apisix/pull/1241)
+- :sunrise: **Keycloak Identity Server Plugin**
[1701](https://github.com/apache/incubator-apisix/pull/1701)
+- :sunrise: **Echo Plugin**
[1632](https://github.com/apache/incubator-apisix/pull/1632)
+- :sunrise: **Consume Restriction Plugin**
[1437](https://github.com/apache/incubator-apisix/pull/1437)
+
+### Improvements
+- Batch Request : Copy all headers to every request
[1697](https://github.com/apache/incubator-apisix/pull/1697)
+- SSL private key encryption
[1678](https://github.com/apache/incubator-apisix/pull/1678)
+- Improvement of docs for multiple plugins
+
+
## 1.3.0
The 1.3 version is mainly for security update.
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index 0683232..d64e260 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -19,6 +19,7 @@
# Table of Contents
+- [1.4.0](#140)
- [1.3.0](#130)
- [1.2.0](#120)
- [1.1.0](#110)
@@ -28,6 +29,23 @@
- [0.7.0](#070)
- [0.6.0](#060)
+## 1.4.0
+
+### Core
+- Admin API: 路由支持唯一 name 字段
[1655](https://github.com/apache/incubator-apisix/pull/1655)
+- 优化 log 缓冲区大小和刷新时间
[1570](https://github.com/apache/incubator-apisix/pull/1570)
+
+### New plugins
+- :sunrise: **Apache Skywalking plugin**
[1241](https://github.com/apache/incubator-apisix/pull/1241)
+- :sunrise: **Keycloak Identity Server Plugin**
[1701](https://github.com/apache/incubator-apisix/pull/1701)
+- :sunrise: **Echo Plugin**
[1632](https://github.com/apache/incubator-apisix/pull/1632)
+- :sunrise: **Consume Restriction Plugin**
[1437](https://github.com/apache/incubator-apisix/pull/1437)
+
+### Improvements
+- Batch Request : 对每个请求拷贝头
[1697](https://github.com/apache/incubator-apisix/pull/1697)
+- SSL 私钥加密 [1678](https://github.com/apache/incubator-apisix/pull/1678)
+- 众多插件文档改善
+
## 1.3.0
1.3 版本主要带来安全更新。
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index 6197ea5..c3606c2 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -15,5 +15,5 @@
-- limitations under the License.
--
return {
-VERSION = "1.3"
+VERSION = "1.4"
}
diff --git a/doc/how-to-build.md b/doc/how-to-build.md
index ccc581a..b1a276e 100644
--- a/doc/how-to-build.md
+++ b/doc/how-to-build.md
@@ -34,21 +34,21 @@ You can install Apache APISIX in a variety of ways,
including source code packag
You need to download the Apache source release first:
```shell
-wget
http://www.apache.org/dist/incubator/apisix/1.3/apache-apisix-1.3-incubating-src.tar.gz
-tar zxvf apache-apisix-1.3-incubating-src.tar.gz
+wget
http://www.apache.org/dist/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz
+tar zxvf apache-apisix-1.4-incubating-src.tar.gz
```
Install the Lua libraries that the runtime depends on:
```shell
-cd apache-apisix-1.3-incubating
+cd apache-apisix-1.4-incubating
make deps
```
### Installation via RPM package (CentOS 7)
```shell
-sudo yum install -y
https://github.com/apache/incubator-apisix/releases/download/1.3/apisix-1.3-0.el7.noarch.rpm
+sudo yum install -y
https://github.com/apache/incubator-apisix/releases/download/1.4/apisix-1.4-0.el7.noarch.rpm
```
### Installation via Luarocks (macOS not supported)
@@ -64,11 +64,11 @@ sudo sh -c "$(curl -fsSL
https://raw.githubusercontent.com/apache/incubator-apis
> Install the specified version via Luarocks:
```shell
-# Install version 1.3
-sudo luarocks install --lua-dir=/path/openresty/luajit apisix 1.3
+# Install version 1.4
+sudo luarocks install --lua-dir=/path/openresty/luajit apisix 1
[GitHub] [incubator-apisix] moonming merged pull request #1742: release: released 1.4-0 version
moonming merged pull request #1742: URL: https://github.com/apache/incubator-apisix/pull/1742 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
[GitHub] [incubator-apisix] colder219 opened a new issue #1780: consul serviece create route limit req report 502
colder219 opened a new issue #1780: URL: https://github.com/apache/incubator-apisix/issues/1780 error log 2020/06/30 14:27:20 [error] 30366#30366: *3160677 [lua] balancer.lua:304: load_balancer(): failed to pick server: missing upstream configuration while connecting to upstream, client: 172.20.30.94, server: , request: "GET /healthcheck HTTP/1.1", host: "172.20.20.7:9080" 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
[GitHub] [incubator-apisix] juzhiyuan opened a new issue #1781: update documentation for Dashboard installation
juzhiyuan opened a new issue #1781: URL: https://github.com/apache/incubator-apisix/issues/1781 ### Issue description There has some out of date documentation[1] about using Dashboard. [1] https://github.com/apache/incubator-apisix/blob/master/README_CN.md 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
