From 1496cee107d2d9b096971bf60226a93e63894861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E5=B0=8F=E5=86=9B?= <xxj@xiexiaojundeMBP.lan>
Date: Fri, 9 Aug 2019 00:30:00 +0800
Subject: [PATCH] sort tag

---
 .DS_Store                           | Bin 6148 -> 0 bytes
 .gitignore                          |   2 ++
 data/view/gtools/generate/common.go |  14 +++++++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)
 delete mode 100644 .DS_Store
 create mode 100644 .gitignore

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

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, " "))
 	}