You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/08/11 08:58:06 UTC
[dubbo-go-pixiu-samples] 03/04: fix coflict
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch xds-istio
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu-samples.git
commit 076c733a0cf20a8d0534f223985ea98b017e571d
Merge: 03a6073 e550126
Author: mazhihui <ma...@baimaohui.net>
AuthorDate: Sun Jul 31 12:05:34 2022 +0800
fix coflict
.github/workflows/github-actions.yml | 10 +-
.gitignore | 1 -
README.md | 85 +++++++++++
dubbogo/simple/bestdo/README.md | 21 +++
.../docker/docker-compose.yml} | 4 +-
.../simple/{registry => bestdo}/pixiu/conf.yaml | 32 +----
.../{registry => bestdo}/server/app/server.go | 9 +-
.../simple/{registry => bestdo}/server/app/user.go | 43 +++---
.../server/profiles/dev/dubbogo.yml} | 4 +-
.../server/profiles/dev/log.yml | 0
dubbogo/simple/bestdo/test/pixiu_test.go | 88 ++++++++++++
.../{registry => direct}/docker/docker-compose.yml | 2 +-
.../simple/direct}/pixiu/conf.yaml | 27 +---
.../{registry => direct}/server/app/server.go | 5 +-
.../simple/{registry => direct}/server/app/user.go | 70 ++++-----
.../server/profiles/dev/log.yml | 0
.../server/profiles/dev/server.yml | 2 -
dubbogo/simple/direct/test/pixiu_test.go | 88 ++++++++++++
dubbogo/simple/jaeger/test/pixiu_test.go | 2 +-
dubbogo/simple/jwt/pixiu/conf.yaml | 129 ++++++++---------
dubbogo/simple/jwt/pixiu/springcloud-conf.yaml | 89 ++++++------
.../{registry => nacos}/docker/docker-compose.yml | 12 +-
.../simple/nacos/docker/docker-health-check.sh | 26 +---
dubbogo/simple/{registry => nacos}/pixiu/conf.yaml | 52 +++----
.../{registry => nacos}/server/app/server.go | 19 ++-
.../simple/{registry => nacos}/server/app/user.go | 33 ++---
.../server/profiles/dev/log.yml | 0
.../server/profiles/dev/server.yml | 14 +-
.../simple/nacos}/test/pixiu_test.go | 26 ++--
dubbogo/simple/start.sh | 16 +--
dubbogo/simple/triple/server/app/greeter.go | 6 +-
.../docker/docker-compose.yml | 0
.../simple/{registry => zookeeper}/pixiu/conf.yaml | 0
.../{registry => zookeeper}/server/app/server.go | 0
.../{registry => zookeeper}/server/app/user.go | 0
.../{registry => zookeeper}/server/app/version.go | 0
.../server/profiles/dev/log.yml | 0
.../server/profiles/dev/server.yml | 0
.../{registry => zookeeper}/test/pixiu_test.go | 0
go.mod | 2 +-
go.sum | 4 +-
grpc/server/app/server.go | 5 +-
grpc/test/pixiu_test.go | 6 +-
http/grpc/server/app/server.go | 5 +-
http/grpc/test/pixiu_test.go | 6 +-
http/simple/pixiu/conf.yaml | 6 +
springcloud/{ => nacos}/docker/docker-compose.yml | 0
springcloud/{ => nacos}/pixiu/conf.yaml | 10 +-
.../{ => nacos}/server/auth-service/pom.xml | 52 ++++---
.../spring/cloud/AuthProviderApplication.java} | 4 +-
.../src/main/resources/application.properties | 0
.../{ => nacos}/server/auth-service/start.sh | 0
.../{ => nacos}/server/user-service/pom.xml | 57 +++++---
.../spring/cloud/UserProviderApplication.java} | 4 +-
.../src/main/resources/application.properties | 0
.../server/user-service}/start.sh | 0
{dubbogo/simple => springcloud}/start.sh | 18 +--
.../docker}/docker-compose.yml | 0
.../conf-zk.yaml => zookeeper/pixiu/conf.yaml} | 1 +
.../zookeeper/server/server-zk-alibaba/pom.xml | 160 +++++++++++++++++++++
.../pixiu/serverzk/ServerZkApplication.java | 0
.../src/main/resources/application.yml | 2 +-
.../server/server-zk-alibaba}/start.sh | 0
.../{ => zookeeper}/server/server-zk/pom.xml | 1 -
.../pixiu/serverzk/ServerZkApplication.java | 0
.../server-zk/src/main/resources/application.yml | 2 +-
.../server/server-zk}/start.sh | 0
start_integrate_test.sh | 4 +-
xds/filesystem-control-panel/pixiu/lds.json | 2 +-
xds/filesystem-control-panel/readme.md | 6 +-
xds/local-control-panel/pixiu/conf.yaml | 3 -
71 files changed, 839 insertions(+), 436 deletions(-)
diff --cc grpc/server/app/server.go
index 71ca5bd,395f2b5..abe429e
--- a/grpc/server/app/server.go
+++ b/grpc/server/app/server.go
@@@ -23,12 -23,14 +23,15 @@@ import
)
import (
+ "github.com/apache/dubbo-go-pixiu/pkg/logger"
- "github.com/apache/dubbo-go-pixiu/samples/http/grpc/proto"
+
"google.golang.org/grpc"
)
+ import (
- "github.com/apache/dubbo-go-pixiu/pkg/logger"
+ "github.com/dubbo-go-pixiu/samples/http/grpc/proto"
+ )
+
const (
MsgUserNotFound = "user not found"
MsgUserQuerySuccessfully = "user(s) query successfully"
diff --cc http/grpc/server/app/server.go
index eedcb2c,1e78853..824d34c
--- a/http/grpc/server/app/server.go
+++ b/http/grpc/server/app/server.go
@@@ -23,13 -23,15 +23,16 @@@ import
)
import (
+ "github.com/apache/dubbo-go-pixiu/pkg/logger"
- "github.com/apache/dubbo-go-pixiu/samples/http/grpc/proto"
+
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
)
+ import (
- "github.com/apache/dubbo-go-pixiu/pkg/logger"
+ "github.com/dubbo-go-pixiu/samples/http/grpc/proto"
+ )
+
const (
MsgUserNotFound = "user not found"
MsgUserQuerySuccessfully = "user(s) query successfully"