From f113d512e815625f697c32b97d01f7589f019865 Mon Sep 17 00:00:00 2001 From: Kevin Wan Date: Wed, 12 Feb 2025 23:48:39 +0800 Subject: [PATCH] chore: coding style (#4644) --- core/mapping/unmarshaler.go | 2 -- rest/httpx/requests_test.go | 1 + tools/goctl/api/dartgen/genvars.go | 13 ++++++----- tools/goctl/api/spec/spec.go | 4 ++-- tools/goctl/model/sql/test/model/usermodel.go | 22 ++++++++++--------- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/core/mapping/unmarshaler.go b/core/mapping/unmarshaler.go index 78d80cadc104..e4587cd36e68 100644 --- a/core/mapping/unmarshaler.go +++ b/core/mapping/unmarshaler.go @@ -19,7 +19,6 @@ import ( ) const ( - comma = "," defaultKeyName = "key" delimiter = '.' ignoreKey = "-" @@ -38,7 +37,6 @@ var ( defaultCacheLock sync.Mutex emptyMap = map[string]any{} emptyValue = reflect.ValueOf(lang.Placeholder) - stringSliceType = reflect.TypeOf([]string{}) ) type ( diff --git a/rest/httpx/requests_test.go b/rest/httpx/requests_test.go index 160894f12024..8297c48d9843 100644 --- a/rest/httpx/requests_test.go +++ b/rest/httpx/requests_test.go @@ -271,6 +271,7 @@ func TestParseFormArray(t *testing.T) { var v struct { Codes []string `form:"codes"` } + r, err := http.NewRequest( http.MethodGet, "/a?codes=aaa,bbb,ccc", diff --git a/tools/goctl/api/dartgen/genvars.go b/tools/goctl/api/dartgen/genvars.go index 64cce8c5b2ab..f2d9e6d698cc 100644 --- a/tools/goctl/api/dartgen/genvars.go +++ b/tools/goctl/api/dartgen/genvars.go @@ -10,10 +10,10 @@ const ( import 'package:shared_preferences/shared_preferences.dart'; import '../data/tokens.dart'; -/// 保存tokens到本地 +/// store tokens to local /// -/// 传入null则删除本地tokens -/// 返回:true:设置成功 false:设置失败 +/// pass null will clean local stored tokens +/// returns true if success, otherwise false Future setTokens(Tokens tokens) async { var sp = await SharedPreferences.getInstance(); if (tokens == null) { @@ -23,9 +23,9 @@ Future setTokens(Tokens tokens) async { return await sp.setString('tokens', jsonEncode(tokens.toJson())); } -/// 获取本地存储的tokens +/// get local stored tokens /// -/// 如果没有,则返回null +/// if no, returns null Future getTokens() async { try { var sp = await SharedPreferences.getInstance(); @@ -82,7 +82,8 @@ func genVars(dir string, isLegacy bool, scheme string, hostname string) error { } if !fileExists(dir + "vars.dart") { - err = os.WriteFile(dir+"vars.dart", []byte(fmt.Sprintf(`const serverHost='%s://%s';`, scheme, hostname)), 0o644) + err = os.WriteFile(dir+"vars.dart", []byte(fmt.Sprintf(`const serverHost='%s://%s';`, + scheme, hostname)), 0o644) if err != nil { return err } diff --git a/tools/goctl/api/spec/spec.go b/tools/goctl/api/spec/spec.go index 8249c66f8195..e5ed1266134f 100644 --- a/tools/goctl/api/spec/spec.go +++ b/tools/goctl/api/spec/spec.go @@ -59,11 +59,11 @@ type ( // Member describes the field of a structure Member struct { Name string - // 数据类型字面值,如:string、map[int]string、[]int64、[]*User + // data type, for example, string、map[int]string、[]int64、[]*User Type Type Tag string Comment string - // 成员头顶注释说明 + // document for the field Docs Doc IsInline bool } diff --git a/tools/goctl/model/sql/test/model/usermodel.go b/tools/goctl/model/sql/test/model/usermodel.go index 322861d89e29..a85fbf086b59 100755 --- a/tools/goctl/model/sql/test/model/usermodel.go +++ b/tools/goctl/model/sql/test/model/usermodel.go @@ -13,10 +13,12 @@ import ( ) var ( - userFieldNames = builder.RawFieldNames(&User{}) - userRows = strings.Join(userFieldNames, ",") - userRowsExpectAutoSet = strings.Join(stringx.Remove(userFieldNames, "`id`", "`create_time`", "`update_time`"), ",") - userRowsWithPlaceHolder = strings.Join(stringx.Remove(userFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" + userFieldNames = builder.RawFieldNames(&User{}) + userRows = strings.Join(userFieldNames, ",") + userRowsExpectAutoSet = strings.Join(stringx.Remove(userFieldNames, + "`id`", "`create_time`", "`update_time`"), ",") + userRowsWithPlaceHolder = strings.Join(stringx.Remove(userFieldNames, + "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" ) type ( @@ -39,12 +41,12 @@ type ( // User defines an data structure for mysql User struct { ID int64 `db:"id"` - User string `db:"user"` // 用户 - Name string `db:"name"` // 用户名称 - Password string `db:"password"` // 用户密码 - Mobile string `db:"mobile"` // 手机号 - Gender string `db:"gender"` // 男|女|未公开 - Nickname string `db:"nickname"` // 用户昵称 + User string `db:"user"` // user + Name string `db:"name"` // user name + Password string `db:"password"` // user password + Mobile string `db:"mobile"` // user mobile + Gender string `db:"gender"` // male | female | unknown + Nickname string `db:"nickname"` // user nickname CreateTime time.Time `db:"create_time"` UpdateTime time.Time `db:"update_time"` }