diff --git a/backend/app/http/medias/controller.go b/backend/app/http/medias/controller.go index bc993b2..f8b3d4c 100644 --- a/backend/app/http/medias/controller.go +++ b/backend/app/http/medias/controller.go @@ -6,7 +6,7 @@ import ( "backend/app/http/storages" "backend/app/http/tenants" - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" "backend/pkg/storage" "backend/providers/jwt" diff --git a/backend/app/http/medias/service.go b/backend/app/http/medias/service.go index 5899b44..d13aa37 100644 --- a/backend/app/http/medias/service.go +++ b/backend/app/http/medias/service.go @@ -5,8 +5,8 @@ import ( "database/sql" "time" - "backend/database/models/qvyun_v2/public/model" - "backend/database/models/qvyun_v2/public/table" + "backend/database/schemas/public/model" + "backend/database/schemas/public/table" "backend/providers/otel" . "github.com/go-jet/jet/v2/postgres" diff --git a/backend/app/http/orders/controller_order.go b/backend/app/http/orders/controller_order.go index 90f9899..4f31e9a 100644 --- a/backend/app/http/orders/controller_order.go +++ b/backend/app/http/orders/controller_order.go @@ -5,7 +5,7 @@ import ( "backend/app/http/tenants" "backend/app/http/users" "backend/app/requests" - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" "backend/providers/jwt" "github.com/gofiber/fiber/v3" diff --git a/backend/app/http/orders/controller_pay.go b/backend/app/http/orders/controller_pay.go index 5d0f300..78cb20d 100644 --- a/backend/app/http/orders/controller_pay.go +++ b/backend/app/http/orders/controller_pay.go @@ -8,7 +8,7 @@ import ( "backend/app/http/tenants" "backend/app/http/users" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" "backend/providers/jwt" "backend/providers/pay" diff --git a/backend/app/http/orders/service.go b/backend/app/http/orders/service.go index db65277..a1a9453 100644 --- a/backend/app/http/orders/service.go +++ b/backend/app/http/orders/service.go @@ -7,8 +7,8 @@ import ( "backend/app/requests" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" - "backend/database/models/qvyun_v2/public/table" + "backend/database/schemas/public/model" + "backend/database/schemas/public/table" "backend/pkg/utils" "backend/providers/otel" diff --git a/backend/app/http/posts/controller.go b/backend/app/http/posts/controller.go index 1781c5e..e3da9d9 100644 --- a/backend/app/http/posts/controller.go +++ b/backend/app/http/posts/controller.go @@ -10,7 +10,7 @@ import ( "backend/app/http/users" "backend/app/requests" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" "backend/providers/event" "backend/providers/hashids" "backend/providers/jwt" diff --git a/backend/app/http/posts/service.go b/backend/app/http/posts/service.go index 0dca7cd..cf3d31e 100644 --- a/backend/app/http/posts/service.go +++ b/backend/app/http/posts/service.go @@ -8,8 +8,8 @@ import ( "backend/app/requests" "backend/database" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" - "backend/database/models/qvyun_v2/public/table" + "backend/database/schemas/public/model" + "backend/database/schemas/public/table" "backend/providers/hashids" "backend/providers/otel" diff --git a/backend/app/http/storages/controller.go b/backend/app/http/storages/controller.go index 044e420..9c0df64 100644 --- a/backend/app/http/storages/controller.go +++ b/backend/app/http/storages/controller.go @@ -1,7 +1,7 @@ package storages import ( - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" "github.com/gofiber/fiber/v3" "github.com/samber/lo" diff --git a/backend/app/http/storages/dto.go b/backend/app/http/storages/dto.go index 715b985..c13dd20 100644 --- a/backend/app/http/storages/dto.go +++ b/backend/app/http/storages/dto.go @@ -2,7 +2,7 @@ package storages import ( "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" ) type Storage struct { diff --git a/backend/app/http/storages/service.go b/backend/app/http/storages/service.go index ee7524f..7c296c6 100644 --- a/backend/app/http/storages/service.go +++ b/backend/app/http/storages/service.go @@ -6,8 +6,8 @@ import ( "errors" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" - "backend/database/models/qvyun_v2/public/table" + "backend/database/schemas/public/model" + "backend/database/schemas/public/table" "backend/providers/otel" . "github.com/go-jet/jet/v2/postgres" diff --git a/backend/app/http/tenants/service.go b/backend/app/http/tenants/service.go index 2e72974..91ab507 100644 --- a/backend/app/http/tenants/service.go +++ b/backend/app/http/tenants/service.go @@ -4,8 +4,8 @@ import ( "context" "database/sql" - "backend/database/models/qvyun_v2/public/model" - "backend/database/models/qvyun_v2/public/table" + "backend/database/schemas/public/model" + "backend/database/schemas/public/table" "backend/providers/otel" . "github.com/go-jet/jet/v2/postgres" diff --git a/backend/app/http/users/service.go b/backend/app/http/users/service.go index 88d00b1..ee76638 100644 --- a/backend/app/http/users/service.go +++ b/backend/app/http/users/service.go @@ -7,8 +7,8 @@ import ( "backend/app/events/publishers" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" - "backend/database/models/qvyun_v2/public/table" + "backend/database/schemas/public/model" + "backend/database/schemas/public/table" "backend/pkg/oauth" "backend/providers/event" "backend/providers/otel" diff --git a/backend/app/http/users/service_test.go b/backend/app/http/users/service_test.go index bd36095..1752b5b 100644 --- a/backend/app/http/users/service_test.go +++ b/backend/app/http/users/service_test.go @@ -8,8 +8,8 @@ import ( "backend/app/service/testx" "backend/database" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" - "backend/database/models/qvyun_v2/public/table" + "backend/database/schemas/public/model" + "backend/database/schemas/public/table" "git.ipao.vip/rogeecn/atom/contracts" . "github.com/smartystreets/goconvey/convey" diff --git a/backend/app/jobs/post_video_cut.go b/backend/app/jobs/post_video_cut.go index f5767af..8ef55fa 100644 --- a/backend/app/jobs/post_video_cut.go +++ b/backend/app/jobs/post_video_cut.go @@ -12,7 +12,7 @@ import ( "backend/app/http/posts" "backend/app/http/storages" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" "backend/pkg/utils" "backend/pkg/utils/fs" diff --git a/backend/app/jobs/post_video_extract_audio.go b/backend/app/jobs/post_video_extract_audio.go index 2117f5e..7fbd2e5 100644 --- a/backend/app/jobs/post_video_extract_audio.go +++ b/backend/app/jobs/post_video_extract_audio.go @@ -12,7 +12,7 @@ import ( "backend/app/http/posts" "backend/app/http/storages" "backend/database/fields" - "backend/database/models/qvyun_v2/public/model" + "backend/database/schemas/public/model" "backend/pkg/utils" "backend/pkg/utils/fs" diff --git a/backend/database/models/qvyun_v2/public/model/medias.go b/backend/database/schemas/public/model/medias.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/medias.go rename to backend/database/schemas/public/model/medias.go diff --git a/backend/database/models/qvyun_v2/public/model/orders.go b/backend/database/schemas/public/model/orders.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/orders.go rename to backend/database/schemas/public/model/orders.go diff --git a/backend/database/models/qvyun_v2/public/model/posts.go b/backend/database/schemas/public/model/posts.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/posts.go rename to backend/database/schemas/public/model/posts.go diff --git a/backend/database/models/qvyun_v2/public/model/river_job_state.go b/backend/database/schemas/public/model/river_job_state.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/river_job_state.go rename to backend/database/schemas/public/model/river_job_state.go diff --git a/backend/database/models/qvyun_v2/public/model/storages.go b/backend/database/schemas/public/model/storages.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/storages.go rename to backend/database/schemas/public/model/storages.go diff --git a/backend/database/models/qvyun_v2/public/model/tenant_user_balances.go b/backend/database/schemas/public/model/tenant_user_balances.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/tenant_user_balances.go rename to backend/database/schemas/public/model/tenant_user_balances.go diff --git a/backend/database/models/qvyun_v2/public/model/tenant_users.go b/backend/database/schemas/public/model/tenant_users.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/tenant_users.go rename to backend/database/schemas/public/model/tenant_users.go diff --git a/backend/database/models/qvyun_v2/public/model/tenants.go b/backend/database/schemas/public/model/tenants.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/tenants.go rename to backend/database/schemas/public/model/tenants.go diff --git a/backend/database/models/qvyun_v2/public/model/user_bought_posts.go b/backend/database/schemas/public/model/user_bought_posts.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/user_bought_posts.go rename to backend/database/schemas/public/model/user_bought_posts.go diff --git a/backend/database/models/qvyun_v2/public/model/user_medias.go b/backend/database/schemas/public/model/user_medias.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/user_medias.go rename to backend/database/schemas/public/model/user_medias.go diff --git a/backend/database/models/qvyun_v2/public/model/user_oauths.go b/backend/database/schemas/public/model/user_oauths.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/user_oauths.go rename to backend/database/schemas/public/model/user_oauths.go diff --git a/backend/database/models/qvyun_v2/public/model/users.go b/backend/database/schemas/public/model/users.go similarity index 100% rename from backend/database/models/qvyun_v2/public/model/users.go rename to backend/database/schemas/public/model/users.go diff --git a/backend/database/models/qvyun_v2/public/table/medias.go b/backend/database/schemas/public/table/medias.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/medias.go rename to backend/database/schemas/public/table/medias.go diff --git a/backend/database/models/qvyun_v2/public/table/orders.go b/backend/database/schemas/public/table/orders.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/orders.go rename to backend/database/schemas/public/table/orders.go diff --git a/backend/database/models/qvyun_v2/public/table/posts.go b/backend/database/schemas/public/table/posts.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/posts.go rename to backend/database/schemas/public/table/posts.go diff --git a/backend/database/models/qvyun_v2/public/table/storages.go b/backend/database/schemas/public/table/storages.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/storages.go rename to backend/database/schemas/public/table/storages.go diff --git a/backend/database/models/qvyun_v2/public/table/table_use_schema.go b/backend/database/schemas/public/table/table_use_schema.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/table_use_schema.go rename to backend/database/schemas/public/table/table_use_schema.go diff --git a/backend/database/models/qvyun_v2/public/table/tenant_user_balances.go b/backend/database/schemas/public/table/tenant_user_balances.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/tenant_user_balances.go rename to backend/database/schemas/public/table/tenant_user_balances.go diff --git a/backend/database/models/qvyun_v2/public/table/tenant_users.go b/backend/database/schemas/public/table/tenant_users.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/tenant_users.go rename to backend/database/schemas/public/table/tenant_users.go diff --git a/backend/database/models/qvyun_v2/public/table/tenants.go b/backend/database/schemas/public/table/tenants.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/tenants.go rename to backend/database/schemas/public/table/tenants.go diff --git a/backend/database/models/qvyun_v2/public/table/user_bought_posts.go b/backend/database/schemas/public/table/user_bought_posts.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/user_bought_posts.go rename to backend/database/schemas/public/table/user_bought_posts.go diff --git a/backend/database/models/qvyun_v2/public/table/user_medias.go b/backend/database/schemas/public/table/user_medias.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/user_medias.go rename to backend/database/schemas/public/table/user_medias.go diff --git a/backend/database/models/qvyun_v2/public/table/user_oauths.go b/backend/database/schemas/public/table/user_oauths.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/user_oauths.go rename to backend/database/schemas/public/table/user_oauths.go diff --git a/backend/database/models/qvyun_v2/public/table/users.go b/backend/database/schemas/public/table/users.go similarity index 100% rename from backend/database/models/qvyun_v2/public/table/users.go rename to backend/database/schemas/public/table/users.go diff --git a/qvyun.code-workspace b/qvyun.code-workspace index 054faec..9ee7e37 100644 --- a/qvyun.code-workspace +++ b/qvyun.code-workspace @@ -6,9 +6,13 @@ { "path": "frontend" }, + { + "path": "backend/database" + "name": "BACKEND_Database", + }, { "path": "backend/app", -"name":"BACKEND_APP" + "name": "BACKEND_APP", } ] } diff --git a/test/justfile b/test/justfile new file mode 100644 index 0000000..5762fbc --- /dev/null +++ b/test/justfile @@ -0,0 +1,6 @@ +recipe-name: + echo 'This is a recipe!' + +# 这是一行注释 +another-recipe: + @echo 'This is another recipe.'