zishuo/sponge
1
0
Fork 0
mirror of https://github.com/zhufuyi/sponge.git synced 2025-10-05 16:57:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs: update document

Browse Source
This commit is contained in:
zhuyasen
2025-03-13 21:51:10 +08:00
parent 09a0e7049a
commit 7eee3570f4
18 changed files with 574 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/sponge/commands/generate/handler-pb.go
View File

@@ -106,8 +106,8 @@ func HandlerPbCommand() *cobra.Command {
using help: using help:
1. move the folders "api" and "internal" to your project code folder. 1. move the folders "api" and "internal" to your project code folder.
2. open a terminal and execute the command: make proto 2. open a terminal and execute the command: make proto
3. compile and run service: make run 3. compile and run server: make run
4. visit http://localhost:8080/apis/swagger/index.html in your browser, and test the http CRUD api. 4. access http://localhost:8080/apis/swagger/index.html in your browser, and test the http CRUD api.
`) `)
fmt.Printf("generate \"handler-pb\" code successfully, out = %s\n", outPath) fmt.Printf("generate \"handler-pb\" code successfully, out = %s\n", outPath)

4
cmd/sponge/commands/generate/handler.go
View File

@@ -103,8 +103,8 @@ func HandlerCommand() *cobra.Command {
using help: using help:
1. move the folder "internal" to your project code folder. 1. move the folder "internal" to your project code folder.
2. open a terminal and execute the command: make docs 2. open a terminal and execute the command: make docs
3. compile and run service: make run 3. compile and run server: make run
4. visit http://localhost:8080/swagger/index.html in your browser, and test the CRUD api interface. 4. access http://localhost:8080/swagger/index.html in your browser, and test the CRUD api interface.
`) `)
fmt.Printf("generate \"handler\" code successfully, out = %s\n", outPath) fmt.Printf("generate \"handler\" code successfully, out = %s\n", outPath)

