使用新的解压targz压缩的方法

.gitignore

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

internal/logic/p2p/client.go

@@ -456,7 +456,7 @@ func (s *sP2P) receiveGatewayMessages(ctx context.Context) {
 
 			g.Log().Info(ctx, "文件接收完成")
 			// 开始覆盖文件与重启
-			err = service.System().Update(ctx)
+			err = service.System().Update(ctx, "")
 
 			//// 调用不同系统的更新服务
 			//service.OS().Update(msgData.Version, msgData.Server)

internal/logic/p2p/p2p.go

@@ -188,9 +188,10 @@ func (s *sP2P) removeDuplicates(strs []string) []string {
 	return result
 }
 
+const privKeyPath = "runtime/p2p.key"
+
 // 生成固定密钥（核心：通过固定种子生成相同密钥）
 func (s *sP2P) generateFixedKey() (crypto.PrivKey, error) {
-	privKeyPath := "runtime/message.key"
 	if ok := gfile.Exists(privKeyPath); ok {
 		// 从文件读取密钥
 		keyBytes := gfile.GetBytes(privKeyPath)

internal/logic/system/model.go

@@ -0,0 +1,87 @@
+package system
+
+import "time"
+
+type T struct {
+	Url             string    `json:"url"`
+	AssetsUrl       string    `json:"assets_url"`
+	UploadUrl       string    `json:"upload_url"`
+	HtmlUrl         string    `json:"html_url"`
+	Id              int       `json:"id"`
+	Author          *Author   `json:"author"`
+	NodeId          string    `json:"node_id"`
+	TagName         string    `json:"tag_name"`
+	TargetCommitish string    `json:"target_commitish"`
+	Name            string    `json:"name"`
+	Draft           bool      `json:"draft"`
+	Immutable       bool      `json:"immutable"`
+	Prerelease      bool      `json:"prerelease"`
+	CreatedAt       time.Time `json:"created_at"`
+	UpdatedAt       time.Time `json:"updated_at"`
+	PublishedAt     time.Time `json:"published_at"`
+	Assets          []*Assets
+	TarballUrl      string `json:"tarball_url"`
+	ZipballUrl      string `json:"zipball_url"`
+	Body            string `json:"body"`
+}
+
+type Author struct {
+	Login             string `json:"login"`
+	Id                int    `json:"id"`
+	NodeId            string `json:"node_id"`
+	AvatarUrl         string `json:"avatar_url"`
+	GravatarId        string `json:"gravatar_id"`
+	Url               string `json:"url"`
+	HtmlUrl           string `json:"html_url"`
+	FollowersUrl      string `json:"followers_url"`
+	FollowingUrl      string `json:"following_url"`
+	GistsUrl          string `json:"gists_url"`
+	StarredUrl        string `json:"starred_url"`
+	SubscriptionsUrl  string `json:"subscriptions_url"`
+	OrganizationsUrl  string `json:"organizations_url"`
+	ReposUrl          string `json:"repos_url"`
+	EventsUrl         string `json:"events_url"`
+	ReceivedEventsUrl string `json:"received_events_url"`
+	Type              string `json:"type"`
+	UserViewType      string `json:"user_view_type"`
+	SiteAdmin         bool   `json:"site_admin"`
+}
+
+type Assets struct {
+	Url                string    `json:"url"`
+	Id                 int       `json:"id"`
+	NodeId             string    `json:"node_id"`
+	Name               string    `json:"name"`
+	Label              string    `json:"label"`
+	Uploader           *Uploader `json:"uploader"`
+	ContentType        string    `json:"content_type"`
+	State              string    `json:"state"`
+	Size               int       `json:"size"`
+	Digest             string    `json:"digest"`
+	DownloadCount      int       `json:"download_count"`
+	CreatedAt          time.Time `json:"created_at"`
+	UpdatedAt          time.Time `json:"updated_at"`
+	BrowserDownloadUrl string    `json:"browser_download_url"`
+}
+
+type Uploader struct {
+	Login             string `json:"login"`
+	Id                int    `json:"id"`
+	NodeId            string `json:"node_id"`
+	AvatarUrl         string `json:"avatar_url"`
+	GravatarId        string `json:"gravatar_id"`
+	Url               string `json:"url"`
+	HtmlUrl           string `json:"html_url"`
+	FollowersUrl      string `json:"followers_url"`
+	FollowingUrl      string `json:"following_url"`
+	GistsUrl          string `json:"gists_url"`
+	StarredUrl        string `json:"starred_url"`
+	SubscriptionsUrl  string `json:"subscriptions_url"`
+	OrganizationsUrl  string `json:"organizations_url"`
+	ReposUrl          string `json:"repos_url"`
+	EventsUrl         string `json:"events_url"`
+	ReceivedEventsUrl string `json:"received_events_url"`
+	Type              string `json:"type"`
+	UserViewType      string `json:"user_view_type"`
+	SiteAdmin         bool   `json:"site_admin"`
+}

internal/logic/system/system.go

@@ -1,7 +1,12 @@
 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"
 )
 
 type sSystem struct{}
@@ -12,6 +17,24 @@ func New() *sSystem {
 
 func init() {
 	service.RegisterSystem(New())
+
+	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)
+		}
+	} else {
+		g.Log().Debugf(gctx.New(), "开发模式，不检查更新")
+	}
 }
 
