fix - go-zero: template

hhstore · hhstore · commit 3d73e14b01c4 · 2021-03-19T13:56:54.000+08:00
diff --git a/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/admin/admin.go b/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/admin/admin.go
@@ -1,7 +1,7 @@
 package admin
 
 import (
-	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"
+	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"
 	"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"
 )
 
diff --git a/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/inner/inner.go b/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/inner/inner.go
@@ -1,7 +1,7 @@
 package inner
 
 import (
-	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"
+	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"
 	"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"
 )
 
diff --git a/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/job/job.go b/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/job/job.go
@@ -8,7 +8,7 @@ import (
 	"github.com/better-go/pkg/log"
 	"github.com/tal-tech/go-zero/core/collection"
 
-	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"
+	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"
 	"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"
 )
 
diff --git a/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/outer/outer.go b/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/outer/outer.go
@@ -2,7 +2,7 @@ package outer
 
 import (
 	"context"
-	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"
+	"{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"
 	"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"
 )
 
diff --git a/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/service.go b/mono-repo/go-zero/{{cookiecutter.go_module_name}}/app/basic/demo/internal/service/service.go
@@ -3,7 +3,7 @@ package service
 import (
     "context"
 
-    "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"
+    "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"
     "{{cookiecutter.go_module_name}}/app/basic/demo/proto/api"
     "{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"
 
@@ -12,12 +12,12 @@ import (
 
 // Service 对应 gRPC API 映射
 type Service struct {
-    Demo *{{cookiecutter.app_name}}.Scope // 推送服务
+    Demo *demo.Scope // 推送服务
 }
 
 func New(cfg *config.Config) *Service {
     return &Service{
-        Demo: {{cookiecutter.app_name}}.NewScope(cfg),
+        Demo: demo.NewScope(cfg),
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package admin`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"`
	`4`	`+ "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"`
`5`	`5`	`"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package inner`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"`
	`4`	`+ "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"`
`5`	`5`	`"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/better-go/pkg/log"`
`9`	`9`	`"github.com/tal-tech/go-zero/core/collection"`
`10`	`10`
`11`		`- "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"`
	`11`	`+ "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"`
`12`	`12`	`"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package outer`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"`
	`5`	`+ "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"`
`6`	`6`	`"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"`
`7`	`7`	`)`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package service`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/{{cookiecutter.app_name}}"`
	`6`	`+ "{{cookiecutter.go_module_name}}/app/basic/demo/internal/domain/demo"`
`7`	`7`	`"{{cookiecutter.go_module_name}}/app/basic/demo/proto/api"`
`8`	`8`	`"{{cookiecutter.go_module_name}}/app/basic/demo/proto/config"`
`9`	`9`
`@@ -12,12 +12,12 @@ import (`
`12`	`12`
`13`	`13`	`// Service 对应 gRPC API 映射`
`14`	`14`	`type Service struct {`
`15`		`- Demo *{{cookiecutter.app_name}}.Scope // 推送服务`
	`15`	`+ Demo *demo.Scope // 推送服务`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`func New(cfg config.Config) Service {`
`19`	`19`	`return &Service{`
`20`		`- Demo: {{cookiecutter.app_name}}.NewScope(cfg),`
	`20`	`+ Demo: demo.NewScope(cfg),`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`