diff --git a/client/internal/accessstat/access_stat.go b/client/internal/accessstat/access_stat.go index c2d3abd..5ce1b6b 100644 --- a/client/internal/accessstat/access_stat.go +++ b/client/internal/accessstat/access_stat.go @@ -6,8 +6,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type AccessStatEventChan = async.UnboundChannel[AccessStatEvent] diff --git a/client/internal/cmdline/bucket.go b/client/internal/cmdline/bucket.go index 015a0fb..71efbca 100644 --- a/client/internal/cmdline/bucket.go +++ b/client/internal/cmdline/bucket.go @@ -6,7 +6,7 @@ import ( "time" "github.com/jedib0t/go-pretty/v6/table" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" ) func BucketListUserBuckets(ctx CommandContext) error { diff --git a/client/internal/cmdline/cache.go b/client/internal/cmdline/cache.go index fa2497a..7340708 100644 --- a/client/internal/cmdline/cache.go +++ b/client/internal/cmdline/cache.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" ) func CacheMovePackage(ctx CommandContext, packageID cdssdk.PackageID, stgID cdssdk.StorageID) error { diff --git a/client/internal/cmdline/commandline.go b/client/internal/cmdline/commandline.go index be4bb06..6e6079c 100644 --- a/client/internal/cmdline/commandline.go +++ b/client/internal/cmdline/commandline.go @@ -2,7 +2,7 @@ package cmdline import ( "github.com/spf13/cobra" - "gitlink.org.cn/cloudream/storage2/client/internal/services" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/services" ) type CommandContext struct { diff --git a/client/internal/cmdline/distlock.go b/client/internal/cmdline/distlock.go index 8655418..1b093b1 100644 --- a/client/internal/cmdline/distlock.go +++ b/client/internal/cmdline/distlock.go @@ -7,7 +7,7 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider" ) // DistLockLock 尝试获取分布式锁。 diff --git a/client/internal/cmdline/getp.go b/client/internal/cmdline/getp.go index e80fcd1..b4175dc 100644 --- a/client/internal/cmdline/getp.go +++ b/client/internal/cmdline/getp.go @@ -12,9 +12,9 @@ import ( "github.com/inhies/go-bytesize" "github.com/spf13/cobra" - "gitlink.org.cn/cloudream/storage2/client/internal/config" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/config" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator" ) func init() { diff --git a/client/internal/cmdline/load.go b/client/internal/cmdline/load.go index d234f9a..824ba8b 100644 --- a/client/internal/cmdline/load.go +++ b/client/internal/cmdline/load.go @@ -8,7 +8,7 @@ import ( "time" "github.com/spf13/cobra" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) func init() { diff --git a/client/internal/cmdline/lsp.go b/client/internal/cmdline/lsp.go index 72698cf..9b64204 100644 --- a/client/internal/cmdline/lsp.go +++ b/client/internal/cmdline/lsp.go @@ -8,7 +8,7 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" ) func init() { diff --git a/client/internal/cmdline/migrate.go b/client/internal/cmdline/migrate.go index 47e534d..f734255 100644 --- a/client/internal/cmdline/migrate.go +++ b/client/internal/cmdline/migrate.go @@ -5,8 +5,8 @@ import ( "os" "github.com/spf13/cobra" - "gitlink.org.cn/cloudream/storage2/client/internal/config" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/config" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/driver/mysql" "gorm.io/gorm" ) diff --git a/client/internal/cmdline/newloadp.go b/client/internal/cmdline/newloadp.go index 8d5decd..40102e5 100644 --- a/client/internal/cmdline/newloadp.go +++ b/client/internal/cmdline/newloadp.go @@ -10,7 +10,7 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" ) func init() { diff --git a/client/internal/cmdline/object.go b/client/internal/cmdline/object.go index ea9b7c3..7b55006 100644 --- a/client/internal/cmdline/object.go +++ b/client/internal/cmdline/object.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" ) // 必须添加的命令函数，用于处理对象上传。 diff --git a/client/internal/cmdline/package.go b/client/internal/cmdline/package.go index 5bb127f..188463e 100644 --- a/client/internal/cmdline/package.go +++ b/client/internal/cmdline/package.go @@ -9,8 +9,8 @@ import ( "time" "github.com/jedib0t/go-pretty/v6/table" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator" ) // PackageListBucketPackages 列出指定存储桶中的所有包裹。 diff --git a/client/internal/cmdline/put.go b/client/internal/cmdline/put.go index e4c5275..f3ab63b 100644 --- a/client/internal/cmdline/put.go +++ b/client/internal/cmdline/put.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/mq" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" ) func init() { diff --git a/client/internal/cmdline/serve.go b/client/internal/cmdline/serve.go index 8298eac..d116480 100644 --- a/client/internal/cmdline/serve.go +++ b/client/internal/cmdline/serve.go @@ -7,22 +7,22 @@ import ( "github.com/spf13/cobra" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/internal/accessstat" - "gitlink.org.cn/cloudream/storage2/client/internal/config" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" - "gitlink.org.cn/cloudream/storage2/client/internal/http" - "gitlink.org.cn/cloudream/storage2/client/internal/metacache" - "gitlink.org.cn/cloudream/storage2/client/internal/mount" - "gitlink.org.cn/cloudream/storage2/client/internal/services" - "gitlink.org.cn/cloudream/storage2/client/internal/uploader" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/models/datamap" - "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/accessstat" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/config" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/http" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/services" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) // 初始化函数，将ServeHTTP命令注册到命令列表中。 diff --git a/client/internal/cmdline/sysevent.go b/client/internal/cmdline/sysevent.go index 9416c79..237b26f 100644 --- a/client/internal/cmdline/sysevent.go +++ b/client/internal/cmdline/sysevent.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/storage2/client/internal/config" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/config" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) func init() { diff --git a/client/internal/cmdline/test.go b/client/internal/cmdline/test.go index 2271ade..c6ff965 100644 --- a/client/internal/cmdline/test.go +++ b/client/internal/cmdline/test.go @@ -11,10 +11,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" ) func init() { diff --git a/client/internal/cmdline/vfstest.go b/client/internal/cmdline/vfstest.go index 2405f92..7673d2a 100644 --- a/client/internal/cmdline/vfstest.go +++ b/client/internal/cmdline/vfstest.go @@ -8,23 +8,23 @@ import ( "github.com/spf13/cobra" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/internal/accessstat" - "gitlink.org.cn/cloudream/storage2/client/internal/config" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" - "gitlink.org.cn/cloudream/storage2/client/internal/http" - "gitlink.org.cn/cloudream/storage2/client/internal/metacache" - "gitlink.org.cn/cloudream/storage2/client/internal/mount" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfstest" - "gitlink.org.cn/cloudream/storage2/client/internal/services" - "gitlink.org.cn/cloudream/storage2/client/internal/uploader" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/models/datamap" - "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/accessstat" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/config" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/http" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfstest" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/services" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) // 初始化函数，将ServeHTTP命令注册到命令列表中。 diff --git a/client/internal/config/config.go b/client/internal/config/config.go index c68e551..af9c61f 100644 --- a/client/internal/config/config.go +++ b/client/internal/config/config.go @@ -5,14 +5,14 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/utils/config" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" - "gitlink.org.cn/cloudream/storage2/client/internal/http" - mntcfg "gitlink.org.cn/cloudream/storage2/client/internal/mount/config" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" - hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/http" + mntcfg "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" + hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" ) type Config struct { diff --git a/client/internal/db/bucket.go b/client/internal/db/bucket.go index ba115f5..77bbb6b 100644 --- a/client/internal/db/bucket.go +++ b/client/internal/db/bucket.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" ) diff --git a/client/internal/db/object.go b/client/internal/db/object.go index 7e6dd77..da48d1c 100644 --- a/client/internal/db/object.go +++ b/client/internal/db/object.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm/clause" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type ObjectDB struct { diff --git a/client/internal/db/object_access_stat.go b/client/internal/db/object_access_stat.go index 9ddcc5a..0bc4a89 100644 --- a/client/internal/db/object_access_stat.go +++ b/client/internal/db/object_access_stat.go @@ -1,7 +1,7 @@ package db import ( - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/client/internal/db/object_block.go b/client/internal/db/object_block.go index 01b7f01..477ddaa 100644 --- a/client/internal/db/object_block.go +++ b/client/internal/db/object_block.go @@ -1,7 +1,7 @@ package db import ( - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm/clause" ) diff --git a/client/internal/db/package.go b/client/internal/db/package.go index f32b6b0..055a7c5 100644 --- a/client/internal/db/package.go +++ b/client/internal/db/package.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" ) diff --git a/client/internal/db/package_access_stat.go b/client/internal/db/package_access_stat.go index 56ff8ec..4a4e7fa 100644 --- a/client/internal/db/package_access_stat.go +++ b/client/internal/db/package_access_stat.go @@ -1,7 +1,7 @@ package db import ( - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/client/internal/db/pinned_object.go b/client/internal/db/pinned_object.go index 057d32b..b0e1532 100644 --- a/client/internal/db/pinned_object.go +++ b/client/internal/db/pinned_object.go @@ -3,7 +3,7 @@ package db import ( "time" - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm/clause" ) diff --git a/client/internal/db/user_space.go b/client/internal/db/user_space.go index d7cb83f..20f06b7 100644 --- a/client/internal/db/user_space.go +++ b/client/internal/db/user_space.go @@ -1,7 +1,7 @@ package db import ( - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type UserSpaceDB struct { diff --git a/client/internal/downloader/downloader.go b/client/internal/downloader/downloader.go index 5250d5f..3053d4e 100644 --- a/client/internal/downloader/downloader.go +++ b/client/internal/downloader/downloader.go @@ -6,11 +6,11 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "gitlink.org.cn/cloudream/common/pkgs/iterator" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" - "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" ) const ( diff --git a/client/internal/downloader/iterator.go b/client/internal/downloader/iterator.go index bdfa1ba..fa12bce 100644 --- a/client/internal/downloader/iterator.go +++ b/client/internal/downloader/iterator.go @@ -11,14 +11,14 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" - "gitlink.org.cn/cloudream/storage2/client/types" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type downloadSpaceInfo struct { diff --git a/client/internal/downloader/lrc.go b/client/internal/downloader/lrc.go index bdafa9a..a59c33c 100644 --- a/client/internal/downloader/lrc.go +++ b/client/internal/downloader/lrc.go @@ -8,7 +8,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" ) func (iter *DownloadObjectIterator) downloadLRCReconstruct(req downloadReqeust2, strg strategy.LRCReconstructStrategy) (io.ReadCloser, error) { diff --git a/client/internal/downloader/lrc_strip_iterator.go b/client/internal/downloader/lrc_strip_iterator.go index 56f33d3..9b94e67 100644 --- a/client/internal/downloader/lrc_strip_iterator.go +++ b/client/internal/downloader/lrc_strip_iterator.go @@ -9,9 +9,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/iterator" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/math2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/parser" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc/parser" ) type LRCStripIterator struct { diff --git a/client/internal/downloader/strategy/selector.go b/client/internal/downloader/strategy/selector.go index 655960f..0837809 100644 --- a/client/internal/downloader/strategy/selector.go +++ b/client/internal/downloader/strategy/selector.go @@ -10,10 +10,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/bitmap" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage2/client/internal/metacache" - "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/consts" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/consts" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type Request struct { diff --git a/client/internal/downloader/strip_iterator.go b/client/internal/downloader/strip_iterator.go index b0c2d84..d44ca74 100644 --- a/client/internal/downloader/strip_iterator.go +++ b/client/internal/downloader/strip_iterator.go @@ -9,9 +9,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/iterator" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" ) type downloadBlock struct { diff --git a/client/internal/http/bucket.go b/client/internal/http/bucket.go index 6ce343f..49b5e75 100644 --- a/client/internal/http/bucket.go +++ b/client/internal/http/bucket.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" + cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" ) type BucketService struct { diff --git a/client/internal/http/cache.go b/client/internal/http/cache.go index cb96596..938c08b 100644 --- a/client/internal/http/cache.go +++ b/client/internal/http/cache.go @@ -8,8 +8,8 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" - cdsapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" + cdsapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" ) type CacheService struct { diff --git a/client/internal/http/config.go b/client/internal/http/config.go index 39b3ba8..c97f912 100644 --- a/client/internal/http/config.go +++ b/client/internal/http/config.go @@ -1,6 +1,6 @@ package http -import "gitlink.org.cn/cloudream/storage2/client/types" +import "gitlink.org.cn/cloudream/jcs-pub/client/types" type Config struct { Enabled bool `json:"enabled"` diff --git a/client/internal/http/mount.go b/client/internal/http/mount.go index 151e91a..8ce13e8 100644 --- a/client/internal/http/mount.go +++ b/client/internal/http/mount.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" + cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" ) type MountService struct { diff --git a/client/internal/http/object.go b/client/internal/http/object.go index 9c8693e..d0dd259 100644 --- a/client/internal/http/object.go +++ b/client/internal/http/object.go @@ -13,9 +13,9 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type ObjectService struct { diff --git a/client/internal/http/package.go b/client/internal/http/package.go index 034d18d..90e0f34 100644 --- a/client/internal/http/package.go +++ b/client/internal/http/package.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) // PackageService 包服务，负责处理包相关的HTTP请求。 diff --git a/client/internal/http/presigned.go b/client/internal/http/presigned.go index a11283f..265c084 100644 --- a/client/internal/http/presigned.go +++ b/client/internal/http/presigned.go @@ -12,8 +12,8 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" ) type PresignedService struct { diff --git a/client/internal/http/server.go b/client/internal/http/server.go index 5bda378..b68b3b1 100644 --- a/client/internal/http/server.go +++ b/client/internal/http/server.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/internal/services" - cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/services" + cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" ) type ServerEventChan = async.UnboundChannel[ServerEvent] diff --git a/client/internal/http/temp.go b/client/internal/http/temp.go index 269182f..ef49525 100644 --- a/client/internal/http/temp.go +++ b/client/internal/http/temp.go @@ -8,7 +8,7 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type TempService struct { diff --git a/client/internal/http/user_space.go b/client/internal/http/user_space.go index a620598..a24d28a 100644 --- a/client/internal/http/user_space.go +++ b/client/internal/http/user_space.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api" + cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" ) type UserSpaceService struct { diff --git a/client/internal/metacache/connectivity.go b/client/internal/metacache/connectivity.go index e8cf4e2..4c415ae 100644 --- a/client/internal/metacache/connectivity.go +++ b/client/internal/metacache/connectivity.go @@ -5,9 +5,9 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func (m *MetaCacheHost) AddConnectivity() *Connectivity { diff --git a/client/internal/metacache/host.go b/client/internal/metacache/host.go index 17def7d..27cf4c3 100644 --- a/client/internal/metacache/host.go +++ b/client/internal/metacache/host.go @@ -3,7 +3,7 @@ package metacache import ( "time" - "gitlink.org.cn/cloudream/storage2/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" ) type MetaCache interface { diff --git a/client/internal/metacache/hubmeta.go b/client/internal/metacache/hubmeta.go index 3b91836..13ff59e 100644 --- a/client/internal/metacache/hubmeta.go +++ b/client/internal/metacache/hubmeta.go @@ -4,9 +4,9 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func (m *MetaCacheHost) AddHubMeta() *HubMeta { diff --git a/client/internal/metacache/storagemeta.go b/client/internal/metacache/storagemeta.go index 754d5c7..5922b61 100644 --- a/client/internal/metacache/storagemeta.go +++ b/client/internal/metacache/storagemeta.go @@ -4,10 +4,10 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/types" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func (m *MetaCacheHost) AddStorageMeta() *UserSpaceMeta { diff --git a/client/internal/mount/fuse/fuse.go b/client/internal/mount/fuse/fuse.go index 012f43b..4700cdf 100644 --- a/client/internal/mount/fuse/fuse.go +++ b/client/internal/mount/fuse/fuse.go @@ -8,7 +8,7 @@ import ( fusefs "github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/config" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config" ) type Fuse struct { diff --git a/client/internal/mount/mount.go b/client/internal/mount/mount.go index 64cec27..191d76e 100644 --- a/client/internal/mount/mount.go +++ b/client/internal/mount/mount.go @@ -2,7 +2,7 @@ package mount import ( "gitlink.org.cn/cloudream/common/pkgs/async" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" ) type MountEventChan = async.UnboundChannel[MountEvent] diff --git a/client/internal/mount/mount_linux.go b/client/internal/mount/mount_linux.go index 0201cfe..2aaead4 100644 --- a/client/internal/mount/mount_linux.go +++ b/client/internal/mount/mount_linux.go @@ -6,13 +6,13 @@ import ( fusefs "github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fuse" "gitlink.org.cn/cloudream/common/pkgs/async" - db2 "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/config" - fuse2 "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs" - "gitlink.org.cn/cloudream/storage2/client/internal/uploader" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + db2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config" + fuse2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type Mount struct { diff --git a/client/internal/mount/mount_win.go b/client/internal/mount/mount_win.go index 2087022..feea75f 100644 --- a/client/internal/mount/mount_win.go +++ b/client/internal/mount/mount_win.go @@ -4,11 +4,11 @@ package mount import ( "gitlink.org.cn/cloudream/common/pkgs/async" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/config" - "gitlink.org.cn/cloudream/storage2/client/internal/uploader" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type Mount struct { diff --git a/client/internal/mount/vfs/cache/cache.go b/client/internal/mount/vfs/cache/cache.go index f046db2..6f43372 100644 --- a/client/internal/mount/vfs/cache/cache.go +++ b/client/internal/mount/vfs/cache/cache.go @@ -15,12 +15,12 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/trie" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/config" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/uploader" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type CacheEntry interface { diff --git a/client/internal/mount/vfs/cache/file.go b/client/internal/mount/vfs/cache/file.go index 8dba53b..8945088 100644 --- a/client/internal/mount/vfs/cache/file.go +++ b/client/internal/mount/vfs/cache/file.go @@ -13,8 +13,8 @@ import ( "gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type FileInfo struct { diff --git a/client/internal/mount/vfs/dir_reader.go b/client/internal/mount/vfs/dir_reader.go index fab0966..309b47e 100644 --- a/client/internal/mount/vfs/dir_reader.go +++ b/client/internal/mount/vfs/dir_reader.go @@ -1,6 +1,6 @@ package vfs -import "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" +import "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" type FuseDirReader struct { allEntries []fuse.FsEntry diff --git a/client/internal/mount/vfs/fuse.go b/client/internal/mount/vfs/fuse.go index 0d35e9b..d012697 100644 --- a/client/internal/mount/vfs/fuse.go +++ b/client/internal/mount/vfs/fuse.go @@ -6,10 +6,10 @@ import ( "time" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" ) diff --git a/client/internal/mount/vfs/fuse_bucket.go b/client/internal/mount/vfs/fuse_bucket.go index 66c4383..81cf786 100644 --- a/client/internal/mount/vfs/fuse_bucket.go +++ b/client/internal/mount/vfs/fuse_bucket.go @@ -6,10 +6,10 @@ import ( "os" "time" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" ) diff --git a/client/internal/mount/vfs/fuse_dir.go b/client/internal/mount/vfs/fuse_dir.go index 8ceb3c7..f8c2c63 100644 --- a/client/internal/mount/vfs/fuse_dir.go +++ b/client/internal/mount/vfs/fuse_dir.go @@ -5,10 +5,10 @@ import ( "os" "time" - db2 "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + db2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" ) diff --git a/client/internal/mount/vfs/fuse_file.go b/client/internal/mount/vfs/fuse_file.go index 97956d3..513009a 100644 --- a/client/internal/mount/vfs/fuse_file.go +++ b/client/internal/mount/vfs/fuse_file.go @@ -4,9 +4,9 @@ import ( "os" "time" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" ) diff --git a/client/internal/mount/vfs/fuse_package.go b/client/internal/mount/vfs/fuse_package.go index 4a51f29..cdd11ca 100644 --- a/client/internal/mount/vfs/fuse_package.go +++ b/client/internal/mount/vfs/fuse_package.go @@ -5,8 +5,8 @@ import ( "os" "time" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" ) type FusePackage struct { diff --git a/client/internal/mount/vfs/fuse_root.go b/client/internal/mount/vfs/fuse_root.go index d53cfaa..2474220 100644 --- a/client/internal/mount/vfs/fuse_root.go +++ b/client/internal/mount/vfs/fuse_root.go @@ -5,10 +5,10 @@ import ( "os" "time" - db2 "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + db2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" "gorm.io/gorm" ) diff --git a/client/internal/mount/vfs/vfs.go b/client/internal/mount/vfs/vfs.go index e5d9441..4236ade 100644 --- a/client/internal/mount/vfs/vfs.go +++ b/client/internal/mount/vfs/vfs.go @@ -1,12 +1,12 @@ package vfs import ( - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/config" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache" - "gitlink.org.cn/cloudream/storage2/client/internal/uploader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" ) type Vfs struct { diff --git a/client/internal/mount/vfstest/fs.go b/client/internal/mount/vfstest/fs.go index 21de64a..0fd5c86 100644 --- a/client/internal/mount/vfstest/fs.go +++ b/client/internal/mount/vfstest/fs.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/internal/mount" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" ) const ( diff --git a/client/internal/services/bucket.go b/client/internal/services/bucket.go index 6c797b3..467b676 100644 --- a/client/internal/services/bucket.go +++ b/client/internal/services/bucket.go @@ -3,7 +3,7 @@ package services import ( "time" - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" ) // BucketService 是对存储桶进行操作的服务类 diff --git a/client/internal/services/cache.go b/client/internal/services/cache.go index b4cd62b..a139d70 100644 --- a/client/internal/services/cache.go +++ b/client/internal/services/cache.go @@ -7,10 +7,10 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - hubmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + hubmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory" ) type CacheService struct { diff --git a/client/internal/services/object.go b/client/internal/services/object.go index f5b7bff..32af672 100644 --- a/client/internal/services/object.go +++ b/client/internal/services/object.go @@ -10,13 +10,13 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/sdk/api" - "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/models/datamap" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/plans" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/plans" "gorm.io/gorm" ) diff --git a/client/internal/services/package.go b/client/internal/services/package.go index 2f8af1d..04cbb48 100644 --- a/client/internal/services/package.go +++ b/client/internal/services/package.go @@ -5,10 +5,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/models/datamap" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" ) // PackageService 提供对包相关操作的服务接口 diff --git a/client/internal/services/service.go b/client/internal/services/service.go index a10be31..75e2ddb 100644 --- a/client/internal/services/service.go +++ b/client/internal/services/service.go @@ -2,14 +2,14 @@ package services import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/client/internal/accessstat" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" - "gitlink.org.cn/cloudream/storage2/client/internal/metacache" - "gitlink.org.cn/cloudream/storage2/client/internal/mount" - "gitlink.org.cn/cloudream/storage2/client/internal/uploader" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/accessstat" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) // Service 结构体封装了分布锁服务和任务管理服务。 diff --git a/client/internal/services/storage.go b/client/internal/services/storage.go index 2b5741e..7ecb93d 100644 --- a/client/internal/services/storage.go +++ b/client/internal/services/storage.go @@ -6,14 +6,14 @@ import ( "path" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy" - "gitlink.org.cn/cloudream/storage2/client/types" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" ) type UserSpaceService struct { diff --git a/client/internal/services/utils.go b/client/internal/services/utils.go index ad7a619..5d61462 100644 --- a/client/internal/services/utils.go +++ b/client/internal/services/utils.go @@ -1,8 +1,8 @@ package services import ( - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/models/datamap" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" ) func getBlockTypeFromRed(red clitypes.Redundancy) string { diff --git a/client/internal/uploader/create_load.go b/client/internal/uploader/create_load.go index 2f18521..e6b0096 100644 --- a/client/internal/uploader/create_load.go +++ b/client/internal/uploader/create_load.go @@ -9,11 +9,11 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" ) type CreateLoadUploader struct { diff --git a/client/internal/uploader/update.go b/client/internal/uploader/update.go index 4465780..606f833 100644 --- a/client/internal/uploader/update.go +++ b/client/internal/uploader/update.go @@ -10,11 +10,11 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" ) type UpdateUploader struct { diff --git a/client/internal/uploader/uploader.go b/client/internal/uploader/uploader.go index 0f0532b..2a749cb 100644 --- a/client/internal/uploader/uploader.go +++ b/client/internal/uploader/uploader.go @@ -12,16 +12,16 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage2/client/internal/db" - "gitlink.org.cn/cloudream/storage2/client/internal/metacache" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" ) type Uploader struct { diff --git a/client/main.go b/client/main.go index e7fc6a6..11a5af1 100644 --- a/client/main.go +++ b/client/main.go @@ -1,7 +1,7 @@ package main import ( - "gitlink.org.cn/cloudream/storage2/client/internal/cmdline" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/cmdline" _ "google.golang.org/grpc/balancer/grpclb" ) diff --git a/client/sdk/api/bucket.go b/client/sdk/api/bucket.go index 8f34668..e4d8151 100644 --- a/client/sdk/api/bucket.go +++ b/client/sdk/api/bucket.go @@ -4,7 +4,7 @@ import ( "net/http" "gitlink.org.cn/cloudream/common/sdks" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type BucketService struct { diff --git a/client/sdk/api/cache.go b/client/sdk/api/cache.go index fbfe92b..7d25ee8 100644 --- a/client/sdk/api/cache.go +++ b/client/sdk/api/cache.go @@ -5,7 +5,7 @@ import ( "net/http" "gitlink.org.cn/cloudream/common/sdks" - cdssdk "gitlink.org.cn/cloudream/storage2/client/types" + cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types" ) const CacheMovePackagePath = "/cache/movePackage" diff --git a/client/sdk/api/mount.go b/client/sdk/api/mount.go index 995e9ff..271e0b3 100644 --- a/client/sdk/api/mount.go +++ b/client/sdk/api/mount.go @@ -4,7 +4,7 @@ import ( "net/http" "gitlink.org.cn/cloudream/common/sdks" - "gitlink.org.cn/cloudream/storage2/client/internal/mount" + "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount" ) type MountService struct { diff --git a/client/sdk/api/object.go b/client/sdk/api/object.go index 1429eee..0f22fb8 100644 --- a/client/sdk/api/object.go +++ b/client/sdk/api/object.go @@ -17,7 +17,7 @@ import ( "gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/storage2/client/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type ObjectService struct { diff --git a/client/sdk/api/package.go b/client/sdk/api/package.go index f17e174..9b5fee6 100644 --- a/client/sdk/api/package.go +++ b/client/sdk/api/package.go @@ -10,7 +10,7 @@ import ( "gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/serder" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type PackageService struct { diff --git a/client/sdk/api/presigned.go b/client/sdk/api/presigned.go index 49a2390..7138851 100644 --- a/client/sdk/api/presigned.go +++ b/client/sdk/api/presigned.go @@ -10,7 +10,7 @@ import ( v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/credentials" "github.com/google/go-querystring/query" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type PresignedService struct { diff --git a/client/sdk/api/storage_test.go b/client/sdk/api/storage_test.go index e2b89b4..6253303 100644 --- a/client/sdk/api/storage_test.go +++ b/client/sdk/api/storage_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" . "github.com/smartystreets/goconvey/convey" "gitlink.org.cn/cloudream/common/pkgs/iterator" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) func Test_PackageGet(t *testing.T) { diff --git a/client/sdk/api/userspace.go b/client/sdk/api/userspace.go index 0890072..f4600be 100644 --- a/client/sdk/api/userspace.go +++ b/client/sdk/api/userspace.go @@ -4,7 +4,7 @@ import ( "net/http" "gitlink.org.cn/cloudream/common/sdks" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) const UserSpaceLoadPackagePath = "/userspace/loadPackage" diff --git a/client/types/types.go b/client/types/types.go index 056822b..0ed56d9 100644 --- a/client/types/types.go +++ b/client/types/types.go @@ -6,7 +6,7 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/utils/sort2" - cotypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cotypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) const ( diff --git a/common/globals/globals.go b/common/globals/globals.go index 6671fde..4f888f1 100644 --- a/common/globals/globals.go +++ b/common/globals/globals.go @@ -1,7 +1,7 @@ package stgglb import ( - "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type LocalMachineInfo struct { diff --git a/common/globals/pools.go b/common/globals/pools.go index 30c46c4..e082a3b 100644 --- a/common/globals/pools.go +++ b/common/globals/pools.go @@ -2,10 +2,10 @@ package stgglb import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - hubmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" - scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner" + hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + hubmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" + scmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner" ) var HubMQPool hubmq.Pool diff --git a/common/globals/stats.go b/common/globals/stats.go index 20a9e1d..e1df01f 100644 --- a/common/globals/stats.go +++ b/common/globals/stats.go @@ -1,5 +1,5 @@ package stgglb -import "gitlink.org.cn/cloudream/storage2/common/pkgs/servicestats" +import "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/servicestats" var Stats servicestats.StatsHost diff --git a/common/globals/utils.go b/common/globals/utils.go index 5797b33..1d9061b 100644 --- a/common/globals/utils.go +++ b/common/globals/utils.go @@ -1,6 +1,6 @@ package stgglb -import cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" +import cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" // 根据当前节点与目标地址的距离关系，选择合适的地址 func SelectGRPCAddress(hub cortypes.Hub, addr cortypes.GRPCAddressInfo) (string, int) { diff --git a/common/models/datamap/datamap.go b/common/models/datamap/datamap.go index 1713ed8..aad10d4 100644 --- a/common/models/datamap/datamap.go +++ b/common/models/datamap/datamap.go @@ -6,8 +6,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/types" "gitlink.org.cn/cloudream/common/utils/serder" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) // 系统事件 diff --git a/common/pkgs/connectivity/collector.go b/common/pkgs/connectivity/collector.go index e551b74..3768330 100644 --- a/common/pkgs/connectivity/collector.go +++ b/common/pkgs/connectivity/collector.go @@ -6,9 +6,9 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type Connectivity struct { diff --git a/common/pkgs/distlock/reqbuilder/metadata.go b/common/pkgs/distlock/reqbuilder/metadata.go index 2d5c333..da2c199 100644 --- a/common/pkgs/distlock/reqbuilder/metadata.go +++ b/common/pkgs/distlock/reqbuilder/metadata.go @@ -1,7 +1,7 @@ package reqbuilder import ( - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider" ) type MetadataLockReqBuilder struct { diff --git a/common/pkgs/distlock/reqbuilder/metadata_object.go b/common/pkgs/distlock/reqbuilder/metadata_object.go index 228070d..fac2328 100644 --- a/common/pkgs/distlock/reqbuilder/metadata_object.go +++ b/common/pkgs/distlock/reqbuilder/metadata_object.go @@ -2,8 +2,8 @@ package reqbuilder import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider" ) type MetadataObjectLockReqBuilder struct { diff --git a/common/pkgs/distlock/reqbuilder/shard_store.go b/common/pkgs/distlock/reqbuilder/shard_store.go index f1907ac..a156582 100644 --- a/common/pkgs/distlock/reqbuilder/shard_store.go +++ b/common/pkgs/distlock/reqbuilder/shard_store.go @@ -4,8 +4,8 @@ import ( "strconv" "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type ShardStoreLockReqBuilder struct { diff --git a/common/pkgs/distlock/reqbuilder/storage.go b/common/pkgs/distlock/reqbuilder/storage.go index 10bf2f2..43179b9 100644 --- a/common/pkgs/distlock/reqbuilder/storage.go +++ b/common/pkgs/distlock/reqbuilder/storage.go @@ -4,8 +4,8 @@ import ( "strconv" "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type StorageLockReqBuilder struct { diff --git a/common/pkgs/distlock/service.go b/common/pkgs/distlock/service.go index a90c303..3308028 100644 --- a/common/pkgs/distlock/service.go +++ b/common/pkgs/distlock/service.go @@ -3,7 +3,7 @@ package distlock import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/trie" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider" ) type Service = distlock.Service diff --git a/common/pkgs/ioswitch2/fromto.go b/common/pkgs/ioswitch2/fromto.go index 74f7af0..9fba25e 100644 --- a/common/pkgs/ioswitch2/fromto.go +++ b/common/pkgs/ioswitch2/fromto.go @@ -3,8 +3,8 @@ package ioswitch2 import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/client/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/client/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type From interface { diff --git a/common/pkgs/ioswitch2/http_hub_worker.go b/common/pkgs/ioswitch2/http_hub_worker.go index ab64acc..9b02aca 100644 --- a/common/pkgs/ioswitch2/http_hub_worker.go +++ b/common/pkgs/ioswitch2/http_hub_worker.go @@ -8,8 +8,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/utils/io2" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type HttpHubWorker struct { diff --git a/common/pkgs/ioswitch2/hub_worker.go b/common/pkgs/ioswitch2/hub_worker.go index b791ae2..83176f4 100644 --- a/common/pkgs/ioswitch2/hub_worker.go +++ b/common/pkgs/ioswitch2/hub_worker.go @@ -8,9 +8,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/types" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/serder" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo]( diff --git a/common/pkgs/ioswitch2/ops2/bypass.go b/common/pkgs/ioswitch2/ops2/bypass.go index 9ef200e..96971f6 100644 --- a/common/pkgs/ioswitch2/ops2/bypass.go +++ b/common/pkgs/ioswitch2/ops2/bypass.go @@ -5,9 +5,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/driver.go b/common/pkgs/ioswitch2/ops2/driver.go index 9d89659..92a8b98 100644 --- a/common/pkgs/ioswitch2/ops2/driver.go +++ b/common/pkgs/ioswitch2/ops2/driver.go @@ -4,7 +4,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" ) // TODO 想办法直接使用ops里的Node，而不是重新实现一遍 diff --git a/common/pkgs/ioswitch2/ops2/ec.go b/common/pkgs/ioswitch2/ops2/ec.go index 3658177..151fc22 100644 --- a/common/pkgs/ioswitch2/ops2/ec.go +++ b/common/pkgs/ioswitch2/ops2/ec.go @@ -11,10 +11,10 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sync2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ec" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ec" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/multipart.go b/common/pkgs/ioswitch2/ops2/multipart.go index af10b1a..fa7bba2 100644 --- a/common/pkgs/ioswitch2/ops2/multipart.go +++ b/common/pkgs/ioswitch2/ops2/multipart.go @@ -7,9 +7,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" log "gitlink.org.cn/cloudream/common/pkgs/logger" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/ops.go b/common/pkgs/ioswitch2/ops2/ops.go index 993db54..b3efae8 100644 --- a/common/pkgs/ioswitch2/ops2/ops.go +++ b/common/pkgs/ioswitch2/ops2/ops.go @@ -3,7 +3,7 @@ package ops2 import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan/ops" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" ) type GraphNodeBuilder struct { diff --git a/common/pkgs/ioswitch2/ops2/public_store.go b/common/pkgs/ioswitch2/ops2/public_store.go index 1229c76..06227fd 100644 --- a/common/pkgs/ioswitch2/ops2/public_store.go +++ b/common/pkgs/ioswitch2/ops2/public_store.go @@ -6,9 +6,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/logger" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/s2s.go b/common/pkgs/ioswitch2/ops2/s2s.go index 6d1864b..9a73438 100644 --- a/common/pkgs/ioswitch2/ops2/s2s.go +++ b/common/pkgs/ioswitch2/ops2/s2s.go @@ -5,9 +5,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/shard_store.go b/common/pkgs/ioswitch2/ops2/shard_store.go index 55da375..f7f970c 100644 --- a/common/pkgs/ioswitch2/ops2/shard_store.go +++ b/common/pkgs/ioswitch2/ops2/shard_store.go @@ -9,10 +9,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/parser/gen/generator.go b/common/pkgs/ioswitch2/parser/gen/generator.go index 3701586..6b73dac 100644 --- a/common/pkgs/ioswitch2/parser/gen/generator.go +++ b/common/pkgs/ioswitch2/parser/gen/generator.go @@ -7,11 +7,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) // 检查使用不同编码时参数是否设置到位 diff --git a/common/pkgs/ioswitch2/parser/opt/chunked.go b/common/pkgs/ioswitch2/parser/opt/chunked.go index 06325f9..def199a 100644 --- a/common/pkgs/ioswitch2/parser/opt/chunked.go +++ b/common/pkgs/ioswitch2/parser/opt/chunked.go @@ -2,8 +2,8 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" ) // 删除输出流未被使用的Join指令 diff --git a/common/pkgs/ioswitch2/parser/opt/ec.go b/common/pkgs/ioswitch2/parser/opt/ec.go index cbb43b3..3d718df 100644 --- a/common/pkgs/ioswitch2/parser/opt/ec.go +++ b/common/pkgs/ioswitch2/parser/opt/ec.go @@ -3,11 +3,11 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) // 减少未使用的Multiply指令的输出流。如果减少到0，则删除该指令 diff --git a/common/pkgs/ioswitch2/parser/opt/misc.go b/common/pkgs/ioswitch2/parser/opt/misc.go index 90726db..14bd217 100644 --- a/common/pkgs/ioswitch2/parser/opt/misc.go +++ b/common/pkgs/ioswitch2/parser/opt/misc.go @@ -3,8 +3,8 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" ) // 删除未使用的From流，不会删除FromDriver diff --git a/common/pkgs/ioswitch2/parser/opt/multipart.go b/common/pkgs/ioswitch2/parser/opt/multipart.go index 6e96c99..07534f2 100644 --- a/common/pkgs/ioswitch2/parser/opt/multipart.go +++ b/common/pkgs/ioswitch2/parser/opt/multipart.go @@ -3,9 +3,9 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory" ) // 将SegmentJoin指令替换成分片上传指令 diff --git a/common/pkgs/ioswitch2/parser/opt/pin.go b/common/pkgs/ioswitch2/parser/opt/pin.go index f580273..6be5050 100644 --- a/common/pkgs/ioswitch2/parser/opt/pin.go +++ b/common/pkgs/ioswitch2/parser/opt/pin.go @@ -2,7 +2,7 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" ) // 通过流的输入输出位置来确定指令的执行位置。 diff --git a/common/pkgs/ioswitch2/parser/opt/s2s.go b/common/pkgs/ioswitch2/parser/opt/s2s.go index 686e87d..d0bc6a2 100644 --- a/common/pkgs/ioswitch2/parser/opt/s2s.go +++ b/common/pkgs/ioswitch2/parser/opt/s2s.go @@ -1,10 +1,10 @@ package opt import ( - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory" ) // 将直接从一个存储服务传到另一个存储服务的过程换成S2S传输 diff --git a/common/pkgs/ioswitch2/parser/opt/segment.go b/common/pkgs/ioswitch2/parser/opt/segment.go index e4e8670..b33fd7e 100644 --- a/common/pkgs/ioswitch2/parser/opt/segment.go +++ b/common/pkgs/ioswitch2/parser/opt/segment.go @@ -2,8 +2,8 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" ) // 删除未使用的SegmentJoin diff --git a/common/pkgs/ioswitch2/parser/parser.go b/common/pkgs/ioswitch2/parser/parser.go index 5adc636..05d6fc7 100644 --- a/common/pkgs/ioswitch2/parser/parser.go +++ b/common/pkgs/ioswitch2/parser/parser.go @@ -3,10 +3,10 @@ package parser import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/gen" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/opt" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/gen" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/opt" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser/state" ) func Parse(ft ioswitch2.FromTo, blder *exec.PlanBuilder) error { diff --git a/common/pkgs/ioswitch2/parser/state/state.go b/common/pkgs/ioswitch2/parser/state/state.go index e5c6244..2fd63cc 100644 --- a/common/pkgs/ioswitch2/parser/state/state.go +++ b/common/pkgs/ioswitch2/parser/state/state.go @@ -3,8 +3,8 @@ package state import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" ) type IndexedStream struct { diff --git a/common/pkgs/ioswitch2/plans/complete_multipart.go b/common/pkgs/ioswitch2/plans/complete_multipart.go index 95485f8..d2cd88b 100644 --- a/common/pkgs/ioswitch2/plans/complete_multipart.go +++ b/common/pkgs/ioswitch2/plans/complete_multipart.go @@ -3,9 +3,9 @@ package plans import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) func CompleteMultipart(blocks []clitypes.ObjectBlock, blockSpaces []clitypes.UserSpaceDetail, targetSpace clitypes.UserSpaceDetail, shardInfoKey string, blder *exec.PlanBuilder) error { diff --git a/common/pkgs/ioswitch2/plans/utils.go b/common/pkgs/ioswitch2/plans/utils.go index 25f2285..1eacd84 100644 --- a/common/pkgs/ioswitch2/plans/utils.go +++ b/common/pkgs/ioswitch2/plans/utils.go @@ -2,8 +2,8 @@ package plans import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func getWorkerInfo(hub cortypes.Hub) exec.WorkerInfo { diff --git a/common/pkgs/ioswitchlrc/fromto.go b/common/pkgs/ioswitchlrc/fromto.go index a60cc72..b93c496 100644 --- a/common/pkgs/ioswitchlrc/fromto.go +++ b/common/pkgs/ioswitchlrc/fromto.go @@ -3,8 +3,8 @@ package ioswitchlrc import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/utils/math2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type From interface { diff --git a/common/pkgs/ioswitchlrc/hub_worker.go b/common/pkgs/ioswitchlrc/hub_worker.go index 7c6b703..e4cd5b9 100644 --- a/common/pkgs/ioswitchlrc/hub_worker.go +++ b/common/pkgs/ioswitchlrc/hub_worker.go @@ -5,9 +5,9 @@ import ( "io" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) // var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo]( diff --git a/common/pkgs/ioswitchlrc/ops2/ec.go b/common/pkgs/ioswitchlrc/ops2/ec.go index 88d00a4..ebf66a0 100644 --- a/common/pkgs/ioswitchlrc/ops2/ec.go +++ b/common/pkgs/ioswitchlrc/ops2/ec.go @@ -10,9 +10,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/utils" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/sync2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ec" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ec/lrc" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ec" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ec/lrc" ) func init() { diff --git a/common/pkgs/ioswitchlrc/ops2/shard_store.go b/common/pkgs/ioswitchlrc/ops2/shard_store.go index 18f670f..9ff5a75 100644 --- a/common/pkgs/ioswitchlrc/ops2/shard_store.go +++ b/common/pkgs/ioswitchlrc/ops2/shard_store.go @@ -9,10 +9,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitchlrc/parser/generator.go b/common/pkgs/ioswitchlrc/parser/generator.go index 688a5fe..e152656 100644 --- a/common/pkgs/ioswitchlrc/parser/generator.go +++ b/common/pkgs/ioswitchlrc/parser/generator.go @@ -7,9 +7,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan" "gitlink.org.cn/cloudream/common/utils/math2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/ops2" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc/ops2" ) type GenerateContext struct { diff --git a/common/pkgs/ioswitchlrc/parser/passes.go b/common/pkgs/ioswitchlrc/parser/passes.go index 5587c67..c54bc00 100644 --- a/common/pkgs/ioswitchlrc/parser/passes.go +++ b/common/pkgs/ioswitchlrc/parser/passes.go @@ -6,10 +6,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) // 计算输入流的打开范围。会把流的范围按条带大小取整 diff --git a/common/pkgs/mq/coordinator/client.go b/common/pkgs/mq/coordinator/client.go index 350e163..01326aa 100644 --- a/common/pkgs/mq/coordinator/client.go +++ b/common/pkgs/mq/coordinator/client.go @@ -4,7 +4,7 @@ import ( "sync" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" + stgmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq" ) type Client struct { diff --git a/common/pkgs/mq/coordinator/hub.go b/common/pkgs/mq/coordinator/hub.go index d634c0b..0a0bc14 100644 --- a/common/pkgs/mq/coordinator/hub.go +++ b/common/pkgs/mq/coordinator/hub.go @@ -2,7 +2,7 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type HubService interface { diff --git a/common/pkgs/mq/coordinator/server.go b/common/pkgs/mq/coordinator/server.go index 3def4b1..06214f4 100644 --- a/common/pkgs/mq/coordinator/server.go +++ b/common/pkgs/mq/coordinator/server.go @@ -3,7 +3,7 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/utils/sync2" - mymq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" + mymq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq" ) // Service 协调端接口 diff --git a/common/pkgs/mq/coordinator/storage.go b/common/pkgs/mq/coordinator/storage.go index 07c0bc4..fc77423 100644 --- a/common/pkgs/mq/coordinator/storage.go +++ b/common/pkgs/mq/coordinator/storage.go @@ -2,7 +2,7 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type StorageService interface { diff --git a/common/pkgs/mq/hub/client.go b/common/pkgs/mq/hub/client.go index fe64671..209f613 100644 --- a/common/pkgs/mq/hub/client.go +++ b/common/pkgs/mq/hub/client.go @@ -4,8 +4,8 @@ import ( "sync" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type Client struct { diff --git a/common/pkgs/mq/hub/server.go b/common/pkgs/mq/hub/server.go index 4d3edc8..827c324 100644 --- a/common/pkgs/mq/hub/server.go +++ b/common/pkgs/mq/hub/server.go @@ -3,8 +3,8 @@ package hub import ( "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/utils/sync2" - mymq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + mymq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type Service interface { diff --git a/common/pkgs/mq/scanner/client.go b/common/pkgs/mq/scanner/client.go index 58dc6d0..de92534 100644 --- a/common/pkgs/mq/scanner/client.go +++ b/common/pkgs/mq/scanner/client.go @@ -4,7 +4,7 @@ import ( "sync" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" + stgmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq" ) type Client struct { diff --git a/common/pkgs/mq/scanner/event.go b/common/pkgs/mq/scanner/event.go index 88997bb..7759240 100644 --- a/common/pkgs/mq/scanner/event.go +++ b/common/pkgs/mq/scanner/event.go @@ -2,7 +2,7 @@ package scanner import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" ) type EventService interface { diff --git a/common/pkgs/mq/scanner/server.go b/common/pkgs/mq/scanner/server.go index df9e940..5be32b1 100644 --- a/common/pkgs/mq/scanner/server.go +++ b/common/pkgs/mq/scanner/server.go @@ -3,7 +3,7 @@ package scanner import ( "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/utils/sync2" - mymq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" + mymq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq" ) // Service 协调端接口 diff --git a/common/pkgs/servicestats/hub_strorage_transfer.go b/common/pkgs/servicestats/hub_strorage_transfer.go index 9fcbe22..72c02d1 100644 --- a/common/pkgs/servicestats/hub_strorage_transfer.go +++ b/common/pkgs/servicestats/hub_strorage_transfer.go @@ -6,7 +6,7 @@ import ( "time" "gitlink.org.cn/cloudream/common/utils/math2" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type HubStorageTransferStats struct { diff --git a/common/pkgs/servicestats/hub_transfter.go b/common/pkgs/servicestats/hub_transfter.go index 58e6ec3..774c233 100644 --- a/common/pkgs/servicestats/hub_transfter.go +++ b/common/pkgs/servicestats/hub_transfter.go @@ -6,7 +6,7 @@ import ( "time" "gitlink.org.cn/cloudream/common/utils/math2" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type HubTransferStats struct { diff --git a/common/pkgs/servicestats/service_stats.go b/common/pkgs/servicestats/service_stats.go index 55c7414..996afed 100644 --- a/common/pkgs/servicestats/service_stats.go +++ b/common/pkgs/servicestats/service_stats.go @@ -4,7 +4,7 @@ import ( "sync" "time" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type StatsHost struct { diff --git a/common/pkgs/storage/all.go b/common/pkgs/storage/all.go index 7cb77db..d86b9bb 100644 --- a/common/pkgs/storage/all.go +++ b/common/pkgs/storage/all.go @@ -2,8 +2,8 @@ package storage import ( // !!! 需要导入所有存储服务的包 !!! - _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/efile" - _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/local" - _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/mashup" - _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/obs" + _ "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/efile" + _ "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/local" + _ "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/mashup" + _ "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/obs" ) diff --git a/common/pkgs/storage/efile/ec_multiplier.go b/common/pkgs/storage/efile/ec_multiplier.go index 0f3ff68..548c4c8 100644 --- a/common/pkgs/storage/efile/ec_multiplier.go +++ b/common/pkgs/storage/efile/ec_multiplier.go @@ -9,9 +9,9 @@ import ( "gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/os2" "gitlink.org.cn/cloudream/common/utils/serder" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type ECMultiplier struct { diff --git a/common/pkgs/storage/efile/efile.go b/common/pkgs/storage/efile/efile.go index 3a18339..e6754b8 100644 --- a/common/pkgs/storage/efile/efile.go +++ b/common/pkgs/storage/efile/efile.go @@ -8,11 +8,11 @@ import ( "gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/serder" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/utils" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func init() { diff --git a/common/pkgs/storage/factory/factory.go b/common/pkgs/storage/factory/factory.go index 9a78cf0..9d51ea6 100644 --- a/common/pkgs/storage/factory/factory.go +++ b/common/pkgs/storage/factory/factory.go @@ -3,10 +3,10 @@ package factory import ( "reflect" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + _ "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) // 此函数永远不会返回nil。如果找不到对应的Builder，则会返回EmptyBuilder， diff --git a/common/pkgs/storage/factory/reg/reg.go b/common/pkgs/storage/factory/reg/reg.go index c602d23..286bd6d 100644 --- a/common/pkgs/storage/factory/reg/reg.go +++ b/common/pkgs/storage/factory/reg/reg.go @@ -4,9 +4,9 @@ import ( "reflect" "gitlink.org.cn/cloudream/common/utils/reflect2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type BuilderCtor func(detail *clitypes.UserSpaceDetail) types.StorageBuilder diff --git a/common/pkgs/storage/local/local.go b/common/pkgs/storage/local/local.go index 6d4aa2b..8cda82b 100644 --- a/common/pkgs/storage/local/local.go +++ b/common/pkgs/storage/local/local.go @@ -3,11 +3,11 @@ package local import ( "fmt" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/utils" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func init() { diff --git a/common/pkgs/storage/local/multipart_upload.go b/common/pkgs/storage/local/multipart_upload.go index 0c1479b..4e1e98c 100644 --- a/common/pkgs/storage/local/multipart_upload.go +++ b/common/pkgs/storage/local/multipart_upload.go @@ -12,9 +12,9 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/os2" "gitlink.org.cn/cloudream/common/utils/sort2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type Multiparter struct { diff --git a/common/pkgs/storage/local/public_store.go b/common/pkgs/storage/local/public_store.go index cf471e4..443d3b4 100644 --- a/common/pkgs/storage/local/public_store.go +++ b/common/pkgs/storage/local/public_store.go @@ -7,7 +7,7 @@ import ( "path/filepath" "gitlink.org.cn/cloudream/common/pkgs/logger" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type PublicStore struct { diff --git a/common/pkgs/storage/local/s2s.go b/common/pkgs/storage/local/s2s.go index 735b043..74a5fcc 100644 --- a/common/pkgs/storage/local/s2s.go +++ b/common/pkgs/storage/local/s2s.go @@ -8,8 +8,8 @@ import ( "path/filepath" "gitlink.org.cn/cloudream/common/utils/os2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type S2STransfer struct { diff --git a/common/pkgs/storage/local/shard_store.go b/common/pkgs/storage/local/shard_store.go index e8ea7a3..2472462 100644 --- a/common/pkgs/storage/local/shard_store.go +++ b/common/pkgs/storage/local/shard_store.go @@ -13,9 +13,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) const ( diff --git a/common/pkgs/storage/mashup/mashup.go b/common/pkgs/storage/mashup/mashup.go index c6a3ecd..7304ab6 100644 --- a/common/pkgs/storage/mashup/mashup.go +++ b/common/pkgs/storage/mashup/mashup.go @@ -3,10 +3,10 @@ package mashup import ( "fmt" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func init() { diff --git a/common/pkgs/storage/obs/obs.go b/common/pkgs/storage/obs/obs.go index fcc1ec7..2005f0c 100644 --- a/common/pkgs/storage/obs/obs.go +++ b/common/pkgs/storage/obs/obs.go @@ -6,12 +6,12 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/s3" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" - s3stg "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/s3" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory/reg" + s3stg "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/s3" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/utils" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func init() { diff --git a/common/pkgs/storage/obs/obs_test.go b/common/pkgs/storage/obs/obs_test.go index 4a200c5..f7f255f 100644 --- a/common/pkgs/storage/obs/obs_test.go +++ b/common/pkgs/storage/obs/obs_test.go @@ -5,8 +5,8 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func Test_S2S(t *testing.T) { diff --git a/common/pkgs/storage/obs/s2s.go b/common/pkgs/storage/obs/s2s.go index 12c650c..a24f5ce 100644 --- a/common/pkgs/storage/obs/s2s.go +++ b/common/pkgs/storage/obs/s2s.go @@ -11,9 +11,9 @@ import ( "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/oms/v2/model" omsregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/oms/v2/region" "gitlink.org.cn/cloudream/common/utils/os2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/s3" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/s3" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type S2STransfer struct { diff --git a/common/pkgs/storage/obs/shard_store.go b/common/pkgs/storage/obs/shard_store.go index 63c5452..dd6e13b 100644 --- a/common/pkgs/storage/obs/shard_store.go +++ b/common/pkgs/storage/obs/shard_store.go @@ -3,10 +3,10 @@ package obs import ( awss3 "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/huaweicloud/huaweicloud-sdk-go-obs/obs" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/s3" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/s3" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type ShardStore struct { diff --git a/common/pkgs/storage/pool/pool.go b/common/pkgs/storage/pool/pool.go index 2402c7a..cedacb4 100644 --- a/common/pkgs/storage/pool/pool.go +++ b/common/pkgs/storage/pool/pool.go @@ -4,10 +4,10 @@ import ( "sync" "gitlink.org.cn/cloudream/common/pkgs/async" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type userSpace struct { diff --git a/common/pkgs/storage/s3/multipart_upload.go b/common/pkgs/storage/s3/multipart_upload.go index b20cb10..9d1c62d 100644 --- a/common/pkgs/storage/s3/multipart_upload.go +++ b/common/pkgs/storage/s3/multipart_upload.go @@ -12,9 +12,9 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/os2" "gitlink.org.cn/cloudream/common/utils/sort2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type Multiparter struct { diff --git a/common/pkgs/storage/s3/public_store.go b/common/pkgs/storage/s3/public_store.go index c3f675a..baa41fc 100644 --- a/common/pkgs/storage/s3/public_store.go +++ b/common/pkgs/storage/s3/public_store.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" "gitlink.org.cn/cloudream/common/pkgs/logger" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type PublicStore struct { diff --git a/common/pkgs/storage/s3/s3.go b/common/pkgs/storage/s3/s3.go index 9f882b0..3263aca 100644 --- a/common/pkgs/storage/s3/s3.go +++ b/common/pkgs/storage/s3/s3.go @@ -6,11 +6,11 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/s3" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/utils" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func init() { diff --git a/common/pkgs/storage/s3/shard_store.go b/common/pkgs/storage/s3/shard_store.go index c9905f3..53d7873 100644 --- a/common/pkgs/storage/s3/shard_store.go +++ b/common/pkgs/storage/s3/shard_store.go @@ -16,9 +16,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/os2" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types" ) const ( diff --git a/common/pkgs/storage/types/bypass.go b/common/pkgs/storage/types/bypass.go index 9e3f141..4d46562 100644 --- a/common/pkgs/storage/types/bypass.go +++ b/common/pkgs/storage/types/bypass.go @@ -1,7 +1,7 @@ package types import ( - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) // 通过旁路上传后的文件的信息 diff --git a/common/pkgs/storage/types/empty_builder.go b/common/pkgs/storage/types/empty_builder.go index 64f06b9..105cdf9 100644 --- a/common/pkgs/storage/types/empty_builder.go +++ b/common/pkgs/storage/types/empty_builder.go @@ -3,7 +3,7 @@ package types import ( "fmt" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type EmptyBuilder struct { diff --git a/common/pkgs/storage/types/s2s.go b/common/pkgs/storage/types/s2s.go index 9db3c98..d9b4d93 100644 --- a/common/pkgs/storage/types/s2s.go +++ b/common/pkgs/storage/types/s2s.go @@ -3,7 +3,7 @@ package types import ( "context" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type S2STransfer interface { diff --git a/common/pkgs/storage/types/shard_store.go b/common/pkgs/storage/types/shard_store.go index c16cef9..2385543 100644 --- a/common/pkgs/storage/types/shard_store.go +++ b/common/pkgs/storage/types/shard_store.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - clitypes "gitlink.org.cn/cloudream/storage2/client/types" + clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types" ) type Status interface { diff --git a/common/pkgs/storage/utils/utils.go b/common/pkgs/storage/utils/utils.go index fc87547..2fb3fa0 100644 --- a/common/pkgs/storage/utils/utils.go +++ b/common/pkgs/storage/utils/utils.go @@ -1,7 +1,7 @@ package utils import ( - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func FindFeature[T cortypes.StorageFeature](detail cortypes.Storage) T { diff --git a/common/pkgs/sysevent/publisher.go b/common/pkgs/sysevent/publisher.go index e22b649..b4c11e7 100644 --- a/common/pkgs/sysevent/publisher.go +++ b/common/pkgs/sysevent/publisher.go @@ -7,7 +7,7 @@ import ( "github.com/streadway/amqp" "gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/storage2/common/models/datamap" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" ) type PublisherEventChan = async.UnboundChannel[PublisherEvent] diff --git a/common/pkgs/sysevent/sysevent.go b/common/pkgs/sysevent/sysevent.go index ed5bf12..ef73a7c 100644 --- a/common/pkgs/sysevent/sysevent.go +++ b/common/pkgs/sysevent/sysevent.go @@ -1,7 +1,7 @@ package sysevent import ( - "gitlink.org.cn/cloudream/storage2/common/models/datamap" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" ) const ( diff --git a/coordinator/internal/cmd/migrate.go b/coordinator/internal/cmd/migrate.go index a7723cf..d4e6663 100644 --- a/coordinator/internal/cmd/migrate.go +++ b/coordinator/internal/cmd/migrate.go @@ -5,8 +5,8 @@ import ( "os" "github.com/spf13/cobra" - "gitlink.org.cn/cloudream/storage2/coordinator/internal/config" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/config" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" "gorm.io/driver/mysql" "gorm.io/gorm" ) diff --git a/coordinator/internal/cmd/serve.go b/coordinator/internal/cmd/serve.go index 8603b07..469d977 100644 --- a/coordinator/internal/cmd/serve.go +++ b/coordinator/internal/cmd/serve.go @@ -7,11 +7,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" - "gitlink.org.cn/cloudream/storage2/coordinator/internal/config" - "gitlink.org.cn/cloudream/storage2/coordinator/internal/db" - mymq "gitlink.org.cn/cloudream/storage2/coordinator/internal/mq" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/config" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/db" + mymq "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/mq" ) func serve(configPath string) { diff --git a/coordinator/internal/config/config.go b/coordinator/internal/config/config.go index dc1daf0..5608e3d 100644 --- a/coordinator/internal/config/config.go +++ b/coordinator/internal/config/config.go @@ -4,7 +4,7 @@ import ( log "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" c "gitlink.org.cn/cloudream/common/utils/config" - "gitlink.org.cn/cloudream/storage2/coordinator/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/db" ) type Config struct { diff --git a/coordinator/internal/db/hub.go b/coordinator/internal/db/hub.go index 065a877..767d701 100644 --- a/coordinator/internal/db/hub.go +++ b/coordinator/internal/db/hub.go @@ -3,7 +3,7 @@ package db import ( "time" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type HubDB struct { diff --git a/coordinator/internal/db/hub_connectivity.go b/coordinator/internal/db/hub_connectivity.go index 754c4b9..62945f4 100644 --- a/coordinator/internal/db/hub_connectivity.go +++ b/coordinator/internal/db/hub_connectivity.go @@ -1,7 +1,7 @@ package db import ( - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" "gorm.io/gorm/clause" ) diff --git a/coordinator/internal/db/location.go b/coordinator/internal/db/location.go index d4bfe2c..38c0af8 100644 --- a/coordinator/internal/db/location.go +++ b/coordinator/internal/db/location.go @@ -3,7 +3,7 @@ package db import ( "fmt" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type LocationDB struct { diff --git a/coordinator/internal/db/storage.go b/coordinator/internal/db/storage.go index 41a06a3..1d3a0d7 100644 --- a/coordinator/internal/db/storage.go +++ b/coordinator/internal/db/storage.go @@ -1,7 +1,7 @@ package db import ( - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type StorageDB struct { diff --git a/coordinator/internal/db/user.go b/coordinator/internal/db/user.go index a9fd156..90c542c 100644 --- a/coordinator/internal/db/user.go +++ b/coordinator/internal/db/user.go @@ -1,7 +1,7 @@ package db import ( - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" "gorm.io/gorm" ) diff --git a/coordinator/internal/mq/hub.go b/coordinator/internal/mq/hub.go index a91f7ed..5ddd286 100644 --- a/coordinator/internal/mq/hub.go +++ b/coordinator/internal/mq/hub.go @@ -6,8 +6,8 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func (svc *Service) GetHubConfig(msg *coormq.GetHubConfig) (*coormq.GetHubConfigResp, *mq.CodeMessage) { diff --git a/coordinator/internal/mq/service.go b/coordinator/internal/mq/service.go index 4a05373..e562299 100644 --- a/coordinator/internal/mq/service.go +++ b/coordinator/internal/mq/service.go @@ -1,7 +1,7 @@ package mq import ( - "gitlink.org.cn/cloudream/storage2/coordinator/internal/db" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/db" ) type Service struct { diff --git a/coordinator/internal/mq/storage.go b/coordinator/internal/mq/storage.go index 308b7b7..06a97e6 100644 --- a/coordinator/internal/mq/storage.go +++ b/coordinator/internal/mq/storage.go @@ -7,9 +7,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage2/coordinator/internal/db" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/db" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) func (svc *Service) GetStorageDetails(msg *coormq.GetStorageDetails) (*coormq.GetStorageDetailsResp, *mq.CodeMessage) { diff --git a/coordinator/main.go b/coordinator/main.go index 55895be..cf79ecd 100644 --- a/coordinator/main.go +++ b/coordinator/main.go @@ -1,7 +1,7 @@ package main import ( - "gitlink.org.cn/cloudream/storage2/coordinator/internal/cmd" + "gitlink.org.cn/cloudream/jcs-pub/coordinator/internal/cmd" ) func main() { diff --git a/go.mod b/go.mod index 4aa275a..7870688 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlink.org.cn/cloudream/storage2 +module gitlink.org.cn/cloudream/jcs-pub go 1.23.0 diff --git a/hub/internal/cmd/serve.go b/hub/internal/cmd/serve.go index 85827a5..89193c8 100644 --- a/hub/internal/cmd/serve.go +++ b/hub/internal/cmd/serve.go @@ -8,27 +8,27 @@ import ( "github.com/go-co-op/gocron/v2" "github.com/spf13/cobra" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" - "gitlink.org.cn/cloudream/storage2/hub/internal/http" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/hub/internal/http" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/models/datamap" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" - hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" - "gitlink.org.cn/cloudream/storage2/hub/internal/config" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/models/datamap" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock" + hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" + "gitlink.org.cn/cloudream/jcs-pub/hub/internal/config" "google.golang.org/grpc" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - hubmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + hubmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" - grpcsvc "gitlink.org.cn/cloudream/storage2/hub/internal/grpc" - cmdsvc "gitlink.org.cn/cloudream/storage2/hub/internal/mq" + grpcsvc "gitlink.org.cn/cloudream/jcs-pub/hub/internal/grpc" + cmdsvc "gitlink.org.cn/cloudream/jcs-pub/hub/internal/mq" ) func init() { @@ -37,7 +37,7 @@ func init() { cmd := &cobra.Command{ Use: "serve", - Short: "start storage2 hub service", + Short: "start jcs-pub hub service", Run: func(cmd *cobra.Command, args []string) { serve(configPath, httpAddr) }, diff --git a/hub/internal/config/config.go b/hub/internal/config/config.go index dd58079..3a126e1 100644 --- a/hub/internal/config/config.go +++ b/hub/internal/config/config.go @@ -5,10 +5,10 @@ import ( log "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" c "gitlink.org.cn/cloudream/common/utils/config" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc" - cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc" + cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types" ) type Config struct { diff --git a/hub/internal/grpc/io.go b/hub/internal/grpc/io.go index 137cdc6..d0b8edf 100644 --- a/hub/internal/grpc/io.go +++ b/hub/internal/grpc/io.go @@ -11,7 +11,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/serder" - hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" + hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" ) func (s *Service) ExecuteIOPlan(ctx context.Context, req *hubrpc.ExecuteIOPlanReq) (*hubrpc.ExecuteIOPlanResp, error) { diff --git a/hub/internal/grpc/ping.go b/hub/internal/grpc/ping.go index 84443a7..7103901 100644 --- a/hub/internal/grpc/ping.go +++ b/hub/internal/grpc/ping.go @@ -3,7 +3,7 @@ package grpc import ( "context" - hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" + hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" ) // Ping 是一个RPC方法，用于验证服务的可用性。 diff --git a/hub/internal/grpc/service.go b/hub/internal/grpc/service.go index 7a75b85..64bf4a7 100644 --- a/hub/internal/grpc/service.go +++ b/hub/internal/grpc/service.go @@ -2,8 +2,8 @@ package grpc import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - hubserver "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" + hubserver "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" ) type Service struct { diff --git a/hub/internal/http/hub_io.go b/hub/internal/http/hub_io.go index eda4478..813737e 100644 --- a/hub/internal/http/hub_io.go +++ b/hub/internal/http/hub_io.go @@ -16,7 +16,7 @@ import ( "gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/serder" - hubapi "gitlink.org.cn/cloudream/storage2/hub/sdk/api" + hubapi "gitlink.org.cn/cloudream/jcs-pub/hub/sdk/api" ) type IOService struct { diff --git a/hub/internal/http/server.go b/hub/internal/http/server.go index 9a13bec..db861f2 100644 --- a/hub/internal/http/server.go +++ b/hub/internal/http/server.go @@ -3,7 +3,7 @@ package http import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/pkgs/logger" - hubapi "gitlink.org.cn/cloudream/storage2/hub/sdk/api" + hubapi "gitlink.org.cn/cloudream/jcs-pub/hub/sdk/api" ) type Server struct { diff --git a/hub/internal/http/service.go b/hub/internal/http/service.go index 5cc8ffe..b5b5bed 100644 --- a/hub/internal/http/service.go +++ b/hub/internal/http/service.go @@ -2,7 +2,7 @@ package http import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" ) type Service struct { diff --git a/hub/internal/mq/hub.go b/hub/internal/mq/hub.go index 1ef13f4..8abac81 100644 --- a/hub/internal/mq/hub.go +++ b/hub/internal/mq/hub.go @@ -2,7 +2,7 @@ package mq import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - hubmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" + hubmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" ) func (svc *Service) GetState(msg *hubmq.GetState) (*hubmq.GetStateResp, *mq.CodeMessage) { diff --git a/hub/internal/mq/service.go b/hub/internal/mq/service.go index 0b1397c..dbb2c15 100644 --- a/hub/internal/mq/service.go +++ b/hub/internal/mq/service.go @@ -1,7 +1,7 @@ package mq import ( - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool" ) type Service struct { diff --git a/hub/internal/mq/storage.go b/hub/internal/mq/storage.go index db2f2f2..9fc80b0 100644 --- a/hub/internal/mq/storage.go +++ b/hub/internal/mq/storage.go @@ -5,9 +5,9 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - hubmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + hubmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" ) func (svc *Service) StorageCreatePackage(msg *hubmq.StorageCreatePackage) (*hubmq.StorageCreatePackageResp, *mq.CodeMessage) { diff --git a/hub/internal/task/cache_move_package.go b/hub/internal/task/cache_move_package.go index 0d0a433..44b422f 100644 --- a/hub/internal/task/cache_move_package.go +++ b/hub/internal/task/cache_move_package.go @@ -8,10 +8,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/task" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" ) type CacheMovePackage struct { diff --git a/hub/internal/task/create_package.go b/hub/internal/task/create_package.go index 568ffcd..906de3f 100644 --- a/hub/internal/task/create_package.go +++ b/hub/internal/task/create_package.go @@ -10,9 +10,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/task" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" - "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" ) // CreatePackageResult 定义创建包的结果结构 diff --git a/hub/internal/task/task.go b/hub/internal/task/task.go index 146a4b7..78342b1 100644 --- a/hub/internal/task/task.go +++ b/hub/internal/task/task.go @@ -4,11 +4,11 @@ package task import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/task" - "gitlink.org.cn/cloudream/storage2/common/pkgs/accessstat" - "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/hubpool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/accessstat" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/downloader" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/hubpool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/uploader" ) // TaskContext 定义了任务执行的上下文环境，包含分布式锁服务、IO开关和网络连接状态收集器 diff --git a/hub/internal/tickevent/report_hub_stats.go b/hub/internal/tickevent/report_hub_stats.go index deaf697..b2698f1 100644 --- a/hub/internal/tickevent/report_hub_stats.go +++ b/hub/internal/tickevent/report_hub_stats.go @@ -3,10 +3,10 @@ package tickevent /* import ( "gitlink.org.cn/cloudream/common/utils/math2" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - stgmod "gitlink.org.cn/cloudream/storage2/common/models" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/hubpool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + stgmod "gitlink.org.cn/cloudream/jcs-pub/common/models" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/hubpool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) func ReportHubTransferStats(evtPub *sysevent.Publisher) { diff --git a/hub/internal/tickevent/report_storage_stats.go b/hub/internal/tickevent/report_storage_stats.go index 662b66e..19e2c40 100644 --- a/hub/internal/tickevent/report_storage_stats.go +++ b/hub/internal/tickevent/report_storage_stats.go @@ -2,9 +2,9 @@ package tickevent /* import ( - stgmod "gitlink.org.cn/cloudream/storage2/common/models" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/hubpool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + stgmod "gitlink.org.cn/cloudream/jcs-pub/common/models" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/hubpool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) func ReportStorageStats(hubPool *hubpool.HubPool, evtPub *sysevent.Publisher) { diff --git a/hub/main.go b/hub/main.go index 75b4835..75a7651 100644 --- a/hub/main.go +++ b/hub/main.go @@ -1,8 +1,8 @@ package main import ( - _ "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/hub/internal/cmd" + _ "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/hub/internal/cmd" ) func main() { diff --git a/scanner/internal/config/config.go b/scanner/internal/config/config.go index 85c4bbc..1e4dd33 100644 --- a/scanner/internal/config/config.go +++ b/scanner/internal/config/config.go @@ -5,7 +5,7 @@ import ( log "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" c "gitlink.org.cn/cloudream/common/utils/config" - db "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/config" + db "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/db2/config" ) type Config struct { diff --git a/scanner/internal/event/agent_check_shardstore.go b/scanner/internal/event/agent_check_shardstore.go index d3694bf..a196c0f 100644 --- a/scanner/internal/event/agent_check_shardstore.go +++ b/scanner/internal/event/agent_check_shardstore.go @@ -7,11 +7,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" - agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/db2" + agtmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" ) // HubCheckShardStore 代表一个用于处理代理缓存检查事件的结构体 diff --git a/scanner/internal/event/agent_check_state.go b/scanner/internal/event/agent_check_state.go index 9a5f87d..727c862 100644 --- a/scanner/internal/event/agent_check_state.go +++ b/scanner/internal/event/agent_check_state.go @@ -6,11 +6,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - "gitlink.org.cn/cloudream/storage2/common/consts" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage2/scanner/internal/config" + "gitlink.org.cn/cloudream/jcs-pub/common/consts" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + agtmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/config" ) type HubCheckState struct { diff --git a/scanner/internal/event/agent_shardstore_gc.go b/scanner/internal/event/agent_shardstore_gc.go index 290e364..1f974a0 100644 --- a/scanner/internal/event/agent_shardstore_gc.go +++ b/scanner/internal/event/agent_shardstore_gc.go @@ -7,12 +7,12 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/db2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/reqbuilder" - agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + agtmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" ) // HubShardStoreGC 类封装了扫描器事件中的HubShardStoreGC结构。 diff --git a/scanner/internal/event/check_package_redundancy.go b/scanner/internal/event/check_package_redundancy.go index 9923608..f660a35 100644 --- a/scanner/internal/event/check_package_redundancy.go +++ b/scanner/internal/event/check_package_redundancy.go @@ -12,17 +12,17 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sort2" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - stgmod "gitlink.org.cn/cloudream/storage2/common/models" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" - lrcparser "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/parser" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage2/scanner/internal/config" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + stgmod "gitlink.org.cn/cloudream/jcs-pub/common/models" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc" + lrcparser "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc/parser" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/config" ) type CheckPackageRedundancy struct { diff --git a/scanner/internal/event/clean_pinned.go b/scanner/internal/event/clean_pinned.go index d4fd6d0..ad14a2e 100644 --- a/scanner/internal/event/clean_pinned.go +++ b/scanner/internal/event/clean_pinned.go @@ -16,15 +16,15 @@ import ( "gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage2/common/consts" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - stgmod "gitlink.org.cn/cloudream/storage2/common/models" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" - coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/common/consts" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + stgmod "gitlink.org.cn/cloudream/jcs-pub/common/models" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser" + coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" ) type CleanPinned struct { diff --git a/scanner/internal/event/event.go b/scanner/internal/event/event.go index 97da54e..a548772 100644 --- a/scanner/internal/event/event.go +++ b/scanner/internal/event/event.go @@ -7,10 +7,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" event "gitlink.org.cn/cloudream/common/pkgs/event" "gitlink.org.cn/cloudream/common/pkgs/typedispatcher" - "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/db2" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" ) type ExecuteArgs struct { diff --git a/scanner/internal/event/update_package_access_stat_amount.go b/scanner/internal/event/update_package_access_stat_amount.go index 8a45e94..667a48f 100644 --- a/scanner/internal/event/update_package_access_stat_amount.go +++ b/scanner/internal/event/update_package_access_stat_amount.go @@ -5,8 +5,8 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/pkgs/logger" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage2/scanner/internal/config" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/config" ) type UpdatePackageAccessStatAmount struct { diff --git a/scanner/internal/mq/event.go b/scanner/internal/mq/event.go index 657d69e..7717e5c 100644 --- a/scanner/internal/mq/event.go +++ b/scanner/internal/mq/event.go @@ -2,8 +2,8 @@ package mq import ( "gitlink.org.cn/cloudream/common/pkgs/logger" - scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner" - "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + scmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) func (svc *Service) PostEvent(msg *scmq.PostEvent) { diff --git a/scanner/internal/mq/service.go b/scanner/internal/mq/service.go index 0afcc27..37b12c3 100644 --- a/scanner/internal/mq/service.go +++ b/scanner/internal/mq/service.go @@ -1,7 +1,7 @@ package mq import ( - "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) type Service struct { diff --git a/scanner/internal/tickevent/batch_all_agent_check_shardstore.go b/scanner/internal/tickevent/batch_all_agent_check_shardstore.go index 3c4322a..3c43f7f 100644 --- a/scanner/internal/tickevent/batch_all_agent_check_shardstore.go +++ b/scanner/internal/tickevent/batch_all_agent_check_shardstore.go @@ -3,8 +3,8 @@ package tickevent import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) const HUB_CHECK_CACHE_BATCH_SIZE = 2 diff --git a/scanner/internal/tickevent/batch_check_package_redudancy.go b/scanner/internal/tickevent/batch_check_package_redudancy.go index 48a4796..363173b 100644 --- a/scanner/internal/tickevent/batch_check_package_redudancy.go +++ b/scanner/internal/tickevent/batch_check_package_redudancy.go @@ -4,8 +4,8 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - evt "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + evt "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) const ( diff --git a/scanner/internal/tickevent/batch_clean_pinned.go b/scanner/internal/tickevent/batch_clean_pinned.go index 92c508c..00360e2 100644 --- a/scanner/internal/tickevent/batch_clean_pinned.go +++ b/scanner/internal/tickevent/batch_clean_pinned.go @@ -4,8 +4,8 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - evt "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + evt "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) type BatchCleanPinned struct { diff --git a/scanner/internal/tickevent/check_agent_state.go b/scanner/internal/tickevent/check_agent_state.go index 2195f1b..92cb73e 100644 --- a/scanner/internal/tickevent/check_agent_state.go +++ b/scanner/internal/tickevent/check_agent_state.go @@ -2,8 +2,8 @@ package tickevent import ( "gitlink.org.cn/cloudream/common/pkgs/logger" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) type CheckHubState struct { diff --git a/scanner/internal/tickevent/storage_gc.go b/scanner/internal/tickevent/storage_gc.go index 80ae417..7d9031f 100644 --- a/scanner/internal/tickevent/storage_gc.go +++ b/scanner/internal/tickevent/storage_gc.go @@ -5,8 +5,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + scevt "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) type StorageGC struct { diff --git a/scanner/internal/tickevent/tick_event.go b/scanner/internal/tickevent/tick_event.go index 8f9cd8d..734233b 100644 --- a/scanner/internal/tickevent/tick_event.go +++ b/scanner/internal/tickevent/tick_event.go @@ -2,8 +2,8 @@ package tickevent import ( tickevent "gitlink.org.cn/cloudream/common/pkgs/tickevent" - mydb "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + mydb "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/db2" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) type ExecuteArgs struct { diff --git a/scanner/internal/tickevent/update_all_package_access_stat_amount.go b/scanner/internal/tickevent/update_all_package_access_stat_amount.go index 32ca817..9221112 100644 --- a/scanner/internal/tickevent/update_all_package_access_stat_amount.go +++ b/scanner/internal/tickevent/update_all_package_access_stat_amount.go @@ -4,8 +4,8 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" - evt "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner/event" + evt "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" ) type UpdateAllPackageAccessStatAmount struct { diff --git a/scanner/main.go b/scanner/main.go index 7155b3a..0b3391d 100644 --- a/scanner/main.go +++ b/scanner/main.go @@ -6,18 +6,18 @@ import ( "os" "gitlink.org.cn/cloudream/common/pkgs/logger" - stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - stgmod "gitlink.org.cn/cloudream/storage2/common/models" - "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" - agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub" - scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner" - "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" - "gitlink.org.cn/cloudream/storage2/scanner/internal/config" - "gitlink.org.cn/cloudream/storage2/scanner/internal/event" - "gitlink.org.cn/cloudream/storage2/scanner/internal/mq" - "gitlink.org.cn/cloudream/storage2/scanner/internal/tickevent" + stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals" + stgmod "gitlink.org.cn/cloudream/jcs-pub/common/models" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/db2" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock" + agtrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub" + scmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/config" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/event" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/mq" + "gitlink.org.cn/cloudream/jcs-pub/scanner/internal/tickevent" ) func main() {