5 Commits

5 changed files with 139 additions and 8 deletions

1
.gitignore vendored
View File

@@ -16,7 +16,6 @@ manifest/output/
temp/
temp.yaml
bin
**/config/config.yaml
v1.0.0/
config/local.yaml
main.exe~

View File

@@ -1,8 +1,11 @@
package system
import (
"context"
"github.com/ayflying/p2p/internal/service"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gcron"
"github.com/gogf/gf/v2/os/gctx"
)
@@ -17,6 +20,14 @@ func init() {
getDev, _ := g.Cfg().GetWithEnv(gctx.New(), "dev")
if !getDev.Bool() {
// 每天0点检查更新
gcron.Add(gctx.New(), "0 0 0 * * *", func(ctx context.Context) {
err := service.System().CheckUpdate()
if err != nil {
g.Log().Errorf(ctx, "检查更新失败:%v", err)
}
})
err := service.System().CheckUpdate()
if err != nil {
g.Log().Errorf(gctx.New(), "检查更新失败:%v", err)
@@ -26,4 +37,4 @@ func init() {
}
}
func (system *sSystem) Init() {}
func (s *sSystem) Init() {}

View File

@@ -1,9 +1,12 @@
package system
import (
"archive/tar"
"compress/gzip"
"context"
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"os"
@@ -17,12 +20,15 @@ import (
"github.com/ayflying/p2p/internal/service"
"github.com/gogf/gf/v2/encoding/gcompress"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gcmd"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gfile"
)
// 本地版本号(建议从编译参数注入,如 -ldflags "-X main.version=v0.1.3"
const versionFile = "version.txt"
var localVersion = "v0.0.0"
// 对应 GitHub API 响应的核心字段(按需精简)
@@ -58,14 +64,16 @@ func (s *sSystem) Update(ctx context.Context, gzFile string) (err error) {
if gzFile == "" {
gzFile = path.Join("download", platform+".gz")
}
//结束后删除压缩包
//defer gfile.RemoveFile(gzFile)
ext := gfile.Ext(gzFile)
if ext == ".zip" {
g.Log().Debugf(ctx, "zip解压%v到%v", gzFile, gfile.Dir(runFile))
err = gcompress.UnZipFile(gzFile, gfile.Dir(runFile))
} else {
g.Log().Debugf(ctx, "gzip解压%v到%v", gzFile, runFile)
err = gcompress.UnGzipFile(gzFile, runFile)
g.Log().Debugf(ctx, "gzip解压%v到%v", gzFile, gfile.Dir(runFile))
err = s.UnTarGz(gzFile, gfile.Dir(runFile))
}
if err != nil {
return
@@ -82,8 +90,76 @@ func (s *sSystem) Update(ctx context.Context, gzFile string) (err error) {
return
}
// UnTarGz 解压tar.gz文件到指定目录
func (s *sSystem) UnTarGz(tarGzFileName, targetDir string) (err error) {
// 打开tar.gz文件
file, err := os.Open(tarGzFileName)
if err != nil {
return err
}
defer file.Close()
// 创建gzip reader
gzr, err := gzip.NewReader(file)
if err != nil {
return err
}
defer gzr.Close()
// 创建tar reader
tr := tar.NewReader(gzr)
// 遍历tar中的每个文件
for {
hdr, err := tr.Next()
if err == io.EOF {
// 到达文件末尾,退出循环
break
}
if err != nil {
return err
}
// 构建解压后的文件路径
targetPath := targetDir + string(os.PathSeparator) + hdr.Name
// 如果是目录,创建目录
if hdr.Typeflag == tar.TypeDir {
err := os.MkdirAll(targetPath, 0755)
if err != nil {
return err
}
continue
}
// 如果是文件,创建文件并写入内容
outFile, err := os.Create(targetPath)
if err != nil {
return err
}
defer outFile.Close()
_, err = io.Copy(outFile, tr)
if err != nil {
return err
}
}
return
}
// RestartSelf 实现 Windows 平台下的程序自重启
func (s *sSystem) RestartSelf() error {
ctx := gctx.New()
// 判断是否为linux平台
if runtime.GOOS == "linux" {
err := ghttp.RestartAllServer(ctx, os.Args[0])
if err != nil {
g.Log().Errorf(ctx, "重启失败:%v", err)
}
return err
}
// 1. 获取当前程序的绝对路径
exePath, err := os.Executable()
if err != nil {
@@ -187,7 +263,7 @@ func (s *sSystem) CheckUpdate() (err error) {
return
}
localVersion = gfile.GetContents("download/version.txt")
localVersion = gfile.GetContents(versionFile)
if s.isNewVersion(localVersion, latestVersion) {
g.Log().Printf(ctx, "发现新版本:%s当前版本%s", latestVersion, localVersion)
@@ -212,7 +288,7 @@ func (s *sSystem) CheckUpdate() (err error) {
return
}
// 保存最新版本号到文件
gfile.PutContents("download/version.txt", latestVersion)
gfile.PutContents(versionFile, latestVersion)
break
}
}

View File

@@ -10,7 +10,6 @@ import (
"github.com/gogf/gf/v2/os/gcmd"
"github.com/gogf/gf/v2/os/gfile"
"github.com/gogf/gf/v2/os/gtime"
//步骤1加载驱动
_ "github.com/gogf/gf/contrib/nosql/redis/v2"
@@ -24,7 +23,7 @@ var (
func main() {
g.Log().Infof(ctx, "启动文件最后修改时间:%v", gtime.New(gfile.MTime(gcmd.GetArg(0).String())).String())
g.Dump("v1.0.0.2")
//g.Dump("v1.0.0.2")
if ok := gfile.Exists("runtime"); !ok {
gfile.Mkdir("runtime")

View File

@@ -0,0 +1,46 @@
module:
server: true
client: true
# https://goframe.org/docs/web/server-config-file-template
server:
address: "51888"
# openapiPath: "/api.json"
# swaggerPath: "/swagger"
dumpRouterMap: false
graceful: true
# https://goframe.org/docs/core/glog-config
logger:
level : "all"
stdout: true
# https://goframe.org/docs/core/gdb-config-file
database:
default:
link: "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
redis:
default:
address: "ay.cname.com:6379"
db: 15
pass: "12345678"
cache:
address: "ay.cname.com:6379"
db: 15
pass: "12345678"
p2p:
list:
# - host: "192.168.50.173"
# port: 51888
# ssl: false
# ws: ws
- host: "ay.cname.com"
port: 51888
ssl: false
ws: ws