From 3e50bee7dae1f043737d40c0b7ba60e3a73977c3 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 29 Feb 2024 01:16:43 +0800 Subject: [PATCH] chore: move api directory --- internal/jobs/presign_link.go | 2 +- server/integration/telegram.go | 2 +- {api => server/route/api}/auth/auth.go | 0 {api => server/route/api}/v1/auth.go | 2 +- {api => server/route/api}/v1/common.go | 0 {api => server/route/api}/v1/docs.go | 0 {api => server/route/api}/v1/http_getter.go | 0 {api => server/route/api}/v1/idp.go | 0 {api => server/route/api}/v1/jwt.go | 2 +- {api => server/route/api}/v1/memo.go | 0 {api => server/route/api}/v1/memo_organizer.go | 0 {api => server/route/api}/v1/memo_relation.go | 0 {api => server/route/api}/v1/resource.go | 0 {api => server/route/api}/v1/storage.go | 0 {api => server/route/api}/v1/swagger.md | 0 {api => server/route/api}/v1/swagger.yaml | 0 {api => server/route/api}/v1/system.go | 0 {api => server/route/api}/v1/system_setting.go | 0 {api => server/route/api}/v1/tag.go | 0 {api => server/route/api}/v1/tag_test.go | 0 {api => server/route/api}/v1/user.go | 0 {api => server/route/api}/v1/v1.go | 4 ++-- {api => server/route/api}/v2/acl.go | 2 +- {api => server/route/api}/v2/acl_config.go | 0 {api => server/route/api}/v2/activity_service.go | 0 {api => server/route/api}/v2/apidocs.swagger.md | 0 {api => server/route/api}/v2/apidocs.swagger.yaml | 0 {api => server/route/api}/v2/auth_service.go | 2 +- {api => server/route/api}/v2/common.go | 0 {api => server/route/api}/v2/inbox_service.go | 0 {api => server/route/api}/v2/memo_relation_service.go | 0 {api => server/route/api}/v2/memo_resource_service.go | 0 {api => server/route/api}/v2/memo_service.go | 2 +- {api => server/route/api}/v2/reaction_service.go | 0 {api => server/route/api}/v2/resource_name.go | 0 {api => server/route/api}/v2/resource_service.go | 0 {api => server/route/api}/v2/tag_service.go | 0 {api => server/route/api}/v2/user_service.go | 2 +- {api => server/route/api}/v2/v2.go | 0 {api => server/route/api}/v2/webhook_service.go | 0 {api => server/route/api}/v2/workspace_service.go | 0 {api => server/route/api}/v2/workspace_setting_service.go | 0 server/{ => route}/frontend/frontend.go | 0 {api => server/route}/resource/resource.go | 0 {api => server/route}/rss/rss.go | 0 server/server.go | 6 +++--- 46 files changed, 13 insertions(+), 13 deletions(-) rename {api => server/route/api}/auth/auth.go (100%) rename {api => server/route/api}/v1/auth.go (99%) rename {api => server/route/api}/v1/common.go (100%) rename {api => server/route/api}/v1/docs.go (100%) rename {api => server/route/api}/v1/http_getter.go (100%) rename {api => server/route/api}/v1/idp.go (100%) rename {api => server/route/api}/v1/jwt.go (98%) rename {api => server/route/api}/v1/memo.go (100%) rename {api => server/route/api}/v1/memo_organizer.go (100%) rename {api => server/route/api}/v1/memo_relation.go (100%) rename {api => server/route/api}/v1/resource.go (100%) rename {api => server/route/api}/v1/storage.go (100%) rename {api => server/route/api}/v1/swagger.md (100%) rename {api => server/route/api}/v1/swagger.yaml (100%) rename {api => server/route/api}/v1/system.go (100%) rename {api => server/route/api}/v1/system_setting.go (100%) rename {api => server/route/api}/v1/tag.go (100%) rename {api => server/route/api}/v1/tag_test.go (100%) rename {api => server/route/api}/v1/user.go (100%) rename {api => server/route/api}/v1/v1.go (96%) rename {api => server/route/api}/v2/acl.go (99%) rename {api => server/route/api}/v2/acl_config.go (100%) rename {api => server/route/api}/v2/activity_service.go (100%) rename {api => server/route/api}/v2/apidocs.swagger.md (100%) rename {api => server/route/api}/v2/apidocs.swagger.yaml (100%) rename {api => server/route/api}/v2/auth_service.go (99%) rename {api => server/route/api}/v2/common.go (100%) rename {api => server/route/api}/v2/inbox_service.go (100%) rename {api => server/route/api}/v2/memo_relation_service.go (100%) rename {api => server/route/api}/v2/memo_resource_service.go (100%) rename {api => server/route/api}/v2/memo_service.go (99%) rename {api => server/route/api}/v2/reaction_service.go (100%) rename {api => server/route/api}/v2/resource_name.go (100%) rename {api => server/route/api}/v2/resource_service.go (100%) rename {api => server/route/api}/v2/tag_service.go (100%) rename {api => server/route/api}/v2/user_service.go (99%) rename {api => server/route/api}/v2/v2.go (100%) rename {api => server/route/api}/v2/webhook_service.go (100%) rename {api => server/route/api}/v2/workspace_service.go (100%) rename {api => server/route/api}/v2/workspace_setting_service.go (100%) rename server/{ => route}/frontend/frontend.go (100%) rename {api => server/route}/resource/resource.go (100%) rename {api => server/route}/rss/rss.go (100%) diff --git a/internal/jobs/presign_link.go b/internal/jobs/presign_link.go index b5a80935..9f6e90df 100644 --- a/internal/jobs/presign_link.go +++ b/internal/jobs/presign_link.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - apiv1 "github.com/usememos/memos/api/v1" "github.com/usememos/memos/internal/log" "github.com/usememos/memos/plugin/storage/s3" + apiv1 "github.com/usememos/memos/server/route/api/v1" "github.com/usememos/memos/store" ) diff --git a/server/integration/telegram.go b/server/integration/telegram.go index 4f04175e..efb6d978 100644 --- a/server/integration/telegram.go +++ b/server/integration/telegram.go @@ -12,10 +12,10 @@ import ( "github.com/lithammer/shortuuid/v4" "github.com/pkg/errors" - apiv1 "github.com/usememos/memos/api/v1" "github.com/usememos/memos/plugin/telegram" "github.com/usememos/memos/plugin/webhook" storepb "github.com/usememos/memos/proto/gen/store" + apiv1 "github.com/usememos/memos/server/route/api/v1" "github.com/usememos/memos/store" ) diff --git a/api/auth/auth.go b/server/route/api/auth/auth.go similarity index 100% rename from api/auth/auth.go rename to server/route/api/auth/auth.go diff --git a/api/v1/auth.go b/server/route/api/v1/auth.go similarity index 99% rename from api/v1/auth.go rename to server/route/api/v1/auth.go index ee132656..0dcaf282 100644 --- a/api/v1/auth.go +++ b/server/route/api/v1/auth.go @@ -13,11 +13,11 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/bcrypt" - "github.com/usememos/memos/api/auth" "github.com/usememos/memos/internal/util" "github.com/usememos/memos/plugin/idp" "github.com/usememos/memos/plugin/idp/oauth2" storepb "github.com/usememos/memos/proto/gen/store" + "github.com/usememos/memos/server/route/api/auth" "github.com/usememos/memos/store" ) diff --git a/api/v1/common.go b/server/route/api/v1/common.go similarity index 100% rename from api/v1/common.go rename to server/route/api/v1/common.go diff --git a/api/v1/docs.go b/server/route/api/v1/docs.go similarity index 100% rename from api/v1/docs.go rename to server/route/api/v1/docs.go diff --git a/api/v1/http_getter.go b/server/route/api/v1/http_getter.go similarity index 100% rename from api/v1/http_getter.go rename to server/route/api/v1/http_getter.go diff --git a/api/v1/idp.go b/server/route/api/v1/idp.go similarity index 100% rename from api/v1/idp.go rename to server/route/api/v1/idp.go diff --git a/api/v1/jwt.go b/server/route/api/v1/jwt.go similarity index 98% rename from api/v1/jwt.go rename to server/route/api/v1/jwt.go index fb1d605c..a2507221 100644 --- a/api/v1/jwt.go +++ b/server/route/api/v1/jwt.go @@ -10,10 +10,10 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/usememos/memos/api/auth" "github.com/usememos/memos/internal/log" "github.com/usememos/memos/internal/util" storepb "github.com/usememos/memos/proto/gen/store" + "github.com/usememos/memos/server/route/api/auth" "github.com/usememos/memos/store" ) diff --git a/api/v1/memo.go b/server/route/api/v1/memo.go similarity index 100% rename from api/v1/memo.go rename to server/route/api/v1/memo.go diff --git a/api/v1/memo_organizer.go b/server/route/api/v1/memo_organizer.go similarity index 100% rename from api/v1/memo_organizer.go rename to server/route/api/v1/memo_organizer.go diff --git a/api/v1/memo_relation.go b/server/route/api/v1/memo_relation.go similarity index 100% rename from api/v1/memo_relation.go rename to server/route/api/v1/memo_relation.go diff --git a/api/v1/resource.go b/server/route/api/v1/resource.go similarity index 100% rename from api/v1/resource.go rename to server/route/api/v1/resource.go diff --git a/api/v1/storage.go b/server/route/api/v1/storage.go similarity index 100% rename from api/v1/storage.go rename to server/route/api/v1/storage.go diff --git a/api/v1/swagger.md b/server/route/api/v1/swagger.md similarity index 100% rename from api/v1/swagger.md rename to server/route/api/v1/swagger.md diff --git a/api/v1/swagger.yaml b/server/route/api/v1/swagger.yaml similarity index 100% rename from api/v1/swagger.yaml rename to server/route/api/v1/swagger.yaml diff --git a/api/v1/system.go b/server/route/api/v1/system.go similarity index 100% rename from api/v1/system.go rename to server/route/api/v1/system.go diff --git a/api/v1/system_setting.go b/server/route/api/v1/system_setting.go similarity index 100% rename from api/v1/system_setting.go rename to server/route/api/v1/system_setting.go diff --git a/api/v1/tag.go b/server/route/api/v1/tag.go similarity index 100% rename from api/v1/tag.go rename to server/route/api/v1/tag.go diff --git a/api/v1/tag_test.go b/server/route/api/v1/tag_test.go similarity index 100% rename from api/v1/tag_test.go rename to server/route/api/v1/tag_test.go diff --git a/api/v1/user.go b/server/route/api/v1/user.go similarity index 100% rename from api/v1/user.go rename to server/route/api/v1/user.go diff --git a/api/v1/v1.go b/server/route/api/v1/v1.go similarity index 96% rename from api/v1/v1.go rename to server/route/api/v1/v1.go index 2143e89b..c4496727 100644 --- a/api/v1/v1.go +++ b/server/route/api/v1/v1.go @@ -7,10 +7,10 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - "github.com/usememos/memos/api/resource" - "github.com/usememos/memos/api/rss" "github.com/usememos/memos/plugin/telegram" "github.com/usememos/memos/server/profile" + "github.com/usememos/memos/server/route/resource" + "github.com/usememos/memos/server/route/rss" "github.com/usememos/memos/store" ) diff --git a/api/v2/acl.go b/server/route/api/v2/acl.go similarity index 99% rename from api/v2/acl.go rename to server/route/api/v2/acl.go index 9c6498c1..23b0a597 100644 --- a/api/v2/acl.go +++ b/server/route/api/v2/acl.go @@ -12,9 +12,9 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/usememos/memos/api/auth" "github.com/usememos/memos/internal/util" storepb "github.com/usememos/memos/proto/gen/store" + "github.com/usememos/memos/server/route/api/auth" "github.com/usememos/memos/store" ) diff --git a/api/v2/acl_config.go b/server/route/api/v2/acl_config.go similarity index 100% rename from api/v2/acl_config.go rename to server/route/api/v2/acl_config.go diff --git a/api/v2/activity_service.go b/server/route/api/v2/activity_service.go similarity index 100% rename from api/v2/activity_service.go rename to server/route/api/v2/activity_service.go diff --git a/api/v2/apidocs.swagger.md b/server/route/api/v2/apidocs.swagger.md similarity index 100% rename from api/v2/apidocs.swagger.md rename to server/route/api/v2/apidocs.swagger.md diff --git a/api/v2/apidocs.swagger.yaml b/server/route/api/v2/apidocs.swagger.yaml similarity index 100% rename from api/v2/apidocs.swagger.yaml rename to server/route/api/v2/apidocs.swagger.yaml diff --git a/api/v2/auth_service.go b/server/route/api/v2/auth_service.go similarity index 99% rename from api/v2/auth_service.go rename to server/route/api/v2/auth_service.go index 24fb48b3..3975dd55 100644 --- a/api/v2/auth_service.go +++ b/server/route/api/v2/auth_service.go @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/usememos/memos/api/auth" + "github.com/usememos/memos/server/route/api/auth" "github.com/usememos/memos/internal/util" "github.com/usememos/memos/plugin/idp" "github.com/usememos/memos/plugin/idp/oauth2" diff --git a/api/v2/common.go b/server/route/api/v2/common.go similarity index 100% rename from api/v2/common.go rename to server/route/api/v2/common.go diff --git a/api/v2/inbox_service.go b/server/route/api/v2/inbox_service.go similarity index 100% rename from api/v2/inbox_service.go rename to server/route/api/v2/inbox_service.go diff --git a/api/v2/memo_relation_service.go b/server/route/api/v2/memo_relation_service.go similarity index 100% rename from api/v2/memo_relation_service.go rename to server/route/api/v2/memo_relation_service.go diff --git a/api/v2/memo_resource_service.go b/server/route/api/v2/memo_resource_service.go similarity index 100% rename from api/v2/memo_resource_service.go rename to server/route/api/v2/memo_resource_service.go diff --git a/api/v2/memo_service.go b/server/route/api/v2/memo_service.go similarity index 99% rename from api/v2/memo_service.go rename to server/route/api/v2/memo_service.go index ae8c4e55..7add198f 100644 --- a/api/v2/memo_service.go +++ b/server/route/api/v2/memo_service.go @@ -17,12 +17,12 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - apiv1 "github.com/usememos/memos/api/v1" "github.com/usememos/memos/internal/log" "github.com/usememos/memos/internal/util" "github.com/usememos/memos/plugin/webhook" apiv2pb "github.com/usememos/memos/proto/gen/api/v2" storepb "github.com/usememos/memos/proto/gen/store" + apiv1 "github.com/usememos/memos/server/route/api/v1" "github.com/usememos/memos/store" ) diff --git a/api/v2/reaction_service.go b/server/route/api/v2/reaction_service.go similarity index 100% rename from api/v2/reaction_service.go rename to server/route/api/v2/reaction_service.go diff --git a/api/v2/resource_name.go b/server/route/api/v2/resource_name.go similarity index 100% rename from api/v2/resource_name.go rename to server/route/api/v2/resource_name.go diff --git a/api/v2/resource_service.go b/server/route/api/v2/resource_service.go similarity index 100% rename from api/v2/resource_service.go rename to server/route/api/v2/resource_service.go diff --git a/api/v2/tag_service.go b/server/route/api/v2/tag_service.go similarity index 100% rename from api/v2/tag_service.go rename to server/route/api/v2/tag_service.go diff --git a/api/v2/user_service.go b/server/route/api/v2/user_service.go similarity index 99% rename from api/v2/user_service.go rename to server/route/api/v2/user_service.go index d21292c3..23c9efb7 100644 --- a/api/v2/user_service.go +++ b/server/route/api/v2/user_service.go @@ -16,10 +16,10 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/usememos/memos/api/auth" "github.com/usememos/memos/internal/util" apiv2pb "github.com/usememos/memos/proto/gen/api/v2" storepb "github.com/usememos/memos/proto/gen/store" + "github.com/usememos/memos/server/route/api/auth" "github.com/usememos/memos/store" ) diff --git a/api/v2/v2.go b/server/route/api/v2/v2.go similarity index 100% rename from api/v2/v2.go rename to server/route/api/v2/v2.go diff --git a/api/v2/webhook_service.go b/server/route/api/v2/webhook_service.go similarity index 100% rename from api/v2/webhook_service.go rename to server/route/api/v2/webhook_service.go diff --git a/api/v2/workspace_service.go b/server/route/api/v2/workspace_service.go similarity index 100% rename from api/v2/workspace_service.go rename to server/route/api/v2/workspace_service.go diff --git a/api/v2/workspace_setting_service.go b/server/route/api/v2/workspace_setting_service.go similarity index 100% rename from api/v2/workspace_setting_service.go rename to server/route/api/v2/workspace_setting_service.go diff --git a/server/frontend/frontend.go b/server/route/frontend/frontend.go similarity index 100% rename from server/frontend/frontend.go rename to server/route/frontend/frontend.go diff --git a/api/resource/resource.go b/server/route/resource/resource.go similarity index 100% rename from api/resource/resource.go rename to server/route/resource/resource.go diff --git a/api/rss/rss.go b/server/route/rss/rss.go similarity index 100% rename from api/rss/rss.go rename to server/route/rss/rss.go diff --git a/server/server.go b/server/server.go index 2f614d6e..ec0e4e90 100644 --- a/server/server.go +++ b/server/server.go @@ -12,10 +12,10 @@ import ( "github.com/labstack/echo/v4/middleware" "github.com/pkg/errors" - apiv1 "github.com/usememos/memos/api/v1" - apiv2 "github.com/usememos/memos/api/v2" + apiv1 "github.com/usememos/memos/server/route/api/v1" + apiv2 "github.com/usememos/memos/server/route/api/v2" "github.com/usememos/memos/plugin/telegram" - "github.com/usememos/memos/server/frontend" + "github.com/usememos/memos/server/route/frontend" "github.com/usememos/memos/server/integration" "github.com/usememos/memos/server/profile" versionchecker "github.com/usememos/memos/server/service/version_checker"