From 2fdef0f732a5d6549d2c42a116dfdd3dc75a0b48 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期一, 06 一月 2020 16:25:34 +0800 Subject: [PATCH] merge ynPatch --- extend/code/code.go | 3 sysComeBack.sh | 15 config/dev.yaml | 13 go.mod | 4 service/SysService.go | 286 +++++++++++++++ mergeAll.sh | 21 + config/pro.yaml | 13 router/router.go | 3 extend/util/zip.go | 314 +++++++++++++++++ controllers/syssetcont.go | 148 ++++++++ go.sum | 8 config/test.yaml | 1 updatePatch.sh | 71 +++ extend/util/util.go | 120 ++++++ extend/config/config.go | 2 15 files changed, 1,012 insertions(+), 10 deletions(-) diff --git a/config/dev.yaml b/config/dev.yaml index a4e7f65..f2a8878 100644 --- a/config/dev.yaml +++ b/config/dev.yaml @@ -19,6 +19,19 @@ channelCount: 0 #纭洏涓暟 diskCount: 2 + #Exec root command + sudoPassword: 123 + sysThresholds: + - value: 60 + color: '#13ce66' + - value: 80 + color: '#FF9C4A' + - value: 95 + color: '#f53d3d' + - value: 100 + color: '#5d0000' + ptzSpeed: 50 + patchPath: /opt/vasystem/patch database: driver: sqlite name: sqlite3 diff --git a/config/pro.yaml b/config/pro.yaml index f3882e1..e71329e 100644 --- a/config/pro.yaml +++ b/config/pro.yaml @@ -19,6 +19,19 @@ channelCount: 0 #纭洏涓暟 diskCount: 2 + #Exec root command + sudoPassword: 123 + sysThresholds: + - value: 60 + color: '#13ce66' + - value: 80 + color: '#FF9C4A' + - value: 95 + color: '#f53d3d' + - value: 100 + color: '#5d0000' + ptzSpeed: 50 + patchPath: /opt/vasystem/patch database: driver: sqlite name: sqlite3 diff --git a/config/test.yaml b/config/test.yaml index 655231c..90ffccc 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -35,6 +35,7 @@ value: 100 color: '#5d0000' ptzSpeed: 50 + patchPath: /opt/vasystem/patch database: driver: sqlite name: sqlite3 diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go index 0bbe12b..12f0593 100644 --- a/controllers/syssetcont.go +++ b/controllers/syssetcont.go @@ -1,11 +1,15 @@ package controllers import ( + "net/http" "regexp" + "strconv" "webserver/extend/code" "webserver/extend/config" "webserver/extend/sys" "webserver/extend/util" + "webserver/middlewares/auth" + "webserver/service" "basic.com/dbapi.git" "github.com/gin-gonic/gin" @@ -483,14 +487,150 @@ var reqBody ResourceConfigVo c.BindJSON(&reqBody) if reqBody.ServiceIp == "" && reqBody.Domain == "" { - util.ResponseFormat(c,code.RequestParamError,"") + util.ResponseFormat(c, code.RequestParamError, "") return } var sysApi dbapi.SysSetApi paramBody := util.Struct2Map(reqBody) - if b,_ := sysApi.SaveResourceConfig(paramBody); b { - util.ResponseFormat(c,code.Success,"") + if b, _ := sysApi.SaveResourceConfig(paramBody); b { + util.ResponseFormat(c, code.Success, "") } else { - util.ResponseFormat(c,code.ComError,"") + util.ResponseFormat(c, code.ComError, "") + } +} +// @Summary 绯荤粺鏇存柊鍖呬笂浼�(鍒嗗潡妫�鏌�) +// @Description 绯荤粺鏇存柊鍖呬笂浼�(鍒嗗潡妫�鏌�) +// @Accept multipart/form-data +// @Produce json +// @Tags sysset +// @Param chunkNumber formData int true "褰撳墠鏄鍑犱釜鍒嗗潡" +// @Param chunkSize formData int true "姣忎竴鍧楃殑澶у皬" +// @Param currentChunkSize formData int true "褰撳墠鍧楃殑澶у皬" +// @Param identifier formData string true "鏁翠釜鏂囦欢鐨勫敮涓�鏍囪瘑锛岀洰鍓嶆槸md5" +// @Param filename formData string true "鏂囦欢鍚嶇О" +// @Param relativePath formData string true "鏂囦欢鍦ㄥ鎴风鐢佃剳鐨勮矾寰�" +// @Param totalChunks formData int true "鏂囦欢鎬诲潡鏁�" +// @Success 200 {string} json "{"code":200, msg:"", success:true}" +// @Failure 500 {string} json "{"code":500, msg:"", success:false}" +// @Router /data/api-v/sysset/patchUpdate [get] +func (sset SysSetController) PatchUpdateCheck(c *gin.Context) { + authDriver := auth.GenerateAuthDriver() + userM := (*authDriver).User(c) + if userM ==nil { + util.ResponseFormat(c,code.TokenNotFound,"鐧诲綍杩囨湡锛岃鐧诲綍") + return + } + chunkNumber, e1 := strconv.Atoi(c.Request.FormValue("chunkNumber")) + chunkSize, e2 := strconv.Atoi(c.Request.FormValue("chunkSize")) + currentChunkSize, e3 := strconv.Atoi(c.Request.FormValue("currentChunkSize")) + identifier := c.Request.FormValue("identifier") + filename := c.Request.FormValue("filename") + relativePath := c.Request.FormValue("relativePath") + totalChunks, e5 := strconv.Atoi(c.Request.FormValue("totalChunks")) + if identifier == "" || e1 != nil || e2 != nil || e3 != nil || e5 !=nil { + util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎") + return + } + var arg = service.FileChunkCheckVo { + UserId: userM["id"].(string), + FileName: filename, + Identifier: identifier, + RelativePath: relativePath, + TotalChunks: totalChunks, + ChunkNumber: chunkNumber, + ChunkSize: chunkSize, + CurrentChunkSize:currentChunkSize, + } + var sv service.SysService + if b := sv.CheckUpdateFile(&arg);b { + c.String(http.StatusOK,"found") + } else { + c.String(http.StatusNoContent,"") + } +} + +// @Security ApiKeyAuth +// @Summary 绯荤粺鏇存柊鍖呬笂浼� +// @Description 绯荤粺鏇存柊鍖呬笂浼� +// @Accept multipart/form-data +// @Produce json +// @Tags sysset +// @Param chunkNumber formData int true "褰撳墠鏄鍑犱釜鍒嗗潡" +// @Param chunkSize formData int true "姣忎竴鍧楃殑澶у皬" +// @Param currentChunkSize formData int true "褰撳墠鍧楃殑澶у皬" +// @Param totalSize formData string true "鏂囦欢鎬诲ぇ灏�" +// @Param identifier formData string true "鏁翠釜鏂囦欢鐨勫敮涓�鏍囪瘑锛岀洰鍓嶆槸md5" +// @Param filename formData string true "鏂囦欢鍚嶇О" +// @Param relativePath formData string true "鏂囦欢鍦ㄥ鎴风鐢佃剳鐨勮矾寰�" +// @Param totalChunks formData int true "鏂囦欢鎬诲潡鏁�" +// @Param file formData file true "鏂囦欢鍒嗙墖鍐呭" +// @Success 200 {string} json "{"code":200, msg:"", success:true}" +// @Failure 500 {string} json "{"code":500, msg:"", success:false}" +// @Router /data/api-v/sysset/patchUpdate [post] +func (sset SysSetController) PatchUpdate(c *gin.Context) { + authDriver := auth.GenerateAuthDriver() + userM := (*authDriver).User(c) + if userM == nil { + util.ResponseFormat(c, code.TokenNotFound, "鐧诲綍杩囨湡锛岃鐧诲綍") + return + } + chunkNumber, e1 := strconv.Atoi(c.Request.FormValue("chunkNumber")) + chunkSize, e2 := strconv.Atoi(c.Request.FormValue("chunkSize")) + currentChunkSize, e3 := strconv.Atoi(c.Request.FormValue("currentChunkSize")) + totalSize, e4 := strconv.ParseInt(c.Request.FormValue("totalSize"), 10, 64) + identifier := c.Request.FormValue("identifier") + filename := c.Request.FormValue("filename") + relativePath := c.Request.FormValue("relativePath") + totalChunks, e5 := strconv.Atoi(c.Request.FormValue("totalChunks")) + file, header, e6 := c.Request.FormFile("file") + if identifier == "" || e1 != nil || e2 != nil || e3 != nil || e4 != nil || e5 != nil || e6 != nil { + util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎") + return + } + var arg = service.FileUploadVo{ + UserId: userM["id"].(string), + FileName: filename, + Identifier: identifier, + RelativePath: relativePath, + TotalSize: totalSize, + TotalChunks: totalChunks, + ChunkNumber: chunkNumber, + ChunkSize: chunkSize, + CurrentChunkSize: currentChunkSize, + File: &file, + Header: header, + } + var sv service.SysService + if b := sv.PatchUpload(&arg); b { + util.ResponseFormat(c, code.Success, "") + } else { + util.ResponseFormat(c, code.ComError, "") + } +} + + +// @Security ApiKeyAuth +// @Summary 寮�濮嬪崌绾� +// @Description 寮�濮嬪崌绾� +// @Accept multipart/form-data +// @Produce json +// @Tags sysset +// @Param identifier formData string true "鏁翠釜鏂囦欢鐨勫敮涓�鏍囪瘑锛岀洰鍓嶆槸md5" +// @Param filename formData string true "鏂囦欢鍚嶇О" +// @Success 200 {string} json "{"code":200, msg:"", success:true}" +// @Failure 500 {string} json "{"code":500, msg:"", success:false}" +// @Router /data/api-v/sysset/upgrade [post] +func (sset SysSetController) Upgrade(c *gin.Context) { + identifier := c.Request.FormValue("identifier") + filename := c.Request.FormValue("filename") + if identifier == "" || filename == "" { + util.ResponseFormat(c,code.RequestParamError,"") + return + } + var sv service.SysService + if b,err := sv.Upgrade(identifier, filename);b { + util.ResponseFormat(c,code.UpgradeSuccess,"鍗囩骇鎴愬姛") + } else { + util.ResponseFormat(c,code.UpgradeFail,err.Error()) } } \ No newline at end of file diff --git a/extend/code/code.go b/extend/code/code.go index 3ef6457..4e7ef5a 100644 --- a/extend/code/code.go +++ b/extend/code/code.go @@ -65,4 +65,7 @@ CreateFirstNodeErr = &Code{http.StatusInternalServerError, false, "鍒涘缓鑺傜偣澶辫触锛�"} QueryClusterInfoErr = &Code{http.StatusInternalServerError, false, "鏌ヨ澶辫触锛岃纭鎮ㄧ殑ip鏄纭殑锛�"} AddClusterInfoErr = &Code{http.StatusInternalServerError, false, "鍔犲叆鑺傜偣澶辫触锛�"} + + UpgradeSuccess = &Code{http.StatusOK, true, "鍗囩骇鎴愬姛"} + UpgradeFail = &Code{http.StatusInternalServerError, false, "鍗囩骇澶辫触"} ) diff --git a/extend/config/config.go b/extend/config/config.go index 32e4f13..48aa484 100644 --- a/extend/config/config.go +++ b/extend/config/config.go @@ -29,6 +29,8 @@ SudoPassword string `mapstructure: "sudoPassword"` //绯荤粺瀵嗙爜 SysThresholds []threshold `mapstructure: "sysThresholds"` PTZSpeed int `mapstructure: "ptzSpeed"` // 浜戝彴绉诲姩閫熷害 + PatchPath string `mapstructure:"patchPath"`//绯荤粺鏇存柊鍖呰矾寰� + BakPath string `mapstructure:"bakPath"`//绯荤粺鏇存柊鍖呰矾寰� } var Server = &server{} diff --git a/extend/util/util.go b/extend/util/util.go index f3dc879..555bc37 100644 --- a/extend/util/util.go +++ b/extend/util/util.go @@ -1,12 +1,19 @@ package util import ( + "archive/zip" "bytes" + "crypto/md5" + "encoding/hex" "encoding/json" "image" + "io" "io/ioutil" "net/http" + "os" + "path/filepath" "strconv" + "time" "webserver/extend/code" "basic.com/pubsub/protomsg.git" @@ -206,3 +213,116 @@ out = out[:n] // compressed data return out, nil } + +// 鍒ゆ柇鎵�缁欒矾寰勬枃浠�/鏂囦欢澶规槸鍚﹀瓨鍦� +func Exists(path string) bool { + if path == "" { + return false + } + _, err := os.Stat(path) //os.Stat鑾峰彇鏂囦欢淇℃伅 + if err != nil { + if os.IsExist(err) { + return true + } + return false + } + return true +} +func CreateDirectory(path string) bool { + if path == "" { + return false + } + if Exists(path) { + return true + } + err := os.MkdirAll(path,os.ModePerm) + if err !=nil { + return false + } + return true +} + +//鏃ユ湡杞瓧绗︿覆 +func FormatDate(date time.Time, layout string) string { + layout = strings.Replace(layout, "yyyy", "2006", 1) + layout = strings.Replace(layout, "yy", "06", 1) + layout = strings.Replace(layout, "MM", "01", 1) + layout = strings.Replace(layout, "dd", "02", 1) + layout = strings.Replace(layout, "HH", "15", 1) + layout = strings.Replace(layout, "mm", "04", 1) + layout = strings.Replace(layout, "ss", "05", 1) + layout = strings.Replace(layout, "SSS", "000", -1) + return date.Format(layout) +} +func ZipCheck(zipPath string) bool { + f, err := os.Open(zipPath) + if err != nil { + return false + } + defer f.Close() + buf := make([]byte, 4) + if n, err := f.Read(buf); err != nil || n < 4 { + return false + } + return bytes.Equal(buf, []byte("PK\x03\x04")) +} +func UnZip(archive, target string) error { + reader, err := zip.OpenReader(archive) + if err != nil { + return err + } + if err := os.MkdirAll(target, 0755); err != nil { + return err + } + for _, file := range reader.File { + path := filepath.Join(target, file.Name) + if file.FileInfo().IsDir() { + os.MkdirAll(path, file.Mode()) + continue + } + fileReader, err := file.Open() + if err != nil { + return err + } + defer fileReader.Close() + targetFile, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, file.Mode()) + if err != nil { + return err + } + defer targetFile.Close() + if _, err := io.Copy(targetFile, fileReader); err != nil { + return err + } + } + + return nil +} + +func FormatNum(oNum int,n int) string { + m := 0 + for { + oNum = oNum / 10 + m++ + if oNum == 0 { + break + } + } + fmtStr := "%0"+strconv.Itoa(m)+"d" + return fmt.Sprintf(fmtStr, n) +} + +func FileMd5(path string) (string,error){ + file, err := os.Open(path) + if err !=nil { + return "",err + } + + defer file.Close() + + _md5 := md5.New() + if _,err := io.Copy(_md5, file);err != nil { + return "",err + } + + return hex.EncodeToString(_md5.Sum(nil)),nil +} \ No newline at end of file diff --git a/extend/util/zip.go b/extend/util/zip.go new file mode 100644 index 0000000..cb44ee3 --- /dev/null +++ b/extend/util/zip.go @@ -0,0 +1,314 @@ +package util + +import ( + "archive/tar" + "basic.com/valib/logger.git" + "compress/gzip" + "errors" + "io" + "io/ioutil" + "os" + "path" + "strings" +) + +//FileName 寰呭帇缂╃殑鏂囦欢鍚� +//DesPathName 鍘嬬缉瀹屼箣鍚庡瓨鏀剧殑鐩綍鍚� +func Gzip(FilePathName, DesPathName string) error { + // 娓呯悊璺緞瀛楃涓� + FilePathName = path.Clean(FilePathName) + // 瑕佽В鍘嬬殑鏂囦欢鍚嶅瓧 + FileName := FilePathName + index := strings.LastIndex(FilePathName, "\\") + if index != -1 { + FileName = FilePathName[index+1:] + } + logger.Debug("鏂囦欢鍚嶇О鏄�", FileName) + //鍒涘缓瀛樻斁鍘嬬缉鏂囦欢鐨勮矾寰�(濡傛灉鏂囦欢澶逛笉瀛樺湪) + + if !dirExists(DesPathName) { + os.MkdirAll(DesPathName, 0777) + } + logger.Debug("鍒涘缓鏂囦欢") + //鍒涘缓鍘嬬缉鏂囦欢 + DesFileName := DesPathName + "\\" + FileName + ".gz" + fw, er := os.Create(DesFileName) + if er != nil { + return er + } + defer fw.Close() + gw := gzip.NewWriter(fw) + defer gw.Close() + + //璇诲彇鏂囦欢鍐呭 + rd := make([]byte, 1024*1024) + rd, err := ioutil.ReadFile(FilePathName) + if err != nil { + logger.Debug("璇诲彇鏂囦欢鍐呯殑鏁版嵁鍑洪敊 err:", err) + return err + } + // 鑾峰彇鏂囦欢鎴栫洰褰曚俊鎭� + fi, err := os.Stat(FilePathName) + if err != nil { + logger.Debug("鑾峰彇鏂囦欢鐨勮缁嗕俊鎭嚭閿� err :", err) + return nil + } + gw.Name = fi.Name() + gw.ModTime = fi.ModTime() + _, err = gw.Write(rd) + if err != nil { + logger.Debug("鍐欏叆鍘嬬缉鏂囦欢鍑洪敊 err:", err) + return err + } + err = gw.Flush() + if err != nil { + logger.Debug("gw.Flush() 鍑洪敊 err:", err) + return err + } + return nil +} +func UnGz(srcGz string, filePath string) error { + fr, err := os.Open(srcGz) + if err != nil { + logger.Debug("open secGZ failed. err:%v", err) + return err + } + gr, err := gzip.NewReader(fr) + if err != nil { + fr.Close() + logger.Debug("create gzip.reader failed. err:%v", err) + return err + } + index := strings.LastIndex(srcGz, ".") + if index == -1 { + gr.Close() + fr.Close() + logger.Debug("find . failed. err:%v", err) + return err + } + fw, err := os.Create(filePath) + if err != nil { + gr.Close() + fr.Close() + logger.Debug("create file failed. err:%v", err) + return err + } + // 鍐欐枃浠� + _, err = io.Copy(fw, gr) + if err != nil { + fw.Close() + gr.Close() + fr.Close() + logger.Debug("write file failed. err:%v", err) + return err + } + fw.Close() + gr.Close() + fr.Close() + //鍒犻櫎gz鍘嬬缉鏂囦欢 + err = os.Remove(srcGz) + if err != nil { + logger.Debug("remove file failed. err:%v", err) + return err + } + return nil +} +// 灏嗘枃浠舵垨鐩綍鎵撳寘鎴� .tar 鏂囦欢 +// src 鏄鎵撳寘鐨勬枃浠舵垨鐩綍鐨勮矾寰� +// dstTar 鏄鐢熸垚鐨� .tar 鏂囦欢鐨勮矾寰� +// failIfExiBst 鏍囪濡傛灉 dstTar 鏂囦欢瀛樺湪锛屾槸鍚︽斁寮冩墦鍖咃紝濡傛灉鍚︼紝鍒欎細瑕嗙洊宸插瓨鍦ㄧ殑鏂囦欢 +func TarGz(src string, dstTar string, failIfExist bool) error { + // 娓呯悊璺緞瀛楃涓� + src = path.Clean(src) + // 鍒ゆ柇瑕佹墦鍖呯殑鏂囦欢鎴栫洰褰曟槸鍚﹀瓨鍦� + if !exists(src) { + return errors.New("瑕佹墦鍖呯殑鏂囦欢鎴栫洰褰曚笉瀛樺湪锛�" + src) + } + // 鍒ゆ柇鐩爣鏂囦欢鏄惁瀛樺湪 + if fileExists(dstTar) { + if failIfExist { // 涓嶈鐩栧凡瀛樺湪鐨勬枃浠� + return errors.New("鐩爣鏂囦欢宸茬粡瀛樺湪锛�" + dstTar) + } else { // 瑕嗙洊宸插瓨鍦ㄧ殑鏂囦欢 + if er := os.Remove(dstTar); er != nil { + return er + } + } + } + // 鍒涘缓绌虹殑鐩爣鏂囦欢 + fw, er := os.Create(dstTar) + if er != nil { + return er + } + defer fw.Close() + gw := gzip.NewWriter(fw) + defer gw.Close() + // 鍒涘缓 tar.Writer锛屾墽琛屾墦鍖呮搷浣� + tw := tar.NewWriter(gw) + var err error + defer func() { + // 杩欓噷瑕佸垽鏂� tw 鏄惁鍏抽棴鎴愬姛锛屽鏋滃叧闂け璐ワ紝鍒� .tar 鏂囦欢鍙兘涓嶅畬鏁� + if er := tw.Close(); er != nil { + err = er + } + }() + // 鑾峰彇鏂囦欢鎴栫洰褰曚俊鎭� + fi, er := os.Stat(src) + if er != nil { + return er + } + // 鑾峰彇瑕佹墦鍖呯殑鏂囦欢鎴栫洰褰曠殑鎵�鍦ㄤ綅缃拰鍚嶇О + srcBase, srcRelative := path.Split(path.Clean(src)) + // 寮�濮嬫墦鍖� + if fi.IsDir() { + logger.Debug("绗竴灞傜洰褰曪細", srcRelative) + tarDir(srcBase, srcRelative, tw, fi) + } else { + tarFile(srcBase, srcRelative, tw, fi) + } + return nil +} +// 鍥犱负瑕佹墽琛岄亶鍘嗘搷浣滐紝鎵�浠ヨ鍗曠嫭鍒涘缓涓�涓嚱鏁� +func tarDir(srcBase, srcRelative string, tw *tar.Writer, fi os.FileInfo) (err error) { + // 鑾峰彇瀹屾暣璺緞 + srcFull := srcBase + srcRelative + logger.Debug("srcFull:", srcFull) + // 鍦ㄧ粨灏炬坊鍔� "/" + last := len(srcRelative) - 1 + if srcRelative[last] != os.PathSeparator { + srcRelative += string(os.PathSeparator) + } + // 鑾峰彇 srcFull 涓嬬殑鏂囦欢鎴栧瓙鐩綍鍒楄〃 + fis, er := ioutil.ReadDir(srcFull) + if er != nil { + return er + } + // 寮�濮嬮亶鍘� + for _, fi := range fis { + if fi.IsDir() { + logger.Debug("涓嬪眰鐩綍") + tarDir(srcBase, srcRelative+fi.Name(), tw, fi) + } else { + logger.Debug("鏄枃浠�") + tarFile(srcBase, srcRelative+fi.Name(), tw, fi) + } + } + return nil +} +// 鍥犱负瑕佸湪 defer 涓叧闂枃浠讹紝鎵�浠ヨ鍗曠嫭鍒涘缓涓�涓嚱鏁� +func tarFile(srcBase, srcRelative string, tw *tar.Writer, fi os.FileInfo) (err error) { + // 鑾峰彇瀹屾暣璺緞 + srcFull := srcBase + srcRelative + logger.Debug("鏂囦欢鐨勫叏璺緞", srcFull) + // 鍐欏叆鏂囦欢淇℃伅 + hdr, er := tar.FileInfoHeader(fi, "") + if er != nil { + return er + } + logger.Debug(srcRelative) + hdr.Name = srcRelative + logger.Debug("鏂囦欢hdr.name", hdr.Name) + if er = tw.WriteHeader(hdr); er != nil { + return er + } + // 鎵撳紑瑕佹墦鍖呯殑鏂囦欢锛屽噯澶囪鍙� + fr, er := os.Open(srcFull) + if er != nil { + return er + } + defer fr.Close() + // 灏嗘枃浠舵暟鎹啓鍏� tw 涓� + if _, er = io.Copy(tw, fr); er != nil { + return er + } + return nil +} + +//瑙e寘 鍙互瑙e帇锛屽帇缂╂枃浠堕噷鏈夋枃浠跺す鐨勶紝涔熷彲浠ヨВ鍘嬪帇缂╂枃浠堕噷鍏ㄦ槸鏂囦欢鐨� +//srcGz寰呰В鍖呮枃浠� +//dstDir 瑙e寘涔嬪悗瀛樻斁鐨勭洰褰� +func UnTarGz(srcGz string, dstDir string) error { + dstDir = path.Clean(dstDir) + string(os.PathSeparator) + //鎵撳紑鍘嬬缉鏂囦欢 + fr, err := os.Open(srcGz) + if err != nil { + return err + } + defer fr.Close() + gw, err := gzip.NewReader(fr) + defer gw.Close() + // 鍒涘缓 tar.Reader 瀵硅薄锛屽噯澶囨墽琛岃В鍖呮搷浣� + // 鍙互鐢� tr.Next() 鏉ラ亶鍘嗗寘涓殑鏂囦欢 + tr := tar.NewReader(gw) + // 閬嶅巻鍖呬腑鐨勬枃浠� + for hdr, er := tr.Next(); er != io.EOF; hdr, er = tr.Next() { + if er != nil { + logger.Debug("--------- er:", er) + return er + } + // 鑾峰彇鏂囦欢淇℃伅 + fi := hdr.FileInfo() + // 鑾峰彇缁濆璺緞 + dstFullPath := dstDir + hdr.Name + logger.Debug("--- dstFullPath:", dstFullPath) + if hdr.Typeflag == tar.TypeDir { + logger.Debug("--- type is floder") + // 鍒涘缓鐩綍 + os.MkdirAll(dstFullPath, fi.Mode().Perm()) + // 璁剧疆鐩綍鏉冮檺 + os.Chmod(dstFullPath, fi.Mode().Perm()) + } else { + logger.Debug(dstFullPath, "--- type is file") + // 鍒涘缓鏂囦欢鎵�鍦ㄧ殑鐩綍 + + strtemp := dstFullPath[:strings.LastIndex(dstFullPath, "\\")+1] + //os.MkdirAll(path.Dir(dstFullPath), os.ModePerm) + + os.MkdirAll(strtemp, os.ModePerm) + // 灏� tr 涓殑鏁版嵁鍐欏叆鏂囦欢涓� + if er := unTarFile(dstFullPath, tr); er != nil { + logger.Debug("unTarFile:",er) + return er + } + // 璁剧疆鏂囦欢鏉冮檺 + os.Chmod(dstFullPath, fi.Mode().Perm()) + } + } + + return nil +} + +// 鍥犱负瑕佸湪 defer 涓叧闂枃浠讹紝鎵�浠ヨ鍗曠嫭鍒涘缓涓�涓嚱鏁� +func unTarFile(dstFile string, tr *tar.Reader) error { + // 鍒涘缓绌烘枃浠讹紝鍑嗗鍐欏叆瑙e寘鍚庣殑鏁版嵁 + fw, er := os.Create(dstFile) + if er != nil { + return er + } + defer fw.Close() + + // 鍐欏叆瑙e寘鍚庣殑鏁版嵁 + _, er = io.Copy(fw, tr) + if er != nil { + return er + } + + return nil +} + +// 鍒ゆ柇妗f鏄惁瀛樺湪 +func exists(name string) bool { + _, err := os.Stat(name) + return err == nil || os.IsExist(err) +} + +// 鍒ゆ柇鏂囦欢鏄惁瀛樺湪 +func fileExists(filename string) bool { + fi, err := os.Stat(filename) + return (err == nil || os.IsExist(err)) && !fi.IsDir() +} + +// 鍒ゆ柇鐩綍鏄惁瀛樺湪 +func dirExists(dirname string) bool { + fi, err := os.Stat(dirname) + return (err == nil || os.IsExist(err)) && fi.IsDir() +} \ No newline at end of file diff --git a/go.mod b/go.mod index e5bd873..9ee1fe0 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ go 1.12 require ( - basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30 // indirect + basic.com/dbapi.git v0.0.0-20191224083228-8018a323ebc3 // indirect basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae // indirect - basic.com/pubsub/protomsg.git v0.0.0-20191217114717-83e84039a99d // indirect + basic.com/pubsub/protomsg.git v0.0.0-20191223033758-3fd9a59b8137 // indirect basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe // indirect basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 basic.com/valib/godraw.git v0.0.0-20191122082247-26e9987cd183 // indirect diff --git a/go.sum b/go.sum index af6558b..eca71e3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30 h1:nesVta2Rf3LAqyFtGAqNOI+Mf9SqHa4gz1Dj38nm5bk= -basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q= +basic.com/dbapi.git v0.0.0-20191224083228-8018a323ebc3 h1:sW+KVl8NguOKbafPou8uNoEBHRcmiKM1lIqB45jucFc= +basic.com/dbapi.git v0.0.0-20191224083228-8018a323ebc3/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q= basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4= basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso= basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b h1:Qh7x2PY3HA9B404Llq+olY5/YlGYrM58bpOHa2CGcro= @@ -8,8 +8,8 @@ basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY= basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae h1:/j1dIDLxzEp51N+ZHZIq1xeYVK9zz8epWEAfw01uWe8= basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw= -basic.com/pubsub/protomsg.git v0.0.0-20191217114717-83e84039a99d h1:8dxtZCRIBdaZwCbqREyRdgXkBqyufK8WJxbrWbNweEA= -basic.com/pubsub/protomsg.git v0.0.0-20191217114717-83e84039a99d/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU= +basic.com/pubsub/protomsg.git v0.0.0-20191223033758-3fd9a59b8137 h1:bvAnC34X/0CjLcubBj2sfHKzYXZXDjnd0LD7pyp1pH0= +basic.com/pubsub/protomsg.git v0.0.0-20191223033758-3fd9a59b8137/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU= basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe h1:uh3u7DuSOw6AwzvPC1EM19sw1Skks1EUJddcbHDKI9M= basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw= basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY= diff --git a/mergeAll.sh b/mergeAll.sh new file mode 100755 index 0000000..8accaf9 --- /dev/null +++ b/mergeAll.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +filepath=$1 +filestore=$2 + +echo "filepath: " $filepath +echo "filestorepath: " $filestore + +if [ ! -f $filestore ]; then + echo "$filestore not exist" +else + rm -f $filestore +fi + +for item in `ls $filepath | sort -n` +do + `cat ${filepath}/${item} >> ${filestore}` + echo "merge ${filepath}/${item} to $filestore ok" +done + +echo "file store ok" \ No newline at end of file diff --git a/router/router.go b/router/router.go index 7bc0328..27db985 100644 --- a/router/router.go +++ b/router/router.go @@ -235,6 +235,9 @@ vsset.GET("/getResourceConfig",ssController.GetResourceConfig) vsset.POST("/saveResourceConfig",ssController.SaveResourceConfig) + vsset.GET("/patchUpdate", ssController.PatchUpdateCheck) + vsset.POST("/patchUpdate", ssController.PatchUpdate) + vsset.POST("/upgrade", ssController.Upgrade) } //绠楁硶搴撴搷浣� diff --git a/service/SysService.go b/service/SysService.go new file mode 100644 index 0000000..1a1f14c --- /dev/null +++ b/service/SysService.go @@ -0,0 +1,286 @@ +package service + +import ( + "basic.com/valib/logger.git" + "bufio" + "errors" + "fmt" + "io/ioutil" + "mime/multipart" + "os" + "os/exec" + "path" + "strings" + "webserver/extend/config" + "webserver/extend/util" +) + +type SysService struct { + +} + +type FileChunkCheckVo struct { + UserId string + ChunkNumber int //褰撳墠鍒嗙墖涓嬫爣,浠�1寮�濮� + ChunkSize int //姣忎竴鍧楃殑澶у皬 + CurrentChunkSize int //褰撳墠鍒嗗潡鐨勫ぇ灏� + FileName string //鏂囦欢鍚嶇О + Identifier string //鏁翠釜鏂囦欢鍞竴鏍囪瘑,md5 + RelativePath string //鏂囦欢瀹㈡埛绔矾寰� + TotalSize int64 //鏂囦欢鎬诲ぇ灏� + TotalChunks int //鎬诲垎鐗囨暟閲� +} + +type FileUploadVo struct { + Id string + UserId string + ChunkNumber int //褰撳墠鍒嗙墖涓嬫爣,浠�1寮�濮� + ChunkSize int //姣忎竴鍧楃殑澶у皬 + CurrentChunkSize int //褰撳墠鍒嗗潡鐨勫ぇ灏� + FileName string //鏂囦欢鍚嶇О + Identifier string //鏁翠釜鏂囦欢鍞竴鏍囪瘑,md5 + RelativePath string //鏂囦欢瀹㈡埛绔矾寰� + TotalSize int64 //鏂囦欢鎬诲ぇ灏� + TotalChunks int //鎬诲垎鐗囨暟閲� + File *multipart.File //褰撳墠鍒嗙墖鐨勬枃浠跺唴瀹� + Header *multipart.FileHeader +} + +func (sv SysService) CheckUpdateFile(arg *FileChunkCheckVo) bool { + configPatchPath := "" + if config.Server.PatchPath != "" { + configPatchPath = config.Server.PatchPath + } else { + configPatchPath = "/opt/vasystem/patch" + } + fileTmpPath := configPatchPath + "/"+arg.Identifier + if !util.Exists(fileTmpPath) { + return false + } + //鍒ゆ柇鍚堟垚鐨勬枃浠舵槸鍚﹀瓨鍦� + index := strings.LastIndex(arg.FileName, ".") + subfix := "" + if index >-1 {//鏈夊悗缂� + subfix = arg.FileName[index:] + } + mergedFilePath := fileTmpPath+subfix + if util.Exists(mergedFilePath) { + return true + } + //鍒ゆ柇鍒嗗潡鏂囦欢鏄惁瀛樺湪 + chunkAlignNum := util.FormatNum(arg.TotalChunks, arg.ChunkNumber) + chunkFilePath := fileTmpPath+"/"+arg.Identifier+"_"+chunkAlignNum + if !util.Exists(chunkFilePath) { + return false + } + if arg.ChunkNumber == arg.TotalChunks { + dirFiles, _ := ioutil.ReadDir(fileTmpPath) + if dirFiles != nil && len(dirFiles) == arg.TotalChunks { + //琛ㄧず鎵�鏈夊垎鍧楅兘涓婁紶浜嗭紝闇�瑕乵erge + if !sv.MergeChunks(fileTmpPath, mergedFilePath) { + return false + } + } + } + return true +} + +func (sv SysService) PatchUpload(arg *FileUploadVo) bool { + configPatchPath := "" + if config.Server.PatchPath != "" { + configPatchPath = config.Server.PatchPath + } else { + configPatchPath = "/opt/vasystem/patch" + } + defer (*arg.File).Close() + if !util.CreateDirectory(configPatchPath) { + return false + } + + filenameWithSuffix := path.Base(arg.Header.Filename) + subfix := path.Ext(filenameWithSuffix) + MD5Str := arg.Identifier + logger.Debug("Identifier:",MD5Str) + fileTmpPath := configPatchPath + "/"+MD5Str + if !util.Exists(fileTmpPath) { + if !util.CreateDirectory(fileTmpPath) { + return false + } + } + chunkAlignNum := util.FormatNum(arg.TotalChunks, arg.ChunkNumber) + fileSavePath := fileTmpPath+"/"+MD5Str+"_"+chunkAlignNum + if util.Exists(fileSavePath) { + rmErr := os.Remove(fileSavePath) + if rmErr != nil { + logger.Debug("rmErr:",rmErr) + return false + } + } + file, e := os.Create(fileSavePath) + if e !=nil { + logger.Debug("os.Create err:",e,"fileSavePath:",fileSavePath) + return false + } + defer file.Close() + writer := bufio.NewWriter(file) + chunkData := make([]byte, arg.Header.Size) + n, err := (*arg.File).ReadAt(chunkData, 0) + if n ==0 || err !=nil { + logger.Debug("read chunkData err:",err,"n:",n) + return false + } + nn, err2 := writer.Write(chunkData) + if nn ==0 || err2 !=nil { + logger.Debug("write chunkData err:",err2,"nn:",nn) + return false + } + if err = writer.Flush(); err != nil { + logger.Debug("write flush err:",err) + } + isComplete := false + dirFiles, _ := ioutil.ReadDir(fileTmpPath) + if dirFiles != nil && len(dirFiles) == arg.TotalChunks { + isComplete = true + } + if isComplete { + if sv.MergeChunks(fileTmpPath,fileTmpPath + subfix) { + logger.Debug("merge all chunks success,identifier:",MD5Str,"fileName:",arg.FileName) + } else { + return false + } + } + return true +} + +//upgrade +func (sv SysService) Upgrade(identifier string,filename string) (bool,error) { + if !bakBeforeUpgrade() { + return false,errors.New("鏇存柊鍓嶅浠藉け璐�") + } + configPatchPath := "" + if config.Server.PatchPath != "" { + configPatchPath = config.Server.PatchPath + } else { + configPatchPath = "/opt/vasystem/patch" + } + + filenameWithSuffix := path.Base(filename) + ext := path.Ext(filenameWithSuffix) + + zipFilePath := configPatchPath + "/"+identifier+ext + if util.Exists(zipFilePath) { + //鏍¢獙md5 + strMd5, e := util.FileMd5(zipFilePath) + if e !=nil || strMd5 == "" { + return false,errors.New("鑾峰彇鍗囩骇鍘嬬缉鍖卪d5澶辫触") + } + if strMd5 == identifier { + if !updatePatch(identifier, ext) { + return false,errors.New("鎵ц鍗囩骇杩囩▼寮傚父,璇风‘瀹氫笂浼犵殑琛ヤ竵鏄痶ar.gz鏍煎紡") + } + return true,nil + + } else { + logger.Debug("strMd5 is", strMd5,"identifier is",identifier,"not equal") + return false,errors.New("鏍¢獙鍗囩骇鏂囦欢澶辫触") + } + } else { + return false,errors.New("鍗囩骇鏂囦欢宸蹭涪澶憋紝璇烽噸鏂颁笂浼�") + } +} + +func bakBeforeUpgrade() bool { + configBakPath := "" + if config.Server.BakPath != "" { + configBakPath = config.Server.BakPath + } else { + configBakPath = "/opt/vasystem/bak" + } + if util.Exists(configBakPath) { + //鍙繚鐣欐渶鏂扮殑鐗堟湰 + if err := os.RemoveAll(configBakPath);err != nil { + return false + } + } + if !util.CreateDirectory(configBakPath) { + return false + } + b, err := ExecCmd("cp -r /opt/vasystem/bin /opt/vasystem/bak") + if err != nil { + logger.Debug("bakBeforeUpgrade result:",string(b),"err:",err) + return false + } + return true +} + +//鏇存柊绯荤粺绋嬪簭 +func updatePatch(identifier string, ext string) bool { + configPatchPath := "" + if config.Server.PatchPath != "" { + configPatchPath = config.Server.PatchPath + } else { + configPatchPath = "/opt/vasystem/patch" + } + //1.瑙e帇缂╂洿鏂板寘 + unPackPath := configPatchPath+"/"+identifier+"_basic/" + if util.Exists(unPackPath) { + //姝ょ増鏈凡缁忔洿鏂拌繃 + rmErr := os.RemoveAll(unPackPath) + if rmErr !=nil { + return false + } + } + if !util.CreateDirectory(unPackPath) { + return false + } + + unPackFilePath := configPatchPath+"/"+identifier+ext + err := util.UnTarGz(unPackFilePath, unPackPath) + if err !=nil { + logger.Debug("UnPack err:",err,"unPackFile:",unPackFilePath) + return false + } + + //濡傛灉閫氱敤鑴氭湰鏈夋洿鏂帮紝鍒欐洿鏂伴�氱敤鑴氭湰 + 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)) + return false + } + } + + //鍒ゆ柇鏇存柊鍖呴噷鏄惁鏈夎ˉ涓佽剼鏈紝濡傛灉鏈夊垯鎵ц锛屽惁鍒欐墽琛寀pdatePatch.sh + updateCmd := fmt.Sprintf("./updatePatch.sh %s %s %s &",unPackPath,unPackFilePath,configPatchPath+"/"+identifier) + if util.Exists(unPackPath+"upgrade.sh") { + updateCmd = fmt.Sprintf("%supgrade.sh %s %s %s &",unPackPath,unPackPath,unPackFilePath,configPatchPath+"/"+identifier) + } + //2.鏇存柊绯荤粺 + b,err := ExecCmd(updateCmd) + if err != nil { + logger.Debug("upgrade err:",err,"result:",string(b),"cmd:",updateCmd) + return false + } else { + logger.Debug("upgrade result:",string(b),"cmd:",updateCmd) + } + return true +} + +func (sv SysService) MergeChunks(chunkPath string, storePath string) bool { + var cmd *exec.Cmd + cmd = exec.Command("/bin/sh", "-c", fmt.Sprintf("./mergeAll.sh %s %s", chunkPath, storePath)) + if b, err := cmd.Output(); err != nil { + logger.Debug("mergeChunks err:", err, "result:", string(b)) + return false + } else { + logger.Debug("mergeChunks result:",string(b),"cmd: ./mergeAll.sh ", chunkPath, storePath) + return true + } +} + +func ExecCmd(cmdStr string) ([]byte,error) { + var cmd *exec.Cmd + cmd = exec.Command("/bin/sh", "-c",cmdStr) + return cmd.Output() +} \ No newline at end of file diff --git a/sysComeBack.sh b/sysComeBack.sh new file mode 100644 index 0000000..5fce24b --- /dev/null +++ b/sysComeBack.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +cd /opt/vasystem/ + +./kill.sh +sleep 2 + +cp -r /opt/vasystem/bak/bin /opt/vasystem/bin + +./daemon.sh -shm + +sleep 2 +echo "backup success" + +exit 0 diff --git a/updatePatch.sh b/updatePatch.sh new file mode 100755 index 0000000..939d793 --- /dev/null +++ b/updatePatch.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +#stop proc +killP() { + pkill $1 + ps aux | grep "$1" | grep -q -v grep + PROCESS_STATUS=$? + if [ $PROCESS_STATUS -ne 0 ]; then + pkill $1 + fi +} +startSdkCompareWithOneParam(){ + number=`ps -ef | grep "sdkCompare" | grep -v grep | wc -l` + if [ $number -ne 2 ]; then + killP sdkCompare + sleep 2 + date +%D-%T" sdkCompare start" + nohup ./sdkCompare $1 >/dev/null 2>&1 & + nohup ./sdkCompare $1 -target=es >/dev/null 2>&1 & + return 1 + else + echo "sdkCompare is exists">>upgrade.out + return 0 + fi + +} +cd /opt/vasystem/bin +patchPath=$1 +zipPath=$2 +chunkPath=$3 +files=$(ls $patchPath) +echo "patchPath: " $patchPath >> upgrade.out +if [ ! -d $patchPath ]; then + echo "$patchPath not exist,patch update fail" >> upgrade.out +else + for item in $files + do + if [ -f $patchPath/$item ]; then + echo "start update proc ${item}" >> upgrade.out + killP $item + sleep 2 + cp $patchPath/$item /opt/vasystem/bin + chmod +x /opt/vasystem/bin/$item + if [ "$item" = "sdkCompare" ]; then + startSdkCompareWithOneParam -e=pro + echo "update ${item} success" >> upgrade.out + elif [ "$item" = "ruleprocess" ]; then + echo "update algorithm" >> upgrade.out + #update algorithm + if [ -d $patchPath/algorithm ]; then + cp -r $patchPath/algorithm /opt/vasystem/bin + fi + nohup ./ruleprocess >/dev/null 2>&1 & + else + nohup ./$item >/dev/null 2>&1 & + echo "update ${item} success" >> upgrade.out + fi + else + if [ "$item" = "dist" ]; then + echo "update web dist" >> upgrade.out + cp -r $patchPath/$item /opt/vasystem/web + else + echo "unknown directory ${item}" >> upgrade.out + fi + fi + done +fi +echo "exec rm -rf ${patchPath} ${zipPath} ${chunkPath}" >> upgrade.out +rm -rf $patchPath $zipPath $chunkPath +echo "rm success" >> upgrade.out +exit 0 \ No newline at end of file -- Gitblit v1.8.0