feat:优化

fynntang · Jun 29, 2023 · e5e68f2 · e5e68f2
1 parent 4dc6a24
commit e5e68f2
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 4 deletions.
diff --git a/protoc-gen-go-crud/deliveries/template.go b/protoc-gen-go-crud/deliveries/template.go
@@ -32,7 +32,7 @@ func ({{$firstLetter}} {{$svrType}}Service){{.OriginalName}}(c *gin.Context, in
 {{- end}}
 
 func ({{$firstLetter}} {{.ServiceType}}Service) Log(c *gin.Context) *zap.SugaredLogger {
-	return global.Logger(ctx).Named("{{.ServiceType}}Repo")
+	return global.Logger(c).Named("{{.ServiceType}}Repo")
 }
 
 `

diff --git a/protoc-gen-go-crud/deliveries/wire.go b/protoc-gen-go-crud/deliveries/wire.go
@@ -2,6 +2,7 @@ package deliveries
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"strings"
 	"text/template"
@@ -28,6 +29,12 @@ var ProviderSet = wire.NewSet({{ range $index, $element := .FunctionNames }}{{ i
 	f := strings.Split(path, "V1")
 	filename := fmt.Sprintf("./internal/%s/deliveries/wire.go", strings.ToLower(f[0]))
 
+	// 判断文件是否存在
+	if _, err := os.Stat(strings.TrimPrefix(filename, "../")); err == nil {
+		log.Println("文件已存在，跳过生成：", filename)
+		return nil
+	}
+
 	functions := []string{}
 	for _, set := range sets {
 		functions = append(functions, fmt.Sprintf("New%sService", set))

diff --git a/protoc-gen-go-crud/internal/authorization/deliveries/authorization.go b/protoc-gen-go-crud/internal/authorization/deliveries/authorization.go
@@ -12,5 +12,5 @@ func (a AuthService) ListMenus(c *gin.Context, in *empty.Empty) (*authorizationV
 }
 
 func (a AuthService) Log(c *gin.Context) *zap.SugaredLogger {
-	return global.Logger(ctx).Named("AuthRepo")
+	return global.Logger(c).Named("AuthRepo")
 }
diff --git a/protoc-gen-go-crud/internal/authorization/deliveries/role.go b/protoc-gen-go-crud/internal/authorization/deliveries/role.go
@@ -29,5 +29,5 @@ func (r RoleService) UpdateRole(c *gin.Context, in *authorizationV1.UpdateRoleRe
 }
 
 func (r RoleService) Log(c *gin.Context) *zap.SugaredLogger {
-	return global.Logger(ctx).Named("RoleRepo")
+	return global.Logger(c).Named("RoleRepo")
 }
diff --git a/protoc-gen-go-crud/internal/users/deliveries/users.go b/protoc-gen-go-crud/internal/users/deliveries/users.go
@@ -61,5 +61,5 @@ func (u UsersService) User(c *gin.Context, in *empty.Empty) (*components.User, e
 }
 
 func (u UsersService) Log(c *gin.Context) *zap.SugaredLogger {
-	return global.Logger(ctx).Named("UsersRepo")
+	return global.Logger(c).Named("UsersRepo")
 }
diff --git a/protoc-gen-go-crud/protoc-gen-go-crud b/protoc-gen-go-crud/protoc-gen-go-crud
diff --git a/protoc-gen-go-crud/repositories/wire.go b/protoc-gen-go-crud/repositories/wire.go
@@ -2,6 +2,7 @@ package repositories
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"strings"
 	"text/template"
@@ -28,6 +29,11 @@ var ProviderSet = wire.NewSet({{ range $index, $element := .FunctionNames }}{{ i
 	f := strings.Split(path, "V1")
 	filename := fmt.Sprintf("./internal/%s/repositories/wire.go", strings.ToLower(f[0]))
 
+	// 判断文件是否存在
+	if _, err := os.Stat(strings.TrimPrefix(filename, "../")); err == nil {
+		log.Println("文件已存在，跳过生成：", filename)
+		return nil
+	}
 	functions := []string{}
 	for _, set := range sets {
 		functions = append(functions, fmt.Sprintf("New%sRepo", set))

diff --git a/protoc-gen-go-crud/usecase/wire.go b/protoc-gen-go-crud/usecase/wire.go
@@ -2,6 +2,7 @@ package usecase
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"strings"
 	"text/template"
@@ -28,6 +29,12 @@ var ProviderSet = wire.NewSet({{ range $index, $element := .FunctionNames }}{{ i
 	f := strings.Split(path, "V1")
 	filename := fmt.Sprintf("./internal/%s/usecase/wire.go", strings.ToLower(f[0]))
 
+	// 判断文件是否存在
+	if _, err := os.Stat(strings.TrimPrefix(filename, "../")); err == nil {
+		log.Println("文件已存在，跳过生成：", filename)
+		return nil
+	}
+
 	functions := []string{}
 	for _, set := range sets {
 		functions = append(functions, fmt.Sprintf("New%sUseCase", set))