diff --git a/go.mod b/go.mod index dd706cb..8b22bc8 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( gitlink.org.cn/cloudream/ec v0.0.0 gitlink.org.cn/cloudream/proto v0.0.0 gitlink.org.cn/cloudream/rabbitmq v0.0.0 - gitlink.org.cn/cloudream/utils v0.0.0 google.golang.org/grpc v1.54.0 ) @@ -69,8 +68,6 @@ require ( ) // 运行go mod tidy时需要将下面几行取消注释 -// replace gitlink.org.cn/cloudream/utils => ../utils -// // replace gitlink.org.cn/cloudream/rabbitmq => ../rabbitmq // // replace gitlink.org.cn/cloudream/ec => ../ec diff --git a/internal/config/config.go b/internal/config/config.go index ab2add5..01c797c 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,10 +1,10 @@ package config import ( + "gitlink.org.cn/cloudream/common/utils/config" + "gitlink.org.cn/cloudream/common/utils/ipfs" + "gitlink.org.cn/cloudream/common/utils/logger" racfg "gitlink.org.cn/cloudream/rabbitmq/config" - "gitlink.org.cn/cloudream/utils/config" - "gitlink.org.cn/cloudream/utils/ipfs" - "gitlink.org.cn/cloudream/utils/logger" ) type Config struct { diff --git a/internal/services/client_command_ec.go b/internal/services/client_command_ec.go index fa856b6..c667dfb 100644 --- a/internal/services/client_command_ec.go +++ b/internal/services/client_command_ec.go @@ -10,8 +10,8 @@ import ( "sync" "gitlink.org.cn/cloudream/client/internal/config" + "gitlink.org.cn/cloudream/common/utils" "gitlink.org.cn/cloudream/ec" - "gitlink.org.cn/cloudream/utils" ) func EcWrite(localFilePath string, bucketID int, objectName string, ecName string) error { diff --git a/internal/services/object.go b/internal/services/object.go index 34592ac..a3c70cc 100644 --- a/internal/services/object.go +++ b/internal/services/object.go @@ -7,17 +7,17 @@ import ( "gitlink.org.cn/cloudream/client/internal/config" "gitlink.org.cn/cloudream/common/consts" + mygrpc "gitlink.org.cn/cloudream/common/utils/grpc" + myio "gitlink.org.cn/cloudream/common/utils/io" + log "gitlink.org.cn/cloudream/common/utils/logger" + serder "gitlink.org.cn/cloudream/common/utils/serder" + mysort "gitlink.org.cn/cloudream/common/utils/sort" "gitlink.org.cn/cloudream/db/model" agentcaller "gitlink.org.cn/cloudream/proto" agtcli "gitlink.org.cn/cloudream/rabbitmq/client/agent" ramsg "gitlink.org.cn/cloudream/rabbitmq/message" agtmsg "gitlink.org.cn/cloudream/rabbitmq/message/agent" coormsg "gitlink.org.cn/cloudream/rabbitmq/message/coordinator" - mygrpc "gitlink.org.cn/cloudream/utils/grpc" - myio "gitlink.org.cn/cloudream/utils/io" - log "gitlink.org.cn/cloudream/utils/logger" - serder "gitlink.org.cn/cloudream/utils/serder" - mysort "gitlink.org.cn/cloudream/utils/sort" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/services/service.go b/internal/services/service.go index a50db2f..e2044bf 100644 --- a/internal/services/service.go +++ b/internal/services/service.go @@ -1,8 +1,8 @@ package services import ( + "gitlink.org.cn/cloudream/common/utils/ipfs" racli "gitlink.org.cn/cloudream/rabbitmq/client/coordinator" - "gitlink.org.cn/cloudream/utils/ipfs" ) type Service struct { diff --git a/main.go b/main.go index 2f11940..31e503d 100644 --- a/main.go +++ b/main.go @@ -9,9 +9,9 @@ import ( "gitlink.org.cn/cloudream/client/internal/cmdline" "gitlink.org.cn/cloudream/client/internal/config" "gitlink.org.cn/cloudream/client/internal/services" + "gitlink.org.cn/cloudream/common/utils/ipfs" + log "gitlink.org.cn/cloudream/common/utils/logger" coorcli "gitlink.org.cn/cloudream/rabbitmq/client/coordinator" - "gitlink.org.cn/cloudream/utils/ipfs" - log "gitlink.org.cn/cloudream/utils/logger" ) func main() {