From 17bd0564775dd89a9e7f9dafb44624b05866714d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 十二月 2019 18:31:36 +0800
Subject: [PATCH] upgrade use tar.gz
---
extend/util/util.go | 58 +++++++++++++++++++++++++++++
service/SysService.go | 22 +++++-----
2 files changed, 69 insertions(+), 11 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index 89fc165..9ff0e64 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -1,8 +1,11 @@
package util
import (
+ "archive/tar"
"archive/zip"
+ "basic.com/valib/logger.git"
"bytes"
+ "compress/gzip"
"crypto/md5"
"encoding/hex"
"encoding/json"
@@ -300,6 +303,61 @@
return nil
}
+func TarGzCheck(filePath string) bool {
+ f, err := os.Open(filePath)
+ if err != nil {
+ return false
+ }
+ defer f.Close()
+ buf := make([]byte, 4)
+ if n, err := f.Read(buf); err != nil || n < 4 {
+ return false
+ }
+ fType := hex.EncodeToString(buf)
+ logger.Debug("file type :",fType)
+ return fType == "8b1f"
+}
+
+//瑙ｅ帇 tar.gz
+func DeCompress(tarFile, dest string) error {
+ srcFile, err := os.Open(tarFile)
+ if err != nil {
+ return err
+ }
+ defer srcFile.Close()
+ gr, err := gzip.NewReader(srcFile)
+ if err != nil {
+ return err
+ }
+ defer gr.Close()
+ tr := tar.NewReader(gr)
+ for {
+ hdr, err := tr.Next()
+ if err != nil {
+ if err == io.EOF {
+ break
+ } else {
+ return err
+ }
+ }
+ filename := dest + hdr.Name
+ file, err := createFile(filename)
+ if err != nil {
+ return err
+ }
+ io.Copy(file, tr)
+ }
+ return nil
+}
+
+func createFile(name string) (*os.File, error) {
+ err := os.MkdirAll(string([]rune(name)[0:strings.LastIndex(name, "/")]), 0755)
+ if err != nil {
+ return nil, err
+ }
+ return os.Create(name)
+}
+
func FormatNum(oNum int,n int) string {
m := 0
for {
diff --git a/service/SysService.go b/service/SysService.go
index ab26ee4..02f67b5 100644
--- a/service/SysService.go
+++ b/service/SysService.go
@@ -177,7 +177,7 @@
return false,errors.New("鑾峰彇鍗囩骇鍘嬬缉鍖卪d5澶辫触")
}
if strMd5 == identifier {
- if util.ZipCheck(zipFilePath) {
+ if util.TarGzCheck(zipFilePath) {
if !updatePatch(identifier, ext) {
return false,errors.New("鎵ц鍗囩骇杩囩▼寮傚父")
}
@@ -228,28 +228,28 @@
configPatchPath = "/opt/vasystem/patch"
}
//1.瑙ｅ帇缂╂洿鏂板寘
- unZipPath := configPatchPath+"/"+identifier+"_basic/"
- if util.Exists(unZipPath) {
+ unPackPath := configPatchPath+"/"+identifier+"_basic/"
+ if util.Exists(unPackPath) {
//姝ょ増鏈凡缁忔洿鏂拌繃
- rmErr := os.RemoveAll(unZipPath)
+ rmErr := os.RemoveAll(unPackPath)
if rmErr !=nil {
return false
}
}
- if !util.CreateDirectory(unZipPath) {
+ if !util.CreateDirectory(unPackPath) {
return false
}
zipFilePath := configPatchPath+"/"+identifier+ext
- err := util.UnZip(zipFilePath, unZipPath)
+ err := util.DeCompress(zipFilePath, unPackPath)
if err !=nil {
logger.Debug("UnZip err:",err,"zipFile:",zipFilePath)
return false
}
//濡傛灉閫氱敤鑴氭湰鏈夋洿鏂帮紝鍒欐洿鏂伴�氱敤鑴氭湰
- if util.Exists(unZipPath+"updatePatch.sh") {
- cpStr := fmt.Sprintf("cp %s /opt/vasystem/bin",unZipPath+"updatePatch.sh")
+ if util.Exists(unPackPath+"updatePatch.sh") {
+ cpStr := fmt.Sprintf("cp %s /opt/vasystem/bin",unPackPath+"updatePatch.sh")
b, err := ExecCmd(cpStr)
if err != nil {
logger.Debug("cp updatePatch.sh to bin err:",err,"result:",string(b))
@@ -258,9 +258,9 @@
}
//鍒ゆ柇鏇存柊鍖呴噷鏄惁鏈夎ˉ涓佽剼鏈紝濡傛灉鏈夊垯鎵ц锛屽惁鍒欐墽琛寀pdatePatch.sh
- updateCmd := fmt.Sprintf("./updatePatch.sh %s %s %s &",unZipPath,zipFilePath,configPatchPath+"/"+identifier)
- if util.Exists(unZipPath+"upgrade.sh") {
- updateCmd = fmt.Sprintf("%supgrade.sh %s %s %s",unZipPath,unZipPath,zipFilePath,configPatchPath+"/"+identifier)
+ updateCmd := fmt.Sprintf("./updatePatch.sh %s %s %s &",unPackPath,zipFilePath,configPatchPath+"/"+identifier)
+ if util.Exists(unPackPath+"upgrade.sh") {
+ updateCmd = fmt.Sprintf("%supgrade.sh %s %s %s",unPackPath,unPackPath,zipFilePath,configPatchPath+"/"+identifier)
}
//2.鏇存柊绯荤粺
b,err := ExecCmd(updateCmd)
--
Gitblit v1.8.0