chore: move api directory

1 year ago · 3e50bee7da
parent 1aa75847d6
commit 3e50bee7da
46 changed files with 13 additions and 13 deletions
--- 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"
 )

--- 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"
 )

--- a/server/route/api/auth/auth.go
+++ b/server/route/api/auth/auth.go
--- a/server/route/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"
 )

--- a/server/route/api/v1/common.go
+++ b/server/route/api/v1/common.go
--- a/server/route/api/v1/docs.go
+++ b/server/route/api/v1/docs.go
--- a/server/route/api/v1/http_getter.go
+++ b/server/route/api/v1/http_getter.go
--- a/server/route/api/v1/idp.go
+++ b/server/route/api/v1/idp.go
--- a/server/route/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"
 )

--- a/server/route/api/v1/memo.go
+++ b/server/route/api/v1/memo.go
--- a/server/route/api/v1/memo_organizer.go
+++ b/server/route/api/v1/memo_organizer.go
--- a/server/route/api/v1/memo_relation.go
+++ b/server/route/api/v1/memo_relation.go
--- a/server/route/api/v1/resource.go
+++ b/server/route/api/v1/resource.go
--- a/server/route/api/v1/storage.go
+++ b/server/route/api/v1/storage.go
--- a/server/route/api/v1/swagger.md
+++ b/server/route/api/v1/swagger.md
--- a/server/route/api/v1/swagger.yaml
+++ b/server/route/api/v1/swagger.yaml
--- a/server/route/api/v1/system.go
+++ b/server/route/api/v1/system.go
--- a/server/route/api/v1/system_setting.go
+++ b/server/route/api/v1/system_setting.go
--- a/server/route/api/v1/tag.go
+++ b/server/route/api/v1/tag.go
--- a/server/route/api/v1/tag_test.go
+++ b/server/route/api/v1/tag_test.go
--- a/server/route/api/v1/user.go
+++ b/server/route/api/v1/user.go
--- a/server/route/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"
 )

--- a/server/route/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"
 )

--- a/server/route/api/v2/acl_config.go
+++ b/server/route/api/v2/acl_config.go
--- a/server/route/api/v2/activity_service.go
+++ b/server/route/api/v2/activity_service.go
--- a/server/route/api/v2/apidocs.swagger.md
+++ b/server/route/api/v2/apidocs.swagger.md
--- a/server/route/api/v2/apidocs.swagger.yaml
+++ b/server/route/api/v2/apidocs.swagger.yaml
--- a/server/route/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"
--- a/server/route/api/v2/common.go
+++ b/server/route/api/v2/common.go
--- a/server/route/api/v2/inbox_service.go
+++ b/server/route/api/v2/inbox_service.go
--- a/server/route/api/v2/memo_relation_service.go
+++ b/server/route/api/v2/memo_relation_service.go
--- a/server/route/api/v2/memo_resource_service.go
+++ b/server/route/api/v2/memo_resource_service.go
--- a/server/route/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"
 )

--- a/server/route/api/v2/reaction_service.go
+++ b/server/route/api/v2/reaction_service.go
--- a/server/route/api/v2/resource_name.go
+++ b/server/route/api/v2/resource_name.go
--- a/server/route/api/v2/resource_service.go
+++ b/server/route/api/v2/resource_service.go
--- a/server/route/api/v2/tag_service.go
+++ b/server/route/api/v2/tag_service.go
--- a/server/route/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"
 )

--- a/server/route/api/v2/v2.go
+++ b/server/route/api/v2/v2.go
--- a/server/route/api/v2/webhook_service.go
+++ b/server/route/api/v2/webhook_service.go
--- a/server/route/api/v2/workspace_service.go
+++ b/server/route/api/v2/workspace_service.go
--- a/server/route/api/v2/workspace_setting_service.go
+++ b/server/route/api/v2/workspace_setting_service.go
--- a/server/route/frontend/frontend.go
+++ b/server/route/frontend/frontend.go
--- a/server/route/resource/resource.go
+++ b/server/route/resource/resource.go
--- a/server/route/rss/rss.go
+++ b/server/route/rss/rss.go
--- 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"