-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
WIP: softly connect to cloudwego-contrib/cwgo-pkg #36
Open
smx-Morgan
wants to merge
12
commits into
kitex-contrib:main
Choose a base branch
from
smx-Morgan:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
97c0e81
Softly connect to cwgo pkg
smx-Morgan de0ea44
softly connect to cwgo-pkg
smx-Morgan d6d7fc2
softly connect to cwgo-pkg
smx-Morgan 9a1627a
update version
smx-Morgan b1e926e
update version
smx-Morgan 4006f42
update version
smx-Morgan 7123850
update version
smx-Morgan 32afd5f
fix CI
smx-Morgan a77f92e
fix CI
smx-Morgan 69491fc
fix CI
smx-Morgan 6110116
fix format
smx-Morgan d0abef7
fix bug
smx-Morgan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,63 +1,70 @@ | ||
module github.com/kitex-contrib/registry-nacos | ||
|
||
go 1.18 | ||
go 1.21 | ||
|
||
require ( | ||
github.com/apache/thrift v0.13.0 | ||
github.com/cloudwego/kitex v0.10.3 | ||
github.com/apache/thrift v0.20.0 | ||
github.com/cloudwego-contrib/cwgo-pkg/registry/nacos v0.0.0 | ||
github.com/cloudwego-contrib/cwgo-pkg/registry/nacos/options v0.0.0-00010101000000-000000000000 | ||
github.com/cloudwego/kitex v0.11.0 | ||
github.com/nacos-group/nacos-sdk-go v1.1.4 | ||
github.com/stretchr/testify v1.9.0 | ||
) | ||
|
||
require ( | ||
github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 // indirect | ||
github.com/aliyun/alibaba-cloud-sdk-go v1.63.32 // indirect | ||
github.com/buger/jsonparser v1.1.1 // indirect | ||
github.com/bytedance/gopkg v0.0.0-20240514070511-01b2cbcf35e1 // indirect | ||
github.com/bytedance/sonic v1.11.8 // indirect | ||
github.com/bytedance/sonic/loader v0.1.1 // indirect | ||
github.com/bytedance/gopkg v0.1.1 // indirect | ||
github.com/bytedance/sonic v1.12.2 // indirect | ||
github.com/bytedance/sonic/loader v0.2.0 // indirect | ||
github.com/cloudwego/base64x v0.1.4 // indirect | ||
github.com/cloudwego/configmanager v0.2.2 // indirect | ||
github.com/cloudwego/dynamicgo v0.2.9 // indirect | ||
github.com/cloudwego/fastpb v0.0.4 // indirect | ||
github.com/cloudwego/frugal v0.1.15 // indirect | ||
github.com/cloudwego/dynamicgo v0.4.0 // indirect | ||
github.com/cloudwego/fastpb v0.0.5 // indirect | ||
github.com/cloudwego/frugal v0.2.0 // indirect | ||
github.com/cloudwego/gopkg v0.1.1 // indirect | ||
github.com/cloudwego/iasm v0.2.0 // indirect | ||
github.com/cloudwego/localsession v0.0.2 // indirect | ||
github.com/cloudwego/netpoll v0.6.3 // indirect | ||
github.com/cloudwego/netpoll v0.6.4 // indirect | ||
github.com/cloudwego/runtimex v0.1.0 // indirect | ||
github.com/cloudwego/thriftgo v0.3.15 // indirect | ||
github.com/cloudwego/thriftgo v0.3.17 // indirect | ||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
github.com/fatih/structtag v1.2.0 // indirect | ||
github.com/go-errors/errors v1.0.1 // indirect | ||
github.com/golang/protobuf v1.5.2 // indirect | ||
github.com/google/pprof v0.0.0-20220608213341-c488b8fa1db3 // indirect | ||
github.com/golang/protobuf v1.5.4 // indirect | ||
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect | ||
github.com/iancoleman/strcase v0.2.0 // indirect | ||
github.com/jhump/protoreflect v1.8.2 // indirect | ||
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect | ||
github.com/jmespath/go-jmespath v0.4.0 // indirect | ||
github.com/json-iterator/go v1.1.12 // indirect | ||
github.com/klauspost/cpuid/v2 v2.2.4 // indirect | ||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
github.com/modern-go/gls v0.0.0-20220109145502-612d0167dce5 // indirect | ||
github.com/modern-go/reflect2 v1.0.2 // indirect | ||
github.com/oleiade/lane v1.0.1 // indirect | ||
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.0 // indirect | ||
github.com/tidwall/gjson v1.9.3 // indirect | ||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
github.com/tidwall/gjson v1.17.3 // indirect | ||
github.com/tidwall/match v1.1.1 // indirect | ||
github.com/tidwall/pretty v1.2.0 // indirect | ||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect | ||
go.uber.org/atomic v1.6.0 // indirect | ||
go.uber.org/multierr v1.5.0 // indirect | ||
go.uber.org/zap v1.15.0 // indirect | ||
go.uber.org/multierr v1.11.0 // indirect | ||
go.uber.org/zap v1.26.0 // indirect | ||
golang.org/x/arch v0.2.0 // indirect | ||
golang.org/x/net v0.17.0 // indirect | ||
golang.org/x/sync v0.1.0 // indirect | ||
golang.org/x/sys v0.13.0 // indirect | ||
golang.org/x/text v0.13.0 // indirect | ||
google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384 // indirect | ||
google.golang.org/protobuf v1.28.1 // indirect | ||
gopkg.in/ini.v1 v1.42.0 // indirect | ||
golang.org/x/net v0.24.0 // indirect | ||
golang.org/x/sync v0.8.0 // indirect | ||
golang.org/x/sys v0.19.0 // indirect | ||
golang.org/x/text v0.14.0 // indirect | ||
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect | ||
google.golang.org/protobuf v1.33.0 // indirect | ||
gopkg.in/ini.v1 v1.67.0 // indirect | ||
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect | ||
gopkg.in/yaml.v3 v3.0.1 // indirect | ||
) | ||
|
||
replace github.com/apache/thrift => github.com/apache/thrift v0.13.0 | ||
|
||
replace github.com/cloudwego-contrib/cwgo-pkg/registry/nacos => github.com/smx-Morgan/cwgo-pkg/registry/nacos v0.0.0-20241016000926-d56ef7e0f578 | ||
|
||
replace github.com/cloudwego-contrib/cwgo-pkg/registry/nacos/options => github.com/smx-Morgan/cwgo-pkg/registry/nacos/options v0.0.0-20241016000926-d56ef7e0f578 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
registry/nacos 这部分代码看起来还没合并到 cwgo-pkg 仓库上,等 cwgo-pkg 先合并吧。再问下这个 PR 的上下文是啥呀,为什么要挪过去~
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
还没有合并,这个pr是看看壳化到cwgo-pkg仓库的可行性,合并之后会重新修改这个pr的代码。挪过去的原因是 希望Hertz 与 Kitex 相同类型的组件能够同步扩展,不需要提多次pr。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
那我先把标题打上 WIP 了