style: +vscodeworkspace

2637309949 · Nov 24, 2021 · 90f01e1 · 90f01e1
1 parent 2738c7a
commit 90f01e1
Show file tree

Hide file tree

Showing 25 changed files with 628 additions and 836 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "go.inferGopath": false
+}
diff --git a/cmd/dolphin/template/assets/auto.tmpl b/cmd/dolphin/template/assets/auto.tmpl
@@ -15,34 +15,35 @@ import (
 	"github.com/spf13/viper"
 )
 
-// Name project
-{{- $pName := .Name }}
-var Name = "{{.Name}}"
-var NopHandlerFunc = func(ctx *Context) { ctx.Next() }
+var (
+	Name = "{{.Name}}"
+	NopHandlerFunc = func(ctx *Context) { ctx.Next() }
+{{- range .Controllers}}
+    {{.ToUpperCase .Name}}Instance = New{{.ToUpperCase .Name}}()
+{{- end}}
+)
 
 // Controller defined
-type Controller struct {
-	Method       string
-	RelativePath string
-	Auth,
-	Roles,
-	Cache,
-	Interceptor,
-	Handler      core.HandlerFunc
-}
+type (
+	Controller struct {
+		Method       string
+		RelativePath string
+		Auth, Roles, Cache, Interceptor, Handler core.HandlerFunc
+	}
+{{- range .Controllers}}
+	{{.ToUpperCase .Name}} struct {
+		Name string
+		Srv  *{{$.Viper.GetString "dir.srv" }}.{{.ToUpperCase .Name}}
+		{{- $APIS := .APIS}}
+		{{- range $index, $api := .APIS}}
+		{{.ToUpperCase $api.Name}}{{- if last $index $APIS}} Controller{{- else}},{{- end}}
+		{{- end}}
+	}
+{{- end}}
+)
 
 {{- range .Controllers}}
 {{- $ctr := .}}
-// {{.ToUpperCase .Name}} defined
-type {{.ToUpperCase .Name}} struct {
-	Name string
-	Srv  *{{$.Viper.GetString "dir.srv" }}.{{.ToUpperCase .Name}}
-	{{- $APIS := .APIS}}
-	{{- range $index, $api := .APIS}}
-	{{.ToUpperCase $api.Name}}{{- if last $index $APIS}} Controller{{- else}},{{- end}}
-	{{- end}}
-}
-
 // New{{.ToUpperCase .Name}} defined
 func New{{.ToUpperCase .Name}}() *{{.ToUpperCase .Name}} {
 	ctr := &{{.ToUpperCase .Name}}{Name: "{{.Name}}", Srv: {{$.Viper.GetString "dir.srv" }}.New{{.ToUpperCase .Name}}()}
@@ -66,9 +67,6 @@ func {{.ToUpperCase .Name}}Routes() {
 	g.Handle(i.{{.ToUpperCase .Name}}.Method, i.{{.ToUpperCase .Name}}.RelativePath, i.{{.ToUpperCase .Name}}.Auth, i.{{.ToUpperCase .Name}}.Roles, i.{{.ToUpperCase .Name}}.Cache, i.{{.ToUpperCase .Name}}.Interceptor, i.{{.ToUpperCase .Name}}.Handler)
 	{{- end}}
 }
-
-// {{.ToUpperCase .Name}}Instance defined
-var {{.ToUpperCase .Name}}Instance = New{{.ToUpperCase .Name}}()
 {{end}}
 
 // SyncModel defined

diff --git a/cmd/dolphin/template/dist/assets.go b/cmd/dolphin/template/dist/assets.go
diff --git a/examples/aisle/.vscode/settings.json b/examples/aisle/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "go.inferGopath": false
+}
diff --git a/examples/aisle/api/app.go b/examples/aisle/api/app.go
diff --git a/examples/aisle/api/auto.go b/examples/aisle/api/auto.go
diff --git a/examples/aisle/api/base_organ.go b/examples/aisle/api/base_organ.go
diff --git a/examples/aisle/x_test.db b/examples/aisle/x_test.db
diff --git a/examples/aisle/x_test_localhost.db b/examples/aisle/x_test_localhost.db
diff --git a/examples/scene/.vscode/settings.json b/examples/scene/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "go.inferGopath": false
+}