diff --git a/tools/goctl/api/dartgen/genapi.go b/tools/goctl/api/dartgen/genapi.go index 067d609f7f7c..4c988431cb45 100644 --- a/tools/goctl/api/dartgen/genapi.go +++ b/tools/goctl/api/dartgen/genapi.go @@ -4,7 +4,6 @@ import ( "os" "text/template" - "github.com/tal-tech/go-zero/core/logx" "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) @@ -30,33 +29,30 @@ Future {{pathToFuncName .Path}}( {{if ne .Method "get"}}{{with .RequestType}}{{. {{end}}` func genApi(dir string, api *spec.ApiSpec) error { - e := os.MkdirAll(dir, 0755) - if e != nil { - logx.Error(e) - return e + err := os.MkdirAll(dir, 0755) + if err != nil { + return err } - e = genApiFile(dir) - if e != nil { - logx.Error(e) - return e + + err = genApiFile(dir) + if err != nil { + return err } - file, e := os.OpenFile(dir+api.Info.Title+".dart", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) - if e != nil { - logx.Error(e) - return e + file, err := os.OpenFile(dir+api.Service.Name+".dart", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) + if err != nil { + return err } - defer file.Close() + defer file.Close() t := template.New("apiTemplate") t = t.Funcs(funcMap) - t, e = t.Parse(apiTemplate) - if e != nil { - logx.Error(e) - return e + t, err = t.Parse(apiTemplate) + if err != nil { + return err } - t.Execute(file, api) - return nil + + return t.Execute(file, api) } func genApiFile(dir string) error { @@ -64,12 +60,12 @@ func genApiFile(dir string) error { if fileExists(path) { return nil } - apiFile, e := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) - if e != nil { - logx.Error(e) - return e + apiFile, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) + if err != nil { + return err } + defer apiFile.Close() - apiFile.WriteString(apiFileContent) - return nil + _, err = apiFile.WriteString(apiFileContent) + return err } diff --git a/tools/goctl/api/dartgen/gendata.go b/tools/goctl/api/dartgen/gendata.go index a4d0dbd869bc..ebaca72a4377 100644 --- a/tools/goctl/api/dartgen/gendata.go +++ b/tools/goctl/api/dartgen/gendata.go @@ -4,7 +4,6 @@ import ( "os" "text/template" - "github.com/tal-tech/go-zero/core/logx" "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) @@ -33,30 +32,27 @@ class {{.Name}}{ ` func genData(dir string, api *spec.ApiSpec) error { - e := os.MkdirAll(dir, 0755) - if e != nil { - logx.Error(e) - return e + err := os.MkdirAll(dir, 0755) + if err != nil { + return err } - e = genTokens(dir) - if e != nil { - logx.Error(e) - return e + + err = genTokens(dir) + if err != nil { + return err } - file, e := os.OpenFile(dir+api.Info.Title+".dart", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) - if e != nil { - logx.Error(e) - return e + file, err := os.OpenFile(dir+api.Service.Name+".dart", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) + if err != nil { + return err } defer file.Close() t := template.New("dataTemplate") t = t.Funcs(funcMap) - t, e = t.Parse(dataTemplate) - if e != nil { - logx.Error(e) - return e + t, err = t.Parse(dataTemplate) + if err != nil { + return err } return t.Execute(file, api) @@ -67,12 +63,13 @@ func genTokens(dir string) error { if fileExists(path) { return nil } - tokensFile, e := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) - if e != nil { - logx.Error(e) - return e + + tokensFile, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) + if err != nil { + return err } + defer tokensFile.Close() - tokensFile.WriteString(tokensFileContent) - return nil + _, err = tokensFile.WriteString(tokensFileContent) + return err } diff --git a/tools/goctl/api/dartgen/genvars.go b/tools/goctl/api/dartgen/genvars.go index a720ec47d803..01bfa3a88242 100644 --- a/tools/goctl/api/dartgen/genvars.go +++ b/tools/goctl/api/dartgen/genvars.go @@ -3,27 +3,9 @@ package dartgen import ( "io/ioutil" "os" - - "github.com/tal-tech/go-zero/core/logx" ) -func genVars(dir string) error { - e := os.MkdirAll(dir, 0755) - if e != nil { - logx.Error(e) - return e - } - - if !fileExists(dir + "vars.dart") { - e = ioutil.WriteFile(dir+"vars.dart", []byte(`const serverHost='demo-crm.xiaoheiban.cn';`), 0644) - if e != nil { - logx.Error(e) - return e - } - } - - if !fileExists(dir + "kv.dart") { - e = ioutil.WriteFile(dir+"kv.dart", []byte(`import 'dart:convert'; +const varTemplate = `import 'dart:convert'; import 'package:shared_preferences/shared_preferences.dart'; import '../data/tokens.dart'; @@ -56,10 +38,25 @@ Future getTokens() async { return null; } } -`), 0644) - if e != nil { - logx.Error(e) - return e +` + +func genVars(dir string) error { + err := os.MkdirAll(dir, 0755) + if err != nil { + return err + } + + if !fileExists(dir + "vars.dart") { + err = ioutil.WriteFile(dir+"vars.dart", []byte(`const serverHost='demo-crm.xiaoheiban.cn';`), 0644) + if err != nil { + return err + } + } + + if !fileExists(dir + "kv.dart") { + err = ioutil.WriteFile(dir+"kv.dart", []byte(varTemplate), 0644) + if err != nil { + return err } } return nil diff --git a/tools/goctl/api/dartgen/util.go b/tools/goctl/api/dartgen/util.go index 833fff4d78ad..dab2d416acaf 100644 --- a/tools/goctl/api/dartgen/util.go +++ b/tools/goctl/api/dartgen/util.go @@ -12,6 +12,7 @@ func lowCamelCase(s string) string { if len(s) < 1 { return "" } + s = util.ToCamelCase(util.ToSnakeCase(s)) return util.ToLower(s[:1]) + s[1:] } diff --git a/tools/goctl/api/dartgen/vars.go b/tools/goctl/api/dartgen/vars.go index 864126cbfe38..78f95e1fc3ff 100644 --- a/tools/goctl/api/dartgen/vars.go +++ b/tools/goctl/api/dartgen/vars.go @@ -11,7 +11,8 @@ var funcMap = template.FuncMap{ "lowCamelCase": lowCamelCase, } -const apiFileContent = `import 'dart:io'; +const ( + apiFileContent = `import 'dart:io'; import 'dart:convert'; import '../vars/kv.dart'; import '../vars/vars.dart'; @@ -97,7 +98,8 @@ Future _apiRequest(String method, String path, dynamic data, if (eventually != null) eventually(); } ` -const tokensFileContent = `class Tokens { + + tokensFileContent = `class Tokens { /// 用于访问的token, 每次请求都必须带在Header里面 final String accessToken; final int accessExpire; @@ -131,3 +133,4 @@ const tokensFileContent = `class Tokens { } } ` +)