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.

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

version v2.5.5 #3068

Merged
merged 4 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ go install github.com/gogf/gf/cmd/gf/v2
golang version >= 1.18
```

# Architecture

<div align=center>
<img src="https://goframe.org/download/attachments/1114119/arch.png"/>
</div>

# Documentation

- Chinese Official Site(中文官网): [https://goframe.org](https://goframe.org/display/gf)
Expand Down
55 changes: 29 additions & 26 deletions cmd/gf/README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,23 @@ You can also install `gf` tool using pre-built binaries: <https://github.com/gog

3. Database support

| DB | support | remarks |
| :------: | :------: | :------: |
| mysql | yes | - |
| mariadb | yes | - |
| tidb | yes | - |
| mssql | yes | - |
| oracle | yes | - |
| pgsql | yes | - |
| sqlite | yes | - |
| clickhouse | no | manually make some changes to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building. |
| dm | no | manually make some changes to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building. |
| DB | builtin support | remarks |
|:----------:|:---------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------:|
| mysql | yes | - |
| mariadb | yes | - |
| tidb | yes | - |
| mssql | yes | - |
| oracle | yes | - |
| pgsql | yes | - |
| sqlite | yes | - |
| sqlitecgo | no | to support sqlite database on 32bit architecture systems, manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building. |
| clickhouse | no | manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building. |
| dm | no | manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building. |

## 2) Manually Install

```shell
git clone https://github.com/gogf/gf && cd gf/cmd/gf && go install
go install github.com/gogf/gf/cmd/gf/v2
```

## 2. Commands
Expand All @@ -47,22 +48,24 @@ USAGE
gf COMMAND [OPTION]

COMMAND
env show current Golang environment variables
run running go codes with hot-compiled-like feature
gen automatically generate go files for dao/do/entity/pb/pbentity
tpl template parsing and building commands
init create and initialize an empty GoFrame project
pack packing any file/directory to a resource file, or a go file
build cross-building go project for lots of platforms
docker build docker image for current GoFrame project
install install gf binary to system (might need root/admin permission)
version show version information of current binary
up upgrade GoFrame version/tool to latest one in current project
env show current Golang environment variables
fix auto fixing codes after upgrading to new GoFrame version
run running go codes with hot-compiled-like feature
gen automatically generate go files for dao/do/entity/pb/pbentity
tpl template parsing and building commands
init create and initialize an empty GoFrame project
pack packing any file/directory to a resource file, or a go file
build cross-building go project for lots of platforms
docker build docker image for current GoFrame project
install install gf binary to system (might need root/admin permission)
version show version information of current binary

OPTION
-y, --yes all yes for all command without prompt ask
-v, --version show version information of current binary
-d, --debug show internal detailed debugging information
-h, --help more information about this command
-y, --yes all yes for all command without prompt ask
-v, --version show version information of current binary
-d, --debug show internal detailed debugging information
-h, --help more information about this command

ADDITIONAL
Use "gf COMMAND -h" for details about a command.
Expand Down
14 changes: 7 additions & 7 deletions cmd/gf/go.mod
Original file line number Diff line number Diff line change
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.4
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.5.4
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.4
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.5.4
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.5.4
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.5.5
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.5.5
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.5
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.5.5
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.5.5
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.5.5
github.com/gogf/gf/v2 v2.5.5
github.com/minio/selfupdate v0.6.0
github.com/olekukonko/tablewriter v0.0.5
golang.org/x/mod v0.9.0
Expand Down
14 changes: 0 additions & 14 deletions cmd/gf/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,6 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.5.4 h1:qfsZ9BGEQ0zcjZoXrDS6hXqIYmfsl75xXODKUfSi3Tc=
github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.5.4/go.mod h1:qpUmfJiCyK+IWi82P9ZtvBArS9zgP7e2koCbeYDZDd4=
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.5.4 h1:hAwujIn56v3GQ09Z8F+SVP1eNuoG6P9Nd8Ty5sbTaU0=
github.com/gogf/gf/contrib/drivers/mssql/v2 v2.5.4/go.mod h1:gW7V/BynC1+46bMOEv/7EJv7NRnkIZDw0vvLD0MHz3o=
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.4 h1:xAmYQZEDBDoce/q5s7UTibYHHW0DSTApfmXVC/i0/zI=
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.4/go.mod h1:lEgzJw5PLBOEJ4gZHgs1GwsbjyBLBttN2sN63rYRNhk=
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.5.4 h1:ZtMuMNETqGcFapCK34olW03xWyYicfZPwNIlXoqbRUg=
github.com/gogf/gf/contrib/drivers/oracle/v2 v2.5.4/go.mod h1:HIOlTEJBrvi7vxHrvkEWuRAMMn1uUl55YPirVRSG5AY=
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.5.4 h1:9NSznPu4xmkgoWmT6XUJjzu5RxQC6+2D4j7pXMzrbkw=
github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.5.4/go.mod h1:wE/R5d40VQGebYlbgueVC1NicGZ0FyBP35BmflP1HMo=
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.5.4 h1:1qWazCCe2UU5zYVncv/u18gFUn2jtyqVZhW0tDON2oc=
github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.5.4/go.mod h1:N+RC0Km7nkLk3bjxtgSsbazBZxhUgbQVvZwRiV+d05c=
github.com/gogf/gf/v2 v2.5.4 h1:UBCSw8mInkHmEqL0E1LYc6QhSpaNFY/wHcFrTI/rzTk=
github.com/gogf/gf/v2 v2.5.4/go.mod h1:7yf5qp0BznfsYx7Sw49m3mQvBsHpwAjJk3Q9ZnKoUEc=
gqcn marked this conversation as resolved.
Show resolved Hide resolved
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
Expand Down
3 changes: 3 additions & 0 deletions contrib/config/README.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Configuration center implements.

Please refer to certain sub folder.
2 changes: 1 addition & 1 deletion contrib/config/apollo/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/apolloconfig/agollo/v4 v4.3.1
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/config/consul/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2
go 1.19

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/hashicorp/consul/api v1.24.0
github.com/hashicorp/go-cleanhttp v0.5.2
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/config/kubecm/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
go 1.19

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.4
k8s.io/client-go v0.27.4
Expand Down
2 changes: 1 addition & 1 deletion contrib/config/nacos/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/nacos-group/nacos-sdk-go v1.1.4
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/config/polaris/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/polarismesh/polaris-go v1.5.4
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/clickhouse/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/ClickHouse/clickhouse-go/v2 v2.0.15
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/gogf/gf/v2 => ../../../

require (
gitee.com/chunanyong/dm v1.8.10
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/mssql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/denisenkom/go-mssqldb v0.12.3
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/mysql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/go-sql-driver/mysql v1.7.1
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/oracle/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/sijms/go-ora/v2 v2.7.10
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/pgsql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/lib/pq v1.10.9
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/sqlite/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/glebarez/go-sqlite v1.21.2
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/drivers/sqlitecgo/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/mattn/go-sqlite3 v1.14.17
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/nosql/redis/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/nosql/redis/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/redis/go-redis/v9 v9.0.5
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/trace v1.14.0
Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/etcd/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2
go 1.18

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

Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/file/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2

go 1.18

require github.com/gogf/gf/v2 v2.5.4
require github.com/gogf/gf/v2 v2.5.5

require (
github.com/BurntSushi/toml v1.2.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/nacos/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/nacos/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/joy999/nacos-sdk-go v0.0.0-20231008093845-7f2f84bc6faa
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/polaris/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
github.com/polarismesh/polaris-go v1.5.4
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/zookeeper/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/go-zookeeper/zk v1.0.3
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
golang.org/x/sync v0.3.0
)

Expand Down
4 changes: 2 additions & 2 deletions contrib/rpc/grpcx/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2
go 1.18

require (
github.com/gogf/gf/contrib/registry/file/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/contrib/registry/file/v2 v2.5.5
github.com/gogf/gf/v2 v2.5.5
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/trace v1.14.0
google.golang.org/grpc v1.57.0
Expand Down
2 changes: 1 addition & 1 deletion contrib/sdk/httpclient/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2

go 1.18

require github.com/gogf/gf/v2 v2.5.4
require github.com/gogf/gf/v2 v2.5.5

require (
github.com/BurntSushi/toml v1.2.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion contrib/trace/jaeger/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/jaeger/v2
go 1.18

require (
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.5
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/exporters/jaeger v1.14.0
go.opentelemetry.io/otel/sdk v1.14.0
Expand Down
2 changes: 1 addition & 1 deletion contrib/trace/otlpgrpc/go.mod
Original file line number Diff line number Diff line change
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.4
github.com/gogf/gf/v2 v2.5.5
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion contrib/trace/otlphttp/go.mod
Original file line number Diff line number Diff line change
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.4
github.com/gogf/gf/v2 v2.5.5
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0
Expand Down
28 changes: 14 additions & 14 deletions example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ module github.com/gogf/gf/example
go 1.20

require (
github.com/gogf/gf/contrib/config/apollo/v2 v2.5.4
github.com/gogf/gf/contrib/config/consul/v2 v2.5.4
github.com/gogf/gf/contrib/config/kubecm/v2 v2.5.4
github.com/gogf/gf/contrib/config/nacos/v2 v2.5.4
github.com/gogf/gf/contrib/config/polaris/v2 v2.5.4
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.4
github.com/gogf/gf/contrib/nosql/redis/v2 v2.5.4
github.com/gogf/gf/contrib/registry/etcd/v2 v2.5.4
github.com/gogf/gf/contrib/registry/file/v2 v2.5.4
github.com/gogf/gf/contrib/registry/polaris/v2 v2.5.4
github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.5.4
github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.5.4
github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.5.4
github.com/gogf/gf/v2 v2.5.4
github.com/gogf/gf/contrib/config/apollo/v2 v2.5.5
github.com/gogf/gf/contrib/config/consul/v2 v2.5.5
github.com/gogf/gf/contrib/config/kubecm/v2 v2.5.5
github.com/gogf/gf/contrib/config/nacos/v2 v2.5.5
github.com/gogf/gf/contrib/config/polaris/v2 v2.5.5
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.5
github.com/gogf/gf/contrib/nosql/redis/v2 v2.5.5
github.com/gogf/gf/contrib/registry/etcd/v2 v2.5.5
github.com/gogf/gf/contrib/registry/file/v2 v2.5.5
github.com/gogf/gf/contrib/registry/polaris/v2 v2.5.5
github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.5.5
github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.5.5
github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.5.5
github.com/gogf/gf/v2 v2.5.5
github.com/hashicorp/consul/api v1.24.0
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/nacos-group/nacos-sdk-go v1.1.4
Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package gf

const (
// VERSION is the current GoFrame version.
VERSION = "v2.5.4"
VERSION = "v2.5.5"
)