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

Jump to bottom

expose iClient as IClient in generated sdk for command gen ctrl #2804

Merged
merged 4 commits into from
Jul 26, 2023
Merged

expose iClient as IClient in generated sdk for command gen ctrl #2804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d486642
fix issue #2482
gqcn Jul 20, 2023
7c9b250
Merge branch 'master' of https://github.com/gogf/gf
gqcn Jul 26, 2023
136146d
expose iClient in generated sdk for command gen ctrl
gqcn Jul 26, 2023
e61b0cd
v2.5.1
gqcn Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions cmd/gf/go.mod
View file
Open in desktop
Expand Up @@ -3,13 +3,13 @@ module github.com/gogf/gf/cmd/gf/v2
go 1.18

require (
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.5.0
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.5.0
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.0
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.5.0
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.5.0
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.5.1
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.5.1
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.1
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.5.1
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.5.1
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.5.1
github.com/gogf/gf/v2 v2.5.1
github.com/minio/selfupdate v0.6.0
github.com/olekukonko/tablewriter v0.0.5
golang.org/x/mod v0.9.0
Expand Down
4 changes: 2 additions & 2 deletions cmd/gf/internal/consts/consts_gen_ctrl_template_sdk.go
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ type implementer struct {
config httpclient.Config
}

func New(config httpclient.Config) iClient {
func New(config httpclient.Config) IClient {
if !gstr.HasPrefix(config.URL, "http") {
config.URL = fmt.Sprintf("http://%s", config.URL)
}
Expand All @@ -49,7 +49,7 @@ package {PkgName}
import (
)

type iClient interface {
type IClient interface {
}
`

Expand Down
2 changes: 1 addition & 1 deletion contrib/config/apollo/go.mod
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/apolloconfig/agollo/v4 v4.1.1
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
)

replace github.com/gogf/gf/v2 => ../../../
2 changes: 1 addition & 1 deletion contrib/config/kubecm/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
k8s.io/api v0.25.2
k8s.io/apimachinery v0.25.2
k8s.io/client-go v0.25.2
Expand Down
2 changes: 1 addition & 1 deletion contrib/config/nacos/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
go 1.15

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
github.com/nacos-group/nacos-sdk-go v1.1.2
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/config/polaris/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
go 1.15

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
github.com/polarismesh/polaris-go v1.5.1
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/clickhouse/go.mod
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/ClickHouse/clickhouse-go/v2 v2.0.15
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
github.com/google/uuid v1.3.0
github.com/shopspring/decimal v1.3.1
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/dm/go.mod
View file
Open in desktop
Expand Up @@ -6,5 +6,5 @@ replace github.com/gogf/gf/v2 => ../../../

require (
gitee.com/chunanyong/dm v1.8.10
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
)
2 changes: 1 addition & 1 deletion contrib/drivers/mssql/go.mod
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/denisenkom/go-mssqldb v0.11.0
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
)

replace github.com/gogf/gf/v2 => ../../../
2 changes: 1 addition & 1 deletion contrib/drivers/mysql/go.mod
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/go-sql-driver/mysql v1.6.0
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
)

replace github.com/gogf/gf/v2 => ../../../
2 changes: 1 addition & 1 deletion contrib/drivers/oracle/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2
go 1.17

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
github.com/sijms/go-ora/v2 v2.4.20
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/pgsql/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2
go 1.15

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
github.com/lib/pq v1.10.4
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/sqlite/go.mod
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/glebarez/go-sqlite v1.17.3
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
)

replace github.com/gogf/gf/v2 => ../../../
2 changes: 1 addition & 1 deletion contrib/nosql/redis/go.mod
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/go-redis/redis/v8 v8.11.5
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
go.opentelemetry.io/otel v1.7.0
go.opentelemetry.io/otel/trace v1.7.0
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/etcd/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2
go 1.15

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
go.etcd.io/etcd/client/v3 v3.5.4
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/file/go.mod
View file
Open in desktop
Expand Up @@ -2,6 +2,6 @@ module github.com/gogf/gf/contrib/registry/file/v2

go 1.15

require github.com/gogf/gf/v2 v2.5.0
require github.com/gogf/gf/v2 v2.5.1

replace github.com/gogf/gf/v2 => ../../../
2 changes: 1 addition & 1 deletion contrib/registry/polaris/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2
go 1.15

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
github.com/polarismesh/polaris-go v1.5.1
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/zookeeper/go.mod
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ go 1.15

require (
github.com/go-zookeeper/zk v1.0.3
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
golang.org/x/sync v0.1.0
)

Expand Down
4 changes: 2 additions & 2 deletions contrib/rpc/grpcx/go.mod
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2
go 1.15

require (
github.com/gogf/gf/contrib/registry/file/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/contrib/registry/file/v2 v2.5.1
github.com/gogf/gf/v2 v2.5.1
go.opentelemetry.io/otel v1.10.0
go.opentelemetry.io/otel/trace v1.10.0
golang.org/x/net v0.0.0-20220919232410-f2f64ebce3c1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion contrib/sdk/httpclient/go.mod
View file
Open in desktop
Expand Up @@ -2,6 +2,6 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2

go 1.15

require github.com/gogf/gf/v2 v2.5.0
require github.com/gogf/gf/v2 v2.5.1

replace github.com/gogf/gf/v2 => ../../../
2 changes: 1 addition & 1 deletion contrib/trace/jaeger/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/jaeger/v2
go 1.15

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
go.opentelemetry.io/otel v1.7.0
go.opentelemetry.io/otel/exporters/jaeger v1.7.0
go.opentelemetry.io/otel/sdk v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion contrib/trace/otlpgrpc/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlpgrpc/v2
go 1.20

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
Expand Down
2 changes: 1 addition & 1 deletion contrib/trace/otlphttp/go.mod
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlphttp/v2
go 1.20

require (
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.1
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0
Expand Down
28 changes: 14 additions & 14 deletions example/go.mod
View file
Open in desktop
Expand Up @@ -3,20 +3,20 @@ module github.com/gogf/gf/example
go 1.15

require (
github.com/gogf/gf/contrib/config/apollo/v2 v2.5.0
github.com/gogf/gf/contrib/config/kubecm/v2 v2.5.0
github.com/gogf/gf/contrib/config/nacos/v2 v2.5.0
github.com/gogf/gf/contrib/config/polaris/v2 v2.5.0
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.0
github.com/gogf/gf/contrib/nosql/redis/v2 v2.5.0
github.com/gogf/gf/contrib/registry/etcd/v2 v2.5.0
github.com/gogf/gf/contrib/registry/file/v2 v2.5.0
github.com/gogf/gf/contrib/registry/polaris/v2 v2.5.0
github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.5.0
github.com/gogf/gf/contrib/trace/jaeger/v2 v2.5.0
github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.5.0
github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.5.0
github.com/gogf/gf/v2 v2.5.0
github.com/gogf/gf/contrib/config/apollo/v2 v2.5.1
github.com/gogf/gf/contrib/config/kubecm/v2 v2.5.1
github.com/gogf/gf/contrib/config/nacos/v2 v2.5.1
github.com/gogf/gf/contrib/config/polaris/v2 v2.5.1
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.1
github.com/gogf/gf/contrib/nosql/redis/v2 v2.5.1
github.com/gogf/gf/contrib/registry/etcd/v2 v2.5.1
github.com/gogf/gf/contrib/registry/file/v2 v2.5.1
github.com/gogf/gf/contrib/registry/polaris/v2 v2.5.1
github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.5.1
github.com/gogf/gf/contrib/trace/jaeger/v2 v2.5.1
github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.5.1
github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.5.1
github.com/gogf/gf/v2 v2.5.1
github.com/nacos-group/nacos-sdk-go v1.1.2
github.com/polarismesh/polaris-go v1.5.1
google.golang.org/grpc v1.55.0
Expand Down
2 changes: 1 addition & 1 deletion version.go
View file
Open in desktop
Expand Up @@ -2,5 +2,5 @@ package gf

const (
// VERSION is the current GoFrame version.
VERSION = "v2.5.0"
VERSION = "v2.5.1"
)