Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make Pixiu Admin config management finer-grained #171

Merged
merged 35 commits into from
Jun 25, 2021
Merged

make Pixiu Admin config management finer-grained #171

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5b09deb
Merge pull request #1 from apache/develop
ztelur Apr 13, 2021
3ebd6a8
init
ztelur Apr 13, 2021
17a701e
update
ztelur Apr 15, 2021
3dc4309
add gin
ztelur Apr 16, 2021
b13baa0
baseinfo and resources
ztelur Apr 20, 2021
8d76eeb
api complete
ztelur Apr 25, 2021
c78093b
import
ztelur Apr 25, 2021
635acde
import
ztelur Apr 25, 2021
2f8c7fd
update
ztelur Apr 30, 2021
0d4c14c
update
ztelur May 8, 2021
94fe2cc
update
ztelur May 8, 2021
2334b25
update
ztelur May 10, 2021
a49b509
replace path with id
ztelur May 12, 2021
f71f783
update
ztelur May 15, 2021
f387764
update
ztelur May 15, 2021
d807c83
Merge branch 'apache:develop' into develop
ztelur May 17, 2021
539bf9a
update
ztelur May 17, 2021
1875ea1
Merge branch 'develop' into admin
ztelur May 17, 2021
5415ef9
update
ztelur May 17, 2021
3faf20d
comment
ztelur May 17, 2021
bba6b4b
use go 1.15 run ci to fix ci problem
ztelur May 17, 2021
619dab6
use gost zk
ztelur May 18, 2021
3c059df
add lock
ztelur May 19, 2021
9d5c3ae
modify import and chinese comment
ztelur May 26, 2021
685ce3a
split func and bugfix
ztelur Jun 14, 2021
9f6c153
Merge branch 'develop' into admin
ztelur Jun 14, 2021
a2bc557
fix go.mod go.sum
ztelur Jun 14, 2021
fc4a311
Merge branch 'apache:develop' into develop
ztelur Jun 14, 2021
948fd60
fix go.mod go.sum
ztelur Jun 14, 2021
550dacd
Merge branch 'develop' into admin
ztelur Jun 14, 2021
3fea7f3
fix go.mod go.sum
ztelur Jun 14, 2021
8e9c361
import location
ztelur Jun 18, 2021
da57025
Merge branch 'apache:develop' into develop
ztelur Jun 24, 2021
0ddbdc9
Merge branch 'develop' into admin
ztelur Jun 24, 2021
a9966e8
Merge branch 'admin' of https://github.com/ztelur/dubbo-go-pixiu into…
ztelur Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/github-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# If you want to matrix build , you can append the following list.
matrix:
go_version:
- 1.14
- 1.15
os:
- ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
language: go

go:
- "1.14"
- "1.15"
env:
- GO111MODULE=on

Expand Down
193 changes: 0 additions & 193 deletions cmd/admin/admin.go
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions configs/admin_config.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions configs/api_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ resources:
- path: '/api/v1/test-dubbo/user'
type: restful
description: user
timeout: 100ms
plugins:
pre:
pluginNames:
Expand Down
23 changes: 15 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,29 @@ module github.com/apache/dubbo-go-pixiu
go 1.14

require (
github.com/apache/dubbo-go v1.5.5
github.com/apache/dubbo-go-hessian2 v1.7.0
github.com/coreos/etcd v3.3.25+incompatible
github.com/dubbogo/dubbo-go-pixiu-filter v0.1.3
github.com/dubbogo/go-zookeeper v1.0.2
github.com/apache/dubbo-go v1.5.6
github.com/apache/dubbo-go-hessian2 v1.9.1
github.com/dubbogo/dubbo-go-pixiu-filter v0.1.4-0.20210514150956-207303ec4bd4
github.com/dubbogo/go-zookeeper v1.0.3
github.com/dubbogo/gost v1.11.8
github.com/emirpasic/gods v1.12.0
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/goinggo/mapstructure v0.0.0-20140717182941-194205d9b4a9
github.com/golang/protobuf v1.5.2 // indirect
github.com/hashicorp/consul/api v1.5.0
github.com/pkg/errors v0.9.1
github.com/spf13/cast v1.3.1
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.7.0
github.com/urfave/cli v1.22.4
go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698
go.uber.org/zap v1.16.0
google.golang.org/grpc v1.26.0
golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc // indirect
golang.org/x/sys v0.0.0-20210415045647-66c3f260301c // indirect
golang.org/x/text v0.3.6 // indirect
gopkg.in/yaml.v2 v2.4.0
)

replace github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 => github.com/envoyproxy/go-control-plane v0.8.0
replace (
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 => github.com/envoyproxy/go-control-plane v0.8.0
google.golang.org/grpc => google.golang.org/grpc v1.26.0
)
Loading