merge master

.github/workflows/go.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go: [1.18,1.19,1.20.x]
+        go: [1.18, 1.19, 1.20.x]
     name: build & test
     runs-on: ubuntu-latest
     services:

cmd/kratos/internal/project/new.go

@@ -16,6 +16,7 @@ import (
 type Project struct {
 	Name string
 	Path string
+	Mod  string
 }
 
 // New new a project from remote repo.
@@ -39,7 +40,7 @@ func (p *Project) New(ctx context.Context, dir string, layout string, branch str
 	}
 	fmt.Printf("🚀 Creating service %s, layout repo is %s, please wait a moment.\n\n", p.Name, layout)
 	repo := base.NewRepo(layout, branch)
-	if err := repo.CopyTo(ctx, to, p.Path, []string{".git", ".github"}); err != nil {
+	if err := repo.CopyTo(ctx, to, p.Mod, []string{".git", ".github"}); err != nil {
 		return err
 	}
 	e := os.Rename(

cmd/kratos/internal/project/project.go

@@ -66,7 +66,7 @@ func run(_ *cobra.Command, args []string) {
 		name = args[0]
 	}
 	projectName, workingDir := processProjectParams(name, wd)
-	p := &Project{Name: projectName, Path: projectName}
+	p := &Project{Name: projectName, Path: projectName, Mod: name}
 	done := make(chan error, 1)
 	go func() {
 		if !nomod {
@@ -84,7 +84,7 @@ func run(_ *cobra.Command, args []string) {
 			panic(e)
 		}
 		// Get the relative path for adding a project based on Go modules
-		p.Path = filepath.Join(strings.TrimPrefix(workingDir, projectRoot+"/"), p.Name)
+		p.Path = filepath.ToSlash(filepath.Join(strings.TrimPrefix(filepath.ToSlash(workingDir), filepath.ToSlash(projectRoot)+"/"), p.Name))
 		done <- p.Add(ctx, workingDir, repoURL, branch, mod)
 	}()
 	select {