feat:

1. diff
2. namespace

template/service/deploy/deoloy.go

@@ -3,9 +3,10 @@ package deploy
 import (
 	"embed"
 	_ "embed"
-	"git.icechen.cn/pkg/wujian_develop_tool/config"
 	"os"
 
+	"git.icechen.cn/pkg/wujian_develop_tool/config"
+
 	"github.com/fatih/color"
 
 	"git.icechen.cn/pkg/wujian_develop_tool/util"
@@ -14,7 +15,7 @@ import (
 //go:embed "*"
 var deployDir embed.FS
 
-func GenDeploy(namespace string, service config.Service) error {
+func GenDeploy(service config.Service) error {
 	color.Green("正在生成deploy...")
 
 	// deploy 文件夹
@@ -25,10 +26,11 @@ func GenDeploy(namespace string, service config.Service) error {
 	}
 
 	data := map[string]string{
-		"NameSpace": namespace,
+		"NameSpace": service.NameSpace,
 		"AppName":   service.Name,
 		"AliasName": service.AliasName,
-		"Port":      service.Port}
+		"Port":      service.Port,
+	}
 
 	// value.yaml
 	valuesTemplate, err := deployDir.ReadFile("values.tpl")
@@ -101,13 +103,5 @@ func copyTo(fileName string, toPath string) error {
 	if err != nil {
 		return err
 	}
-
-	toFile, err := os.OpenFile(toPath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, os.ModePerm)
-	if err != nil {
-		return err
-	}
-	defer toFile.Close()
-
-	_, err = toFile.Write(fileContent)
-	return err
+	return util.WriteFile(toPath, fileContent)
 }

template/service/deploy/values.tpl

@@ -1,5 +1,5 @@
 nameSpace: {{ .NameSpace }}
 aliasName: {{ .AliasName }}
-image: reg.icechen.cn/{{ .NameSpace }}/api-{{ .AppName }}
+image: reg.icechen.cn/{{ .NameSpace }}/service-{{ .AppName }}
 imageTag: latest
 port: {{ .Port }}

template/service/docker/golang/Dockerfile.tpl

@@ -8,7 +8,7 @@ RUN go mod download -x
 WORKDIR /go/src
 ADD . .
 RUN go mod tidy
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o service_{{ .Name }} ./app/service/{{ .Name }}
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o service_{{ .Name }} ./{{ .Root }}
 
 FROM reg.icechen.cn/alpine as {{ .Name }}
 WORKDIR /go/src

template/service/docker/golang/golang.go

@@ -3,6 +3,8 @@ package golang
 import (
 	_ "embed"
 
+	"git.icechen.cn/pkg/wujian_develop_tool/config"
+
 	"github.com/fatih/color"
 
 	"git.icechen.cn/pkg/wujian_develop_tool/util"
@@ -14,11 +16,11 @@ var dockerfileTemplate string
 //go:embed "main.tpl"
 var mainGoTemplate string
 
-func GenDockerfile(name string) error {
+func GenDockerfile(service config.Service) error {
 	color.Green("正在生成dockerfile...")
-	err := util.TemplateToFile("app/service/"+name+"/Dockerfile", dockerfileTemplate, map[string]string{"Name": name})
+	err := util.TemplateToFile(service.Root+"/Dockerfile", dockerfileTemplate, service)
 	if err != nil {
 		return err
 	}
-	return util.TemplateToFile("app/service/"+name+"/main.go", mainGoTemplate, nil)
+	return util.TemplateToFile(service.Root+"/main.go", mainGoTemplate, nil)
 }