github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 09:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor code (#1700)

Browse Source
This commit is contained in:
Kevin Wan 2022-03-23 19:09:45 +08:00 committed by GitHub
parent d8054d8def
commit 3febb1a5d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/goctl/pkg/collection/sortedmap.go
View File

@ -28,7 +28,7 @@ func New() *SortedMap {
} }
} }
func (m *SortedMap) SetExpression(expression string) (key interface{}, value interface{}, err error) { func (m *SortedMap) SetExpression(expression string) (key, value interface{}, err error) {
idx := strings.Index(expression, "=") idx := strings.Index(expression, "=")
if idx == -1 { if idx == -1 {
return "", "", ErrInvalidKVExpression return "", "", ErrInvalidKVExpression
@ -86,7 +86,7 @@ func (m *SortedMap) Get(key interface{}) (interface{}, bool) {
return e.Value.(KV)[1], true return e.Value.(KV)[1], true
} }
func (m *SortedMap) GetOr(key interface{}, dft interface{}) interface{} { func (m *SortedMap) GetOr(key, dft interface{}) interface{} {
e, ok := m.keys[key] e, ok := m.keys[key]
if !ok { if !ok {
return dft return dft

2
tools/goctl/pkg/downloader/downloader.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
) )
func Download(url string, filename string) error { func Download(url, filename string) error {
resp, err := http.Get(url) resp, err := http.Get(url)
if err != nil { if err != nil {
return err return err

2
tools/goctl/pkg/env/env.go vendored
View File

@ -88,7 +88,7 @@ func Get(key string) string {
return GetOr(key, "") return GetOr(key, "")
} }
func GetOr(key string, def string) string { func GetOr(key, def string) string {
return goctlEnv.GetStringOr(key, def) return goctlEnv.GetStringOr(key, def)
} }

2
tools/goctl/rpc/generator/genpb_test.go
View File

@ -25,7 +25,7 @@ message Resp{}
service Greeter { service Greeter {
rpc greet(Req) returns (Resp); rpc greet(Req) returns (Resp);
} }
`), 0666) `), 0o666)
if err != nil { if err != nil {
t.Log(err) t.Log(err)
return return

2
tools/goctl/util/git.go
View File

@ -12,7 +12,7 @@ import (
"github.com/zeromicro/go-zero/tools/goctl/util/pathx" "github.com/zeromicro/go-zero/tools/goctl/util/pathx"
) )
func CloneIntoGitHome(url string, branch string) (dir string, err error) { func CloneIntoGitHome(url, branch string) (dir string, err error) {
gitHome, err := pathx.GetGitHome() gitHome, err := pathx.GetGitHome()
if err != nil { if err != nil {
return "", err return "", err

3
tools/goctl/util/pathx/file_test.go
View File

@ -79,7 +79,7 @@ func TestGetGoctlHome(t *testing.T) {
t.Run("goctl_is_file", func(t *testing.T) { t.Run("goctl_is_file", func(t *testing.T) {
tmpFile := filepath.Join(t.TempDir(), "a.tmp") tmpFile := filepath.Join(t.TempDir(), "a.tmp")
backupTempFile := tmpFile + ".old" backupTempFile := tmpFile + ".old"
err := ioutil.WriteFile(tmpFile, nil, 0666) err := ioutil.WriteFile(tmpFile, nil, 0o666)
if err != nil { if err != nil {
return return
} }
@ -104,5 +104,4 @@ func TestGetGoctlHome(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, dir, home) assert.Equal(t, dir, home)
}) })
} }