Skip to content

Commit

Permalink
Merge branch 'develop' into add_more_test_case
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexStocks committed Jul 12, 2021
2 parents 2c9e62e + a4f790b commit 9e69486
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 805 deletions.
1 change: 1 addition & 0 deletions pkg/config/api_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ func handlePutEvent(key, val []byte) {
return
}
mergeApiConfigMethod(res.ResourcePath, *res)
return
}

//handle base info
Expand Down
23 changes: 0 additions & 23 deletions samples/admin/admin/admin_config.yaml

This file was deleted.

180 changes: 0 additions & 180 deletions samples/admin/proxy/api_config.yaml

This file was deleted.

85 changes: 0 additions & 85 deletions samples/admin/proxy/conf.yaml

This file was deleted.

59 changes: 1 addition & 58 deletions samples/admin/sample.md
Original file line number Diff line number Diff line change
@@ -1,58 +1 @@
# Local example

## prepare etcd config

run etcd local or in docker, then use etcdctl to set api config

- export ETCDCTL_API=3
- if use docker, run `docker cp api_config.yaml mycontainer:/path` to copy file to docker
- run `cat api_config.yaml | etcdctl put "/proxy/config/api"` to set api config


## Start provider:

config env:
- CONF_PROVIDER_FILE_PATH=/XXX/dubbo-go-proxy/samples/admin/server/config/server.yml
- APP_LOG_CONF_FILE=/XXX/dubbo-go-proxy/samples/admin/server/config/log.yml

run samples/admin/server/app/server.go

## Start proxy

config program arguments:
- -c /XXX/dubbo-go-proxy/samples/admin/proxy/conf.yaml
- -a /XXX/dubbo-go-proxy/samples/admin/proxy/api_config.yaml

to replace -a program arguments, should put api_meta_config in conf.yaml

```yaml
api_meta_config:
address: "127.0.0.1:2379"
api_config_path: "/pixiu/config/api"
```


run cmd/proxy/proxy.go

##

curl "http://127.0.0.1:8888/api/v1/test-dubbo/user?name=tc" , the result:

```json
{
"age": 18,
"id": "0001",
"name": "tc"
}
```

## Start admin

clone from https://github.com/dubbogo/pixiu-admin

cd pixiu-admin

run cmd/admin/admin.go

config program arguments:
- -c /xx/pixiu-admin/configs/admin_config.yaml
please refer to https://www.yuque.com/docs/share/6e9de027-0548-45a1-a64c-d97529f5f5cc?# 《Pixiu Admin 》
Loading

0 comments on commit 9e69486

Please sign in to comment.