Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
陈曦
sub2api
Commits
2270a54f
Unverified
Commit
2270a54f
authored
Dec 31, 2025
by
NepetaLemon
Committed by
GitHub
Dec 31, 2025
Browse files
refactor: 移除 infrastructure 目录 (#108)
* refactor: 迁移初始化 db 和 redis 到 repository * refactor: 迁移 errors 到 pkg
parent
bb7ade26
Changes
35
Show whitespace changes
Inline
Side-by-side
backend/internal/server/middleware/recovery_test.go
View file @
2270a54f
...
...
@@ -8,7 +8,7 @@ import (
"net/http/httptest"
"testing"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/response"
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/require"
...
...
backend/internal/service/account_service.go
View file @
2270a54f
...
...
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
)
...
...
backend/internal/service/api_key_service.go
View file @
2270a54f
...
...
@@ -8,7 +8,7 @@ import (
"time"
"github.com/Wei-Shaw/sub2api/internal/config"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
"github.com/Wei-Shaw/sub2api/internal/pkg/timezone"
)
...
...
backend/internal/service/auth_service.go
View file @
2270a54f
...
...
@@ -8,7 +8,7 @@ import (
"time"
"github.com/Wei-Shaw/sub2api/internal/config"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/golang-jwt/jwt/v5"
"golang.org/x/crypto/bcrypt"
...
...
backend/internal/service/billing_cache_service.go
View file @
2270a54f
...
...
@@ -9,7 +9,7 @@ import (
"time"
"github.com/Wei-Shaw/sub2api/internal/config"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
)
// 错误定义
...
...
backend/internal/service/email_service.go
View file @
2270a54f
...
...
@@ -10,7 +10,7 @@ import (
"strconv"
"time"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
)
var
(
...
...
backend/internal/service/group_service.go
View file @
2270a54f
...
...
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
)
...
...
backend/internal/service/proxy_service.go
View file @
2270a54f
...
...
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
)
...
...
backend/internal/service/redeem_service.go
View file @
2270a54f
...
...
@@ -10,7 +10,7 @@ import (
"time"
dbent
"github.com/Wei-Shaw/sub2api/ent"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
)
...
...
backend/internal/service/setting_service.go
View file @
2270a54f
...
...
@@ -9,7 +9,7 @@ import (
"strconv"
"github.com/Wei-Shaw/sub2api/internal/config"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
)
var
(
...
...
backend/internal/service/subscription_service.go
View file @
2270a54f
...
...
@@ -6,7 +6,7 @@ import (
"log"
"time"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
)
...
...
backend/internal/service/turnstile_service.go
View file @
2270a54f
...
...
@@ -5,7 +5,7 @@ import (
"fmt"
"log"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
)
var
(
...
...
backend/internal/service/usage_service.go
View file @
2270a54f
...
...
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
"github.com/Wei-Shaw/sub2api/internal/pkg/usagestats"
)
...
...
backend/internal/service/user_service.go
View file @
2270a54f
...
...
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
/errors"
infraerrors
"github.com/Wei-Shaw/sub2api/internal/
pkg
/errors"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
)
...
...
backend/internal/setup/setup.go
View file @
2270a54f
...
...
@@ -11,7 +11,7 @@ import (
"strconv"
"time"
"github.com/Wei-Shaw/sub2api/internal/
infrastructure
"
"github.com/Wei-Shaw/sub2api/internal/
repository
"
"github.com/Wei-Shaw/sub2api/internal/service"
_
"github.com/lib/pq"
...
...
@@ -262,7 +262,7 @@ func initializeDatabase(cfg *SetupConfig) error {
migrationCtx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
60
*
time
.
Second
)
defer
cancel
()
return
infrastructure
.
ApplyMigrations
(
migrationCtx
,
db
)
return
repository
.
ApplyMigrations
(
migrationCtx
,
db
)
}
func
createAdminUser
(
cfg
*
SetupConfig
)
error
{
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment