Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

imporve log widget

Browse Source
This commit is contained in:
arm64v8a
2022-12-12 10:03:07 +09:00
parent e0a1f9f164
commit 8e20e499e1
8 changed files with 103 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
go/cmd/nekobox_core/grpc_box.go
View File

@@ -12,7 +12,6 @@ import (
"neko/pkg/speedtest"
"nekobox_core/box_main"
"reflect"
"time"
"unsafe"
box "github.com/sagernet/sing-box"
@@ -39,16 +38,6 @@ func (s *server) Start(ctx context.Context, in *gen.LoadConfigReq) (out *gen.Err
log.Println("Start:", in.CoreConfig)
}
if neko_common.GetBuildTime() > 0 {
if time.Now().Unix() >= neko_common.GetExpireTime() {
err = errors.New("Your version is too old! Please update!! 版本太旧，请升级！")
return
} else if time.Now().Unix() >= (neko_common.GetExpireTime() - 30*24*60*60) {
log.Println("Your version is too old! Please update!! 版本太旧，请升级！")
log.Println("This version expires on " + time.Unix(neko_common.GetExpireTime(), 0).Format("2006-01-02"))
}
}
if instance != nil {
err = errors.New("instance already started")
return

11
go/cmd/nekoray_core/grpc_ray.go
View File

@@ -8,7 +8,6 @@ import (
"io"
"libcore"
"libcore/stun"
"log"
"neko/gen"
"neko/pkg/grpc_server"
"neko/pkg/neko_common"
@@ -39,16 +38,6 @@ func (s *server) Start(ctx context.Context, in *gen.LoadConfigReq) (out *gen.Err
logrus.Println("Start:", in.CoreConfig, in.TryDomains)
}
if neko_common.GetBuildTime() > 0 {
if time.Now().Unix() >= neko_common.GetExpireTime() {
err = errors.New("Your version is too old! Please update!! 版本太旧，请升级！")
return
} else if time.Now().Unix() >= (neko_common.GetExpireTime() - 30*24*60*60) {
log.Println("Your version is too old! Please update!! 版本太旧，请升级！")
log.Println("This version expires on " + time.Unix(neko_common.GetExpireTime(), 0).Format("2006-01-02"))
}
}
if instance != nil {
err = errors.New("instance already started")
return

18
go/pkg/neko_common/common.go
View File

@@ -2,8 +2,6 @@ package neko_common
import (
"net/http"
"strings"
"time"
)
var Version_v2ray string = "N/A"
@@ -20,19 +18,3 @@ const (
)
var GetProxyHttpClient func() *http.Client
func GetBuildTime() int64 {
if !strings.HasPrefix(Version_neko, "nekoray-") {
return 0
}
ver := strings.TrimLeft(Version_neko, "nekoray-")
buildDate := ver[strings.Index(ver, "-")+1:]
buildTime, _ := time.Parse("2006-01-02", buildDate)
return buildTime.Unix()
}
func GetExpireTime() int64 {
buildTime := time.Unix(GetBuildTime(), 0)
expireTime := buildTime.AddDate(0, 6, 0) // current force update: 6 months
return expireTime.Unix()
}