go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-24 03:46:37 +02:00
Code Issues Releases Activity

Merge pull request #4 from bilibili/master

Browse Source 
merge
This commit is contained in:
wuxingzhong 2019-11-19 10:50:16 +08:00 committed by GitHub
commit a1839c0d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -33,7 +33,7 @@ Go version>=1.13
### Installation
```shell
go get -u github.com/bilibili/kratos/tool/kratos
GO111MODULE=on && go get -u github.com/bilibili/kratos/tool/kratos
cd $GOPATH/src
kratos new kratos-demo
```

2
pkg/conf/paladin/apollo/apollo.go
View File

@ -96,7 +96,7 @@ func buildConfigForApollo() (c *Config, err error) {
if clusterFromEnv := os.Getenv("APOLLO_CLUSTER"); clusterFromEnv != "" {
confCluster = clusterFromEnv
}
if confAppID == "" {
if confCluster == "" {
err = errors.New("invalid apollo cluster, pass it via APOLLO_CLUSTER=xxx with env or --apollo.cluster=xxx with flag")
return
}

2
tool/protobuf/protoc-gen-bswagger/generator.go
View File

@ -166,7 +166,7 @@ func (t *swaggerGen) getOperationByHTTPMethod(httpMethod string, pathItem *swagg
case http.MethodPut:
pathItem.Put = op
case http.MethodDelete:
pathItem.Put = op
pathItem.Delete = op
case http.MethodPatch:
pathItem.Patch = op
default: