diff --git a/internal/config/config.go b/internal/config/config.go index 02939b3..e6acbce 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,8 +1,8 @@ package config import ( - "gitlink.org.cn/cloudream/common/pkg/distlock" - log "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/distlock" + log "gitlink.org.cn/cloudream/common/pkgs/logger" c "gitlink.org.cn/cloudream/common/utils/config" db "gitlink.org.cn/cloudream/storage-common/pkgs/db/config" racfg "gitlink.org.cn/cloudream/storage-common/pkgs/mq/config" diff --git a/internal/event/agent_check_cache.go b/internal/event/agent_check_cache.go index 047dfcc..24261eb 100644 --- a/internal/event/agent_check_cache.go +++ b/internal/event/agent_check_cache.go @@ -5,9 +5,9 @@ import ( "time" "github.com/samber/lo" - "gitlink.org.cn/cloudream/common/pkg/distlock/reqbuilder" - "gitlink.org.cn/cloudream/common/pkg/logger" - "gitlink.org.cn/cloudream/common/pkg/mq" + "gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/common/pkgs/logger" + "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model" "gitlink.org.cn/cloudream/storage-scanner/internal/config" diff --git a/internal/event/agent_check_state.go b/internal/event/agent_check_state.go index 77050aa..257f9a3 100644 --- a/internal/event/agent_check_state.go +++ b/internal/event/agent_check_state.go @@ -5,9 +5,9 @@ import ( "time" "github.com/samber/lo" - "gitlink.org.cn/cloudream/common/pkg/distlock/reqbuilder" - "gitlink.org.cn/cloudream/common/pkg/logger" - "gitlink.org.cn/cloudream/common/pkg/mq" + "gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/common/pkgs/logger" + "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/storage-common/consts" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model" agtcli "gitlink.org.cn/cloudream/storage-common/pkgs/mq/client/agent" diff --git a/internal/event/agent_check_storage.go b/internal/event/agent_check_storage.go index 9dc2981..8306b3d 100644 --- a/internal/event/agent_check_storage.go +++ b/internal/event/agent_check_storage.go @@ -5,9 +5,9 @@ import ( "time" "github.com/samber/lo" - "gitlink.org.cn/cloudream/common/pkg/distlock/reqbuilder" - "gitlink.org.cn/cloudream/common/pkg/logger" - "gitlink.org.cn/cloudream/common/pkg/mq" + "gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/common/pkgs/logger" + "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/storage-common/consts" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model" agtcli "gitlink.org.cn/cloudream/storage-common/pkgs/mq/client/agent" diff --git a/internal/event/check_cache.go b/internal/event/check_cache.go index 4d7ee90..e4d0bcb 100644 --- a/internal/event/check_cache.go +++ b/internal/event/check_cache.go @@ -4,8 +4,8 @@ import ( "database/sql" "github.com/samber/lo" - "gitlink.org.cn/cloudream/common/pkg/distlock/reqbuilder" - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-common/consts" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/message/scanner/event" diff --git a/internal/event/check_object.go b/internal/event/check_object.go index 1a95355..0c88c24 100644 --- a/internal/event/check_object.go +++ b/internal/event/check_object.go @@ -2,8 +2,8 @@ package event import ( "github.com/samber/lo" - "gitlink.org.cn/cloudream/common/pkg/distlock/reqbuilder" - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/common/pkgs/logger" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/message/scanner/event" ) diff --git a/internal/event/check_rep_count.go b/internal/event/check_rep_count.go index 5edb6b4..bfe7dff 100644 --- a/internal/event/check_rep_count.go +++ b/internal/event/check_rep_count.go @@ -5,8 +5,8 @@ import ( "math" "github.com/samber/lo" - "gitlink.org.cn/cloudream/common/pkg/distlock/reqbuilder" - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/common/pkgs/logger" mymath "gitlink.org.cn/cloudream/common/utils/math" mysort "gitlink.org.cn/cloudream/common/utils/sort" "gitlink.org.cn/cloudream/storage-common/consts" diff --git a/internal/event/event.go b/internal/event/event.go index a405669..bbb25bd 100644 --- a/internal/event/event.go +++ b/internal/event/event.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - distlocksvc "gitlink.org.cn/cloudream/common/pkg/distlock/service" - event "gitlink.org.cn/cloudream/common/pkg/event" - "gitlink.org.cn/cloudream/common/pkg/typedispatcher" + distlocksvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + event "gitlink.org.cn/cloudream/common/pkgs/event" + "gitlink.org.cn/cloudream/common/pkgs/typedispatcher" mydb "gitlink.org.cn/cloudream/storage-common/pkgs/db" ) diff --git a/internal/services/event.go b/internal/services/event.go index 90649e8..c601a16 100644 --- a/internal/services/event.go +++ b/internal/services/event.go @@ -1,7 +1,7 @@ package services import ( - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/logger" scmsg "gitlink.org.cn/cloudream/storage-common/pkgs/mq/message/scanner" scevt "gitlink.org.cn/cloudream/storage-common/pkgs/mq/message/scanner/event" "gitlink.org.cn/cloudream/storage-scanner/internal/event" diff --git a/internal/tickevent/batch_all_agent_check_cache.go b/internal/tickevent/batch_all_agent_check_cache.go index e567408..9d87297 100644 --- a/internal/tickevent/batch_all_agent_check_cache.go +++ b/internal/tickevent/batch_all_agent_check_cache.go @@ -2,7 +2,7 @@ package tickevent import ( "github.com/samber/lo" - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-common/pkgs/db/model" "gitlink.org.cn/cloudream/storage-scanner/internal/event" ) diff --git a/internal/tickevent/batch_check_all_object.go b/internal/tickevent/batch_check_all_object.go index 744b4c8..043bc8a 100644 --- a/internal/tickevent/batch_check_all_object.go +++ b/internal/tickevent/batch_check_all_object.go @@ -1,7 +1,7 @@ package tickevent import ( - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-scanner/internal/event" ) diff --git a/internal/tickevent/batch_check_all_rep_count.go b/internal/tickevent/batch_check_all_rep_count.go index 6643653..ef4e9d7 100644 --- a/internal/tickevent/batch_check_all_rep_count.go +++ b/internal/tickevent/batch_check_all_rep_count.go @@ -1,7 +1,7 @@ package tickevent import ( - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-scanner/internal/event" ) diff --git a/internal/tickevent/batch_check_all_storage.go b/internal/tickevent/batch_check_all_storage.go index 558b9ed..bbd290d 100644 --- a/internal/tickevent/batch_check_all_storage.go +++ b/internal/tickevent/batch_check_all_storage.go @@ -1,7 +1,7 @@ package tickevent import ( - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-scanner/internal/event" ) diff --git a/internal/tickevent/check_agent_state.go b/internal/tickevent/check_agent_state.go index 4bdc4e4..b12d2f7 100644 --- a/internal/tickevent/check_agent_state.go +++ b/internal/tickevent/check_agent_state.go @@ -1,7 +1,7 @@ package tickevent import ( - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-scanner/internal/event" ) diff --git a/internal/tickevent/check_cache.go b/internal/tickevent/check_cache.go index 5676f60..a8e0245 100644 --- a/internal/tickevent/check_cache.go +++ b/internal/tickevent/check_cache.go @@ -1,7 +1,7 @@ package tickevent import ( - "gitlink.org.cn/cloudream/common/pkg/logger" + "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-scanner/internal/event" ) diff --git a/internal/tickevent/tick_event.go b/internal/tickevent/tick_event.go index 45815fa..8051fc9 100644 --- a/internal/tickevent/tick_event.go +++ b/internal/tickevent/tick_event.go @@ -1,7 +1,7 @@ package tickevent import ( - tickevent "gitlink.org.cn/cloudream/common/pkg/tickevent" + tickevent "gitlink.org.cn/cloudream/common/pkgs/tickevent" mydb "gitlink.org.cn/cloudream/storage-common/pkgs/db" "gitlink.org.cn/cloudream/storage-scanner/internal/event" ) diff --git a/main.go b/main.go index e32c6fc..1898eef 100644 --- a/main.go +++ b/main.go @@ -5,8 +5,8 @@ import ( "os" "sync" - distlocksvc "gitlink.org.cn/cloudream/common/pkg/distlock/service" - log "gitlink.org.cn/cloudream/common/pkg/logger" + distlocksvc "gitlink.org.cn/cloudream/common/pkgs/distlock/service" + log "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/storage-common/pkgs/db" scsvr "gitlink.org.cn/cloudream/storage-common/pkgs/mq/server/scanner" "gitlink.org.cn/cloudream/storage-scanner/internal/config"