diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ee81aa0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +db/oauth_db.go diff --git a/data/view/gtools/generate/common.go b/data/view/gtools/generate/common.go index cc36982..2ab2ad5 100644 --- a/data/view/gtools/generate/common.go +++ b/data/view/gtools/generate/common.go @@ -2,6 +2,7 @@ package generate import ( "fmt" + "sort" "strings" "github.com/xxjwxc/gormt/data/config" @@ -49,10 +50,17 @@ func (e *GenElement) AddTag(k string, v string) { //Generate 获取结果数据 func (e *GenElement) Generate() string { tag := "" - var tags []string + if e.Tags != nil { - for k, v := range e.Tags { - tags = append(tags, fmt.Sprintf(`%v:"%v"`, k, strings.Join(v, ";"))) + var ks []string + for k := range e.Tags { + ks = append(ks, k) + } + sort.Strings(ks) + + var tags []string + for _, v := range ks { + tags = append(tags, fmt.Sprintf(`%v:"%v"`, v, strings.Join(e.Tags[v], ";"))) } tag = fmt.Sprintf("`%v`", strings.Join(tags, " ")) }