Skip to content

Commit 621bb71

Browse files
zhufuyizhufuyi
committed
modify scripts for mono-repo
1 parent 9218f10 commit 621bb71

File tree

17 files changed

+102
-96
lines changed

17 files changed

+102
-96
lines changed

‎Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ graph:
5555
.PHONY: docs
5656
# Generate swagger docs, only for ⓵ Web services created based on sql
5757
docs:
58-
go mod tidy
59-
@gofmt -s -w .
6058
@bash scripts/swag-docs.sh $(HOST)
6159
# delete the templates code end
6260

‎Makefile-for-http‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ graph:
3636

3737

3838
.PHONY: docs
39-
# Generate swagger docs, , only for ⓵ Web services created based on sql
39+
# Generate swagger docs, only for ⓵ Web services created based on sql
4040
docs:
41-
go mod tidy
42-
@gofmt -s -w .
4341
@bash scripts/swag-docs.sh $(HOST)
4442

4543

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

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ const (
4040
undeterminedDBDriver = "undetermined" // used in services created based on protobuf.
4141

4242
// code name
43-
codeNameModel = "model"
44-
codeNameCache = "cache"
45-
codeNameDao = "dao"
46-
codeNameHandler = "handler"
47-
codeNameHandlerPb = "handler-pb"
48-
codeNameService = "service"
49-
codeNameServiceHTTP = "service-handler"
5043
codeNameHTTP = "http"
51-
codeNameHTTPPb = "http-pb"
5244
codeNameGRPC = "grpc"
45+
codeNameHTTPPb = "http-pb"
5346
codeNameGRPCPb = "grpc-pb"
5447
codeNameGRPCGW = "grpc-gw-pb"
5548
codeNameGRPCHTTP = "grpc-http-pb"
56-
codeNameGRPCConn = "grpc-conn"
49+
codeNameHandler = "handler"
50+
codeNameHandlerPb = "handler-pb"
51+
codeNameService = "service"
52+
codeNameServiceHTTP = "service-handler"
53+
codeNameDao = "dao"
5754
codeNameProtobuf = "protobuf"
55+
codeNameModel = "model"
56+
codeNameGRPCConn = "grpc-conn"
57+
codeNameCache = "cache"
5858

5959
wellPrefix = "## "
6060
mgoSuffix = ".mgo"
@@ -629,17 +629,27 @@ func moveProtoFileToAPIDir(moduleName string, serverName string, suitedMonoRepo
629629

630630
var (
631631
// for protoc.sh and protoc-doc.sh
632-
monoRepoAPIPath = `bash scripts/init.sh
632+
monoRepoAPIPath = `bash scripts/patch-mono.sh
633633
cd ..
634+
634635
protoBasePath="api"`
636+
637+
// for patch-mono.sh
638+
monoRepoHTTPPatch = `bash scripts/patch-mono.sh
639+
640+
HOST_ADDR=$1`
641+
635642
// for patch.sh
636-
typePbShellCode = ` if [ ! -d "../api/types" ]; then
643+
typePbShellCode = `
644+
if [ ! -d "../api/types" ]; then
637645
sponge patch gen-types-pb --out=./
638646
checkResult $?
639647
mv -f api/types ../api
640648
rmdir api
641649
fi`
642-
dupCodeMark = "--dir=internal/ecode"
650+
651+
dupCodeMark = "--dir=internal/ecode"
652+
643653
adaptDupCode = func(serverType string, serverName string) string {
644654
if serverType == codeNameHTTP {
645655
return dupCodeMark
@@ -710,6 +720,14 @@ func serverCodeFields(serverType string, moduleName string, serverName string) [
710720
Old: `protoBasePath="api"`,
711721
New: monoRepoAPIPath,
712722
},
723+
{
724+
Old: `HOST_ADDR=$1`,
725+
New: monoRepoHTTPPatch,
726+
},
727+
{
728+
Old: `genServerType=$1`,
729+
New: fmt.Sprintf(`genServerType="%s"`, serverType),
730+
},
713731
{
714732
Old: fmt.Sprintf("go get %s@", moduleName),
715733
New: fmt.Sprintf("go get %s@", "github.com/zhufuyi/sponge"),

‎cmd/sponge/commands/generate/grpc-http-pb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ func (g *httpAndGRPCPbGenerator) addFields(r replacer.Replacer) []replacer.Field
339339
}...)
340340

341341
if g.suitedMonoRepo {
342-
fs := serverCodeFields(r.GetOutputDir(), g.moduleName, g.serverName)
342+
fs := serverCodeFields(codeNameGRPCHTTP, g.moduleName, g.serverName)
343343
fields = append(fields, fs...)
344344
}
345345

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ func (g *httpPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
317317
}...)
318318

319319
if g.suitedMonoRepo {
320-
fs := serverCodeFields(r.GetOutputDir(), g.moduleName, g.serverName)
320+
fs := serverCodeFields(codeNameHTTPPb, g.moduleName, g.serverName)
321321
fields = append(fields, fs...)
322322
}
323323

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ Examples:
9999
codes: codes,
100100
outPath: outPath,
101101
isExtendedAPI: sqlArgs.IsExtendedAPI,
102-
serverType: codeNameHTTP,
103102

104103
suitedMonoRepo: suitedMonoRepo,
105104
}
@@ -183,7 +182,6 @@ type httpGenerator struct {
183182
isEmbed bool
184183
isExtendedAPI bool
185184
suitedMonoRepo bool
186-
serverType string
187185

188186
fields []replacer.Field
189187
}
@@ -498,7 +496,7 @@ func (g *httpGenerator) addFields(r replacer.Replacer) []replacer.Field {
498496
}...)
499497

500498
if g.suitedMonoRepo {
501-
fs := serverCodeFields(g.serverType, g.moduleName, g.serverName)
499+
fs := serverCodeFields(codeNameHTTP, g.moduleName, g.serverName)
502500
fields = append(fields, fs...)
503501
}
504502

‎cmd/sponge/commands/generate/rpc-gw-pb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ func (g *rpcGwPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
323323
}...)
324324

