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

gqcn · web-flow · commit e0e00434cc87 · 2023-07-26T21:27:58.000+08:00
diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod
@@ -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
diff --git a/cmd/gf/internal/consts/consts_gen_ctrl_template_sdk.go b/cmd/gf/internal/consts/consts_gen_ctrl_template_sdk.go
@@ -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)
 	}
@@ -49,7 +49,7 @@ package {PkgName}
 import (
 )
 
-type iClient interface {
+type IClient interface {
 }
 `
 
diff --git a/contrib/config/apollo/go.mod b/contrib/config/apollo/go.mod
@@ -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 => ../../../
diff --git a/contrib/config/kubecm/go.mod b/contrib/config/kubecm/go.mod
@@ -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
diff --git a/contrib/config/nacos/go.mod b/contrib/config/nacos/go.mod
@@ -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
 )
 
diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod
@@ -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
 )
 
diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod
@@ -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
 )
diff --git a/contrib/drivers/dm/go.mod b/contrib/drivers/dm/go.mod
@@ -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
 )
diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod
@@ -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 => ../../../
diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod
@@ -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 => ../../../
diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod
@@ -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
 )
 
diff --git a/contrib/drivers/pgsql/go.mod b/contrib/drivers/pgsql/go.mod
@@ -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
 )
 
diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod
@@ -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 => ../../../
diff --git a/contrib/nosql/redis/go.mod b/contrib/nosql/redis/go.mod
@@ -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
 )
diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod
@@ -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
 )
 
diff --git a/contrib/registry/file/go.mod b/contrib/registry/file/go.mod
@@ -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 => ../../../
diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod
@@ -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
 )
 
diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod
@@ -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
 )
 
diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod
@@ -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
diff --git a/contrib/sdk/httpclient/go.mod b/contrib/sdk/httpclient/go.mod
@@ -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 => ../../../
diff --git a/contrib/trace/jaeger/go.mod b/contrib/trace/jaeger/go.mod
@@ -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
diff --git a/contrib/trace/otlpgrpc/go.mod b/contrib/trace/otlpgrpc/go.mod
@@ -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
diff --git a/contrib/trace/otlphttp/go.mod b/contrib/trace/otlphttp/go.mod
@@ -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
diff --git a/example/go.mod b/example/go.mod
@@ -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
diff --git a/version.go b/version.go
@@ -2,5 +2,5 @@ package gf
 
 const (
 	// VERSION is the current GoFrame version.
-	VERSION = "v2.5.0"
+	VERSION = "v2.5.1"
 )

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ type implementer struct {`
`25`	`25`	`config httpclient.Config`
`26`	`26`	`}`
`27`	`27`
`28`		`-func New(config httpclient.Config) iClient {`
	`28`	`+func New(config httpclient.Config) IClient {`
`29`	`29`	`if !gstr.HasPrefix(config.URL, "http") {`
`30`	`30`	`config.URL = fmt.Sprintf("http://%s", config.URL)`
`31`	`31`	`}`
`@@ -49,7 +49,7 @@ package {PkgName}`
`49`	`49`	`import (`
`50`	`50`	`)`
`51`	`51`
`52`		`-type iClient interface {`
	`52`	`+type IClient interface {`
`53`	`53`	`}`
`54`	`54`	`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/apolloconfig/agollo/v4 v4.1.1`
`7`		`- github.com/gogf/gf/v2 v2.5.0`
	`7`	`+ github.com/gogf/gf/v2 v2.5.1`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`replace github.com/gogf/gf/v2 => ../../../`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2`
`3`	`3`	`go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/gogf/gf/v2 v2.5.0`
	`6`	`+ github.com/gogf/gf/v2 v2.5.1`
`7`	`7`	`github.com/nacos-group/nacos-sdk-go v1.1.2`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/ClickHouse/clickhouse-go/v2 v2.0.15`
`7`		`- github.com/gogf/gf/v2 v2.5.0`
	`7`	`+ github.com/gogf/gf/v2 v2.5.1`
`8`	`8`	`github.com/google/uuid v1.3.0`
`9`	`9`	`github.com/shopspring/decimal v1.3.1`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ replace github.com/gogf/gf/v2 => ../../../`
`6`	`6`
`7`	`7`	`require (`
`8`	`8`	`gitee.com/chunanyong/dm v1.8.10`
`9`		`- github.com/gogf/gf/v2 v2.5.0`
	`9`	`+ github.com/gogf/gf/v2 v2.5.1`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/denisenkom/go-mssqldb v0.11.0`
`7`		`- github.com/gogf/gf/v2 v2.5.0`
	`7`	`+ github.com/gogf/gf/v2 v2.5.1`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`replace github.com/gogf/gf/v2 => ../../../`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/go-sql-driver/mysql v1.6.0`
`7`		`- github.com/gogf/gf/v2 v2.5.0`
	`7`	`+ github.com/gogf/gf/v2 v2.5.1`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`replace github.com/gogf/gf/v2 => ../../../`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2`
`3`	`3`	`go 1.17`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/gogf/gf/v2 v2.5.0`
	`6`	`+ github.com/gogf/gf/v2 v2.5.1`
`7`	`7`	`github.com/sijms/go-ora/v2 v2.4.20`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/glebarez/go-sqlite v1.17.3`
`7`		`- github.com/gogf/gf/v2 v2.5.0`
	`7`	`+ github.com/gogf/gf/v2 v2.5.1`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`replace github.com/gogf/gf/v2 => ../../../`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.15`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/go-redis/redis/v8 v8.11.5`
`7`		`- github.com/gogf/gf/v2 v2.5.0`
	`7`	`+ github.com/gogf/gf/v2 v2.5.1`
`8`	`8`	`go.opentelemetry.io/otel v1.7.0`
`9`	`9`	`go.opentelemetry.io/otel/trace v1.7.0`
`10`	`10`	`)`