CasaOS - A simple, easy-to-use, elegant open-source Personal Cloud system.
Replace satori/go.uuid with google/uuid (#1573)
Eng Zer Jun27d6dd86e2b2
diff --git a/go.mod b/go.modindex 70a27b9..ec5e5a1 100644--- a/go.mod+++ b/go.mod@@ -19,6 +19,7 @@ require (github.com/golang/mock v1.6.0github.com/gomodule/redigo v1.8.9github.com/google/go-github/v36 v36.0.0+ github.com/google/uuid v1.3.0github.com/googollee/go-socket.io v1.7.0github.com/gorilla/websocket v1.5.0github.com/h2non/filetype v1.1.3@@ -34,7 +35,6 @@ require (github.com/pkg/errors v0.9.1github.com/robfig/cron/v3 v3.0.1github.com/samber/lo v1.38.1- github.com/satori/go.uuid v1.2.0github.com/shirou/gopsutil/v3 v3.23.2github.com/sirupsen/logrus v1.9.3github.com/stretchr/testify v1.8.4@@ -82,7 +82,6 @@ require (github.com/golang/snappy v0.0.4 // indirectgithub.com/google/go-cmp v0.6.0 // indirectgithub.com/google/go-querystring v1.1.0 // indirect- github.com/google/uuid v1.3.0 // indirectgithub.com/gorilla/mux v1.8.0 // indirectgithub.com/invopop/yaml v0.2.0 // indirectgithub.com/jinzhu/inflection v1.0.0 // indirectdiff --git a/go.sum b/go.sumindex 63beb8e..046d48c 100644--- a/go.sum+++ b/go.sum@@ -260,8 +260,6 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRgithub.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=github.com/shirou/gopsutil/v3 v3.23.2 h1:PAWSuiAszn7IhPMBtXsbSCafej7PqUOvY6YywlQUExU=github.com/shirou/gopsutil/v3 v3.23.2/go.mod h1:gv0aQw33GLo3pG8SiWKiQrbDzbRY1K80RyZJ7V4Th1M=github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=diff --git a/route/v1/file.go b/route/v1/file.goindex f07f5cf..e19d670 100644--- a/route/v1/file.go+++ b/route/v1/file.go@@ -29,7 +29,7 @@ import (model2 "github.com/IceWhaleTech/CasaOS/service/model""github.com/gin-gonic/gin"- uuid "github.com/satori/go.uuid"+ "github.com/google/uuid""go.uber.org/zap""github.com/h2non/filetype"@@ -715,7 +715,7 @@ func PostOperateFileOrDir(c *gin.Context) {list.TotalSize = totallist.ProcessedSize = 0- uid := uuid.NewV4().String()+ uid := uuid.NewString()service.FileQueue.Store(uid, list)service.OpStrArr = append(service.OpStrArr, uid)if len(service.OpStrArr) == 1 {@@ -923,7 +923,7 @@ func ConnectWebSocket(c *gin.Context) {peerId := c.Query("peer")writer := c.Writerrequest := c.Request- key := uuid.NewV4().String()+ key := uuid.NewString()//peerModel := service.MyService.Peer().GetPeerByUserAgent(c.Request.UserAgent())peerModel := model2.PeerDriveDBModel{}name := service.GetName(request)