This is an automated email from the ASF dual-hosted git repository. vinci pushed a commit to branch refactor in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit a5956e72a6cfa69f843a0ce5fe421382af725765 Author: ShiningRush <277040...@qq.com> AuthorDate: Fri Sep 18 22:04:39 2020 +0800 feat: upgrade droplet --- api/go.mod | 2 +- api/go.sum | 2 ++ api/internal/core/store/store.go | 1 - api/internal/utils/consts/error.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/go.mod b/api/go.mod index af5cb74..1c935ff 100644 --- a/api/go.mod +++ b/api/go.mod @@ -17,7 +17,7 @@ require ( github.com/jinzhu/gorm v1.9.12 github.com/magiconair/properties v1.8.1 github.com/satori/go.uuid v1.2.0 - github.com/shiningrush/droplet v0.1.1 + github.com/shiningrush/droplet v0.1.2 github.com/shiningrush/droplet/wrapper/gin v0.1.0 github.com/sirupsen/logrus v1.6.0 github.com/spf13/viper v1.7.1 diff --git a/api/go.sum b/api/go.sum index 7f9aa90..50b3cdf 100644 --- a/api/go.sum +++ b/api/go.sum @@ -278,6 +278,8 @@ github.com/shiningrush/droplet v0.1.0 h1:Lk/nzfouI8Xqv9VtzNZZISwTVxWeXmEd9IlgIZw github.com/shiningrush/droplet v0.1.0/go.mod h1:akW2vIeamvMD6zj6wIBfzYn6StGXBxwlW3gA+hcHu5M= github.com/shiningrush/droplet v0.1.1 h1:x+69JP60jzq6ROmsDooNhVSX8jhwFEmjBnryVvCHgjc= github.com/shiningrush/droplet v0.1.1/go.mod h1:akW2vIeamvMD6zj6wIBfzYn6StGXBxwlW3gA+hcHu5M= +github.com/shiningrush/droplet v0.1.2 h1:nGE6Ii8Hgra6UQ6lr4jvkvFuSsmg3AASf+KCF8wQgxY= +github.com/shiningrush/droplet v0.1.2/go.mod h1:akW2vIeamvMD6zj6wIBfzYn6StGXBxwlW3gA+hcHu5M= github.com/shiningrush/droplet/wrapper/gin v0.1.0 h1:eKUtuInaz8BH9dwjDnpdnP29iH7bhaB0NIOF9tL7nFM= github.com/shiningrush/droplet/wrapper/gin v0.1.0/go.mod h1:ZJu+sCRrVXn5Pg618c1KK3Ob2UiXGuPM1ROx5uMM9YQ= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= diff --git a/api/internal/core/store/store.go b/api/internal/core/store/store.go index 2d199d7..7296082 100644 --- a/api/internal/core/store/store.go +++ b/api/internal/core/store/store.go @@ -139,7 +139,6 @@ func (s *GenericStore) List(input ListInput) (*ListOutput, error) { output.Rows = ret[skipCount:] return output, nil } - output.Rows = ret[skipCount:endIdx] } diff --git a/api/internal/utils/consts/error.go b/api/internal/utils/consts/error.go index 7abee58..4f8f1d4 100644 --- a/api/internal/utils/consts/error.go +++ b/api/internal/utils/consts/error.go @@ -7,6 +7,6 @@ const ( ) var ( - // base error please refer to github.com/shiningrush/droplet/data, such as data.ErrNotFound, data.ErrConflicted + // base error please refer to github.com/shiningrush/droplet/data, such as data.ErrNotFound, data.ErrConflicted ErrDemoBiz = data.BaseError{Code: ErrCodeDemoBiz, Message: "this is just a demo error"} )