|
|
@ -3,8 +3,9 @@ package site |
|
|
|
import ( |
|
|
|
"encoding/json" |
|
|
|
"errors" |
|
|
|
"log" |
|
|
|
|
|
|
|
"git.tetele.net/tgo/redis" |
|
|
|
"git.tetele.net/tgo/redisrpc" |
|
|
|
) |
|
|
|
|
|
|
|
/** |
|
|
@ -15,7 +16,7 @@ import ( |
|
|
|
func GetSiteFromRedis(host string) (map[string]string, error) { |
|
|
|
|
|
|
|
var site map[string]string = make(map[string]string) |
|
|
|
info, err := redis.HGetString(SITE_KEY, host) |
|
|
|
info, err := redisrpc.HGetString(SITE_KEY, host) |
|
|
|
if err != nil { |
|
|
|
return site, err |
|
|
|
} |
|
|
@ -55,32 +56,41 @@ func SetToRedis(host string, site map[string]string) error { |
|
|
|
if err != nil { |
|
|
|
return err |
|
|
|
} |
|
|
|
_, err = redis.HMSet(SITE_KEY, host, siteStr) |
|
|
|
_, err = redisrpc.HSet(SITE_KEY, host, string(siteStr)) |
|
|
|
|
|
|
|
return err |
|
|
|
} |
|
|
|
|
|
|
|
/**/ |
|
|
|
func GetAll() ([]map[string]string, error) { |
|
|
|
|
|
|
|
list, err := redis.HGetAll(SITE_KEY) |
|
|
|
list, err := redisrpc.HGetAll(SITE_KEY) |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
|
|
|
|
var siteInfo map[string]string |
|
|
|
var all []map[string]string |
|
|
|
if len(list) > 0 { |
|
|
|
for key, item := range list { |
|
|
|
if (key+1)%2 == 0 { //只处理偶数位
|
|
|
|
siteInfo = make(map[string]string) |
|
|
|
err = json.Unmarshal(item, &siteInfo) |
|
|
|
for _, item := range list { |
|
|
|
siteInfo = make(map[string]string) |
|
|
|
|
|
|
|
for key, value := range item { |
|
|
|
err = json.Unmarshal([]byte(value), &siteInfo) |
|
|
|
if err != nil { |
|
|
|
continue |
|
|
|
log.Println("json unmarshal error", err, value) |
|
|
|
break |
|
|
|
} |
|
|
|
siteInfo["domainname"] = string(list[key-1]) |
|
|
|
all = append(all, siteInfo) |
|
|
|
siteInfo["domainname"] = key |
|
|
|
} |
|
|
|
|
|
|
|
if len(siteInfo) < 1 { |
|
|
|
continue |
|
|
|
} |
|
|
|
all = append(all, siteInfo) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return all, err |
|
|
|
} |