325325
if g.suitedMonoRepo {
326-
fs := serverCodeFields(r.GetOutputDir(), g.moduleName, g.serverName)
326+
fs := serverCodeFields(codeNameGRPCGW, g.moduleName, g.serverName)
327327
fields = append(fields, fs...)
328328
}
329329

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ func (g *rpcPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
314314
}...)
315315

316316
if g.suitedMonoRepo {
317-
fs := serverCodeFields(r.GetOutputDir(), g.moduleName, g.serverName)
317+
fs := serverCodeFields(codeNameGRPCPb, g.moduleName, g.serverName)
318318
fields = append(fields, fs...)
319319
}
320320

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,6 @@ func (g *rpcGenerator) generateCode() (string, error) {
296296
if err := moveProtoFileToAPIDir(g.moduleName, g.serverName, g.suitedMonoRepo, r.GetOutputDir()); err != nil {
297297
return "", err
298298
}
299-
//apiDir := g.serverName + gofile.GetPathDelimiter() + "api"
300-
//protoFiles, _ := gofile.ListFiles(apiDir, gofile.WithNoAbsolutePath(), gofile.WithSuffix(".proto"))
301-
//if err := saveProtobufFiles(g.moduleName, g.serverName, g.suitedMonoRepo, r.GetOutputDir(), protoFiles); err != nil {
302-
// return "", err
303-
//}
304-
//_ = os.RemoveAll(apiDir)
305299
}
306300
_ = saveGenInfo(g.moduleName, g.serverName, g.suitedMonoRepo, r.GetOutputDir())
307301

@@ -521,7 +515,7 @@ func (g *rpcGenerator) addFields(r replacer.Replacer) []replacer.Field {
521515
}...)
522516

523517
if g.suitedMonoRepo {
524-
fs := serverCodeFields(r.GetOutputDir(), g.moduleName, g.serverName)
518+
fs := serverCodeFields(codeNameGRPC, g.moduleName, g.serverName)
525519
fields = append(fields, fs...)
526520
}
527521

‎cmd/sponge/commands/patch/copy-go-mod.go‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package patch
33
import (
44
"errors"
55
"fmt"
6+
"os"
7+
"strings"
68

79
"github.com/fatih/color"
810
"github.com/spf13/cobra"
@@ -14,9 +16,10 @@ import (
1416
// CopyGOModCommand copy go mod files
1517
func CopyGOModCommand() *cobra.Command {
1618
var (
17-
moduleName string // module name for go.mod
18-
outPath string // output directory
19-
isLogExist bool
19+
moduleName string // module name for go.mod
20+
outPath string // output directory
21+
isLogExist bool
22+
isForceReplace bool
2023
)
2124

2225
cmd := &cobra.Command{
@@ -44,10 +47,15 @@ Examples:
4447

4548
goModFile := outPath + gofile.GetPathDelimiter() + "go.mod"
4649
if gofile.IsExists(goModFile) {
47-
if isLogExist {
48-
fmt.Printf("%s already exists, skip copying.\n", goModFile)
50+
if !isForceReplace {
51+
if isLogExist {
52+
fmt.Printf("%s already exists, skip copying.\n", goModFile)
53+
}
54+
return nil
4955
}
50-
return nil
56+
// delete the go.mod and go.sum file if it exists
57+
_ = os.RemoveAll(goModFile)
58+
_ = os.RemoveAll(strings.TrimSuffix(goModFile, ".mod") + ".sum")
5159
}
5260

5361
out, err := runCopyGoModCommand(moduleName, outPath)
@@ -62,7 +70,8 @@ Examples:
6270

6371
cmd.Flags().StringVarP(&moduleName, "module-name", "m", "", "module-name is the name of the module in the go.mod file")
6472
cmd.Flags().StringVarP(&outPath, "out", "o", ".", "output directory")
65-
cmd.Flags().BoolVarP(&isLogExist, "is-log-exist", "l", false, "is log file exist")
73+
cmd.Flags().BoolVarP(&isLogExist, "is-log-exist", "l", false, "whether to log file exist")
74+
cmd.Flags().BoolVarP(&isForceReplace, "is-force-replace", "f", false, "whether to force replace the go.mod file")
6675

6776
return cmd
6877
}

0 commit comments

Comments
 (0)