update yi

godcong · Nov 6, 2019 · 02003a7 · 02003a7
1 parent aa0ee54
commit 02003a7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/guaxiang.go b/guaxiang.go
@@ -35,21 +35,19 @@ type GuaXiang struct {
 
 var gx map[string]*GuaXiang
 
-func GetGuaXiang() map[string]*GuaXiang {
-	return getGuaXiang()
-}
-func getGuaXiang() map[string]*GuaXiang {
-	if gx == nil {
-		gx = make(map[string]*GuaXiang)
-		data, err := libDecompressStatik()
-		if err != nil {
-			panic(err)
-		}
-		err = json.Unmarshal(data, &gx)
-		if err != nil {
-			panic(err)
-		}
+func init() {
+	gx = make(map[string]*GuaXiang)
+	data, err := libDecompressStatik()
+	if err != nil {
+		panic(err)
+	}
+	err = json.Unmarshal(data, &gx)
+	if err != nil {
+		panic(err)
 	}
+}
+
+func GetGuaXiang() map[string]*GuaXiang {
 	return gx
 }
 

diff --git a/guaxiang_test.go b/guaxiang_test.go
@@ -1482,8 +1482,8 @@ func TestSetGuaXiang(t *testing.T) {
 }
 
 func TestGetGuaXiang(t *testing.T) {
-	if len(getGuaXiang()) != 64 {
-		t.Log("not enough", getGuaXiang())
+	if len(GetGuaXiang()) != 64 {
+		t.Log("not enough", GetGuaXiang())
 	}
 
 }