Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve gen service code #3140

Merged
merged 2 commits into from
Nov 14, 2023
Merged

improve gen service code #3140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fbee79
improve gen service code
oldme-git Nov 9, 2023
ec06c06
Merge branch 'master' into improve-code
gqcn Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cmd/gf/internal/cmd/genservice/genservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package genservice
import (
"context"
"fmt"
"path/filepath"

"github.com/gogf/gf/v2/container/garray"
"github.com/gogf/gf/v2/container/gmap"
Expand Down Expand Up @@ -93,10 +94,10 @@ const (
)

func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGenServiceOutput, err error) {
in.SrcFolder = gstr.TrimRight(in.SrcFolder, `\/`)
in.SrcFolder = gstr.Replace(in.SrcFolder, "\\", "/")
in.WatchFile = gstr.TrimRight(in.WatchFile, `\/`)
in.WatchFile = gstr.Replace(in.WatchFile, "\\", "/")
in.SrcFolder = filepath.ToSlash(in.SrcFolder)
in.SrcFolder = gstr.TrimRight(in.SrcFolder, `/`)
in.WatchFile = filepath.ToSlash(in.WatchFile)
in.WatchFile = gstr.TrimRight(in.WatchFile, `/`)
gqcn marked this conversation as resolved.
Show resolved Hide resolved

// Watch file handling.
if in.WatchFile != "" {
Expand Down
Loading