diff --git a/.agents/skills/database-migration/SKILL.md b/.agents/skills/database-migration/SKILL.md index c589378d..fdf3f6c4 100644 --- a/.agents/skills/database-migration/SKILL.md +++ b/.agents/skills/database-migration/SKILL.md @@ -33,7 +33,7 @@ package order import ( "embed" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" ) //go:embed migrations/*.sql diff --git a/.agents/skills/file-upload/SKILL.md b/.agents/skills/file-upload/SKILL.md index b3a84bb9..b17b0dc8 100644 --- a/.agents/skills/file-upload/SKILL.md +++ b/.agents/skills/file-upload/SKILL.md @@ -84,7 +84,7 @@ import ( "bytes" "github.com/Rain-kl/Wavelet/internal/apps/upload" - "github.com/Rain-kl/Wavelet/backend/pkg/model" + "github.com/Rain-kl/Wavelet/pkg/model" ) func ingestMirrorFile(ctx context.Context, userID uint64, data []byte, hash, filename, mime, ext string) (model.Upload, error) { diff --git a/.agents/skills/new-api/SKILL.md b/.agents/skills/new-api/SKILL.md index 8ef2fa32..473a4024 100644 --- a/.agents/skills/new-api/SKILL.md +++ b/.agents/skills/new-api/SKILL.md @@ -39,8 +39,8 @@ backend/plugins/domain/order/ package order import ( - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" ) type Plugin struct { diff --git a/.agents/skills/new-async-task/references/CODE-EXAMPLES.md b/.agents/skills/new-async-task/references/CODE-EXAMPLES.md index 454372d0..c19a525b 100644 --- a/.agents/skills/new-async-task/references/CODE-EXAMPLES.md +++ b/.agents/skills/new-async-task/references/CODE-EXAMPLES.md @@ -61,8 +61,8 @@ package user import ( "time" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/extpoints" ) func (p *Plugin) Apply(ctx *core.Context) error { diff --git a/.agents/skills/push-notification/SKILL.md b/.agents/skills/push-notification/SKILL.md index c860b9e1..5c42e9ee 100644 --- a/.agents/skills/push-notification/SKILL.md +++ b/.agents/skills/push-notification/SKILL.md @@ -39,7 +39,7 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/admin/push" - "github.com/Rain-kl/Wavelet/backend/pkg/listener" + "github.com/Rain-kl/Wavelet/pkg/listener" ) var NewUserRegistered = push.EventMetadata{ @@ -84,7 +84,7 @@ func Register() { 在业务逻辑完成处(如 `internal/apps/user/routers.go`)仅 import `internal/listener` 并发射事件: ```go -import "github.com/Rain-kl/Wavelet/backend/pkg/listener" +import "github.com/Rain-kl/Wavelet/pkg/listener" func Register(c *gin.Context) { // ... 注册成功逻辑 ... diff --git a/Makefile b/Makefile index 797bcbec..9a0b24ba 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION ?= dev BUILD_DATE ?= $(shell date -u +'%Y-%m-%dT%H:%M:%SZ') -MODULE := $(shell go list -m) +MODULE := $(shell cd backend && go list -m) swagger: scripts/swagger.sh @@ -15,7 +15,7 @@ license-check: format: @echo "==> Formatting backend Go source..." - gofmt -w $$(find . -type f -name '*.go' -not -path './.git/*' -not -path './frontend/*') + gofmt -w $$(find backend -type f -name '*.go' -not -path './.git/*') @echo "==> Formatting frontend source..." cd frontend && pnpm format @@ -27,11 +27,11 @@ build-embedded: pnpm build:embed rm -rf backend/plugins/drivers/driver_http/dist cp -R frontend/out backend/plugins/drivers/driver_http/dist - go build \ + cd backend && go build \ -tags embed_frontend \ - -ldflags "-s -w -X '$(MODULE)/backend/pkg/buildinfo.Version=$(VERSION)' -X '$(MODULE)/backend/pkg/buildinfo.BuildTime=$(BUILD_DATE)'" \ - -o bin/wavelet \ - backend/main.go + -ldflags "-s -w -X '$(MODULE)/pkg/buildinfo.Version=$(VERSION)' -X '$(MODULE)/pkg/buildinfo.BuildTime=$(BUILD_DATE)'" \ + -o ../bin/wavelet \ + main.go code-check: @echo "==> Architecture guards..." @@ -54,7 +54,7 @@ code-check: @echo " → plugins/domain/ must not import other plugins/domain/..." @for d in backend/plugins/domain/*/; do \ name=$$(basename $$d); \ - imports=$$(rg -n '"github.com/Rain-kl/Wavelet/backend/plugins/domain/' backend/plugins/domain/"$$name" -g '*.go' 2>/dev/null | rg -v "backend/plugins/domain/$$name/" | rg -v '_test.go' || true); \ + imports=$$(rg -n '"$(MODULE)/plugins/domain/' backend/plugins/domain/"$$name" -g '*.go' 2>/dev/null | rg -v "backend/plugins/domain/$$name/" | rg -v '_test.go' || true); \ if [ -n "$$imports" ]; then \ echo "error: backend/plugins/domain/$$name must not import other domain plugins" >&2; \ echo "$$imports" >&2; \ @@ -62,15 +62,15 @@ code-check: fi; \ done @echo " → Architecture guards PASS" - golangci-lint run ./backend/... + cd backend && golangci-lint run cd frontend && pnpm tsc --noEmit --jsx preserve && npx eslint . --max-warnings 0 build-backend: @echo "==> Building backend version=$(VERSION) build_date=$(BUILD_DATE)..." - go build \ - -ldflags "-s -w -X '$(MODULE)/backend/pkg/buildinfo.Version=$(VERSION)' -X '$(MODULE)/backend/pkg/buildinfo.BuildTime=$(BUILD_DATE)'" \ - -o bin/wavelet \ - backend/main.go + cd backend && go build \ + -ldflags "-s -w -X '$(MODULE)/pkg/buildinfo.Version=$(VERSION)' -X '$(MODULE)/pkg/buildinfo.BuildTime=$(BUILD_DATE)'" \ + -o ../bin/wavelet \ + main.go build-frontend: @echo "==> Building frontend version=$(VERSION) build_date=$(BUILD_DATE)..." @@ -84,7 +84,7 @@ build-test: @PIDS=""; \ STATUS=0; \ ( cd frontend && pnpm build:embed 2>&1 | sed 's/^/[frontend] /' ) & PIDS="$$PIDS $$!"; \ - ( go test ./... && go build -o /dev/null ./... 2>&1 | sed 's/^/[backend] /' ) & PIDS="$$PIDS $$!"; \ + ( cd backend && go test ./... && go build -o /dev/null ./... 2>&1 | sed 's/^/[backend] /' ) & PIDS="$$PIDS $$!"; \ for PID in $$PIDS; do \ wait $$PID || STATUS=1; \ done; \ diff --git a/backend/cmd/all.go b/backend/cmd/all.go index 91a284c7..6f7df684 100644 --- a/backend/cmd/all.go +++ b/backend/cmd/all.go @@ -8,7 +8,7 @@ package cmd import ( "log" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" "github.com/spf13/cobra" ) diff --git a/backend/cmd/api.go b/backend/cmd/api.go index 1b32df34..5c0b8d43 100644 --- a/backend/cmd/api.go +++ b/backend/cmd/api.go @@ -7,7 +7,7 @@ package cmd import ( "log" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" "github.com/spf13/cobra" ) diff --git a/backend/cmd/app.go b/backend/cmd/app.go index 5463ba3b..e84d4da2 100644 --- a/backend/cmd/app.go +++ b/backend/cmd/app.go @@ -10,24 +10,24 @@ import ( "log" "time" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/admin" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/cap" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/system" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/user" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_cron" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_http" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - infradb "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/plugins/domain/admin" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + "github.com/Rain-kl/Wavelet/plugins/domain/cap" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control" + "github.com/Rain-kl/Wavelet/plugins/domain/system" + "github.com/Rain-kl/Wavelet/plugins/domain/upload" + "github.com/Rain-kl/Wavelet/plugins/domain/user" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_cron" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_http" + "github.com/Rain-kl/Wavelet/plugins/infra/cache" + infradb "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/logger" + "github.com/Rain-kl/Wavelet/plugins/infra/storage" "github.com/pressly/goose/v3" goosedb "github.com/pressly/goose/v3/database" ) diff --git a/backend/cmd/app_test.go b/backend/cmd/app_test.go index ca4929ed..d653d256 100644 --- a/backend/cmd/app_test.go +++ b/backend/cmd/app_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" ) func TestNewWaveletAppProfiles(t *testing.T) { diff --git a/backend/cmd/banner.go b/backend/cmd/banner.go index 4c0e5461..8ef0a4f2 100644 --- a/backend/cmd/banner.go +++ b/backend/cmd/banner.go @@ -12,8 +12,8 @@ import ( "runtime" "strings" - "github.com/Rain-kl/Wavelet/backend/pkg/buildinfo" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/buildinfo" + "github.com/Rain-kl/Wavelet/pkg/config" ) //nolint:unused // startup banner formatting utilities diff --git a/backend/cmd/banner_test.go b/backend/cmd/banner_test.go index 0d31cd5f..6862b96e 100644 --- a/backend/cmd/banner_test.go +++ b/backend/cmd/banner_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/Rain-kl/Wavelet/backend/pkg/buildinfo" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/buildinfo" + "github.com/Rain-kl/Wavelet/pkg/config" ) func TestFormatStartupBanner(t *testing.T) { diff --git a/backend/cmd/reset_passwd.go b/backend/cmd/reset_passwd.go index 03a263f8..dcbe9bf9 100644 --- a/backend/cmd/reset_passwd.go +++ b/backend/cmd/reset_passwd.go @@ -13,10 +13,10 @@ import ( "os" "strings" - userdomain "github.com/Rain-kl/Wavelet/backend/plugins/domain/user" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + userdomain "github.com/Rain-kl/Wavelet/plugins/domain/user" + "github.com/Rain-kl/Wavelet/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" "github.com/spf13/cobra" "gorm.io/gorm" ) diff --git a/backend/cmd/reset_passwd_test.go b/backend/cmd/reset_passwd_test.go index 5b953086..a10d8dbe 100644 --- a/backend/cmd/reset_passwd_test.go +++ b/backend/cmd/reset_passwd_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - userdomain "github.com/Rain-kl/Wavelet/backend/plugins/domain/user" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + userdomain "github.com/Rain-kl/Wavelet/plugins/domain/user" ) func TestResetPasswdCmd_WithUserAndPassword(t *testing.T) { diff --git a/backend/cmd/root.go b/backend/cmd/root.go index b2670709..43fd44e3 100644 --- a/backend/cmd/root.go +++ b/backend/cmd/root.go @@ -9,10 +9,10 @@ import ( "log" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/buildinfo" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/trace" + "github.com/Rain-kl/Wavelet/pkg/buildinfo" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/trace" "github.com/spf13/cobra" ) diff --git a/backend/cmd/scheduler.go b/backend/cmd/scheduler.go index 85cff5bf..3f444f15 100644 --- a/backend/cmd/scheduler.go +++ b/backend/cmd/scheduler.go @@ -7,7 +7,7 @@ package cmd import ( "log" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" "github.com/spf13/cobra" ) diff --git a/backend/cmd/worker.go b/backend/cmd/worker.go index 05b77668..372f9c2e 100644 --- a/backend/cmd/worker.go +++ b/backend/cmd/worker.go @@ -7,7 +7,7 @@ package cmd import ( "log" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" "github.com/spf13/cobra" ) diff --git a/backend/core/app_test.go b/backend/core/app_test.go index a35b86d6..327a3e58 100644 --- a/backend/core/app_test.go +++ b/backend/core/app_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/extpoints" ) // appMockDriver is a test driver tracking its start/stop lifecycle. diff --git a/backend/core/context.go b/backend/core/context.go index 9976f6f8..d9341896 100644 --- a/backend/core/context.go +++ b/backend/core/context.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core/extpoints" ) // Context is the central micro-kernel service bus and runtime lifecycle container. diff --git a/backend/core/context_test.go b/backend/core/context_test.go index d67f76dc..6bdf2a7e 100644 --- a/backend/core/context_test.go +++ b/backend/core/context_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" ) // Sample services for testing diff --git a/backend/core/events_test.go b/backend/core/events_test.go index 4d347b2b..48ed0856 100644 --- a/backend/core/events_test.go +++ b/backend/core/events_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" ) type UserRegisteredEvent struct { diff --git a/backend/core/extpoints/extpoints_test.go b/backend/core/extpoints/extpoints_test.go index 11a35591..b0853630 100644 --- a/backend/core/extpoints/extpoints_test.go +++ b/backend/core/extpoints/extpoints_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/extpoints" ) func TestRouterExtension(t *testing.T) { diff --git a/backend/core/types.go b/backend/core/types.go index 729d261b..2197a9ca 100644 --- a/backend/core/types.go +++ b/backend/core/types.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core/extpoints" ) // Standard sentinel errors returned by core operations. diff --git a/backend/downstream/plugins/custom_example/plugin.go b/backend/downstream/plugins/custom_example/plugin.go index 44069df0..24b0ecea 100644 --- a/backend/downstream/plugins/custom_example/plugin.go +++ b/backend/downstream/plugins/custom_example/plugin.go @@ -8,8 +8,8 @@ package custom_example import ( "net/http" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" "github.com/gin-gonic/gin" ) diff --git a/go.mod b/backend/go.mod similarity index 100% rename from go.mod rename to backend/go.mod diff --git a/go.sum b/backend/go.sum similarity index 100% rename from go.sum rename to backend/go.sum diff --git a/backend/main.go b/backend/main.go index 031c839a..d7114f30 100644 --- a/backend/main.go +++ b/backend/main.go @@ -4,7 +4,7 @@ // Package main 是 Wavelet 平台的程序入口 package main -import "github.com/Rain-kl/Wavelet/backend/cmd" +import "github.com/Rain-kl/Wavelet/cmd" // @title Wavelet API // @version 1.0.0 diff --git a/backend/pkg/idgen/snowflake.go b/backend/pkg/idgen/snowflake.go index 4132f6d3..aec36f8c 100644 --- a/backend/pkg/idgen/snowflake.go +++ b/backend/pkg/idgen/snowflake.go @@ -9,7 +9,7 @@ import ( "fmt" "log" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/config" "github.com/bwmarrin/snowflake" ) diff --git a/backend/pkg/testhelper/gin.go b/backend/pkg/testhelper/gin.go index c9e0c640..b743fcc5 100644 --- a/backend/pkg/testhelper/gin.go +++ b/backend/pkg/testhelper/gin.go @@ -4,7 +4,7 @@ package testhelper import ( - "github.com/Rain-kl/Wavelet/backend/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/response" "github.com/gin-gonic/gin" ) diff --git a/backend/pkg/testhelper/test_helper.go b/backend/pkg/testhelper/test_helper.go index 84df3606..74ca3ac6 100644 --- a/backend/pkg/testhelper/test_helper.go +++ b/backend/pkg/testhelper/test_helper.go @@ -10,8 +10,8 @@ import ( "testing" "time" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/alicebob/miniredis/v2" "github.com/glebarez/sqlite" "github.com/redis/go-redis/v9" diff --git a/backend/pkg/util/http_clients.go b/backend/pkg/util/http_clients.go index e8846d93..a370e405 100644 --- a/backend/pkg/util/http_clients.go +++ b/backend/pkg/util/http_clients.go @@ -12,7 +12,7 @@ import ( "net/url" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/httppool" + "github.com/Rain-kl/Wavelet/pkg/httppool" ) // IsLocalhost 检查 URL 是否为 localhost diff --git a/backend/plugins/domain/admin/handlers_auth_source.go b/backend/plugins/domain/admin/handlers_auth_source.go index 6d21b671..f0121862 100644 --- a/backend/plugins/domain/admin/handlers_auth_source.go +++ b/backend/plugins/domain/admin/handlers_auth_source.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/admin/handlers_cache.go b/backend/plugins/domain/admin/handlers_cache.go index 75441b2f..5a1ef936 100644 --- a/backend/plugins/domain/admin/handlers_cache.go +++ b/backend/plugins/domain/admin/handlers_cache.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/diskcache" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/diskcache" ) type updateCacheConfigRequest struct { diff --git a/backend/plugins/domain/admin/handlers_config.go b/backend/plugins/domain/admin/handlers_config.go index 6bc0858d..39cc32d2 100644 --- a/backend/plugins/domain/admin/handlers_config.go +++ b/backend/plugins/domain/admin/handlers_config.go @@ -13,13 +13,13 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - mail "github.com/Rain-kl/Wavelet/backend/pkg/mail" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/cap" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/logger" + mail "github.com/Rain-kl/Wavelet/pkg/mail" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/plugins/domain/cap" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" "github.com/gin-gonic/gin" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/admin/handlers_db.go b/backend/plugins/domain/admin/handlers_db.go index cebbeb5d..089c5f8e 100644 --- a/backend/plugins/domain/admin/handlers_db.go +++ b/backend/plugins/domain/admin/handlers_db.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/response" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/admin/handlers_logs.go b/backend/plugins/domain/admin/handlers_logs.go index aedf8244..c882a402 100644 --- a/backend/plugins/domain/admin/handlers_logs.go +++ b/backend/plugins/domain/admin/handlers_logs.go @@ -15,14 +15,14 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control/logstore" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control/logstore" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" ) diff --git a/backend/plugins/domain/admin/handlers_status.go b/backend/plugins/domain/admin/handlers_status.go index b5f41fc7..f3b459f6 100644 --- a/backend/plugins/domain/admin/handlers_status.go +++ b/backend/plugins/domain/admin/handlers_status.go @@ -16,10 +16,10 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control/logstore" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control/logstore" ) var startTime = time.Now() diff --git a/backend/plugins/domain/admin/handlers_tasks.go b/backend/plugins/domain/admin/handlers_tasks.go index db63f69b..63373e10 100644 --- a/backend/plugins/domain/admin/handlers_tasks.go +++ b/backend/plugins/domain/admin/handlers_tasks.go @@ -14,10 +14,10 @@ import ( "github.com/gin-gonic/gin" "github.com/robfig/cron/v3" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_cron" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_cron" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" ) // ListTaskTypes 获取支持的任务类型列表 diff --git a/backend/plugins/domain/admin/handlers_templates.go b/backend/plugins/domain/admin/handlers_templates.go index bed6ce16..a4d2c88a 100644 --- a/backend/plugins/domain/admin/handlers_templates.go +++ b/backend/plugins/domain/admin/handlers_templates.go @@ -11,7 +11,7 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/response" ) // CreateTemplateRequest 创建模板请求 diff --git a/backend/plugins/domain/admin/handlers_updater.go b/backend/plugins/domain/admin/handlers_updater.go index 27efd4b3..e6aa5f27 100644 --- a/backend/plugins/domain/admin/handlers_updater.go +++ b/backend/plugins/domain/admin/handlers_updater.go @@ -24,10 +24,10 @@ import ( "github.com/gin-gonic/gin" "golang.org/x/mod/semver" - "github.com/Rain-kl/Wavelet/backend/pkg/buildinfo" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/pkg/buildinfo" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/util" ) const ( diff --git a/backend/plugins/domain/admin/handlers_user.go b/backend/plugins/domain/admin/handlers_user.go index 4bc2f677..b076f937 100644 --- a/backend/plugins/domain/admin/handlers_user.go +++ b/backend/plugins/domain/admin/handlers_user.go @@ -15,13 +15,13 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const minPasswordLength = 8 diff --git a/backend/plugins/domain/admin/middlewares.go b/backend/plugins/domain/admin/middlewares.go index a1fc3939..2497920c 100644 --- a/backend/plugins/domain/admin/middlewares.go +++ b/backend/plugins/domain/admin/middlewares.go @@ -4,11 +4,11 @@ package admin import ( - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/trace" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/trace" + "github.com/Rain-kl/Wavelet/pkg/util" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/admin/plugin.go b/backend/plugins/domain/admin/plugin.go index 0daec1ae..ec574c99 100644 --- a/backend/plugins/domain/admin/plugin.go +++ b/backend/plugins/domain/admin/plugin.go @@ -8,9 +8,9 @@ import ( "context" "embed" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/core/extpoints" "github.com/gin-gonic/gin" "github.com/hibiken/asynq" ) diff --git a/backend/plugins/domain/admin/plugin_test.go b/backend/plugins/domain/admin/plugin_test.go index 729c03e9..49d0cc51 100644 --- a/backend/plugins/domain/admin/plugin_test.go +++ b/backend/plugins/domain/admin/plugin_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/admin" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/plugins/domain/admin" ) func TestAdminPluginUnit(t *testing.T) { diff --git a/backend/plugins/domain/admin/repository.go b/backend/plugins/domain/admin/repository.go index 87fab502..7652a0dd 100644 --- a/backend/plugins/domain/admin/repository.go +++ b/backend/plugins/domain/admin/repository.go @@ -16,11 +16,11 @@ import ( "github.com/shopspring/decimal" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/cache/ram" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/cache/ram" + "github.com/Rain-kl/Wavelet/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/util" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/admin/restart_unix.go b/backend/plugins/domain/admin/restart_unix.go index 6d9516fe..fa272dca 100644 --- a/backend/plugins/domain/admin/restart_unix.go +++ b/backend/plugins/domain/admin/restart_unix.go @@ -12,7 +12,7 @@ import ( "path/filepath" "syscall" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/logger" ) const installedBinaryMode = 0o755 diff --git a/backend/plugins/domain/admin/system_config_cache.go b/backend/plugins/domain/admin/system_config_cache.go index a26dddf7..6978095e 100644 --- a/backend/plugins/domain/admin/system_config_cache.go +++ b/backend/plugins/domain/admin/system_config_cache.go @@ -12,9 +12,9 @@ import ( "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/cache/ram" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/pkg/cache/ram" + "github.com/Rain-kl/Wavelet/pkg/util" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" ) const ( diff --git a/backend/plugins/domain/admin/system_config_test.go b/backend/plugins/domain/admin/system_config_test.go index e074bf38..95acb2a3 100644 --- a/backend/plugins/domain/admin/system_config_test.go +++ b/backend/plugins/domain/admin/system_config_test.go @@ -14,8 +14,8 @@ import ( "github.com/redis/go-redis/v9/maintnotifications" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/plugins/infra/database" ) func setupSystemConfigTest(t *testing.T) (*gorm.DB, func()) { diff --git a/backend/plugins/domain/auth/audit.go b/backend/plugins/domain/auth/audit.go index 138c26c5..6e2958f2 100644 --- a/backend/plugins/domain/auth/audit.go +++ b/backend/plugins/domain/auth/audit.go @@ -8,8 +8,8 @@ import ( "context" "encoding/json" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/auth/auth_source_resolver.go b/backend/plugins/domain/auth/auth_source_resolver.go index 78c2f7ec..a7ce5c91 100644 --- a/backend/plugins/domain/auth/auth_source_resolver.go +++ b/backend/plugins/domain/auth/auth_source_resolver.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core/contracts" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/coreos/go-oidc/v3/oidc" "golang.org/x/oauth2" diff --git a/backend/plugins/domain/auth/cache.go b/backend/plugins/domain/auth/cache.go index 68fd26e7..76db1efe 100644 --- a/backend/plugins/domain/auth/cache.go +++ b/backend/plugins/domain/auth/cache.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/cache/ram" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/cache/ram" + "github.com/Rain-kl/Wavelet/pkg/util" + db "github.com/Rain-kl/Wavelet/plugins/infra/cache" ) const ( diff --git a/backend/plugins/domain/auth/cache_test.go b/backend/plugins/domain/auth/cache_test.go index 032432e5..38472e9a 100644 --- a/backend/plugins/domain/auth/cache_test.go +++ b/backend/plugins/domain/auth/cache_test.go @@ -11,9 +11,9 @@ import ( "github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9/maintnotifications" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + db "github.com/Rain-kl/Wavelet/plugins/infra/cache" ) func setupOauthCacheTest(t *testing.T) (*miniredis.Miniredis, func()) { diff --git a/backend/plugins/domain/auth/handlers.go b/backend/plugins/domain/auth/handlers.go index 3ec6a290..e8d8ed4c 100644 --- a/backend/plugins/domain/auth/handlers.go +++ b/backend/plugins/domain/auth/handlers.go @@ -13,14 +13,14 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" + "github.com/Rain-kl/Wavelet/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/util" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/coreos/go-oidc/v3/oidc" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" diff --git a/backend/plugins/domain/auth/middleware.go b/backend/plugins/domain/auth/middleware.go index d1e932f4..616a022c 100644 --- a/backend/plugins/domain/auth/middleware.go +++ b/backend/plugins/domain/auth/middleware.go @@ -10,11 +10,11 @@ import ( "encoding/hex" "errors" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/trace" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/trace" + "github.com/Rain-kl/Wavelet/pkg/util" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/auth/models.go b/backend/plugins/domain/auth/models.go index c5374ded..10cb2e54 100644 --- a/backend/plugins/domain/auth/models.go +++ b/backend/plugins/domain/auth/models.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" + "github.com/Rain-kl/Wavelet/core/contracts" ) var authSourceNamePattern = regexp.MustCompile(`^[A-Za-z0-9][A-Za-z0-9_-]{0,79}$`) diff --git a/backend/plugins/domain/auth/plugin.go b/backend/plugins/domain/auth/plugin.go index cec331e5..0f55f07f 100644 --- a/backend/plugins/domain/auth/plugin.go +++ b/backend/plugins/domain/auth/plugin.go @@ -7,9 +7,9 @@ package auth import ( "embed" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/core/extpoints" ) //go:embed migrations/*.sql diff --git a/backend/plugins/domain/auth/plugin_test.go b/backend/plugins/domain/auth/plugin_test.go index acf4d0e8..228043ae 100644 --- a/backend/plugins/domain/auth/plugin_test.go +++ b/backend/plugins/domain/auth/plugin_test.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/require" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) type testUser struct { diff --git a/backend/plugins/domain/auth/repository.go b/backend/plugins/domain/auth/repository.go index f230bf74..df8ebafd 100644 --- a/backend/plugins/domain/auth/repository.go +++ b/backend/plugins/domain/auth/repository.go @@ -7,7 +7,7 @@ package auth import ( "context" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) // GetAuthSourceByID 根据 ID 获取认证源 diff --git a/backend/plugins/domain/auth/service.go b/backend/plugins/domain/auth/service.go index 7a0181f6..a39826ea 100644 --- a/backend/plugins/domain/auth/service.go +++ b/backend/plugins/domain/auth/service.go @@ -8,9 +8,9 @@ import ( "errors" "sync" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/util" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/auth/session.go b/backend/plugins/domain/auth/session.go index ec7f49b4..c1a18051 100644 --- a/backend/plugins/domain/auth/session.go +++ b/backend/plugins/domain/auth/session.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/config" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/google/uuid" diff --git a/backend/plugins/domain/cap/handlers.go b/backend/plugins/domain/cap/handlers.go index 5b3df2b2..12f921e9 100644 --- a/backend/plugins/domain/cap/handlers.go +++ b/backend/plugins/domain/cap/handlers.go @@ -6,9 +6,9 @@ package cap import ( "net/http" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/cap/pow" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/plugins/domain/cap/pow" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/cap/manager.go b/backend/plugins/domain/cap/manager.go index 831944e2..c84f6610 100644 --- a/backend/plugins/domain/cap/manager.go +++ b/backend/plugins/domain/cap/manager.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/cap/pow" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/plugins/domain/cap/pow" + db "github.com/Rain-kl/Wavelet/plugins/infra/cache" ) const ( diff --git a/backend/plugins/domain/cap/middleware.go b/backend/plugins/domain/cap/middleware.go index 59882317..b8ca625a 100644 --- a/backend/plugins/domain/cap/middleware.go +++ b/backend/plugins/domain/cap/middleware.go @@ -6,7 +6,7 @@ package cap import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/backend/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/response" ) // VerifyMiddleware returns a Gin middleware that checks and consumes the X-Cap-Token header. diff --git a/backend/plugins/domain/cap/plugin.go b/backend/plugins/domain/cap/plugin.go index 7cca96c2..dc733e90 100644 --- a/backend/plugins/domain/cap/plugin.go +++ b/backend/plugins/domain/cap/plugin.go @@ -5,8 +5,8 @@ package cap import ( - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/extpoints" ) // Plugin implements core.Plugin to provide CAPTCHA generation, validation, and route protection. diff --git a/backend/plugins/domain/cap/runtime_settings.go b/backend/plugins/domain/cap/runtime_settings.go index 0afafaaf..869e52bb 100644 --- a/backend/plugins/domain/cap/runtime_settings.go +++ b/backend/plugins/domain/cap/runtime_settings.go @@ -14,9 +14,9 @@ import ( "golang.org/x/sync/singleflight" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/util" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/domain_test.go b/backend/plugins/domain/domain_test.go index 97e8ed59..3473a50a 100644 --- a/backend/plugins/domain/domain_test.go +++ b/backend/plugins/domain/domain_test.go @@ -16,17 +16,17 @@ import ( "github.com/stretchr/testify/require" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/admin" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/user" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/domain/admin" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control" + "github.com/Rain-kl/Wavelet/plugins/domain/user" + "github.com/Rain-kl/Wavelet/plugins/infra/cache" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/logger" + "github.com/Rain-kl/Wavelet/plugins/infra/storage" ) func setupTestDB(t *testing.T) *gorm.DB { diff --git a/backend/plugins/domain/message_gateway/admin_handlers.go b/backend/plugins/domain/message_gateway/admin_handlers.go index b386771a..f8d9b286 100644 --- a/backend/plugins/domain/message_gateway/admin_handlers.go +++ b/backend/plugins/domain/message_gateway/admin_handlers.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/Rain-kl/Wavelet/backend/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/response" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/message_gateway/channels/qq/adapter.go b/backend/plugins/domain/message_gateway/channels/qq/adapter.go index 0f7cc5bf..f84947b8 100644 --- a/backend/plugins/domain/message_gateway/channels/qq/adapter.go +++ b/backend/plugins/domain/message_gateway/channels/qq/adapter.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" "github.com/tencent-connect/botgo" "github.com/tencent-connect/botgo/dto" "github.com/tencent-connect/botgo/event" diff --git a/backend/plugins/domain/message_gateway/channels/qq/adapter_test.go b/backend/plugins/domain/message_gateway/channels/qq/adapter_test.go index 76a05d79..68bbecd9 100644 --- a/backend/plugins/domain/message_gateway/channels/qq/adapter_test.go +++ b/backend/plugins/domain/message_gateway/channels/qq/adapter_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" ) func TestHandleEvent_DropsNonC2C(t *testing.T) { diff --git a/backend/plugins/domain/message_gateway/channels/telegram/adapter.go b/backend/plugins/domain/message_gateway/channels/telegram/adapter.go index fee67dca..3d2359b2 100644 --- a/backend/plugins/domain/message_gateway/channels/telegram/adapter.go +++ b/backend/plugins/domain/message_gateway/channels/telegram/adapter.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" tele "gopkg.in/telebot.v4" ) diff --git a/backend/plugins/domain/message_gateway/channels/telegram/adapter_test.go b/backend/plugins/domain/message_gateway/channels/telegram/adapter_test.go index f0407663..f0d67039 100644 --- a/backend/plugins/domain/message_gateway/channels/telegram/adapter_test.go +++ b/backend/plugins/domain/message_gateway/channels/telegram/adapter_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" tele "gopkg.in/telebot.v4" ) diff --git a/backend/plugins/domain/message_gateway/custom_events_admin_login.go b/backend/plugins/domain/message_gateway/custom_events_admin_login.go index 99077bea..4e09c1f8 100644 --- a/backend/plugins/domain/message_gateway/custom_events_admin_login.go +++ b/backend/plugins/domain/message_gateway/custom_events_admin_login.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" + "github.com/Rain-kl/Wavelet/core/contracts" ) // AdminLogin is the metadata definition for the admin login event. diff --git a/backend/plugins/domain/message_gateway/handlers.go b/backend/plugins/domain/message_gateway/handlers.go index dbd6a3ba..ae33cae2 100644 --- a/backend/plugins/domain/message_gateway/handlers.go +++ b/backend/plugins/domain/message_gateway/handlers.go @@ -8,9 +8,9 @@ import ( "net/http" "strconv" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/util" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/message_gateway/message_gateway_test.go b/backend/plugins/domain/message_gateway/message_gateway_test.go index c0dbf8c4..88b8d0d9 100644 --- a/backend/plugins/domain/message_gateway/message_gateway_test.go +++ b/backend/plugins/domain/message_gateway/message_gateway_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" ) func TestUpsertPairingCode_ReusesUnexpired(t *testing.T) { diff --git a/backend/plugins/domain/message_gateway/plugin.go b/backend/plugins/domain/message_gateway/plugin.go index 978f5f49..67219f69 100644 --- a/backend/plugins/domain/message_gateway/plugin.go +++ b/backend/plugins/domain/message_gateway/plugin.go @@ -8,9 +8,9 @@ import ( "context" "embed" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/core/extpoints" "github.com/gin-gonic/gin" "github.com/hibiken/asynq" ) diff --git a/backend/plugins/domain/message_gateway/plugin_test.go b/backend/plugins/domain/message_gateway/plugin_test.go index c3154887..0f098197 100644 --- a/backend/plugins/domain/message_gateway/plugin_test.go +++ b/backend/plugins/domain/message_gateway/plugin_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" ) func TestMessageGatewayPluginUnit(t *testing.T) { diff --git a/backend/plugins/domain/message_gateway/push/custom.go b/backend/plugins/domain/message_gateway/push/custom.go index a033a707..c8326792 100644 --- a/backend/plugins/domain/message_gateway/push/custom.go +++ b/backend/plugins/domain/message_gateway/push/custom.go @@ -13,7 +13,7 @@ import ( "net/http" "strings" - "github.com/Rain-kl/Wavelet/backend/pkg/httppool" + "github.com/Rain-kl/Wavelet/pkg/httppool" ) func init() { diff --git a/backend/plugins/domain/message_gateway/push/email.go b/backend/plugins/domain/message_gateway/push/email.go index 5123daf7..d2eb047f 100644 --- a/backend/plugins/domain/message_gateway/push/email.go +++ b/backend/plugins/domain/message_gateway/push/email.go @@ -11,7 +11,7 @@ import ( "net/smtp" "strings" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/pkg/util" ) func init() { diff --git a/backend/plugins/domain/message_gateway/push/lark.go b/backend/plugins/domain/message_gateway/push/lark.go index 14e287f7..e97a8b1a 100644 --- a/backend/plugins/domain/message_gateway/push/lark.go +++ b/backend/plugins/domain/message_gateway/push/lark.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/httppool" + "github.com/Rain-kl/Wavelet/pkg/httppool" ) func init() { diff --git a/backend/plugins/domain/message_gateway/push/telegram.go b/backend/plugins/domain/message_gateway/push/telegram.go index 0a1bc27b..54f49e76 100644 --- a/backend/plugins/domain/message_gateway/push/telegram.go +++ b/backend/plugins/domain/message_gateway/push/telegram.go @@ -12,7 +12,7 @@ import ( "net/http" "strings" - "github.com/Rain-kl/Wavelet/backend/pkg/httppool" + "github.com/Rain-kl/Wavelet/pkg/httppool" ) func init() { diff --git a/backend/plugins/domain/message_gateway/push_channels.go b/backend/plugins/domain/message_gateway/push_channels.go index 073f6fea..0509ec3b 100644 --- a/backend/plugins/domain/message_gateway/push_channels.go +++ b/backend/plugins/domain/message_gateway/push_channels.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - pkgpush "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway/push" + "github.com/Rain-kl/Wavelet/pkg/response" + pkgpush "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway/push" "github.com/gin-gonic/gin" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/message_gateway/push_events.go b/backend/plugins/domain/message_gateway/push_events.go index 8134542c..6ddec299 100644 --- a/backend/plugins/domain/message_gateway/push_events.go +++ b/backend/plugins/domain/message_gateway/push_events.go @@ -9,11 +9,11 @@ import ( "errors" "sync" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/logger" - pkgpush "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway/push" + pkgpush "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway/push" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/pkg/util" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/message_gateway/push_handlers.go b/backend/plugins/domain/message_gateway/push_handlers.go index 020b44ef..5dd14831 100644 --- a/backend/plugins/domain/message_gateway/push_handlers.go +++ b/backend/plugins/domain/message_gateway/push_handlers.go @@ -9,9 +9,9 @@ import ( "net/http" "strconv" - pkgpush "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway/push" + pkgpush "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway/push" - "github.com/Rain-kl/Wavelet/backend/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/response" "github.com/gin-gonic/gin" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/message_gateway/push_logics.go b/backend/plugins/domain/message_gateway/push_logics.go index 235f0738..f6ff7a26 100644 --- a/backend/plugins/domain/message_gateway/push_logics.go +++ b/backend/plugins/domain/message_gateway/push_logics.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - pkgpush "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway/push" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core/contracts" + pkgpush "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway/push" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/message_gateway/push_task_listener.go b/backend/plugins/domain/message_gateway/push_task_listener.go index 4c56291a..79e94b76 100644 --- a/backend/plugins/domain/message_gateway/push_task_listener.go +++ b/backend/plugins/domain/message_gateway/push_task_listener.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" ) // RegisterTaskListeners subscribes push notification handlers to task completion events. diff --git a/backend/plugins/domain/message_gateway/push_tasks.go b/backend/plugins/domain/message_gateway/push_tasks.go index 4dff4ad9..53981f7d 100644 --- a/backend/plugins/domain/message_gateway/push_tasks.go +++ b/backend/plugins/domain/message_gateway/push_tasks.go @@ -9,8 +9,8 @@ import ( "errors" "fmt" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway/push" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway/push" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" ) const ( diff --git a/backend/plugins/domain/message_gateway/repository.go b/backend/plugins/domain/message_gateway/repository.go index 27fcb2c1..da143499 100644 --- a/backend/plugins/domain/message_gateway/repository.go +++ b/backend/plugins/domain/message_gateway/repository.go @@ -10,9 +10,9 @@ import ( "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/idgen" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/message_gateway/runner.go b/backend/plugins/domain/message_gateway/runner.go index 72d22767..daa0593c 100644 --- a/backend/plugins/domain/message_gateway/runner.go +++ b/backend/plugins/domain/message_gateway/runner.go @@ -7,7 +7,7 @@ import ( "context" "sync" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/logger" ) // Runner manages lifecycle for long-lived channel adapters (WebSocket, long-polling, etc.). diff --git a/backend/plugins/domain/message_gateway/secret.go b/backend/plugins/domain/message_gateway/secret.go index 49c45892..343f7404 100644 --- a/backend/plugins/domain/message_gateway/secret.go +++ b/backend/plugins/domain/message_gateway/secret.go @@ -8,8 +8,8 @@ import ( "encoding/hex" "encoding/json" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/util" ) // CredentialKey is AES-256 hex derived from the session secret. diff --git a/backend/plugins/domain/risk_control/logics.go b/backend/plugins/domain/risk_control/logics.go index 6b74bcae..f65ecbbe 100644 --- a/backend/plugins/domain/risk_control/logics.go +++ b/backend/plugins/domain/risk_control/logics.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/batchwriter" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control/logstore" + "github.com/Rain-kl/Wavelet/pkg/batchwriter" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control/logstore" ) var ( diff --git a/backend/plugins/domain/risk_control/logstore/access_log.go b/backend/plugins/domain/risk_control/logstore/access_log.go index 47622eee..5f91596f 100644 --- a/backend/plugins/domain/risk_control/logstore/access_log.go +++ b/backend/plugins/domain/risk_control/logstore/access_log.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/util" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/risk_control/logstore/access_log_stats.go b/backend/plugins/domain/risk_control/logstore/access_log_stats.go index b568ef84..2a320867 100644 --- a/backend/plugins/domain/risk_control/logstore/access_log_stats.go +++ b/backend/plugins/domain/risk_control/logstore/access_log_stats.go @@ -9,7 +9,7 @@ import ( "sort" "time" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const hoursInDay = 24 diff --git a/backend/plugins/domain/risk_control/logstore/access_log_test.go b/backend/plugins/domain/risk_control/logstore/access_log_test.go index d52b07e3..bc06db18 100644 --- a/backend/plugins/domain/risk_control/logstore/access_log_test.go +++ b/backend/plugins/domain/risk_control/logstore/access_log_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/require" "gorm.io/gorm" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) func setupChGormDB(t *testing.T) *gorm.DB { diff --git a/backend/plugins/domain/risk_control/logstore/access_log_writer.go b/backend/plugins/domain/risk_control/logstore/access_log_writer.go index 81fbc9c9..21c500cf 100644 --- a/backend/plugins/domain/risk_control/logstore/access_log_writer.go +++ b/backend/plugins/domain/risk_control/logstore/access_log_writer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) // BatchInsert writes access logs to ClickHouse using the native batch API. diff --git a/backend/plugins/domain/risk_control/logstore/cleanup.go b/backend/plugins/domain/risk_control/logstore/cleanup.go index ae989072..3eeb6df8 100644 --- a/backend/plugins/domain/risk_control/logstore/cleanup.go +++ b/backend/plugins/domain/risk_control/logstore/cleanup.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/logger" ) const ( diff --git a/backend/plugins/domain/risk_control/logstore/clickhouse.go b/backend/plugins/domain/risk_control/logstore/clickhouse.go index 4c8e7966..51f0b415 100644 --- a/backend/plugins/domain/risk_control/logstore/clickhouse.go +++ b/backend/plugins/domain/risk_control/logstore/clickhouse.go @@ -9,7 +9,7 @@ import ( "time" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) type clickhouseUserAccessLogStore struct { diff --git a/backend/plugins/domain/risk_control/logstore/gorm.go b/backend/plugins/domain/risk_control/logstore/gorm.go index 8873566e..5dd0c7a2 100644 --- a/backend/plugins/domain/risk_control/logstore/gorm.go +++ b/backend/plugins/domain/risk_control/logstore/gorm.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/idgen" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/risk_control/logstore/imports_test.go b/backend/plugins/domain/risk_control/logstore/imports_test.go index 015195bb..1dc4bb37 100644 --- a/backend/plugins/domain/risk_control/logstore/imports_test.go +++ b/backend/plugins/domain/risk_control/logstore/imports_test.go @@ -12,12 +12,12 @@ import ( // plugins/domain 不得直接 import 已废弃的 internal。 var forbiddenImports = []string{ "github.com/Rain-kl/Wavelet/internal", - "github.com/Rain-kl/Wavelet/backend/internal", + "github.com/Rain-kl/Wavelet/internal", } func TestAppsMustNotImportPersistenceDirectly(t *testing.T) { - t.Chdir("../../../../..") - out, err := exec.Command("go", "list", "-test", "-f", `{{.ImportPath}} {{join .Imports " "}}`, "./backend/plugins/domain/...").Output() + t.Chdir("../../../..") + out, err := exec.Command("go", "list", "-test", "-f", `{{.ImportPath}} {{join .Imports " "}}`, "./plugins/domain/...").Output() if err != nil { t.Fatalf("go list: %v", err) } @@ -27,7 +27,7 @@ func TestAppsMustNotImportPersistenceDirectly(t *testing.T) { continue } pkg := fields[0] - if !strings.HasPrefix(pkg, "github.com/Rain-kl/Wavelet/backend/plugins/domain") { + if !strings.HasPrefix(pkg, "github.com/Rain-kl/Wavelet/plugins/domain") { continue } for _, imp := range fields[1:] { diff --git a/backend/plugins/domain/risk_control/logstore/provider.go b/backend/plugins/domain/risk_control/logstore/provider.go index 3b8ee988..1e30897d 100644 --- a/backend/plugins/domain/risk_control/logstore/provider.go +++ b/backend/plugins/domain/risk_control/logstore/provider.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/logger" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/risk_control/middleware.go b/backend/plugins/domain/risk_control/middleware.go index e9c74d50..53414dac 100644 --- a/backend/plugins/domain/risk_control/middleware.go +++ b/backend/plugins/domain/risk_control/middleware.go @@ -9,12 +9,12 @@ import ( "net/http" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control/logstore" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control/logstore" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/risk_control/middleware_test.go b/backend/plugins/domain/risk_control/middleware_test.go index 67d62bdc..238ad7a8 100644 --- a/backend/plugins/domain/risk_control/middleware_test.go +++ b/backend/plugins/domain/risk_control/middleware_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/batchwriter" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control/logstore" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/batchwriter" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control/logstore" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" ) diff --git a/backend/plugins/domain/risk_control/plugin.go b/backend/plugins/domain/risk_control/plugin.go index 304be9f8..abafb4a0 100644 --- a/backend/plugins/domain/risk_control/plugin.go +++ b/backend/plugins/domain/risk_control/plugin.go @@ -8,8 +8,8 @@ import ( "context" "embed" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/extpoints" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/risk_control/plugin_test.go b/backend/plugins/domain/risk_control/plugin_test.go index 73cf064c..4ab89607 100644 --- a/backend/plugins/domain/risk_control/plugin_test.go +++ b/backend/plugins/domain/risk_control/plugin_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control" ) func TestRiskControlPluginUnit(t *testing.T) { diff --git a/backend/plugins/domain/system/plugin.go b/backend/plugins/domain/system/plugin.go index f02c6d05..13839e20 100644 --- a/backend/plugins/domain/system/plugin.go +++ b/backend/plugins/domain/system/plugin.go @@ -7,10 +7,10 @@ package system import ( "net/http" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/response" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/upload/cache/access_cache.go b/backend/plugins/domain/upload/cache/access_cache.go index 20bd13f4..bc0b5f2e 100644 --- a/backend/plugins/domain/upload/cache/access_cache.go +++ b/backend/plugins/domain/upload/cache/access_cache.go @@ -11,12 +11,12 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) const fileAccessInvalidationChannel = "upload:file_access_invalidation" diff --git a/backend/plugins/domain/upload/cache/access_cache_test.go b/backend/plugins/domain/upload/cache/access_cache_test.go index b5706738..ba838cc2 100644 --- a/backend/plugins/domain/upload/cache/access_cache_test.go +++ b/backend/plugins/domain/upload/cache/access_cache_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" ) func TestLoadMigrationAccessStateCachesResult(t *testing.T) { diff --git a/backend/plugins/domain/upload/cache/meta_cache.go b/backend/plugins/domain/upload/cache/meta_cache.go index 8317619a..2e364b26 100644 --- a/backend/plugins/domain/upload/cache/meta_cache.go +++ b/backend/plugins/domain/upload/cache/meta_cache.go @@ -9,11 +9,11 @@ import ( "fmt" "sync" - "github.com/Rain-kl/Wavelet/backend/pkg/cache/ram" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/cache/ram" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/upload/cache/meta_cache_test.go b/backend/plugins/domain/upload/cache/meta_cache_test.go index 1458a388..2a50a5b0 100644 --- a/backend/plugins/domain/upload/cache/meta_cache_test.go +++ b/backend/plugins/domain/upload/cache/meta_cache_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/upload/errs.go b/backend/plugins/domain/upload/errs.go index 5e099fe1..996c8e6d 100644 --- a/backend/plugins/domain/upload/errs.go +++ b/backend/plugins/domain/upload/errs.go @@ -5,7 +5,7 @@ // Package upload 提供文件上传与下载功能 package upload -import "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" +import "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" // 文件管理常量 const ( diff --git a/backend/plugins/domain/upload/exports.go b/backend/plugins/domain/upload/exports.go index a1fa4bf4..2501533a 100644 --- a/backend/plugins/domain/upload/exports.go +++ b/backend/plugins/domain/upload/exports.go @@ -4,14 +4,14 @@ package upload import ( - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/filesrv" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/handler" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/ingest" - uploadstats "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/stats" - uploadtask "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/task" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/util" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/cache" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/filesrv" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/handler" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/ingest" + uploadstats "github.com/Rain-kl/Wavelet/plugins/domain/upload/stats" + uploadtask "github.com/Rain-kl/Wavelet/plugins/domain/upload/task" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/util" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" ) // HTTP handlers diff --git a/backend/plugins/domain/upload/filesrv/file_server.go b/backend/plugins/domain/upload/filesrv/file_server.go index e966b83f..3a5f1684 100644 --- a/backend/plugins/domain/upload/filesrv/file_server.go +++ b/backend/plugins/domain/upload/filesrv/file_server.go @@ -15,18 +15,18 @@ import ( "strconv" "strings" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - pkgutil "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/util" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/diskcache" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/response" + pkgutil "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/cache" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/util" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/diskcache" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" "golang.org/x/sync/singleflight" "gorm.io/gorm" diff --git a/backend/plugins/domain/upload/filesrv/file_server_test.go b/backend/plugins/domain/upload/filesrv/file_server_test.go index 2cd928cd..10fb1f54 100644 --- a/backend/plugins/domain/upload/filesrv/file_server_test.go +++ b/backend/plugins/domain/upload/filesrv/file_server_test.go @@ -23,15 +23,15 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadutil "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/util" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/diskcache" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/cache" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadutil "github.com/Rain-kl/Wavelet/plugins/domain/upload/util" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/diskcache" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) func init() { diff --git a/backend/plugins/domain/upload/handler/file_management.go b/backend/plugins/domain/upload/handler/file_management.go index fb8513db..e0f88b94 100644 --- a/backend/plugins/domain/upload/handler/file_management.go +++ b/backend/plugins/domain/upload/handler/file_management.go @@ -9,14 +9,14 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/ingest" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/repository" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/ingest" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/repository" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" ) type listFilesRequest struct { diff --git a/backend/plugins/domain/upload/handler/file_management_test.go b/backend/plugins/domain/upload/handler/file_management_test.go index 0fc03166..4903c183 100644 --- a/backend/plugins/domain/upload/handler/file_management_test.go +++ b/backend/plugins/domain/upload/handler/file_management_test.go @@ -11,9 +11,9 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" ) func TestGetDistinctUploadTypes(t *testing.T) { diff --git a/backend/plugins/domain/upload/handler/logics.go b/backend/plugins/domain/upload/handler/logics.go index ee262cac..b43c1db0 100644 --- a/backend/plugins/domain/upload/handler/logics.go +++ b/backend/plugins/domain/upload/handler/logics.go @@ -10,9 +10,9 @@ import ( "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/ingest" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/repository" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/ingest" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/repository" ) func listUploadFiles(ctx context.Context, filter repository.UploadListFilter) (int64, []models.Upload, error) { diff --git a/backend/plugins/domain/upload/handler/routers.go b/backend/plugins/domain/upload/handler/routers.go index f4e292bd..90e5b5d3 100644 --- a/backend/plugins/domain/upload/handler/routers.go +++ b/backend/plugins/domain/upload/handler/routers.go @@ -22,16 +22,16 @@ import ( "strconv" "strings" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - pkgutil "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/filesrv" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/ingest" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/util" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + pkgutil "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/filesrv" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/ingest" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/util" "github.com/gin-gonic/gin" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/upload/handler/routers_test.go b/backend/plugins/domain/upload/handler/routers_test.go index 96abdc00..03beaa9d 100644 --- a/backend/plugins/domain/upload/handler/routers_test.go +++ b/backend/plugins/domain/upload/handler/routers_test.go @@ -19,14 +19,14 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstats "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/stats" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstats "github.com/Rain-kl/Wavelet/plugins/domain/upload/stats" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/upload/handler/stats.go b/backend/plugins/domain/upload/handler/stats.go index 7031970e..1f3da760 100644 --- a/backend/plugins/domain/upload/handler/stats.go +++ b/backend/plugins/domain/upload/handler/stats.go @@ -9,8 +9,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" + "github.com/Rain-kl/Wavelet/pkg/response" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" ) type trendItem struct { diff --git a/backend/plugins/domain/upload/ingest/errors.go b/backend/plugins/domain/upload/ingest/errors.go index c7e8aa95..1d33e945 100644 --- a/backend/plugins/domain/upload/ingest/errors.go +++ b/backend/plugins/domain/upload/ingest/errors.go @@ -6,7 +6,7 @@ package ingest import ( "errors" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" ) // ErrForbidden indicates the caller is not allowed to mutate the upload record. diff --git a/backend/plugins/domain/upload/ingest/helpers.go b/backend/plugins/domain/upload/ingest/helpers.go index 08b11d25..1e4c7753 100644 --- a/backend/plugins/domain/upload/ingest/helpers.go +++ b/backend/plugins/domain/upload/ingest/helpers.go @@ -12,16 +12,16 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - uploadcache "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/repository" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstats "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/stats" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/logger" + uploadcache "github.com/Rain-kl/Wavelet/plugins/domain/upload/cache" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/repository" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstats "github.com/Rain-kl/Wavelet/plugins/domain/upload/stats" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/upload/ingest/ingest.go b/backend/plugins/domain/upload/ingest/ingest.go index 7da2b64c..60b3fdc3 100644 --- a/backend/plugins/domain/upload/ingest/ingest.go +++ b/backend/plugins/domain/upload/ingest/ingest.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/repository" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/repository" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/upload/ingest/ingest_test.go b/backend/plugins/domain/upload/ingest/ingest_test.go index 7368a328..37ff7b1e 100644 --- a/backend/plugins/domain/upload/ingest/ingest_test.go +++ b/backend/plugins/domain/upload/ingest/ingest_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) func TestIngestPolicyCreateIncrementsStats(t *testing.T) { diff --git a/backend/plugins/domain/upload/ingest/remove.go b/backend/plugins/domain/upload/ingest/remove.go index 304817cb..eaa04cf7 100644 --- a/backend/plugins/domain/upload/ingest/remove.go +++ b/backend/plugins/domain/upload/ingest/remove.go @@ -6,11 +6,11 @@ package ingest import ( "context" - uploadcache "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/repository" - uploadstats "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/stats" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + uploadcache "github.com/Rain-kl/Wavelet/plugins/domain/upload/cache" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/repository" + uploadstats "github.com/Rain-kl/Wavelet/plugins/domain/upload/stats" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/upload/ingest/types.go b/backend/plugins/domain/upload/ingest/types.go index e0a46283..8575852b 100644 --- a/backend/plugins/domain/upload/ingest/types.go +++ b/backend/plugins/domain/upload/ingest/types.go @@ -7,7 +7,7 @@ package ingest import ( "io" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" ) // Policy controls how ingest handles hash collisions and record creation. diff --git a/backend/plugins/domain/upload/models.go b/backend/plugins/domain/upload/models.go index b9ce83cd..c64ee407 100644 --- a/backend/plugins/domain/upload/models.go +++ b/backend/plugins/domain/upload/models.go @@ -5,7 +5,7 @@ package upload import ( - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" ) // UploadStatus 上传状态类型别名 diff --git a/backend/plugins/domain/upload/plugin.go b/backend/plugins/domain/upload/plugin.go index ca87ce56..78d07567 100644 --- a/backend/plugins/domain/upload/plugin.go +++ b/backend/plugins/domain/upload/plugin.go @@ -8,12 +8,12 @@ import ( "context" "embed" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/filesrv" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/handler" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/task" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/core/extpoints" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/filesrv" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/handler" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/task" "github.com/gin-gonic/gin" "github.com/hibiken/asynq" ) diff --git a/backend/plugins/domain/upload/repository.go b/backend/plugins/domain/upload/repository.go index 82e6ce55..e9895a69 100644 --- a/backend/plugins/domain/upload/repository.go +++ b/backend/plugins/domain/upload/repository.go @@ -9,9 +9,9 @@ import ( "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/util" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) // UploadListFilter filters paginated upload queries. diff --git a/backend/plugins/domain/upload/repository/repository.go b/backend/plugins/domain/upload/repository/repository.go index 34594c1f..b9737365 100644 --- a/backend/plugins/domain/upload/repository/repository.go +++ b/backend/plugins/domain/upload/repository/repository.go @@ -9,9 +9,9 @@ import ( "context" "strings" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/upload/stats/category.go b/backend/plugins/domain/upload/stats/category.go index 754676c4..466dafe8 100644 --- a/backend/plugins/domain/upload/stats/category.go +++ b/backend/plugins/domain/upload/stats/category.go @@ -7,7 +7,7 @@ package stats import ( "strings" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/util" ) const ( diff --git a/backend/plugins/domain/upload/stats/stats_counter.go b/backend/plugins/domain/upload/stats/stats_counter.go index 3bea8570..39c2c6dd 100644 --- a/backend/plugins/domain/upload/stats/stats_counter.go +++ b/backend/plugins/domain/upload/stats/stats_counter.go @@ -7,9 +7,9 @@ import ( "context" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/backend/plugins/domain/upload/stats/stats_counter_test.go b/backend/plugins/domain/upload/stats/stats_counter_test.go index 68b0832e..54208f82 100644 --- a/backend/plugins/domain/upload/stats/stats_counter_test.go +++ b/backend/plugins/domain/upload/stats/stats_counter_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/upload/storage/access_state.go b/backend/plugins/domain/upload/storage/access_state.go index f1a64b4c..62a3c03f 100644 --- a/backend/plugins/domain/upload/storage/access_state.go +++ b/backend/plugins/domain/upload/storage/access_state.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) // MigrationAccessState captures cached migration maintenance state. diff --git a/backend/plugins/domain/upload/storage/migration.go b/backend/plugins/domain/upload/storage/migration.go index 589bf9c7..91af0cd7 100644 --- a/backend/plugins/domain/upload/storage/migration.go +++ b/backend/plugins/domain/upload/storage/migration.go @@ -10,8 +10,8 @@ import ( "fmt" "strings" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) // StorageMigrationTask is the Asynq task name for storage migration. diff --git a/backend/plugins/domain/upload/storage/storage_ops.go b/backend/plugins/domain/upload/storage/storage_ops.go index 2557588f..f6f978ee 100644 --- a/backend/plugins/domain/upload/storage/storage_ops.go +++ b/backend/plugins/domain/upload/storage/storage_ops.go @@ -6,9 +6,9 @@ package storage import ( "context" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) // ReadOnly checks if the storage system is in read-only maintenance mode. diff --git a/backend/plugins/domain/upload/task/cleanup.go b/backend/plugins/domain/upload/task/cleanup.go index 99cdd814..62574b59 100644 --- a/backend/plugins/domain/upload/task/cleanup.go +++ b/backend/plugins/domain/upload/task/cleanup.go @@ -12,16 +12,16 @@ import ( "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - logstore "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control/logstore" - uploadcache "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - uploadstats "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/stats" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/logger" + logstore "github.com/Rain-kl/Wavelet/plugins/domain/risk_control/logstore" + uploadcache "github.com/Rain-kl/Wavelet/plugins/domain/upload/cache" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + uploadstats "github.com/Rain-kl/Wavelet/plugins/domain/upload/stats" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) const ( diff --git a/backend/plugins/domain/upload/task/rebuild_stats.go b/backend/plugins/domain/upload/task/rebuild_stats.go index 02e96c95..94b1fe9f 100644 --- a/backend/plugins/domain/upload/task/rebuild_stats.go +++ b/backend/plugins/domain/upload/task/rebuild_stats.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - uploadstats "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/stats" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + uploadstats "github.com/Rain-kl/Wavelet/plugins/domain/upload/stats" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/upload/task/rebuild_stats_test.go b/backend/plugins/domain/upload/task/rebuild_stats_test.go index 5ce81498..05b60c66 100644 --- a/backend/plugins/domain/upload/task/rebuild_stats_test.go +++ b/backend/plugins/domain/upload/task/rebuild_stats_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) func TestRebuildUploadStatsHandler_Execute(t *testing.T) { diff --git a/backend/plugins/domain/upload/task/storage_migration.go b/backend/plugins/domain/upload/task/storage_migration.go index 08b5badc..f1c8d8bf 100644 --- a/backend/plugins/domain/upload/task/storage_migration.go +++ b/backend/plugins/domain/upload/task/storage_migration.go @@ -17,14 +17,14 @@ import ( "golang.org/x/sync/errgroup" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - uploadstats "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/stats" - uploadstorage "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/storage" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - cache "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + uploadstats "github.com/Rain-kl/Wavelet/plugins/domain/upload/stats" + uploadstorage "github.com/Rain-kl/Wavelet/plugins/domain/upload/storage" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + cache "github.com/Rain-kl/Wavelet/plugins/infra/cache" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) const ( diff --git a/backend/plugins/domain/upload/task/storage_migration_task_test.go b/backend/plugins/domain/upload/task/storage_migration_task_test.go index 7b026268..6f61a04d 100644 --- a/backend/plugins/domain/upload/task/storage_migration_task_test.go +++ b/backend/plugins/domain/upload/task/storage_migration_task_test.go @@ -16,10 +16,10 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - cache "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + cache "github.com/Rain-kl/Wavelet/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" "github.com/alicebob/miniredis/v2" "github.com/redis/go-redis/v9" ) diff --git a/backend/plugins/domain/upload/task/tasks.go b/backend/plugins/domain/upload/task/tasks.go index c76a65f4..c2a92da8 100644 --- a/backend/plugins/domain/upload/task/tasks.go +++ b/backend/plugins/domain/upload/task/tasks.go @@ -12,11 +12,11 @@ import ( "strings" "sync" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/filesrv" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/filesrv" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/domain/upload/task/tasks_test.go b/backend/plugins/domain/upload/task/tasks_test.go index 87cd275f..098ecc16 100644 --- a/backend/plugins/domain/upload/task/tasks_test.go +++ b/backend/plugins/domain/upload/task/tasks_test.go @@ -17,15 +17,15 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - msg "github.com/Rain-kl/Wavelet/backend/plugins/domain/message_gateway" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/filesrv" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/diskcache" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + msg "github.com/Rain-kl/Wavelet/plugins/domain/message_gateway" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/filesrv" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/diskcache" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/backend/plugins/domain/upload/util/media.go b/backend/plugins/domain/upload/util/media.go index a85e4dd1..dd725cd5 100644 --- a/backend/plugins/domain/upload/util/media.go +++ b/backend/plugins/domain/upload/util/media.go @@ -6,7 +6,7 @@ package util import ( "strings" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" ) // IsImageExtension reports whether ext is a common image format. diff --git a/backend/plugins/domain/upload/util/utils.go b/backend/plugins/domain/upload/util/utils.go index 32f7092c..d10d3914 100644 --- a/backend/plugins/domain/upload/util/utils.go +++ b/backend/plugins/domain/upload/util/utils.go @@ -16,7 +16,7 @@ import ( "io" "strings" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/shared" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/shared" "github.com/deepteams/webp" _ "golang.org/x/image/webp" // Register WebP decoder for image.Decode ) diff --git a/backend/plugins/domain/user/handlers.go b/backend/plugins/domain/user/handlers.go index 7f3995b8..db39143c 100644 --- a/backend/plugins/domain/user/handlers.go +++ b/backend/plugins/domain/user/handlers.go @@ -12,10 +12,10 @@ import ( "strconv" "time" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/response" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/response" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/domain/user/models.go b/backend/plugins/domain/user/models.go index 0f5e8111..e083e65f 100644 --- a/backend/plugins/domain/user/models.go +++ b/backend/plugins/domain/user/models.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/pkg/util" ) // AccessToken 个人访问令牌实体 diff --git a/backend/plugins/domain/user/plugin.go b/backend/plugins/domain/user/plugin.go index a7c2bf31..8f1b7393 100644 --- a/backend/plugins/domain/user/plugin.go +++ b/backend/plugins/domain/user/plugin.go @@ -8,9 +8,9 @@ import ( "context" "embed" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/core/extpoints" "github.com/gin-gonic/gin" "github.com/hibiken/asynq" ) diff --git a/backend/plugins/domain/user/plugin_test.go b/backend/plugins/domain/user/plugin_test.go index 90378678..c744d7b3 100644 --- a/backend/plugins/domain/user/plugin_test.go +++ b/backend/plugins/domain/user/plugin_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/user" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/domain/user" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) func setupTestDB(t *testing.T) *gorm.DB { diff --git a/backend/plugins/domain/user/repository.go b/backend/plugins/domain/user/repository.go index 22afeb6f..9efa28b8 100644 --- a/backend/plugins/domain/user/repository.go +++ b/backend/plugins/domain/user/repository.go @@ -9,8 +9,8 @@ import ( "strings" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/util" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/plugins/domain/user/service.go b/backend/plugins/domain/user/service.go index a9f1ef04..859bc515 100644 --- a/backend/plugins/domain/user/service.go +++ b/backend/plugins/domain/user/service.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/idgen" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" - pkgu "github.com/Rain-kl/Wavelet/backend/pkg/util" + pkgu "github.com/Rain-kl/Wavelet/pkg/util" ) func toUserDTO(u *User) *contracts.UserDTO { diff --git a/backend/plugins/drivers/driver_asynq_cron/plugin.go b/backend/plugins/drivers/driver_asynq_cron/plugin.go index 9d7315e4..16112c29 100644 --- a/backend/plugins/drivers/driver_asynq_cron/plugin.go +++ b/backend/plugins/drivers/driver_asynq_cron/plugin.go @@ -14,8 +14,8 @@ import ( "github.com/hibiken/asynq" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" ) //go:embed migrations/*.sql diff --git a/backend/plugins/drivers/driver_asynq_cron/schedule.go b/backend/plugins/drivers/driver_asynq_cron/schedule.go index ee840a84..1685a918 100644 --- a/backend/plugins/drivers/driver_asynq_cron/schedule.go +++ b/backend/plugins/drivers/driver_asynq_cron/schedule.go @@ -7,7 +7,7 @@ import ( "context" "time" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) // Schedule 定时任务配置表 diff --git a/backend/plugins/drivers/driver_asynq_cron/scheduler.go b/backend/plugins/drivers/driver_asynq_cron/scheduler.go index cf93e6ba..124684e9 100644 --- a/backend/plugins/drivers/driver_asynq_cron/scheduler.go +++ b/backend/plugins/drivers/driver_asynq_cron/scheduler.go @@ -13,8 +13,8 @@ import ( "github.com/hibiken/asynq" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" ) var ( diff --git a/backend/plugins/drivers/driver_asynq_worker/executor.go b/backend/plugins/drivers/driver_asynq_worker/executor.go index 9e29efef..928e2156 100644 --- a/backend/plugins/drivers/driver_asynq_worker/executor.go +++ b/backend/plugins/drivers/driver_asynq_worker/executor.go @@ -19,10 +19,10 @@ import ( "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - otel_trace "github.com/Rain-kl/Wavelet/backend/pkg/trace" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/pkg/idgen" + "github.com/Rain-kl/Wavelet/pkg/logger" + otel_trace "github.com/Rain-kl/Wavelet/pkg/trace" + "github.com/Rain-kl/Wavelet/pkg/util" ) var ( diff --git a/backend/plugins/drivers/driver_asynq_worker/executor_test.go b/backend/plugins/drivers/driver_asynq_worker/executor_test.go index 847d38e7..cd03f550 100644 --- a/backend/plugins/drivers/driver_asynq_worker/executor_test.go +++ b/backend/plugins/drivers/driver_asynq_worker/executor_test.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" + "github.com/Rain-kl/Wavelet/pkg/testhelper" ) // mockHandler 用于测试的模拟任务处理器 diff --git a/backend/plugins/drivers/driver_asynq_worker/plugin.go b/backend/plugins/drivers/driver_asynq_worker/plugin.go index 9b5dc3ea..a0e4e35d 100644 --- a/backend/plugins/drivers/driver_asynq_worker/plugin.go +++ b/backend/plugins/drivers/driver_asynq_worker/plugin.go @@ -14,7 +14,7 @@ import ( "github.com/hibiken/asynq" - "github.com/Rain-kl/Wavelet/backend/core" + "github.com/Rain-kl/Wavelet/core" ) const ( diff --git a/backend/plugins/drivers/driver_asynq_worker/task_repo.go b/backend/plugins/drivers/driver_asynq_worker/task_repo.go index 881830b0..f6c3064d 100644 --- a/backend/plugins/drivers/driver_asynq_worker/task_repo.go +++ b/backend/plugins/drivers/driver_asynq_worker/task_repo.go @@ -12,9 +12,9 @@ import ( "github.com/redis/go-redis/v9" - "github.com/Rain-kl/Wavelet/backend/pkg/idgen" - cachepkg "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/idgen" + cachepkg "github.com/Rain-kl/Wavelet/plugins/infra/cache" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) const ( diff --git a/backend/plugins/drivers/driver_asynq_worker/types.go b/backend/plugins/drivers/driver_asynq_worker/types.go index ade6a463..03a9fe68 100644 --- a/backend/plugins/drivers/driver_asynq_worker/types.go +++ b/backend/plugins/drivers/driver_asynq_worker/types.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm" - db "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + db "github.com/Rain-kl/Wavelet/plugins/infra/database" ) // TaskExecutionStatus 任务执行状态 diff --git a/backend/plugins/drivers/driver_asynq_worker/utils.go b/backend/plugins/drivers/driver_asynq_worker/utils.go index fd61ac2f..41d5b208 100644 --- a/backend/plugins/drivers/driver_asynq_worker/utils.go +++ b/backend/plugins/drivers/driver_asynq_worker/utils.go @@ -9,7 +9,7 @@ import ( "github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9/maintnotifications" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/config" ) type redisClientConnOpt struct { diff --git a/backend/plugins/drivers/driver_asynq_worker/utils_test.go b/backend/plugins/drivers/driver_asynq_worker/utils_test.go index 0354bfd6..1ab5bf5f 100644 --- a/backend/plugins/drivers/driver_asynq_worker/utils_test.go +++ b/backend/plugins/drivers/driver_asynq_worker/utils_test.go @@ -6,7 +6,7 @@ package driver_asynq_worker import ( "testing" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/config" "github.com/redis/go-redis/v9/maintnotifications" ) diff --git a/backend/plugins/drivers/driver_http/engine.go b/backend/plugins/drivers/driver_http/engine.go index 6bd9c48a..cba4be84 100644 --- a/backend/plugins/drivers/driver_http/engine.go +++ b/backend/plugins/drivers/driver_http/engine.go @@ -16,11 +16,11 @@ import ( "syscall" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/trace" - "github.com/Rain-kl/Wavelet/backend/pkg/util" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/auth" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/risk_control" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/trace" + "github.com/Rain-kl/Wavelet/pkg/util" + "github.com/Rain-kl/Wavelet/plugins/domain/auth" + "github.com/Rain-kl/Wavelet/plugins/domain/risk_control" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/redis" "github.com/gin-gonic/gin" diff --git a/backend/plugins/drivers/driver_http/middlewares.go b/backend/plugins/drivers/driver_http/middlewares.go index 2289a881..b513a792 100644 --- a/backend/plugins/drivers/driver_http/middlewares.go +++ b/backend/plugins/drivers/driver_http/middlewares.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/config" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" - "github.com/Rain-kl/Wavelet/backend/pkg/response" - otel_trace "github.com/Rain-kl/Wavelet/backend/pkg/trace" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/response" + otel_trace "github.com/Rain-kl/Wavelet/pkg/trace" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" diff --git a/backend/plugins/drivers/driver_http/middlewares_test.go b/backend/plugins/drivers/driver_http/middlewares_test.go index 78dbe4b8..12fc578b 100644 --- a/backend/plugins/drivers/driver_http/middlewares_test.go +++ b/backend/plugins/drivers/driver_http/middlewares_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" + "github.com/Rain-kl/Wavelet/pkg/testhelper" "github.com/gin-gonic/gin" ) diff --git a/backend/plugins/drivers/driver_http/plugin.go b/backend/plugins/drivers/driver_http/plugin.go index 38ee9f26..5af542a5 100644 --- a/backend/plugins/drivers/driver_http/plugin.go +++ b/backend/plugins/drivers/driver_http/plugin.go @@ -15,8 +15,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/pkg/util" ) const ( diff --git a/backend/plugins/drivers/drivers_test.go b/backend/plugins/drivers/drivers_test.go index 242835eb..07d44c3b 100644 --- a/backend/plugins/drivers/drivers_test.go +++ b/backend/plugins/drivers/drivers_test.go @@ -20,11 +20,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/extpoints" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_cron" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_asynq_worker" - "github.com/Rain-kl/Wavelet/backend/plugins/drivers/driver_http" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/extpoints" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_cron" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_asynq_worker" + "github.com/Rain-kl/Wavelet/plugins/drivers/driver_http" ) func init() { diff --git a/backend/plugins/infra/cache/plugin.go b/backend/plugins/infra/cache/plugin.go index ab994ecb..33498a57 100644 --- a/backend/plugins/infra/cache/plugin.go +++ b/backend/plugins/infra/cache/plugin.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/cache/ram" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/cache/ram" + "github.com/Rain-kl/Wavelet/pkg/util" "github.com/redis/go-redis/v9" ) diff --git a/backend/plugins/infra/cache/plugin_test.go b/backend/plugins/infra/cache/plugin_test.go index 00705ca1..d34ecf79 100644 --- a/backend/plugins/infra/cache/plugin_test.go +++ b/backend/plugins/infra/cache/plugin_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/infra/cache" ) func TestCachePluginOperations(t *testing.T) { diff --git a/backend/plugins/infra/cache/redis.go b/backend/plugins/infra/cache/redis.go index e03aa91c..5acc7e6c 100644 --- a/backend/plugins/infra/cache/redis.go +++ b/backend/plugins/infra/cache/redis.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/config" "github.com/redis/go-redis/extra/redisotel/v9" "github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9/maintnotifications" diff --git a/backend/plugins/infra/database/clickhouse.go b/backend/plugins/infra/database/clickhouse.go index 6645a9f7..fc613222 100644 --- a/backend/plugins/infra/database/clickhouse.go +++ b/backend/plugins/infra/database/clickhouse.go @@ -16,7 +16,7 @@ import ( "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/config" "go.opentelemetry.io/otel/attribute" clickhouseDriver "gorm.io/driver/clickhouse" "gorm.io/gorm" diff --git a/backend/plugins/infra/database/plugin.go b/backend/plugins/infra/database/plugin.go index 803f60bf..4a768377 100644 --- a/backend/plugins/infra/database/plugin.go +++ b/backend/plugins/infra/database/plugin.go @@ -7,8 +7,8 @@ package database import ( "context" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" "gorm.io/gorm" ) diff --git a/backend/plugins/infra/database/plugin_test.go b/backend/plugins/infra/database/plugin_test.go index ec76fc7e..6f5243ea 100644 --- a/backend/plugins/infra/database/plugin_test.go +++ b/backend/plugins/infra/database/plugin_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/infra/database" ) type Item struct { diff --git a/backend/plugins/infra/database/postgres.go b/backend/plugins/infra/database/postgres.go index f81318b7..25816982 100644 --- a/backend/plugins/infra/database/postgres.go +++ b/backend/plugins/infra/database/postgres.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/config" + "github.com/Rain-kl/Wavelet/pkg/config" "github.com/glebarez/sqlite" "go.opentelemetry.io/otel/attribute" "gorm.io/driver/postgres" diff --git a/backend/plugins/infra/database/postgres_logger.go b/backend/plugins/infra/database/postgres_logger.go index b14de60f..61b74666 100644 --- a/backend/plugins/infra/database/postgres_logger.go +++ b/backend/plugins/infra/database/postgres_logger.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/pkg/logger" "gorm.io/gorm" gormLogger "gorm.io/gorm/logger" ) diff --git a/backend/plugins/infra/infra_test.go b/backend/plugins/infra/infra_test.go index fe98b073..c6827b54 100644 --- a/backend/plugins/infra/infra_test.go +++ b/backend/plugins/infra/infra_test.go @@ -19,13 +19,13 @@ import ( "github.com/stretchr/testify/require" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/logger" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/plugins/infra/database" + "github.com/Rain-kl/Wavelet/plugins/infra/logger" + "github.com/Rain-kl/Wavelet/plugins/infra/storage" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) type TestUser struct { diff --git a/backend/plugins/infra/logger/plugin.go b/backend/plugins/infra/logger/plugin.go index 545e26f0..e3ab711c 100644 --- a/backend/plugins/infra/logger/plugin.go +++ b/backend/plugins/infra/logger/plugin.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/pkg/logger" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/pkg/logger" ) // Plugin implements core.Plugin to provide contracts.LoggerService. diff --git a/backend/plugins/infra/logger/plugin_test.go b/backend/plugins/infra/logger/plugin_test.go index c23a73b9..6ac452e2 100644 --- a/backend/plugins/infra/logger/plugin_test.go +++ b/backend/plugins/infra/logger/plugin_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/logger" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/infra/logger" ) func TestLoggerPluginOperations(t *testing.T) { diff --git a/backend/plugins/infra/storage/diskcache/cache.go b/backend/plugins/infra/storage/diskcache/cache.go index 7c913218..7c7b0bca 100644 --- a/backend/plugins/infra/storage/diskcache/cache.go +++ b/backend/plugins/infra/storage/diskcache/cache.go @@ -10,8 +10,8 @@ import ( "sync" "time" - pkgcache "github.com/Rain-kl/Wavelet/backend/pkg/cache/disk" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + pkgcache "github.com/Rain-kl/Wavelet/pkg/cache/disk" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" ) // Status represents the runtime cache statistics. diff --git a/backend/plugins/infra/storage/diskcache/cache_test.go b/backend/plugins/infra/storage/diskcache/cache_test.go index a2740ee1..3dec9bf6 100644 --- a/backend/plugins/infra/storage/diskcache/cache_test.go +++ b/backend/plugins/infra/storage/diskcache/cache_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/Rain-kl/Wavelet/backend/pkg/testhelper" - cache "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + "github.com/Rain-kl/Wavelet/pkg/testhelper" + cache "github.com/Rain-kl/Wavelet/plugins/infra/cache" ) func TestDiskCacheReloadConfig(t *testing.T) { diff --git a/backend/plugins/infra/storage/objectstore/config.go b/backend/plugins/infra/storage/objectstore/config.go index 3bb9daa2..88ef9ca6 100644 --- a/backend/plugins/infra/storage/objectstore/config.go +++ b/backend/plugins/infra/storage/objectstore/config.go @@ -12,7 +12,7 @@ import ( "strings" "time" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/plugins/infra/storage/objectstore/http.go b/backend/plugins/infra/storage/objectstore/http.go index b2445f6a..fe6698e2 100644 --- a/backend/plugins/infra/storage/objectstore/http.go +++ b/backend/plugins/infra/storage/objectstore/http.go @@ -10,7 +10,7 @@ import ( "net/url" "time" - "github.com/Rain-kl/Wavelet/backend/pkg/httppool" + "github.com/Rain-kl/Wavelet/pkg/httppool" ) func getHTTPObject(ctx context.Context, baseURL, key string) (*Object, error) { diff --git a/backend/plugins/infra/storage/objectstore/storage.go b/backend/plugins/infra/storage/objectstore/storage.go index c22c3ad5..c2c512f4 100644 --- a/backend/plugins/infra/storage/objectstore/storage.go +++ b/backend/plugins/infra/storage/objectstore/storage.go @@ -13,10 +13,10 @@ import ( "sync" "time" - cache "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" - database "github.com/Rain-kl/Wavelet/backend/plugins/infra/database" + cache "github.com/Rain-kl/Wavelet/plugins/infra/cache" + database "github.com/Rain-kl/Wavelet/plugins/infra/database" - "github.com/Rain-kl/Wavelet/backend/pkg/util" + "github.com/Rain-kl/Wavelet/pkg/util" "gorm.io/gorm" ) diff --git a/backend/plugins/infra/storage/objectstore/storage_test.go b/backend/plugins/infra/storage/objectstore/storage_test.go index 48894117..5c919f9e 100644 --- a/backend/plugins/infra/storage/objectstore/storage_test.go +++ b/backend/plugins/infra/storage/objectstore/storage_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - cache "github.com/Rain-kl/Wavelet/backend/plugins/infra/cache" + cache "github.com/Rain-kl/Wavelet/plugins/infra/cache" "github.com/alicebob/miniredis/v2" "github.com/redis/go-redis/v9" ) diff --git a/backend/plugins/infra/storage/objectstore/webdav.go b/backend/plugins/infra/storage/objectstore/webdav.go index a33c6d13..5d8e3e65 100644 --- a/backend/plugins/infra/storage/objectstore/webdav.go +++ b/backend/plugins/infra/storage/objectstore/webdav.go @@ -11,7 +11,7 @@ import ( "path" "strings" - "github.com/Rain-kl/Wavelet/backend/pkg/httppool" + "github.com/Rain-kl/Wavelet/pkg/httppool" "github.com/studio-b12/gowebdav" ) diff --git a/backend/plugins/infra/storage/plugin.go b/backend/plugins/infra/storage/plugin.go index 6da3bf8f..d03d229a 100644 --- a/backend/plugins/infra/storage/plugin.go +++ b/backend/plugins/infra/storage/plugin.go @@ -9,11 +9,11 @@ import ( "fmt" "io" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/ingest" - uploadmodels "github.com/Rain-kl/Wavelet/backend/plugins/domain/upload/models" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/domain/upload/ingest" + uploadmodels "github.com/Rain-kl/Wavelet/plugins/domain/upload/models" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) // Option configures the storage plugin. diff --git a/backend/plugins/infra/storage/plugin_test.go b/backend/plugins/infra/storage/plugin_test.go index 68fa9104..86d0eadc 100644 --- a/backend/plugins/infra/storage/plugin_test.go +++ b/backend/plugins/infra/storage/plugin_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/backend/core" - "github.com/Rain-kl/Wavelet/backend/core/contracts" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage" - "github.com/Rain-kl/Wavelet/backend/plugins/infra/storage/objectstore" + "github.com/Rain-kl/Wavelet/core" + "github.com/Rain-kl/Wavelet/core/contracts" + "github.com/Rain-kl/Wavelet/plugins/infra/storage" + "github.com/Rain-kl/Wavelet/plugins/infra/storage/objectstore" ) type mockStorageBackend struct { diff --git a/scripts/swagger.sh b/scripts/swagger.sh index 9821d9ab..df371fa6 100755 --- a/scripts/swagger.sh +++ b/scripts/swagger.sh @@ -3,4 +3,4 @@ # execute this first # go install github.com/swaggo/swag/cmd/swag@latest -swag init --dir backend/ -o docs --parseDependency --parseInternal --exclude fast-note-sync-service-source +(cd backend && swag init -o ../docs --parseDependency --parseInternal --exclude fast-note-sync-service-source)