github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-07-03 21:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
刘河 2019-02-01 09:09:08 +08:00
parent c336bf94d8
commit 21de0a0ada
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/file.go
View File

@ -1,7 +1,6 @@
package utils package utils
import ( import (
"easyProxy/utils"
"encoding/csv" "encoding/csv"
"errors" "errors"
"github.com/astaxie/beego" "github.com/astaxie/beego"
@ -53,7 +52,7 @@ func (s *Csv) StoreTasksToCsv() {
task.Config.U, task.Config.U,
task.Config.P, task.Config.P,
task.Config.Compress, task.Config.Compress,
utils.GetStrByBool(task.Status), GetStrByBool(task.Status),
GetStrByBool(task.Config.Crypt), GetStrByBool(task.Config.Crypt),
strconv.Itoa(task.Config.CompressEncode), strconv.Itoa(task.Config.CompressEncode),
strconv.Itoa(task.Config.CompressDecode), strconv.Itoa(task.Config.CompressDecode),
@ -109,7 +108,7 @@ func (s *Csv) LoadTaskFromCsv() {
CompressEncode: GetIntNoErrByStr(item[8]), CompressEncode: GetIntNoErrByStr(item[8]),
CompressDecode: GetIntNoErrByStr(item[9]), CompressDecode: GetIntNoErrByStr(item[9]),
}, },
Status: utils.GetBoolByStr(item[6]), Status: GetBoolByStr(item[6]),
Id: GetIntNoErrByStr(item[10]), Id: GetIntNoErrByStr(item[10]),
UseClientCnf: GetBoolByStr(item[12]), UseClientCnf: GetBoolByStr(item[12]),
Remark: item[13], Remark: item[13],
@ -137,7 +136,7 @@ func (s *Csv) GetIdByVerifyKey(vKey string, addr string) (int, error) {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
for _, v := range s.Clients { for _, v := range s.Clients {
if utils.Getverifyval(v.VerifyKey) == vKey && v.Status { if Getverifyval(v.VerifyKey) == vKey && v.Status {
if arr := strings.Split(addr, ":"); len(arr) > 0 { if arr := strings.Split(addr, ":"); len(arr) > 0 {
v.Addr = arr[0] v.Addr = arr[0]
} }
@ -245,7 +244,7 @@ func (s *Csv) LoadClientFromCsv() {
post.Rate.Start() post.Rate.Start()
} }
post.Flow = new(Flow) post.Flow = new(Flow)
post.Flow.FlowLimit = int64(utils.GetIntNoerrByStr(item[9])) post.Flow.FlowLimit = int64(GetIntNoErrByStr(item[9]))
clients = append(clients, post) clients = append(clients, post)
} }
s.Clients = clients s.Clients = clients
@ -405,7 +404,7 @@ func (s *Csv) StoreClientsToCsv() {
strconv.FormatBool(client.Status), strconv.FormatBool(client.Status),
client.Cnf.U, client.Cnf.U,
client.Cnf.P, client.Cnf.P,
utils.GetStrByBool(client.Cnf.Crypt), GetStrByBool(client.Cnf.Crypt),
client.Cnf.Compress, client.Cnf.Compress,
strconv.Itoa(client.RateLimit), strconv.Itoa(client.RateLimit),
strconv.Itoa(int(client.Flow.FlowLimit)), strconv.Itoa(int(client.Flow.FlowLimit)),
@ -426,4 +425,3 @@ func GetCsvDb() *Csv {
}) })
return CsvDb return CsvDb
} }