diff --git a/service/controller/setting.go b/service/controller/setting.go index b0ee1379..e236b5f3 100644 --- a/service/controller/setting.go +++ b/service/controller/setting.go @@ -14,7 +14,7 @@ func GetSetting(ctx *gin.Context) { var localGFWListVersion string t, err := asset.GetGFWListModTime() if err == nil { - localGFWListVersion = t.Format("2006-01-02") + localGFWListVersion = t.Local().Format("2006-01-02") } tools.ResponseSuccess(ctx, gin.H{ "setting": s, diff --git a/service/controller/version.go b/service/controller/version.go index 55239e30..2fd94563 100644 --- a/service/controller/version.go +++ b/service/controller/version.go @@ -45,5 +45,5 @@ func GetRemoteGFWListVersion(ctx *gin.Context) { tools.ResponseError(ctx, err) return } - tools.ResponseSuccess(ctx, gin.H{"remoteGFWListVersion": g.UpdateTime.Format("2006-01-02")}) + tools.ResponseSuccess(ctx, gin.H{"remoteGFWListVersion": g.UpdateTime.Local().Format("2006-01-02")}) } diff --git a/service/model/gfwlist/gfwlist.go b/service/model/gfwlist/gfwlist.go index 9d927fcb..462d7a95 100644 --- a/service/model/gfwlist/gfwlist.go +++ b/service/model/gfwlist/gfwlist.go @@ -13,12 +13,13 @@ import ( "io/ioutil" "log" "net/http" + "os" "sync" "time" ) type GFWList struct { - UpdateTime *time.Time + UpdateTime time.Time Tag string sync.Mutex } @@ -28,7 +29,7 @@ var g GFWList func GetRemoteGFWListUpdateTime(c *http.Client) (gfwlist GFWList, err error) { g.Lock() defer g.Unlock() - if g.UpdateTime != nil { + if !g.UpdateTime.IsZero() { return g, nil } resp, err := httpClient.HttpGetUsingSpecificClient(c, "https://api.github.com/repos/mzz2017/dist-v2ray-rules-dat/tags") @@ -51,12 +52,12 @@ func GetRemoteGFWListUpdateTime(c *http.Client) (gfwlist GFWList, err error) { } b, _ = ioutil.ReadAll(resp.Body) t := gjson.GetBytes(b, "commit.committer.date").Time() - g.Tag = tag - g.UpdateTime = &t if t.IsZero() { err = errors.New("fail in get latest version of GFWList: fail in getting commit date of latest tag") return } + g.Tag = tag + g.UpdateTime = t return g, nil } func IsUpdate() (update bool, remoteTime time.Time, err error) { @@ -64,7 +65,7 @@ func IsUpdate() (update bool, remoteTime time.Time, err error) { if err != nil { return } - remoteTime = *gfwlist.UpdateTime + remoteTime = gfwlist.UpdateTime if !asset.IsGFWListExists() { //本地文件不存在,那远端必定比本地新 return false, remoteTime, nil @@ -74,7 +75,7 @@ func IsUpdate() (update bool, remoteTime time.Time, err error) { if err != nil { return } - if t.After(remoteTime) { + if !t.Before(remoteTime) { //那确实新 update = true return @@ -106,9 +107,10 @@ func UpdateLocalGFWList() (localGFWListVersionAfterUpdate string, err error) { log.Println(err) return } + _ = os.Chtimes(asset.GetV2rayLocationAsset()+"/LoyalsoldierSite.dat", gfwlist.UpdateTime, gfwlist.UpdateTime) t, err := files.GetFileModTime(asset.GetV2rayLocationAsset() + "/LoyalsoldierSite.dat") if err == nil { - localGFWListVersionAfterUpdate = t.Format("2006-01-02") + localGFWListVersionAfterUpdate = t.Local().Format("2006-01-02") } log.Printf("download[%v]: %v -> SUCCESS\n", i+1, u) return @@ -121,7 +123,7 @@ func CheckAndUpdateGFWList() (localGFWListVersionAfterUpdate string, err error) } if update { return "", errors.New( - "latest version is " + tRemote.Format("2006-01-02") + ". current GFWList is up to date", + "latest version is " + tRemote.Local().Format("2006-01-02") + ". GFWList is up to date", ) } diff --git a/service/persistence/logs/logs.go b/service/persistence/logs/logs.go index 97166a2c..fe3ab554 100644 --- a/service/persistence/logs/logs.go +++ b/service/persistence/logs/logs.go @@ -5,7 +5,7 @@ import ( ) func format(s string) string { - return time.Now().Format("2006-01-02 15:04:05") + " " + s + return time.Now().Local().Format("2006-01-02 15:04:05") + " " + s } // //func Print(s string) {