-func (system *sSystem) Init() {}
+func (s *sSystem) Init() {}

internal/logic/system/update.go

@@ -1,31 +1,83 @@
 package system
 
 import (
+	"archive/tar"
+	"compress/gzip"
 	"context"
+	"encoding/json"
 	"fmt"
+	"io"
 	"log"
+	"net/http"
 	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"time"
 
 	"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"
 )
 
-func (s *sSystem) Update(ctx context.Context) (err error) {
+// 本地版本号（建议从编译参数注入，如 -ldflags "-X main.version=v0.1.3"）
+const versionFile = "version.txt"
+
+var localVersion = "v0.0.0"
+
+// 对应 GitHub API 响应的核心字段（按需精简）
+type GitHubRelease struct {
+	Url             string    `json:"url"`
+	AssetsUrl       string    `json:"assets_url"`
+	UploadUrl       string    `json:"upload_url"`
+	HtmlUrl         string    `json:"html_url"`
+	Id              int       `json:"id"`
+	TagName         string    `json:"tag_name"`
+	Assets          []*Assets `json:"assets"`
+	NodeId          string    `json:"node_id"`
+	TargetCommitish string    `json:"target_commitish"`
+	Name            string    `json:"name"`
+	Draft           bool      `json:"draft"`
+	Immutable       bool      `json:"immutable"`
+	Prerelease      bool      `json:"prerelease"`
+	CreatedAt       time.Time `json:"created_at"`
+	UpdatedAt       time.Time `json:"updated_at"`
+	PublishedAt     time.Time `json:"published_at"`
+	TarballUrl      string    `json:"tarball_url"`
+	ZipballUrl      string    `json:"zipball_url"`
+	Body            string    `json:"body"`
+}
+
+func (s *sSystem) Update(ctx context.Context, gzFile string) (err error) {
 	//拼接操作系统和架构（格式：OS_ARCH）
 	platform := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)
 
 	runFile := gcmd.GetArg(0).String()
 	oldFile, err := service.System().RenameRunningFile(runFile)
 	g.Log().Debugf(ctx, "执行文件改名为%v", oldFile)
-	gz := path.Join("download", platform+".gz")
-	err = gcompress.UnGzipFile(gz, runFile)
+	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, gfile.Dir(runFile))
+		err = s.UnTarGz(gzFile, gfile.Dir(runFile))
+	}
+	if err != nil {
+		return
+	}
 
 	go func() {
 		log.Println("5秒后开始重启...")
@@ -38,8 +90,76 @@ func (s *sSystem) Update(ctx context.Context) (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 {
@@ -96,3 +216,84 @@ func (s *sSystem) RenameRunningFile(exePath string) (string, error) {
 	}
 	return backupPath, nil
 }
+
+// 简化版版本对比（仅适用于 vX.Y.Z 格式）
+func (s *sSystem) isNewVersion(local, latest string) bool {
+	// 移除前缀 "v"，按 "." 分割成数字切片
+	localParts := strings.Split(strings.TrimPrefix(local, "v"), ".")
+	latestParts := strings.Split(strings.TrimPrefix(latest, "v"), ".")
+
+	// 逐段对比版本号（如 0.1.3 vs 0.1.4 → 后者更新）
+	for i := 0; i < len(localParts) && i < len(latestParts); i++ {
+		if localParts[i] < latestParts[i] {
+			return true
+		} else if localParts[i] > latestParts[i] {
+			return false
+		}
+	}
+	// 若前缀相同，长度更长的版本更新（如 0.1 vs 0.1.1）
+	return len(localParts) < len(latestParts)
+}
+
+func (s *sSystem) getLatestVersion() (string, []*Assets, error) {
+	apiURL := "https://api.github.com/repos/ayflying/p2p/releases/latest"
+	resp, err := http.Get(apiURL)
+	if err != nil {
+		return "", nil, fmt.Errorf("请求失败：%v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return "", nil, fmt.Errorf("API 响应错误：%d", resp.StatusCode)
+	}
+
+	var release GitHubRelease
+	if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
+		return "", nil, fmt.Errorf("解析响应失败：%v", err)
+	}
+
+	return release.TagName, release.Assets, nil
+}
+
+func (s *sSystem) CheckUpdate() (err error) {
+	ctx := gctx.New()
+	latestVersion, assets, err := s.getLatestVersion()
+	if err != nil {
+		fmt.Printf("检查更新失败：%v\n", err)
+		return
+	}
+
+	localVersion = gfile.GetContents(versionFile)
+
+	if s.isNewVersion(localVersion, latestVersion) {
+		g.Log().Printf(ctx, "发现新版本：%s（当前版本：%s）", latestVersion, localVersion)
+		//拼接操作系统和架构（格式：OS_ARCH）
+		platform := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)
+		//name := fmt.Sprintf("p2p_%s_%s.tar.gz", latestVersion, platform)
+		fmt.Println("下载链接：")
+		for _, asset := range assets {
+			if strings.Contains(fmt.Sprintf("_%s.", asset.Name), platform) {
+				fmt.Printf("- %s\n", asset.BrowserDownloadUrl)
+
+				// 下载更新文件
+				fileDownload, err2 := g.Client().Get(ctx, asset.BrowserDownloadUrl)
+				if err2 != nil {
+					return
+				}
+				updateFile := path.Join("download", asset.Name)
+				err = gfile.PutBytes(updateFile, fileDownload.ReadAll())
+
+				err = s.Update(ctx, updateFile)
+				if err != nil {
+					return
+				}
+				// 保存最新版本号到文件
+				gfile.PutContents(versionFile, latestVersion)
+				break
+			}
+		}
+	} else {
+		fmt.Printf("当前已是最新版本：%s\n", localVersion)
+	}
+	return
+}

internal/service/system.go

@@ -12,11 +12,12 @@ import (
 type (
 	ISystem interface {
 		Init()
-		Update(ctx context.Context) (err error)
+		Update(ctx context.Context, gzFile string) (err error)
 		// RestartSelf 实现 Windows 平台下的程序自重启
 		RestartSelf() error
 		// RenameRunningFile 重命名正在运行的程序文件（如 message.exe → message.exe~）
 		RenameRunningFile(exePath string) (string, error)
+		CheckUpdate() (err error)
 	}
 )
 

main.go

@@ -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")

manifest/config/config.yaml

@@ -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
+
+