18
cmd/sponge/commands/generate/http-pb.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/go-dev-frame/sponge/pkg/replacer" "github.com/go-dev-frame/sponge/pkg/replacer"
) )
// HTTPPbCommand generate web service code based on protobuf file // HTTPPbCommand generate web server code based on protobuf file
func HTTPPbCommand() *cobra.Command { func HTTPPbCommand() *cobra.Command {
var ( var (
moduleName string // module name for go.mod moduleName string // module name for go.mod
@@ -26,15 +26,15 @@ func HTTPPbCommand() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "http-pb", Use: "http-pb",
Short: "Generate web service code based on protobuf file", Short: "Generate web server code based on protobuf file",
Long: "Generate web service code based on protobuf file.", Long: "Generate web server code based on protobuf file.",
Example: color.HiBlackString(` # Generate web service code. Example: color.HiBlackString(` # Generate web server code.
sponge web http-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./test.proto sponge web http-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./test.proto
# Generate web service code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists. # Generate web server code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists.
sponge web http-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./test.proto --out=./yourServerDir sponge web http-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./test.proto --out=./yourServerDir
# Generate web service code and specify the docker image repository address. # Generate web server code and specify the docker image repository address.
sponge web http-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --protobuf-file=./test.proto sponge web http-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --protobuf-file=./test.proto
# If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`), # If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`),
@@ -173,12 +173,12 @@ func (g *httpPbGenerator) generateCode() (string, error) {
using help: using help:
1. open a terminal and execute the command to generate code: make proto 1. open a terminal and execute the command to generate code: make proto
2. open file internal/handler/xxx.go, replace panic("implement me") according to template code example. 2. open file internal/handler/xxx.go, replace panic("implement me") according to template code example.
3. compile and run service: make run 3. compile and run server: make run
4. visit http://localhost:8080/apis/swagger/index.html in your browser, and test the http api. 4. access http://localhost:8080/apis/swagger/index.html in your browser, and test the http api.
`) `)
outpath := r.GetOutputDir() outpath := r.GetOutputDir()
fmt.Printf("generate %s's web service code successfully, out = %s\n", g.serverName, outpath) fmt.Printf("generate %s's web server code successfully, out = %s\n", g.serverName, outpath)
return outpath, nil return outpath, nil
} }

22
cmd/sponge/commands/generate/http.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/go-dev-frame/sponge/pkg/sql2code/parser" "github.com/go-dev-frame/sponge/pkg/sql2code/parser"
) )
// HTTPCommand generate web service code // HTTPCommand generate web server code
func HTTPCommand() *cobra.Command { func HTTPCommand() *cobra.Command {
var ( var (
moduleName string // module name for go.mod moduleName string // module name for go.mod
@@ -36,21 +36,21 @@ func HTTPCommand() *cobra.Command {
//nolint //nolint
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "http", Use: "http",
Short: "Generate web service code based on sql", Short: "Generate web server code based on sql",
Long: "Generate web service code based on sql.", Long: "Generate web server code based on sql.",
Example: color.HiBlackString(` # Generate web service code. Example: color.HiBlackString(` # Generate web server code.
sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
# Generate web service code with multiple table names. # Generate web server code with multiple table names.
sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2 sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
# Generate web service code with extended api. # Generate web server code with extended api.
sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --extended-api=true sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --extended-api=true
# Generate web service code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists. # Generate web server code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists.
sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
# Generate web service code and specify the docker image repository address. # Generate web server code and specify the docker image repository address.
sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user sponge web http --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
# If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`), # If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`),
@@ -135,11 +135,11 @@ func HTTPCommand() *cobra.Command {
fmt.Printf(` fmt.Printf(`
using help: using help:
1. open a terminal and execute the command to generate the swagger documentation: make docs 1. open a terminal and execute the command to generate the swagger documentation: make docs
2. compile and run service: make run 2. compile and run server: make run
3. visit http://localhost:8080/swagger/index.html in your browser, and test the http CRUD api. 3. access http://localhost:8080/swagger/index.html in your browser, and test the http CRUD api.
`) `)
fmt.Printf("generate %s's web service code successfully, out = %s\n", serverName, outPath) fmt.Printf("generate %s's web server code successfully, out = %s\n", serverName, outPath)
_ = generateConfigmap(serverName, outPath) _ = generateConfigmap(serverName, outPath)
return nil return nil

18
cmd/sponge/commands/generate/rpc-gw-pb.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/go-dev-frame/sponge/pkg/replacer" "github.com/go-dev-frame/sponge/pkg/replacer"
) )
// RPCGwPbCommand generate grpc gateway service code base on protobuf file // RPCGwPbCommand generate grpc gateway server code base on protobuf file
func RPCGwPbCommand() *cobra.Command { func RPCGwPbCommand() *cobra.Command {
var ( var (
moduleName string // module name for go.mod moduleName string // module name for go.mod
@@ -26,15 +26,15 @@ func RPCGwPbCommand() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "rpc-gw-pb", Use: "rpc-gw-pb",
Short: "Generate grpc gateway service code based on protobuf file", Short: "Generate grpc gateway server code based on protobuf file",
Long: "Generate grpc gateway service code based on protobuf file.", Long: "Generate grpc gateway server code based on protobuf file.",
Example: color.HiBlackString(` # Generate grpc gateway service code. Example: color.HiBlackString(` # Generate grpc gateway server code.
sponge micro rpc-gw-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto sponge micro rpc-gw-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto
# Generate grpc gateway service code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists. # Generate grpc gateway server code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists.
sponge micro rpc-gw-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto --out=./yourServerDir sponge micro rpc-gw-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto --out=./yourServerDir
# Generate grpc gateway service code and specify the docker image repository address. # Generate grpc gateway server code and specify the docker image repository address.
sponge micro rpc-gw-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --protobuf-file=./demo.proto sponge micro rpc-gw-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --protobuf-file=./demo.proto
# If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`), # If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`),
@@ -174,11 +174,11 @@ func (g *rpcGwPbGenerator) generateCode() error {
using help: using help:
1. open a terminal and execute the command to generate code: make proto 1. open a terminal and execute the command to generate code: make proto
2. open internal/service/xxx.go file, replace panic("implement me") according to template code example. 2. open internal/service/xxx.go file, replace panic("implement me") according to template code example.
3. compile and run service: make run 3. compile and run server: make run
4. visit http://localhost:8080/apis/swagger/index.html in your browser, and test the http api. 4. access http://localhost:8080/apis/swagger/index.html in your browser, and test the http api.
`) `)
fmt.Printf("generate %s's grpc gateway service code successfully, out = %s\n", g.serverName, r.GetOutputDir()) fmt.Printf("generate %s's grpc gateway server code successfully, out = %s\n", g.serverName, r.GetOutputDir())
return nil return nil
} }

18
cmd/sponge/commands/generate/rpc-pb.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/go-dev-frame/sponge/pkg/replacer" "github.com/go-dev-frame/sponge/pkg/replacer"
) )
// RPCPbCommand generate grpc service code bash on protobuf file // RPCPbCommand generate grpc server code based on protobuf file
func RPCPbCommand() *cobra.Command { func RPCPbCommand() *cobra.Command {
var ( var (
moduleName string // module name for go.mod moduleName string // module name for go.mod
@@ -26,15 +26,15 @@ func RPCPbCommand() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "rpc-pb", Use: "rpc-pb",
Short: "Generate grpc service code based on protobuf file", Short: "Generate grpc server code based on protobuf file",
Long: "Generate grpc service code based on protobuf file.", Long: "Generate grpc server code based on protobuf file.",
Example: color.HiBlackString(` # Generate grpc service code. Example: color.HiBlackString(` # Generate grpc server code.
sponge micro rpc-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto sponge micro rpc-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto
# Generate grpc service code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists. # Generate grpc server code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists.
sponge micro rpc-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto --out=./yourServerDir sponge micro rpc-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --protobuf-file=./demo.proto --out=./yourServerDir
# Generate grpc service code and specify the docker image repository address. # Generate grpc server code and specify the docker image repository address.
sponge micro rpc-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --protobuf-file=./demo.proto sponge micro rpc-pb --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --protobuf-file=./demo.proto
# If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`), # If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`),
@@ -170,11 +170,11 @@ func (g *rpcPbGenerator) generateCode() error {
using help: using help:
1. open a terminal and execute the command to generate code: make proto 1. open a terminal and execute the command to generate code: make proto
2. open file "internal/service/xxx.go", replace panic("implement me") according to template code example. 2. open file "internal/service/xxx.go", replace panic("implement me") according to template code example.
3. compile and run service: make run 3. compile and run server: make run
4. open the file "internal/service/xxx_client_test.go" using Goland or VS Code, and test the grpc api. 4. open the file "internal/service/xxx_client_test.go" using Goland or VSCode, and test the grpc api.
`) `)
fmt.Printf("generate %s's grpc service code successfully, out = %s\n", g.serverName, r.GetOutputDir()) fmt.Printf("generate %s's grpc server code successfully, out = %s\n", g.serverName, r.GetOutputDir())
return nil return nil
} }

22
cmd/sponge/commands/generate/rpc.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/go-dev-frame/sponge/pkg/sql2code/parser" "github.com/go-dev-frame/sponge/pkg/sql2code/parser"
) )
// RPCCommand generate grpc service code // RPCCommand generate grpc server code
func RPCCommand() *cobra.Command { func RPCCommand() *cobra.Command {
var ( var (
moduleName string // module name for go.mod moduleName string // module name for go.mod
@@ -37,21 +37,21 @@ func RPCCommand() *cobra.Command {
//nolint //nolint
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "rpc", Use: "rpc",
Short: "Generate grpc service code based on sql", Short: "Generate grpc server code based on sql",
Long: "Generate grpc service code based on sql.", Long: "Generate grpc server code based on sql.",
Example: color.HiBlackString(` # Generate grpc service code. Example: color.HiBlackString(` # Generate grpc server code.
sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
# Generate grpc service code with multiple table names. # Generate grpc server code with multiple table names.
sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2 sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
# Generate grpc service code with extended api. # Generate grpc server code with extended api.
sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --extended-api=true sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --extended-api=true
# Generate grpc service code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists. # Generate grpc server code and specify the output directory, Note: code generation will be canceled when the latest generated file already exists.
sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
# Generate grpc service code and specify the docker image repository address. # Generate grpc server code and specify the docker image repository address.
sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user sponge micro rpc --module-name=yourModuleName --server-name=yourServerName --project-name=yourProjectName --repo-addr=192.168.3.37:9443/user-name --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
# If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`), # If you want the generated code to suited to mono-repo, you need to set the parameter --suited-mono-repo=true`),
@@ -135,11 +135,11 @@ func RPCCommand() *cobra.Command {
fmt.Printf(` fmt.Printf(`
using help: using help:
1. open a terminal and execute the command to generate code: make proto 1. open a terminal and execute the command to generate code: make proto
2. compile and run service: make run 2. compile and run server: make run
3. open the file internal/service/xxx_client_test.go using Goland or VS Code, and test the grpc CRUD api. 3. open the file internal/service/xxx_client_test.go using Goland or VSCode, and test the grpc CRUD api.
`) `)
fmt.Printf("generate %s's grpc service code successfully, out = %s\n", serverName, outPath) fmt.Printf("generate %s's grpc server code successfully, out = %s\n", serverName, outPath)
_ = generateConfigmap(serverName, outPath) _ = generateConfigmap(serverName, outPath)
return nil return nil

6
cmd/sponge/commands/generate/service-handler.go
View File

@@ -106,9 +106,9 @@ func ServiceAndHandlerCRUDCommand() *cobra.Command {
using help: using help:
1. move the folders "api" and "internal" to your project code folder. 1. move the folders "api" and "internal" to your project code folder.
2. open a terminal and execute the command to generate code: make proto 2. open a terminal and execute the command to generate code: make proto
3. compile and run service: make run 3. compile and run server: make run
4. visit http://localhost:8080/apis/swagger/index.html in your browser, and test the http CRUD api. 4. access http://localhost:8080/apis/swagger/index.html in your browser, and test the http CRUD api.
open the file "internal/service/xxx_client_test.go" using Goland or VS Code, and test the grpc CRUD api. open the file "internal/service/xxx_client_test.go" using Goland or VSCode, and test the grpc CRUD api.
`) `)
fmt.Printf("generate \"service-http\" code successfully, out = %s\n", outPath) fmt.Printf("generate \"service-http\" code successfully, out = %s\n", outPath)

4
cmd/sponge/commands/generate/service.go
View File

@@ -105,8 +105,8 @@ func ServiceCommand() *cobra.Command {
using help: using help:
1. move the folders "api" and "internal" to your project code folder. 1. move the folders "api" and "internal" to your project code folder.
2. open a terminal and execute the command to generate code: make proto 2. open a terminal and execute the command to generate code: make proto
3. compile and run service: make run 3. compile and run server: make run
4. open the file internal/service/xxx_client_test.go using Goland or VS Code, and test the grpc CRUD api. 4. open the file internal/service/xxx_client_test.go using Goland or VSCode, and test the grpc CRUD api.
`) `)
fmt.Printf("generate \"service\" code successfully, out = %s\n", outPath) fmt.Printf("generate \"service\" code successfully, out = %s\n", outPath)

1
cmd/sponge/commands/micro.go
View File

@@ -27,6 +27,7 @@ func GenMicroCommand() *cobra.Command {
generate.RPCPbCommand(), generate.RPCPbCommand(),
generate.GRPCConnectionCommand(), generate.GRPCConnectionCommand(),
generate.ConvertSwagJSONCommand("micro"), generate.ConvertSwagJSONCommand("micro"),
generate.GRPCAndHTTPCommand(),
generate.GRPCAndHTTPPbCommand(), generate.GRPCAndHTTPPbCommand(),
generate.ServiceAndHandlerCRUDCommand(), generate.ServiceAndHandlerCRUDCommand(),
) )

6
cmd/sponge/commands/run.go
View File

@@ -25,8 +25,8 @@ func OpenUICommand() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "run", Use: "run",
Short: "Run code generation UI service", Short: "Run code generation engine service, generate code in UI interface",
Long: "Run code generation UI service.", Long: "Run code generation engine service, generate code in UI interface.",
Example: color.HiBlackString(` # Running ui service, local browser access only. Example: color.HiBlackString(` # Running ui service, local browser access only.
sponge run sponge run
@@ -43,7 +43,7 @@ func OpenUICommand() *cobra.Command {
return err return err
} }
} }
fmt.Printf("The code generation service has started, version = %s, please visit %s in your browser.\n", fmt.Printf("The code generation engine service is already running, version = %s, access the url %s in your browser.\n",
getVersion(), color.HiCyanString(spongeAddr)) getVersion(), color.HiCyanString(spongeAddr))
go func() { go func() {
_ = open(spongeAddr) _ = open(spongeAddr)

6
cmd/sponge/commands/upgrade.go
View File

@@ -56,7 +56,7 @@ func runUpgrade(targetVersion string) (string, error) {
p.LoopPrint(runningTip) p.LoopPrint(runningTip)
err := runUpgradeCommand(targetVersion) err := runUpgradeCommand(targetVersion)
if err != nil { if err != nil {
p.StopPrint(failTip) p.StopPrint(failTip + "\nError: " + err.Error())
return "", err return "", err
} }
p.StopPrint(finishTip) p.StopPrint(finishTip)
@@ -68,7 +68,7 @@ func runUpgrade(targetVersion string) (string, error) {
p.LoopPrint(runningTip) p.LoopPrint(runningTip)
ver, err := copyToTempDir(targetVersion) ver, err := copyToTempDir(targetVersion)
if err != nil { if err != nil {
p.StopPrint(failTip) p.StopPrint(failTip + "\nError: " + err.Error())
return "", err return "", err
} }
p.StopPrint(finishTip) p.StopPrint(finishTip)
@@ -80,7 +80,7 @@ func runUpgrade(targetVersion string) (string, error) {
p.LoopPrint(runningTip) p.LoopPrint(runningTip)
err = updateSpongeInternalPlugin(ver) err = updateSpongeInternalPlugin(ver)
if err != nil { if err != nil {
p.StopPrint(failTip) p.StopPrint(failTip + "\nError: " + err.Error())
return "", err return "", err
} }
p.StopPrint(finishTip) p.StopPrint(finishTip)

57
cmd/sponge/server/handler.go
View File

@@ -193,7 +193,12 @@ func handleGenerateCode(c *gin.Context, outPath string, arg string) {
} }
zipFile := out + ".zip" zipFile := out + ".zip"
err := CompressPathToZip(out, zipFile) var err error
if gofile.IsWindows() {
err = AdaptToWindowsZip(out, zipFile)
} else {
err = CompressPathToZip(out, zipFile)
}
if err != nil { if err != nil {
responseErr(c, err, errcode.InternalServerError) responseErr(c, err, errcode.InternalServerError)
return return
@@ -424,6 +429,56 @@ func compress(file *os.File, prefix string, zw *zip.Writer) error {
return nil return nil
} }
func AdaptToWindowsZip(outPath, targetFile string) error {
d, err := os.Create(targetFile)
if err != nil {
return err
}
defer d.Close()
w := zip.NewWriter(d)
defer w.Close()
baseDir := filepath.Dir(outPath)
return filepath.Walk(outPath, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
header, err := zip.FileInfoHeader(info)
if err != nil {
return err
}
relPath, err := filepath.Rel(baseDir, path)
if err != nil {
return err
}
header.Name = filepath.ToSlash(relPath) // convert to slash path
if info.IsDir() {
header.Name += "/"
_, err = w.CreateHeader(header)
return err
}
writer, err := w.CreateHeader(header)
if err != nil {
return err
}
file, err := os.Open(path)
if err != nil {
return err
}
defer file.Close()
_, err = io.Copy(writer, file)
return err
})
}
func getSpongeDir() string { func getSpongeDir() string {
dir, err := os.UserHomeDir() dir, err := os.UserHomeDir()
if err != nil { if err != nil {

2
doc.go
View File

@@ -26,7 +26,7 @@
// //
// plugins Managing sponge dependency plugins // plugins Managing sponge dependency plugins
// //
// run Run code generation UI service // run Run code generation engine service, generate code in UI interface
// //
// template Generate code based on custom templates // template Generate code based on custom templates
// //

166
pkg/gin/middleware/README.md
View File

@@ -11,34 +11,39 @@ Common gin middleware libraries.
You can set the maximum length for printing, add a request id field, ignore print path, customize [zap](go.uber.org/zap) log. You can set the maximum length for printing, add a request id field, ignore print path, customize [zap](go.uber.org/zap) log.
```go ```go
import "github.com/go-dev-frame/sponge/pkg/gin/middleware" import (
"github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
)
func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
// Print input parameters and return results // Print input parameters and return results
// case 1: // Case 1: default
r.Use(middleware.Logging()) // default {
// case 2: r.Use(middleware.Logging()
r.Use(middleware.Logging( // custom }
// Case 2: custom
{
r.Use(middleware.Logging(
middleware.WithLog(logger.Get()))
middleware.WithMaxLen(400), middleware.WithMaxLen(400),
middleware.WithRequestIDFromHeader(), middleware.WithRequestIDFromHeader(),
//middleware.WithRequestIDFromContext(), //middleware.WithRequestIDFromContext(),
//middleware.WithLog(log), // custom zap log
//middleware.WithIgnoreRoutes("/hello"), //middleware.WithIgnoreRoutes("/hello"),
)) ))
}
// ---------------------------------------- /*******************************************
TIP: You can use middleware.SimpleLog instead of
middleware.Logging, it only prints return results
*******************************************/
// Print only return results // ......
// case 1: return r
r.Use(middleware.SimpleLog()) // default }
// case 2:
r.Use(middleware.SimpleLog( // custom
middleware.WithRequestIDFromHeader(),
//middleware.WithRequestIDFromContext(),
//middleware.WithLog(log), // custom zap log
//middleware.WithIgnoreRoutes("/hello"),
))
``` ```
<br> <br>
@@ -46,10 +51,20 @@ You can set the maximum length for printing, add a request id field, ignore prin
### Allow cross-domain requests middleware ### Allow cross-domain requests middleware
```go ```go
import "github.com/go-dev-frame/sponge/pkg/gin/middleware" import (
"github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
)
func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
r.Use(middleware.Cors()) r.Use(middleware.Cors())
// ......
return r
}
``` ```
<br> <br>
@@ -59,20 +74,29 @@ You can set the maximum length for printing, add a request id field, ignore prin
Adaptive flow limitation based on hardware resources. Adaptive flow limitation based on hardware resources.
```go ```go
import "github.com/go-dev-frame/sponge/pkg/gin/middleware" import (
"github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
)
func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
// case 1: default // Case 1: default
r.Use(middleware.RateLimit()) r.Use(middleware.RateLimit())
// case 2: custom // Case 2: custom
r.Use(middleware.RateLimit( r.Use(middleware.RateLimit(
middleware.WithWindow(time.Second*10), middleware.WithWindow(time.Second*10),
middleware.WithBucket(1000), middleware.WithBucket(1000),
middleware.WithCPUThreshold(100), middleware.WithCPUThreshold(100),
middleware.WithCPUQuota(0.5), middleware.WithCPUQuota(0.5),
)) ))
// ......
return r
}
``` ```
<br> <br>
@@ -80,13 +104,23 @@ Adaptive flow limitation based on hardware resources.
### Circuit Breaker middleware ### Circuit Breaker middleware
```go ```go
import "github.com/go-dev-frame/sponge/pkg/gin/middleware" import (
"github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
)
func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
r.Use(middleware.CircuitBreaker( r.Use(middleware.CircuitBreaker(
//middleware.WithValidCode(http.StatusRequestTimeout), // add error code 408 for circuit breaker //middleware.WithValidCode(http.StatusRequestTimeout), // add error code 408 for circuit breaker
//middleware.WithDegradeHandler(handler), // add custom degrade handler //middleware.WithDegradeHandler(handler), // add custom degrade handler
)) ))
// ......
return r
}
``` ```
<br> <br>
@@ -97,14 +131,14 @@ Adaptive flow limitation based on hardware resources.
package main package main
import ( import (
"time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware" "github.com/go-dev-frame/sponge/pkg/gin/middleware"
"github.com/go-dev-frame/sponge/pkg/gin/response" "github.com/go-dev-frame/sponge/pkg/gin/response"
"github.com/go-dev-frame/sponge/pkg/jwt" "github.com/go-dev-frame/sponge/pkg/jwt"
"time"
) )
func web() { func main() {
r := gin.Default() r := gin.Default()
// Case 1: default jwt options, signKey, signMethod(HS256), expiry time(24 hour) // Case 1: default jwt options, signKey, signMethod(HS256), expiry time(24 hour)
@@ -195,8 +229,11 @@ func extraVerifyFn(claims *jwt.Claims, c *gin.Context) error {
### Tracing middleware ### Tracing middleware
```go ```go
import "github.com/go-dev-frame/sponge/pkg/tracer" import (
import "github.com/go-dev-frame/sponge/pkg/gin/middleware" "github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
"github.com/go-dev-frame/sponge/pkg/tracer"
)
func InitTrace(serviceName string) { func InitTrace(serviceName string) {
exporter, err := tracer.NewJaegerAgentExporter("192.168.3.37", "6831") exporter, err := tracer.NewJaegerAgentExporter("192.168.3.37", "6831")
@@ -213,15 +250,18 @@ func InitTrace(serviceName string) {
tracer.Init(exporter, resource) // collect all by default tracer.Init(exporter, resource) // collect all by default
} }
func NewRouter( func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
r.Use(middleware.Tracing("your-service-name")) r.Use(middleware.Tracing("your-service-name"))
// ...... // ......
) return r
}
// if necessary, you can create a span in the program // if necessary, you can create a span in the program
func SpanDemo(serviceName string, spanName string, ctx context.Context) { func CreateSpanDemo(serviceName string, spanName string, ctx context.Context) {
_, span := otel.Tracer(serviceName).Start( _, span := otel.Tracer(serviceName).Start(
ctx, spanName, ctx, spanName,
trace.WithAttributes(attribute.String(spanName, time.Now().String())), trace.WithAttributes(attribute.String(spanName, time.Now().String())),
@@ -237,9 +277,15 @@ func SpanDemo(serviceName string, spanName string, ctx context.Context) {
### Metrics middleware ### Metrics middleware
```go ```go
import "github.com/go-dev-frame/sponge/pkg/gin/middleware/metrics" import (
"github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
"github.com/go-dev-frame/sponge/pkg/gin/middleware/metrics"
)
func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
r.Use(metrics.Metrics(r, r.Use(metrics.Metrics(r,
//metrics.WithMetricsPath("/demo/metrics"), // default is /metrics //metrics.WithMetricsPath("/demo/metrics"), // default is /metrics
@@ -247,6 +293,9 @@ func SpanDemo(serviceName string, spanName string, ctx context.Context) {
//metrics.WithIgnoreRequestMethods(http.MethodHead), // ignore request methods //metrics.WithIgnoreRequestMethods(http.MethodHead), // ignore request methods
//metrics.WithIgnoreRequestPaths("/ping", "/health"), // ignore request paths //metrics.WithIgnoreRequestPaths("/ping", "/health"), // ignore request paths
)) ))
// ......
return r
``` ```
<br> <br>
@@ -254,25 +303,33 @@ func SpanDemo(serviceName string, spanName string, ctx context.Context) {
### Request id ### Request id
```go ```go
import "github.com/go-dev-frame/sponge/pkg/gin/middleware" import (
"github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
)
// Default request id func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
// Case 1: default request id
{
r.Use(middleware.RequestID()) r.Use(middleware.RequestID())
}
// --- or --- // Case 2: custom request id key
{
// Customized request id key
//r.User(middleware.RequestID( //r.User(middleware.RequestID(
// middleware.WithContextRequestIDKey("your ctx request id key"), // default is request_id // middleware.WithContextRequestIDKey("your ctx request id key"), // default is request_id
// middleware.WithHeaderRequestIDKey("your header request id key"), // default is X-Request-Id // middleware.WithHeaderRequestIDKey("your header request id key"), // default is X-Request-Id
//)) //))
// If you change the ContextRequestIDKey, you have to set the same key name if you want to print the request id in the mysql logs as well. // If you change the ContextRequestIDKey, you have to set the same key name if you want to print the request id in the mysql logs as well.
// example: // example:
// db, err := mysql.Init(dsn, // db, err := mysql.Init(dsn,mysql.WithLogRequestIDKey("your ctx request id key")) // print request_id
// mysql.WithLogRequestIDKey("your ctx request id key"), // print request_id }
// ...
// ) // ......
return r
}
``` ```
<br> <br>
@@ -280,17 +337,30 @@ func SpanDemo(serviceName string, spanName string, ctx context.Context) {
### Timeout ### Timeout
```go ```go
import "github.com/go-dev-frame/sponge/pkg/gin/middleware" import (
"github.com/gin-gonic/gin"
"github.com/go-dev-frame/sponge/pkg/gin/middleware"
)
func NewRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
// ......
// way1: global set timeout // Case 1: global set timeout
{
r.Use(middleware.Timeout(time.Second*5)) r.Use(middleware.Timeout(time.Second*5))
}
// --- or --- // Case 2: set timeout for specifyed router
{
// way2: router set timeout r.GET("/userExample/:id", middleware.Timeout(time.Second*3), GetByID)
r.GET("/userExample/:id", middleware.Timeout(time.Second*3), h.GetByID) }
// Note: If timeout is set both globally and in the router, the minimum timeout prevails // Note: If timeout is set both globally and in the router, the minimum timeout prevails
// ......
return r
}
func GetByID(c *gin.Context) {
// do something
}
``` ```

174
pkg/grpc/interceptor/README.md
View File

@@ -24,13 +24,18 @@ All import paths are "github.com/go-dev-frame/sponge/pkg/grpc/interceptor".
**gRPC server side** **gRPC server side**
```go ```go
// set unary server logging import (
func getServerOptions() []grpc.ServerOption { "github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"github.com/go-dev-frame/sponge/pkg/logger"
"google.golang.org/grpc"
)
func setServerOptions() []grpc.ServerOption {
var options []grpc.ServerOption var options []grpc.ServerOption
option := grpc.ChainUnaryInterceptor( option := grpc.ChainUnaryInterceptor(
// if you don't want to log reply data, you can use interceptor.StreamServerSimpleLog instead of interceptor.UnaryServerLog, // if you don't want to log reply data, you can use interceptor.StreamServerSimpleLog instead of interceptor.UnaryServerLog,
interceptor.UnaryServerLog( interceptor.UnaryServerLog( // set unary server logging
logger.Get(), logger.Get(),
interceptor.WithReplaceGRPCLogger(), interceptor.WithReplaceGRPCLogger(),
//interceptor.WithMarshalFn(fn), // customised marshal function, default is jsonpb.Marshal //interceptor.WithMarshalFn(fn), // customised marshal function, default is jsonpb.Marshal
@@ -50,12 +55,16 @@ func getServerOptions() []grpc.ServerOption {
**gRPC client side** **gRPC client side**
```go ```go
// set unary client logging import (
func getDialOptions() []grpc.DialOption { "github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
option := grpc.WithChainUnaryInterceptor( option := grpc.WithChainUnaryInterceptor(
interceptor.UnaryClientLog( interceptor.UnaryClientLog( // set unary client logging
logger.Get(), logger.Get(),
interceptor.WithReplaceGRPCLogger(), interceptor.WithReplaceGRPCLogger(),
), ),
@@ -75,7 +84,12 @@ func getDialOptions() []grpc.DialOption {
**gRPC server side** **gRPC server side**
```go ```go
func getServerOptions() []grpc.ServerOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setServerOptions() []grpc.ServerOption {
var options []grpc.ServerOption var options []grpc.ServerOption
option := grpc.ChainUnaryInterceptor( option := grpc.ChainUnaryInterceptor(
@@ -90,7 +104,12 @@ func getServerOptions() []grpc.ServerOption {
**gRPC client side** **gRPC client side**
```go ```go
func getDialOptions() []grpc.DialOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
option := grpc.WithChainUnaryInterceptor( option := grpc.WithChainUnaryInterceptor(
@@ -109,7 +128,12 @@ func getDialOptions() []grpc.DialOption {
**gRPC client side** **gRPC client side**
```go ```go
func getDialOptions() []grpc.DialOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
// use insecure transfer // use insecure transfer
@@ -118,9 +142,9 @@ func getDialOptions() []grpc.DialOption {
// retry // retry
option := grpc.WithChainUnaryInterceptor( option := grpc.WithChainUnaryInterceptor(
interceptor.UnaryClientRetry( interceptor.UnaryClientRetry(
//middleware.WithRetryTimes(5), // modify the default number of retries to 3 by default //interceptor.WithRetryTimes(5), // modify the default number of retries to 3 by default
//middleware.WithRetryInterval(100*time.Millisecond), // modify the default retry interval, default 50 milliseconds //interceptor.WithRetryInterval(100*time.Millisecond), // modify the default retry interval, default 50 milliseconds
//middleware.WithRetryErrCodes(), // add trigger retry error code, default is codes.Internal, codes.DeadlineExceeded, codes.Unavailable //interceptor.WithRetryErrCodes(), // add trigger retry error code, default is codes.Internal, codes.DeadlineExceeded, codes.Unavailable
), ),
) )
options = append(options, option) options = append(options, option)
@@ -131,12 +155,19 @@ func getDialOptions() []grpc.DialOption {
<br> <br>
#### Adaptive rate limiter interceptor #### Rate limiter interceptor
Adaptive flow limitation based on hardware resources.
**gRPC server side** **gRPC server side**
```go ```go
func getDialOptions() []grpc.DialOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
// use insecure transfer // use insecure transfer
@@ -159,12 +190,17 @@ func getDialOptions() []grpc.DialOption {
<br> <br>
#### Adaptive circuit breaker interceptor #### Circuit breaker interceptor
**gRPC server side** **gRPC server side**
```go ```go
func getDialOptions() []grpc.DialOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
// use insecure transfer // use insecure transfer
@@ -173,7 +209,7 @@ func getDialOptions() []grpc.DialOption {
// circuit breaker // circuit breaker
option := grpc.ChainUnaryInterceptor( option := grpc.ChainUnaryInterceptor(
interceptor.UnaryServerCircuitBreaker( interceptor.UnaryServerCircuitBreaker(
//interceptor.WithValidCode(codes.DeadlineExceeded), // add error code 4 for circuit breaker //interceptor.WithValidCode(codes.DeadlineExceeded), // add error code for circuit breaker
//interceptor.WithUnaryServerDegradeHandler(handler), // add custom degrade handler //interceptor.WithUnaryServerDegradeHandler(handler), // add custom degrade handler
), ),
) )
@@ -190,13 +226,17 @@ func getDialOptions() []grpc.DialOption {
**gRPC client side** **gRPC client side**
```go ```go
func getDialOptions() []grpc.DialOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
// use insecure transfer // use insecure transfer
options = append(options, grpc.WithTransportCredentials(insecure.NewCredentials())) options = append(options, grpc.WithTransportCredentials(insecure.NewCredentials()))
// timeout
option := grpc.WithChainUnaryInterceptor( option := grpc.WithChainUnaryInterceptor(
interceptor.UnaryClientTimeout(time.Second), // set timeout interceptor.UnaryClientTimeout(time.Second), // set timeout
) )
@@ -210,9 +250,14 @@ func getDialOptions() []grpc.DialOption {
#### Tracing interceptor #### Tracing interceptor
**gRPC server side** **Initialize tracing**
```go ```go
import (
"github.com/go-dev-frame/sponge/pkg/tracer"
"go.opentelemetry.io/otel"
)
// initialize tracing // initialize tracing
func InitTrace(serviceName string) { func InitTrace(serviceName string) {
exporter, err := tracer.NewJaegerAgentExporter("192.168.3.37", "6831") exporter, err := tracer.NewJaegerAgentExporter("192.168.3.37", "6831")
@@ -229,8 +274,48 @@ func InitTrace(serviceName string) {
tracer.Init(exporter, resource) // collect all by default tracer.Init(exporter, resource) // collect all by default
} }
// set up trace on the client side // if necessary, you can create a span in the program
func getDialOptions() []grpc.DialOption { func SpanDemo(serviceName string, spanName string, ctx context.Context) {
_, span := otel.Tracer(serviceName).Start(
ctx, spanName,
trace.WithAttributes(attribute.String(spanName, time.Now().String())), // customised attributes
)
defer span.End()
// ......
}
```
**gRPC server side**
```go
import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setServerOptions() []grpc.ServerOption {
var options []grpc.ServerOption
// use tracing
option := grpc.UnaryInterceptor(
interceptor.UnaryServerTracing(),
)
options = append(options, option)
return options
}
```
**gRPC client side**
```go
import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
// use insecure transfer // use insecure transfer
@@ -244,30 +329,6 @@ func getDialOptions() []grpc.DialOption {
return options return options
} }
// set up trace on the server side
func getServerOptions() []grpc.ServerOption {
var options []grpc.ServerOption
// use tracing
option := grpc.UnaryInterceptor(
interceptor.UnaryServerTracing(),
)
options = append(options, option)
return options
}
// if necessary, you can create a span in the program
func SpanDemo(serviceName string, spanName string, ctx context.Context) {
_, span := otel.Tracer(serviceName).Start(
ctx, spanName,
trace.WithAttributes(attribute.String(spanName, time.Now().String())), // customised attributes
)
defer span.End()
// ......
}
``` ```
<br> <br>
@@ -283,7 +344,12 @@ Click to view [metrics examples](../metrics/README.md).
**gRPC server side** **gRPC server side**
```go ```go
func getServerOptions() []grpc.ServerOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setServerOptions() []grpc.ServerOption {
var options []grpc.ServerOption var options []grpc.ServerOption
option := grpc.ChainUnaryInterceptor( option := grpc.ChainUnaryInterceptor(
@@ -300,7 +366,12 @@ func getServerOptions() []grpc.ServerOption {
**gRPC client side** **gRPC client side**
```go ```go
func getDialOptions() []grpc.DialOption { import (
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"google.golang.org/grpc"
)
func setDialOptions() []grpc.DialOption {
var options []grpc.DialOption var options []grpc.DialOption
// use insecure transfer // use insecure transfer
@@ -326,11 +397,11 @@ package main
import ( import (
"context" "context"
"net"
"time"
"github.com/go-dev-frame/sponge/pkg/grpc/interceptor" "github.com/go-dev-frame/sponge/pkg/grpc/interceptor"
"github.com/go-dev-frame/sponge/pkg/jwt" "github.com/go-dev-frame/sponge/pkg/jwt"
"google.golang.org/grpc" "google.golang.org/grpc"
"net"
"time"
userV1 "user/api/user/v1" userV1 "user/api/user/v1"
) )
@@ -394,7 +465,7 @@ func (s *user) Login(ctx context.Context, req *userV1.LoginRequest) (*userV1.Log
jwt.WithGenerateTokenFields(fields), jwt.WithGenerateTokenFields(fields),
jwt.WithGenerateTokenClaims([]jwt.RegisteredClaimsOption{ jwt.WithGenerateTokenClaims([]jwt.RegisteredClaimsOption{
jwt.WithExpires(time.Hour * 12), jwt.WithExpires(time.Hour * 12),
//jwt.WithIssuedAt(now), // jwt.WithIssuedAt(now),
// jwt.WithSubject("123"), // jwt.WithSubject("123"),
// jwt.WithIssuer("https://auth.example.com"), // jwt.WithIssuer("https://auth.example.com"),
// jwt.WithAudience("https://api.example.com"), // jwt.WithAudience("https://api.example.com"),
@@ -453,7 +524,6 @@ func main() {
cli.GetByID(ctx, &userV1.GetUserByIDRequest{Id: 100}) cli.GetByID(ctx, &userV1.GetUserByIDRequest{Id: 100})
} }
``` ```
<br> <br>

2
pkg/sql2code/sql2code_test.go
View File

@@ -160,7 +160,7 @@ func TestGenerateError(t *testing.T) {
assert.Error(t, err) assert.Error(t, err)
} }
func Test_getOptions(t *testing.T) { func Test_setOptions(t *testing.T) {
a := &Args{ a := &Args{
Package: "Package", Package: "Package",
GormType: true, GormType: true,

14
pkg/tracer/example-cn.md
View File

@@ -1,7 +1,7 @@
### 启动jaeger和elasticsearch服务 ### 启动jaeger和elasticsearch服务
链路跟踪使用jaeger，存储使用elasticsearch，在本地使用[docker-compose](https://github.com/docker/compose/releases)启动两个服务。 链路追踪使用jaeger，存储使用elasticsearch，在本地使用[docker-compose](https://github.com/docker/compose/releases)启动两个服务。
**(1) elasticsearch服务** **(1) elasticsearch服务**
@@ -21,9 +21,9 @@
<br> <br>
### 单服务链路跟踪示例 ### 单服务链路追踪示例
以`⓵基于sql创建web服务`代码为例，修改配置文件`configs/user.yml`，开启链路跟踪功能(字段enableTrace)，并且填写jaeger配置信息。 以`⓵基于sql创建web服务`代码为例，修改配置文件`configs/user.yml`，开启链路追踪功能(字段enableTrace)，并且填写jaeger配置信息。
如果想跟踪redis，启用redis缓存，把yaml配置文件里的缓存类型字段**cacheType**值改为redis，并配置redis地址，同时在本地使用docker启动redis服务，这是[redis服务启动脚本](https://github.com/go-dev-frame/sponge/tree/main/test/server/redis)。 如果想跟踪redis，启用redis缓存，把yaml配置文件里的缓存类型字段**cacheType**值改为redis，并配置redis地址，同时在本地使用docker启动redis服务，这是[redis服务启动脚本](https://github.com/go-dev-frame/sponge/tree/main/test/server/redis)。
@@ -34,7 +34,7 @@
make run make run
``` ```
复制 [http://localhost:8080/swagger/index.html](http://localhost:8080/apis/swagger/index.html) 到浏览器访问swagger主页，以请求get查询为例，连续请求同一个id两次，链路跟踪如下图所示。 复制 [http://localhost:8080/swagger/index.html](http://localhost:8080/apis/swagger/index.html) 到浏览器访问swagger主页，以请求get查询为例，连续请求同一个id两次，链路追踪如下图所示。
![one-server-trace](https://raw.githubusercontent.com/go-dev-frame/sponge_examples/main/assets/one-server-trace.jpg) ![one-server-trace](https://raw.githubusercontent.com/go-dev-frame/sponge_examples/main/assets/one-server-trace.jpg)
@@ -68,13 +68,13 @@ defer span.End()
<br> <br>
### 多服务链路跟踪示例 ### 多服务链路追踪示例
以一个极简版的电商微服务集群为例，点击查看[源码](https://github.com/go-dev-frame/sponge_examples/tree/main/6_micro-cluster)，一个共四个服务**shopgw**、**product**、**inventory**、**comment**，分别修改4个服务yaml配置(在configs目录下)，开启链路跟踪功能，并且填写jaeger配置信息。 以一个极简版的电商微服务集群为例，点击查看[源码](https://github.com/go-dev-frame/sponge_examples/tree/main/6_micro-cluster)，一个共四个服务**shopgw**、**product**、**inventory**、**comment**，分别修改4个服务yaml配置(在configs目录下)，开启链路追踪功能，并且填写jaeger配置信息。
在 **product**、**inventory**、**comment** 三个服务的**internal/service**目录下找到模板文件，填充代码替代`panic("implement me")`，使得代码可以正常执行，并且手动添加一个**span**，添加随机延时。 在 **product**、**inventory**、**comment** 三个服务的**internal/service**目录下找到模板文件，填充代码替代`panic("implement me")`，使得代码可以正常执行，并且手动添加一个**span**，添加随机延时。
启动 **shopgw**、**product**、**inventory**、**comment** 四个服务，在浏览器访问 [http://localhost:8080/apis/swagger/index.html](http://localhost:8080/apis/swagger/index.html) ，执行get请求，链路跟踪界面如下图所示。 启动 **shopgw**、**product**、**inventory**、**comment** 四个服务，在浏览器访问 [http://localhost:8080/apis/swagger/index.html](http://localhost:8080/apis/swagger/index.html) ，执行get请求，链路追踪界面如下图所示。
![multi-servers-trace](https://raw.githubusercontent.com/go-dev-frame/sponge_examples/main/assets/multi-servers-trace.jpg) ![multi-servers-trace](https://raw.githubusercontent.com/go-dev-frame/sponge_examples/main/assets/multi-servers-trace.jpg)