refactor file|path (#1409)
Co-authored-by: anqiansong <anqiansong@bytedance.com>
This commit is contained in:
@@ -8,7 +8,7 @@ import (
|
||||
"github.com/logrusorgru/aurora"
|
||||
"github.com/tal-tech/go-zero/core/logx"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/api/parser"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
|
||||
"github.com/urfave/cli"
|
||||
)
|
||||
|
||||
@@ -30,7 +30,7 @@ func JavaCommand(c *cli.Context) error {
|
||||
|
||||
api.Service = api.Service.JoinPrefix()
|
||||
packetName := strings.TrimSuffix(api.Service.Name, "-api")
|
||||
logx.Must(util.MkdirIfNotExist(dir))
|
||||
logx.Must(pathx.MkdirIfNotExist(dir))
|
||||
logx.Must(genPacket(dir, packetName, api))
|
||||
logx.Must(genComponents(dir, packetName, api))
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"github.com/tal-tech/go-zero/tools/goctl/api/spec"
|
||||
apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -110,7 +111,7 @@ func (c *componentsContext) createComponent(dir, packetName string, ty spec.Type
|
||||
|
||||
modelFile := util.Title(ty.Name()) + ".java"
|
||||
filename := path.Join(dir, modelDir, modelFile)
|
||||
if err := util.RemoveOrQuit(filename); err != nil {
|
||||
if err := pathx.RemoveOrQuit(filename); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -270,7 +271,7 @@ func (c *componentsContext) buildConstructor() (string, string, error) {
|
||||
writeIndent(&constructorSetter, 2)
|
||||
constructorSetter.WriteString(fmt.Sprintf("this.%s = %s;", pn, util.Untitle(member.Name)))
|
||||
if index != len(c.members)-1 {
|
||||
constructorSetter.WriteString(util.NL)
|
||||
constructorSetter.WriteString(pathx.NL)
|
||||
}
|
||||
}
|
||||
return params.String(), constructorSetter.String(), nil
|
||||
|
||||
@@ -8,12 +8,13 @@ import (
|
||||
|
||||
"github.com/tal-tech/go-zero/tools/goctl/api/spec"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util/pathx"
|
||||
)
|
||||
|
||||
func writeProperty(writer io.Writer, member spec.Member, indent int) error {
|
||||
if len(member.Comment) > 0 {
|
||||
writeIndent(writer, indent)
|
||||
fmt.Fprint(writer, member.Comment+util.NL)
|
||||
fmt.Fprint(writer, member.Comment+pathx.NL)
|
||||
}
|
||||
writeIndent(writer, indent)
|
||||
ty, err := specTypeToJava(member.Type)
|
||||
|
||||
Reference in New Issue
Block a user