|
@@ -8,10 +8,11 @@ import (
|
|
|
|
|
|
|
|
var client *clientv3.Client
|
|
var client *clientv3.Client
|
|
|
|
|
|
|
|
-func New() error {
|
|
|
|
|
|
|
+func NewEtcdClient(endpoints []string) error {
|
|
|
var err error
|
|
var err error
|
|
|
config := clientv3.Config{
|
|
config := clientv3.Config{
|
|
|
- Endpoints: []string{"47.106.183.209:31379"},
|
|
|
|
|
|
|
+ Endpoints: endpoints,
|
|
|
|
|
+ //Endpoints: []string{"47.106.183.209:31379"},
|
|
|
//Endpoints: []string{"10.43.152.46:2379"},
|
|
//Endpoints: []string{"10.43.152.46:2379"},
|
|
|
DialTimeout: 5 * time.Second,
|
|
DialTimeout: 5 * time.Second,
|
|
|
}
|
|
}
|
|
@@ -36,20 +37,19 @@ func Get(key string) (string, error) {
|
|
|
return string(resp.Kvs[0].Value), nil
|
|
return string(resp.Kvs[0].Value), nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func GetWithPrefix(key string) ([]string, error) {
|
|
|
|
|
- var values []string
|
|
|
|
|
- var i int64
|
|
|
|
|
|
|
+func GetWithPrefix(key string) (map[string]string, error) {
|
|
|
|
|
+ result := make(map[string]string, 0)
|
|
|
|
|
|
|
|
resp, err := client.Get(context.TODO(), key, clientv3.WithPrefix())
|
|
resp, err := client.Get(context.TODO(), key, clientv3.WithPrefix())
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- return values, err
|
|
|
|
|
|
|
+ return result, err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- for i = 0; i < resp.Count; i++ {
|
|
|
|
|
- values = append(values, string(resp.Kvs[i].Value))
|
|
|
|
|
|
|
+ for i := int64(0); i < resp.Count; i++ {
|
|
|
|
|
+ result[string(resp.Kvs[i].Key)] = string(resp.Kvs[i].Value)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return values, nil
|
|
|
|
|
|
|
+ return result, nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func Put(key, val string) error {
|
|
func Put(key, val string) error {
|