From 1d71d2a36ad11fd27223634cda8bd2229ef566bf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 20 十一月 2019 12:49:11 +0800
Subject: [PATCH] ---
---
cache/cache.go | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/cache/cache.go b/cache/cache.go
index f0df5d9..2706eb1 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -6,6 +6,7 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/gopherdiscovery.git"
"basic.com/valib/logger.git"
+ "encoding/json"
"errors"
"fmt"
"github.com/gogo/protobuf/proto"
@@ -141,9 +142,13 @@
var api dbapi.DicApi
flag, dics := api.FindByType("")
if flag {
- for key, dics1 := range dics.(map[string]interface{}) {
- for _,dic := range dics1.([]Dic) {
- cMap.Set(PREFIX_DIC+key+dic.value, dic)
+ var dicss map[string][]Dic
+ b, _ := json.Marshal(dics)
+ if err := json.Unmarshal(b, &dicss); err == nil {
+ for key, dics1 := range dicss {
+ for _, dic := range dics1 {
+ cMap.Set(PREFIX_DIC + key + dic.Value, dic)
+ }
}
}
}
@@ -222,16 +227,16 @@
return sdk, errors.New("sdk not found")
}
}
+
// 鑾峰彇瀛楀吀鍊�
-func GetDic(key string) (value string) {
- obj, b := cMap.Get(PREFIX_SDK + key)
+func GetDic(key string) (name string) {
+ obj, b := cMap.Get(PREFIX_DIC + key)
if b {
- return obj.(Dic).value
+ return obj.(Dic).Name
} else {
return ""
}
}
-
func initSoData() {
var api dbapi.SoApi
@@ -253,11 +258,11 @@
}
type Dic struct {
- Id string
- value string
- Name string
- Type string
- Description string
- Sort int
- Parent_id string
+ Id string `json:"id"`
+ Value string `json:"value"`
+ Name string `json:"name"`
+ Type string `json:"type"`
+ Description string `json:"description"`
+ Sort int `json:"sort"`
+ Parent_id string `json:"parent_id"`
}
--
Gitblit v1.8.0