|
|
|
@ -8,7 +8,7 @@ import ( |
|
|
|
"strings" |
|
|
|
"strings" |
|
|
|
"time" |
|
|
|
"time" |
|
|
|
|
|
|
|
|
|
|
|
"gopkg.in/redis.v3" |
|
|
|
"gopkg.in/redis.v3" |
|
|
|
|
|
|
|
|
|
|
|
"github.com/yuriy0803/open-etc-pool-friends/util" |
|
|
|
"github.com/yuriy0803/open-etc-pool-friends/util" |
|
|
|
) |
|
|
|
) |
|
|
|
@ -207,7 +207,11 @@ func convertPoolChartsResults(raw *redis.ZSliceCmd) []*PoolCharts { |
|
|
|
pc.PoolHash, _ = strconv.ParseInt(str[strings.LastIndex(str, ":")+1:], 10, 64) |
|
|
|
pc.PoolHash, _ = strconv.ParseInt(str[strings.LastIndex(str, ":")+1:], 10, 64) |
|
|
|
result = append(result, &pc) |
|
|
|
result = append(result, &pc) |
|
|
|
} |
|
|
|
} |
|
|
|
return result |
|
|
|
var reverse []*PoolCharts |
|
|
|
|
|
|
|
for i := len(result) - 1; i >= 0; i-- { |
|
|
|
|
|
|
|
reverse = append(reverse, result[i]) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return reverse |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func convertMinerChartsResults(raw *redis.ZSliceCmd) []*MinerCharts { |
|
|
|
func convertMinerChartsResults(raw *redis.ZSliceCmd) []*MinerCharts { |
|
|
|
@ -223,7 +227,11 @@ func convertMinerChartsResults(raw *redis.ZSliceCmd) []*MinerCharts { |
|
|
|
mc.WorkerOnline = strings.Split(str, ":")[4] |
|
|
|
mc.WorkerOnline = strings.Split(str, ":")[4] |
|
|
|
result = append(result, &mc) |
|
|
|
result = append(result, &mc) |
|
|
|
} |
|
|
|
} |
|
|
|
return result |
|
|
|
var reverse []*MinerCharts |
|
|
|
|
|
|
|
for i := len(result) - 1; i >= 0; i-- { |
|
|
|
|
|
|
|
reverse = append(reverse, result[i]) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return reverse |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (r *RedisClient) GetAllMinerAccount() (account []string, err error) { |
|
|
|
func (r *RedisClient) GetAllMinerAccount() (account []string, err error) { |
|
|
|
@ -1284,7 +1292,11 @@ func convertPaymentsResults(raw *redis.ZSliceCmd) []map[string]interface{} { |
|
|
|
} |
|
|
|
} |
|
|
|
result = append(result, tx) |
|
|
|
result = append(result, tx) |
|
|
|
} |
|
|
|
} |
|
|
|
return result |
|
|
|
var reverse []map[string]interface{} |
|
|
|
|
|
|
|
for i := len(result) - 1; i >= 0; i-- { |
|
|
|
|
|
|
|
reverse = append(reverse, result[i]) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return reverse |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* |
|
|
|
/* |
|
|
|
@ -1315,7 +1327,11 @@ func convertPaymentChartsResults(raw *redis.ZSliceCmd) []*PaymentCharts { |
|
|
|
result = append(result, &pc) |
|
|
|
result = append(result, &pc) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return result |
|
|
|
var reverse []*PaymentCharts |
|
|
|
|
|
|
|
for i := len(result) - 1; i >= 0; i-- { |
|
|
|
|
|
|
|
reverse = append(reverse, result[i]) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return reverse |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (r *RedisClient) GetCurrentHashrate(login string) (int64, error) { |
|
|
|
func (r *RedisClient) GetCurrentHashrate(login string) (int64, error) { |
|
|
|
|