usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-09-12 16:54:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

refactor: clean packages

Browse source
This commit is contained in:
Steven 2025-05-29 21:44:43 +08:00
parent 2bde296217
commit f1b365f928
23 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/memos/main.go
View file

@ -12,9 +12,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/internal/version"
"github.com/usememos/memos/server"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/server/version"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store/db"
)

2
internal/util/resource_name.go → internal/base/resource_name.go
View file

@ -1,4 +1,4 @@
package util
package base
import "regexp"

2
internal/util/resource_name_test.go → internal/base/resource_name_test.go
View file

@ -1,4 +1,4 @@
package util
package base
import (
"testing"

0
server/profile/profile.go → internal/profile/profile.go
View file

0
server/version/version.go → internal/version/version.go
View file

0
server/version/version_test.go → internal/version/version_test.go
View file

3
server/router/api/v1/auth_service.go
View file

@ -16,6 +16,7 @@ import (
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/emptypb"
"github.com/usememos/memos/internal/base"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/plugin/idp"
"github.com/usememos/memos/plugin/idp/oauth2"
@ -207,7 +208,7 @@ func (s *APIV1Service) SignUp(ctx context.Context, request *v1pb.SignUpRequest)
Nickname: request.Username,
PasswordHash: string(passwordHash),
}
if !util.UIDMatcher.MatchString(strings.ToLower(create.Username)) {
if !base.UIDMatcher.MatchString(strings.ToLower(create.Username)) {
return nil, status.Errorf(codes.InvalidArgument, "invalid username: %s", create.Username)
}

2
server/router/api/v1/resource_service.go
View file

@ -22,11 +22,11 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/plugin/storage/s3"
v1pb "github.com/usememos/memos/proto/gen/api/v1"
storepb "github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/store"
)

6
server/router/api/v1/user_service.go
View file

@ -20,7 +20,7 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/internal/base"
v1pb "github.com/usememos/memos/proto/gen/api/v1"
storepb "github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/store"
@ -122,7 +122,7 @@ func (s *APIV1Service) CreateUser(ctx context.Context, request *v1pb.CreateUserR
if currentUser.Role != store.RoleHost {
return nil, status.Errorf(codes.PermissionDenied, "permission denied")
}
if !util.UIDMatcher.MatchString(strings.ToLower(request.User.Username)) {
if !base.UIDMatcher.MatchString(strings.ToLower(request.User.Username)) {
return nil, status.Errorf(codes.InvalidArgument, "invalid username: %s", request.User.Username)
}
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)
@ -184,7 +184,7 @@ func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserR
if workspaceGeneralSetting.DisallowChangeUsername {
return nil, status.Errorf(codes.PermissionDenied, "permission denied: disallow change username")
}
if !util.UIDMatcher.MatchString(strings.ToLower(request.User.Username)) {
if !base.UIDMatcher.MatchString(strings.ToLower(request.User.Username)) {
return nil, status.Errorf(codes.InvalidArgument, "invalid username: %s", request.User.Username)
}
update.Username = &request.User.Username

2
server/router/api/v1/v1.go
View file

@ -14,8 +14,8 @@ import (
"google.golang.org/grpc/health/grpc_health_v1"
"google.golang.org/grpc/reflection"
"github.com/usememos/memos/internal/profile"
v1pb "github.com/usememos/memos/proto/gen/api/v1"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/store"
)

15
server/router/frontend/frontend.go
View file

@ -9,8 +9,8 @@ import (
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/store"
)
@ -30,12 +30,17 @@ func NewFrontendService(profile *profile.Profile, store *store.Store) *FrontendS
}
func (*FrontendService) Serve(_ context.Context, e *echo.Echo) {
apiSkipper := func(c echo.Context) bool {
skipper := func(c echo.Context) bool {
// Skip API routes.
if util.HasPrefixes(c.Path(), "/api", "/memos.api.v1") {
return true
}
// Set Cache-Control header to allow public caching with a max-age of 30 days (in seconds).
c.Response().Header().Set(echo.HeaderCacheControl, "public, max-age=2592000")
// Skip setting cache headers for index.html
if c.Path() == "/" || c.Path() == "/index.html" {
return false
}
// Set Cache-Control header to allow public caching with a max-age of 7 days.
c.Response().Header().Set(echo.HeaderCacheControl, "public, max-age=604800") // 7 days
return false
}
@ -43,7 +48,7 @@ func (*FrontendService) Serve(_ context.Context, e *echo.Echo) {
e.Use(middleware.StaticWithConfig(middleware.StaticConfig{
Filesystem: getFileSystem("dist"),
HTML5: true, // Enable fallback to index.html
Skipper: apiSkipper,
Skipper: skipper,
}))
}

2
server/router/rss/rss.go
View file

@ -12,8 +12,8 @@ import (
"github.com/usememos/gomark"
"github.com/usememos/gomark/renderer"
"github.com/usememos/memos/internal/profile"
storepb "github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/store"
)

2
server/server.go
View file

@ -18,8 +18,8 @@ import (
"github.com/soheilhy/cmux"
"google.golang.org/grpc"
"github.com/usememos/memos/internal/profile"
storepb "github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/server/profiler"
apiv1 "github.com/usememos/memos/server/router/api/v1"
"github.com/usememos/memos/server/router/frontend"

2
store/db/db.go
View file

@ -3,7 +3,7 @@ package db
import (
"github.com/pkg/errors"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store/db/mysql"
"github.com/usememos/memos/store/db/postgres"

2
store/db/mysql/mysql.go
View file

@ -6,7 +6,7 @@ import (
"github.com/go-sql-driver/mysql"
"github.com/pkg/errors"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/store"
)

2
store/db/postgres/postgres.go
View file

@ -8,7 +8,7 @@ import (
_ "github.com/lib/pq"
"github.com/pkg/errors"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/store"
)

2
store/db/sqlite/sqlite.go
View file

@ -8,7 +8,7 @@ import (
// Import the SQLite driver.
_ "modernc.org/sqlite"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/store"
)

6
store/memo.go
View file

@ -4,7 +4,7 @@ import (
"context"
"errors"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/internal/base"
storepb "github.com/usememos/memos/proto/gen/store"
)
@ -112,7 +112,7 @@ type DeleteMemo struct {
}
func (s *Store) CreateMemo(ctx context.Context, create *Memo) (*Memo, error) {
if !util.UIDMatcher.MatchString(create.UID) {
if !base.UIDMatcher.MatchString(create.UID) {
return nil, errors.New("invalid uid")
}
return s.driver.CreateMemo(ctx, create)
@ -136,7 +136,7 @@ func (s *Store) GetMemo(ctx context.Context, find *FindMemo) (*Memo, error) {
}
func (s *Store) UpdateMemo(ctx context.Context, update *UpdateMemo) error {
if update.UID != nil && !util.UIDMatcher.MatchString(*update.UID) {
if update.UID != nil && !base.UIDMatcher.MatchString(*update.UID) {
return errors.New("invalid uid")
}
return s.driver.UpdateMemo(ctx, update)

2
store/migrator.go
View file

@ -14,8 +14,8 @@ import (
"github.com/pkg/errors"
"github.com/usememos/memos/internal/version"
storepb "github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/version"
)
//go:embed migration

6
store/resource.go
View file

@ -8,7 +8,7 @@ import (
"github.com/pkg/errors"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/internal/base"
"github.com/usememos/memos/plugin/storage/s3"
storepb "github.com/usememos/memos/proto/gen/store"
)
@ -67,7 +67,7 @@ type DeleteResource struct {
}
func (s *Store) CreateResource(ctx context.Context, create *Resource) (*Resource, error) {
if !util.UIDMatcher.MatchString(create.UID) {
if !base.UIDMatcher.MatchString(create.UID) {
return nil, errors.New("invalid uid")
}
return s.driver.CreateResource(ctx, create)
@ -102,7 +102,7 @@ func (s *Store) GetResource(ctx context.Context, find *FindResource) (*Resource,
}
func (s *Store) UpdateResource(ctx context.Context, update *UpdateResource) error {
if update.UID != nil && !util.UIDMatcher.MatchString(*update.UID) {
if update.UID != nil && !base.UIDMatcher.MatchString(*update.UID) {
return errors.New("invalid uid")
}
return s.driver.UpdateResource(ctx, update)

2
store/store.go
View file

@ -3,7 +3,7 @@ package store
import (
"time"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/store/cache"
)

4
store/test/store.go
View file

@ -13,8 +13,8 @@ import (
"github.com/joho/godotenv"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/server/version"
"github.com/usememos/memos/internal/profile"
"github.com/usememos/memos/internal/version"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store/db"
)

1
web/package.json
View file

@ -1,5 +1,6 @@
{
"name": "memos",
"private": true,
"scripts": {
"dev": "vite",
"build": "vite build",