Skip to content

Commit 8b93cf3

Browse files
zhufuyizhufuyi
committed
modify default embed
1 parent 59b1168 commit 8b93cf3

File tree

10 files changed

+27
-50
lines changed

10 files changed

+27
-50
lines changed

‎cmd/sponge/commands/generate/common.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,10 @@ func serverCodeFields(outDir string, moduleName string, serverName string) []rep
574574
Old: fmt.Sprintf("\"%s/api", moduleName),
575575
New: fmt.Sprintf("\"%s/api", moduleName+"/"+serverName),
576576
},
577+
{
578+
Old: "vrf internal",
579+
New: "vrf Internal",
580+
},
577581
}
578582
}
579583

@@ -598,6 +602,10 @@ func SubServerCodeFields(outDir string, moduleName string, serverName string) []
598602
Old: fmt.Sprintf("\"%s/api", moduleName),
599603
New: fmt.Sprintf("\"%s/api", moduleName+"/"+serverName),
600604
},
605+
{
606+
Old: "vrf internal",
607+
New: "vrf Internal",
608+
},
601609
}
602610
}
603611

‎cmd/sponge/commands/generate/dao.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,12 @@ func DaoCommand(parentName string) *cobra.Command {
3636
Long: fmt.Sprintf(`generate dao code based on sql.
3737
3838
Examples:
39-
# generate dao code and embed gorm.model struct.
39+
# generate dao code.
4040
sponge %s dao --module-name=yourModuleName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
4141
4242
# generate dao code with multiple table names.
4343
sponge %s dao --module-name=yourModuleName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
4444
45-
# generate dao code, structure fields correspond to the column names of the table.
46-
sponge %s dao --module-name=yourModuleName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --embed=false
47-
4845
# generate dao code and specify the server directory, Note: code generation will be canceled when the latest generated file already exists.
4946
sponge %s dao --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
5047
@@ -124,7 +121,7 @@ using help:
124121
_ = cmd.MarkFlagRequired("db-dsn")
125122
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
126123
_ = cmd.MarkFlagRequired("db-table")
127-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
124+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
128125
cmd.Flags().StringVarP(&serverName, "server-name", "s", "", "server name")
129126
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
130127
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")

‎cmd/sponge/commands/generate/handler-pb.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,12 @@ func HandlerPbCommand() *cobra.Command {
3838
Long: `generate handler and protobuf CRUD code based on sql.
3939
4040
Examples:
41-
# generate handler and protobuf code and embed gorm.model struct.
41+
# generate handler and protobuf code.
4242
sponge web handler-pb --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
4343
4444
# generate handler and protobuf code with multiple table names.
4545
sponge web handler-pb --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
4646
47-
# generate handler and protobuf code, structure fields correspond to the column names of the table.
48-
sponge web handler-pb --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --embed=false
49-
5047
# generate handler and protobuf code and specify the server directory, Note: code generation will be canceled when the latest generated file already exists.
5148
sponge web handler-pb --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
5249
`,
@@ -124,7 +121,7 @@ using help:
124121
_ = cmd.MarkFlagRequired("db-dsn")
125122
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
126123
_ = cmd.MarkFlagRequired("db-table")
127-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
124+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
128125
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
129126
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
130127
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./handler-pb_<time>,"+

‎cmd/sponge/commands/generate/handler.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,12 @@ func HandlerCommand() *cobra.Command {
3636
Long: `generate handler CRUD code based on sql.
3737
3838
Examples:
39-
# generate handler code and embed gorm.model struct.
39+
# generate handler code.
4040
sponge web handler --module-name=yourModuleName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
4141
4242
# generate handler code with multiple table names.
4343
sponge web handler --module-name=yourModuleName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
4444
45-
# generate handler code, structure fields correspond to the column names of the table.
46-
sponge web handler --module-name=yourModuleName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --embed=false
47-
4845
# generate handler code and specify the server directory, Note: code generation will be canceled when the latest generated file already exists.
4946
sponge web handler --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
5047
@@ -121,7 +118,7 @@ using help:
121118
_ = cmd.MarkFlagRequired("db-dsn")
122119
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
123120
_ = cmd.MarkFlagRequired("db-table")
124-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
121+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
125122
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
126123
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
127124
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./handler_<time>, "+

‎cmd/sponge/commands/generate/http.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,9 @@ func HTTPCommand() *cobra.Command {
3939
Long: `generate web service code based on sql.
4040
4141
Examples:
42-
# generate web service code and embed gorm.model struct.
42+
# generate web service code.
4343
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
4444
45-
# generate web service code, structure fields correspond to the column names of the table.
46-
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 --embed=false
47-
4845
# generate web service code with multiple table names.
4946
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
5047
@@ -156,7 +153,7 @@ using help:
156153
_ = cmd.MarkFlagRequired("db-dsn")
157154
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
158155
_ = cmd.MarkFlagRequired("db-table")
159-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
156+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
160157
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
161158
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
162159
cmd.Flags().StringVarP(&repoAddr, "repo-addr", "r", "", "docker image repository address, excluding http and repository names")

‎cmd/sponge/commands/generate/model.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@ func ModelCommand(parentName string) *cobra.Command {
3131
Long: fmt.Sprintf(`generate model code based on sql.
3232
3333
Examples:
34-
# generate model code and embed gorm.model struct.
34+
# generate model code.
3535
sponge %s model --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
3636
3737
# generate model code with multiple table names.
3838
sponge %s model --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
3939
40-
# generate model code, structure fields correspond to the column names of the table.
41-
sponge %s model --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --embed=false
42-
4340
# generate model code and specify the server directory, Note: code generation will be canceled when the latest generated file already exists.
4441
sponge %s model --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
4542
`, parentName, parentName, parentName, parentName),
@@ -86,7 +83,7 @@ using help:
8683
_ = cmd.MarkFlagRequired("db-dsn")
8784
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
8885
_ = cmd.MarkFlagRequired("db-table")
89-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
86+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
9087
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
9188
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./model_<time>")
9289

‎cmd/sponge/commands/generate/rpc.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,9 @@ func RPCCommand() *cobra.Command {
4040
Long: `generate grpc service code based on sql.
4141
4242
Examples:
43-
# generate grpc service code and embed gorm.model struct.
43+
# generate grpc service code.
4444
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
4545
46-
# generate grpc service code, structure fields correspond to the column names of the table.
47-
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 --embed=false
48-
4946
# generate grpc service code with multiple table names.
5047
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
5148
@@ -158,7 +155,7 @@ using help:
158155
_ = cmd.MarkFlagRequired("db-dsn")
159156
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
160157
_ = cmd.MarkFlagRequired("db-table")
161-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
158+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
162159
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
163160
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
164161
cmd.Flags().StringVarP(&repoAddr, "repo-addr", "r", "", "docker image repository address, excluding http and repository names")

‎cmd/sponge/commands/generate/service-handler.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,12 @@ func ServiceAndHandlerCRUDCommand() *cobra.Command {
3838
Long: `generate both grpc service and http handler CRUD code based on sql.
3939
4040
Examples:
41-
# generate CRUD code and embed gorm.model struct.
41+
# generate CRUD code.
4242
sponge micro service-handler --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
4343
4444
# generate CRUD code with multiple table names.
4545
sponge micro service-handler --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
4646
47-
# generate CRUD code, structure fields correspond to the column names of the table.
48-
sponge micro service-handler --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --embed=false
49-
5047
# generate CRUD code and specify the server directory, Note: code generation will be canceled when the latest generated file already exists.
5148
sponge micro service-handler --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
5249
@@ -127,7 +124,7 @@ using help:
127124
_ = cmd.MarkFlagRequired("db-dsn")
128125
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
129126
_ = cmd.MarkFlagRequired("db-table")
130-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
127+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
131128
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
132129
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
133130
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./service_<time>,"+

‎cmd/sponge/commands/generate/service.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,12 @@ func ServiceCommand() *cobra.Command {
3737
Long: `generate grpc service CRUD code based on sql.
3838
3939
Examples:
40-
# generate service code and embed gorm.model struct.
40+
# generate service code.
4141
sponge micro service --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user
4242
4343
# generate service code with multiple table names.
4444
sponge micro service --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=t1,t2
4545
46-
# generate service code, structure fields correspond to the column names of the table.
47-
sponge micro service --module-name=yourModuleName --server-name=yourServerName --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --embed=false
48-
4946
# generate service code and specify the server directory, Note: code generation will be canceled when the latest generated file already exists.
5047
sponge micro service --db-driver=mysql --db-dsn=root:123456@(192.168.3.37:3306)/test --db-table=user --out=./yourServerDir
5148
@@ -125,7 +122,7 @@ using help:
125122
_ = cmd.MarkFlagRequired("db-dsn")
126123
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
127124
_ = cmd.MarkFlagRequired("db-table")
128-
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", true, "whether to embed gorm.model struct")
125+
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
129126
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
130127
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
131128
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./service_<time>,"+

‎cmd/sponge/commands/generate/template.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,12 @@ func NewCenter(configFile string) (*Center, error) {
392392
httpServerConfigCode = `# http server settings
393393
http:
394394
port: 8080 # listen port
395-
readTimeout: 5 # read timeout, unit(second)
396-
writeTimeout: 5 # write timeout, unit(second), if enableHTTPProfile is true, it needs to be greater than 60s, the default value for pprof to do profiling is 60s`
395+
timeout: 10 # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s`
397396

398397
rpcServerConfigCode = `# grpc server settings
399398
grpc:
400399
port: 8282 # listen port
401400
httpPort: 8283 # profile and metrics ports
402-
readTimeout: 5 # read timeout, unit(second)
403-
writeTimeout: 5 # write timeout, unit(second)
404401
enableToken: false # whether to enable server-side token authentication, default appID=grpc, appKey=123456
405402
# serverSecure parameter setting
406403
# if type="", it means no secure connection, no need to fill in any parameters
@@ -438,8 +435,7 @@ grpcClient:
438435
rpcGwServerConfigCode = `# http server settings
439436
http:
440437
port: 8080 # listen port
441-
readTimeout: 5 # read timeout, unit(second)
442-
writeTimeout: 5 # write timeout, unit(second), if enableHTTPProfile is true, it needs to be greater than 60s, the default value for pprof to do profiling is 60s
438+
timeout: 10 # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s
443439
444440
445441
# grpc client-side settings, support for setting up multiple grpc clients.
@@ -467,16 +463,13 @@ grpcClient:
467463
grpcAndHTTPServerConfigCode = `# http server settings
468464
http:
469465
port: 8080 # listen port
470-
readTimeout: 5 # read timeout, unit(second)
471-
writeTimeout: 5 # write timeout, unit(second), if enableHTTPProfile is true, it needs to be greater than 60s, the default value for pprof to do profiling is 60s
466+
timeout: 10 # request timeout, unit(second), if 0 means not set, if greater than 0 means set timeout, if enableHTTPProfile is true, it needs to set 0 or greater than 60s
472467
473468
474469
# grpc server settings
475470
grpc:
476471
port: 8282 # listen port
477472
httpPort: 8283 # profile and metrics ports
478-
readTimeout: 5 # read timeout, unit(second)
479-
writeTimeout: 5 # write timeout, unit(second)
480473
enableToken: false # whether to enable server-side token authentication, default appID=grpc, appKey=123456
481474
# serverSecure parameter setting
482475
# if type="", it means no secure connection, no need to fill in any parameters

0 commit comments

Comments
 (0)