Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ NCM_API_BASE=https://ncmapi.bikonoo.com
NCM_MUSIC_U=

# ===== QM API ======
QM_COOKIE=
QM_COOKIE=''
QM_COOKIE_KEY=qm:cookie

# ===== 邮件通知=====
Expand All @@ -112,7 +112,7 @@ SMTP_PORT=587
SMTP_USERNAME=
SMTP_PASSWORD=
EMAIL_FROM=
EMAIL_FROM_NAME=AMLL Hub
EMAIL_FROM_NAME='AMLL Hub'
# 站点地址
SITE_URL=http://localhost:5173
# 用户名→邮箱的缓存时长
Expand Down
6 changes: 6 additions & 0 deletions backend/cmd/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ func Run() {
adminRepo := repository.NewAdminRepo(db)
notifRepo := repository.NewNotificationRepo(db)
announcementRepo := repository.NewAnnouncementRepo(db)
documentRepo := repository.NewDocumentRepo(db)

// GitHub 登录/迁移 repository
githubBindingRepo := repository.NewGithubBindingRepo(db)
Expand Down Expand Up @@ -189,6 +190,9 @@ func Run() {
announcementRepo, notifRepo, notifSvc, mailSender, mailResolver, cfg.Email.SiteURL,
)

// 文档系统
documentSvc := service.NewDocumentService(db, documentRepo, fileSvc)

// 搜索IP投稿
searchIpSvc := service.NewSearchIPService(searchIpRepo, minioClient, cfg.MinIO.Bucket)

Expand Down Expand Up @@ -335,6 +339,7 @@ func Run() {
adminH := handler.NewAdminHandler(reviewerRepo, reviewerCache, userSearchSvc)
notifH := handler.NewNotificationHandler(notifSvc)
announcementH := handler.NewAnnouncementHandler(announcementSvc)
documentH := handler.NewDocumentHandler(documentSvc, reviewerCache, adminCache)
userActivityH := handler.NewUserActivityHandler(userActivitySvc)
userProfileH := handler.NewUserProfileHandler(userProfileSvc)
userSearchH := handler.NewUserSearchHandler(userSearchSvc)
Expand Down Expand Up @@ -381,6 +386,7 @@ func Run() {
PluginStore: pluginStoreH,
PluginReview: pluginReviewH,
PluginAdmin: pluginAdminH,
Document: documentH,

ReviewerCache: reviewerCache,
AdminCache: adminCache,
Expand Down
11 changes: 6 additions & 5 deletions backend/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/amll-dev/amll-hub/backend

go 1.25.1
go 1.26.0

require (
github.com/gin-contrib/cors v1.7.2
Expand All @@ -20,16 +20,17 @@ require (
require github.com/cybaka520/AMLLHub-Music-API v0.0.0-20261101074547-e28507b69fc7

require (
github.com/Masterminds/semver/v3 v3.5.0
github.com/gin-contrib/gzip v1.2.6
github.com/golang-jwt/jwt/v5 v5.3.1
github.com/gorilla/websocket v1.5.3
github.com/microcosm-cc/bluemonday v1.0.27
github.com/xiaowumin-mark/amll-ttml v0.0.0-20260531031314-ba3d96f45513
github.com/yuin/goldmark v1.8.7
golang.org/x/image v0.48.0
)

require (
github.com/Masterminds/semver/v3 v3.5.0 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/bytedance/gopkg v0.1.3 // indirect
github.com/goccy/go-yaml v1.19.2 // indirect
Expand Down Expand Up @@ -94,9 +95,9 @@ require (
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/sync v0.25.0 // indirect
golang.org/x/sys v0.50.0 // indirect
golang.org/x/text v0.44.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
14 changes: 8 additions & 6 deletions backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -204,27 +204,29 @@ golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/image v0.48.0 h1:1AvuPcuoOTJpA7s4VZ5umrb90T3So0rkB/bSGmxkxik=
golang.org/x/image v0.48.0/go.mod h1:mmtg64iqJKGqEgy+r13dfybl85tmxUd2lMnmaiSdWYY=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sync v0.25.0 h1:dJnifr0nMV8/SBnBvdo4eSGGnrc3O4FFx6IqvtLcmRs=
golang.org/x/sync v0.25.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.50.0 h1:dkKZEFTEKaLr1sjhs0WiKqoi8Jj5nHbS3Njmx1UoMJs=
golang.org/x/sys v0.50.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
golang.org/x/text v0.44.0 h1:YItdp/mQNGnsmrgpcdA5yQ3bnRxCfo/Tj/iByGW9GGo=
golang.org/x/text v0.44.0/go.mod h1:S4FR1waQ9LbjQTls97SyRjDaUUVkaM+cXwwuG/G+MwY=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
Expand Down
70 changes: 68 additions & 2 deletions backend/internal/handler/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,60 @@ func (h *AuthHandler) Login(c *gin.Context) {
writeAuthErr(c, err)
return
}
h.enrichReviewer(c, &result.User)
h.enrichReviewer(c, result.User)
pkg.OK(c, result)
}

// LoginMfa POST /api/v1/auth/login/mfa
// 完成密码登录后的二次验证
func (h *AuthHandler) LoginMfa(c *gin.Context) {
var req struct {
ChallengeID string `json:"challengeId" binding:"required"`
MfaType string `json:"mfaType" binding:"required"`
Passcode string `json:"passcode"`
RecoveryCode string `json:"recoveryCode"`
}
if err := c.ShouldBindJSON(&req); err != nil {
pkg.BadRequest(c, "challengeId 和 mfaType 必填")
return
}

ctx, cancel := context.WithTimeout(c.Request.Context(), longTimeout)
defer cancel()

result, err := h.svc.VerifyMfaLogin(ctx, req.ChallengeID, req.MfaType, req.Passcode, req.RecoveryCode)
if err != nil {
writeAuthErr(c, err)
return
}
h.enrichReviewer(c, result.User)
pkg.OK(c, result)
}

// SendLoginMfaCode POST /api/v1/auth/login/mfa/send-code
// 给 MFA 会话发送邮箱/短信验证码
func (h *AuthHandler) SendLoginMfaCode(c *gin.Context) {
var req struct {
ChallengeID string `json:"challengeId" binding:"required"`
MfaType string `json:"mfaType" binding:"required"`
CaptchaType string `json:"captchaType"`
CaptchaToken string `json:"captchaToken"`
}
if err := c.ShouldBindJSON(&req); err != nil {
pkg.BadRequest(c, "challengeId 和 mfaType 必填")
return
}

ctx, cancel := context.WithTimeout(c.Request.Context(), longTimeout)
defer cancel()

if err := h.svc.SendMfaCode(ctx, req.ChallengeID, req.MfaType, req.CaptchaType, req.CaptchaToken); err != nil {
writeAuthErr(c, err)
return
}
pkg.OKWithMsg(c, nil, "验证码已发送")
}

// LoginByCode POST /api/v1/auth/login-code
// 验证码登录
func (h *AuthHandler) LoginByCode(c *gin.Context) {
Expand All @@ -85,7 +135,7 @@ func (h *AuthHandler) LoginByCode(c *gin.Context) {
writeAuthErr(c, err)
return
}
h.enrichReviewer(c, &result.User)
h.enrichReviewer(c, result.User)
pkg.OK(c, result)
}

Expand Down Expand Up @@ -400,6 +450,22 @@ func writeAuthErr(c *gin.Context, err error) {
pkg.Fail(c, http.StatusUnauthorized, http.StatusUnauthorized, "用户名或密码错误")
case errors.Is(err, service.ErrInvalidCode):
pkg.Fail(c, http.StatusBadRequest, http.StatusBadRequest, "验证码错误")
case errors.Is(err, service.ErrMfaChallengeExpired):
pkg.Fail(c, http.StatusGone, http.StatusGone, "二次验证已过期,请重新登录")
case errors.Is(err, service.ErrMfaTooManyAttempts):
pkg.Fail(c, http.StatusTooManyRequests, http.StatusTooManyRequests, "验证失败次数过多,请重新登录")
case errors.Is(err, service.ErrMfaMethodUnavailable):
pkg.BadRequest(c, "该验证方式不可用")
case errors.Is(err, service.ErrMfaSetupRequired):
pkg.Fail(c, http.StatusForbidden, http.StatusForbidden, "请先完成多因素认证设置")
case errors.Is(err, service.ErrMfaOperationFailed):
detail := err.Error()
if idx := strings.Index(detail, ": "); idx >= 0 {
detail = detail[idx+2:]
}
pkg.Fail(c, http.StatusBadGateway, http.StatusBadGateway, detail)
case errors.Is(err, service.ErrPasswordUpdateRequired):
pkg.Fail(c, http.StatusForbidden, http.StatusForbidden, "密码已过期,请先重置密码")
case errors.Is(err, service.ErrCodeExpired):
pkg.Fail(c, http.StatusBadRequest, http.StatusBadRequest, "验证码已失效,请重新获取")
case errors.Is(err, service.ErrUserNotFound):
Expand Down
4 changes: 2 additions & 2 deletions backend/internal/handler/auth_github.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (h *AuthGithubHandler) BindLogin(c *gin.Context) {
writeGithubErr(c, err)
return
}
h.enrichReviewer(c, &result.User)
h.enrichReviewer(c, result.User)
pkg.OK(c, result)
}

Expand All @@ -143,7 +143,7 @@ func (h *AuthGithubHandler) BindRegister(c *gin.Context) {
writeGithubErr(c, err)
return
}
h.enrichReviewer(c, &result.User)
h.enrichReviewer(c, result.User)
pkg.OK(c, result)
}

Expand Down
Loading
Loading