您的验证码为：%s，10分钟内有效，请勿泄露。
`, code) - if err = email.Send(ctx, emailAddr, subject, body); err != nil { - log.Error(ctx, "func", "SendEmailCode", "msg", "send email error", "error", err) + subject, body := email.BuildVerifyCodeEmail(emailAddr, code) + if err := email.Send(ctx, emailAddr, subject, body); err != nil { + log.Error(ctx, "func", "SendEmailVerifyCode", "msg", "send email error", "error", err) return err } if cacheErr := cache.SetUserEmailCode(ctx, emailAddr, code); cacheErr != nil { - log.Error(ctx, "func", "SendEmailCode", "msg", "set email code error", "error", cacheErr) + log.Error(ctx, "func", "SendEmailVerifyCode", "msg", "set email code error", "error", cacheErr) } if cacheErr := cache.SetUserSendEmailLimit(ctx, emailAddr); cacheErr != nil { - log.Error(ctx, "func", "SendEmailCode", "msg", "set send email limit error", "error", cacheErr) + log.Error(ctx, "func", "SendEmailVerifyCode", "msg", "set send email limit error", "error", cacheErr) } + + record := &dao.EmailSendLog{Email: emailAddr, Status: dao.EmailSendStatusSent} + if logErr := svc.emailSendLogDao.Create(dao.DB.WithContext(ctx), record); logErr != nil { + log.Error(ctx, "func", "SendEmailVerifyCode", "msg", "create email send log error", "error", logErr) + } + return nil } -func (svc *UserService) RegisterByEmail(ctx context.Context, emailAddr, password, code string) (uid int64, err error) { +func (svc *UserService) RegisterByEmail(ctx context.Context, emailAddr, password, verifyCode string) (uid int64, err error) { storedCode, err := cache.GetUserEmailCode(ctx, emailAddr) if err != nil { log.Error(ctx, "func", "RegisterByEmail", "msg", "get email code error", "error", err) return 0, err } - if storedCode == "" || storedCode != code { - log.Warn(ctx, "func", "RegisterByEmail", "msg", "invalid email code", "email", emailAddr) + + if storedCode == "" || storedCode != verifyCode { return 0, common.ErrEmailCodeError } + _ = cache.DeleteUserEmailCode(ctx, emailAddr) + + uid, err = svc.registerByEmailInternal(ctx, emailAddr, password) + if err != nil { + return 0, err + } + + if logErr := svc.emailSendLogDao.MarkRegistered(dao.DB.WithContext(ctx), emailAddr); logErr != nil { + log.Error(ctx, "func", "RegisterByEmail", "msg", "mark email send log registered error", "error", logErr) + } + + return uid, nil +} + +func (svc *UserService) registerByEmailInternal(ctx context.Context, emailAddr, password string) (uid int64, err error) { existingUser, err := svc.userDao.GetByEmail(dao.DB.WithContext(ctx), emailAddr) if err != nil { log.Error(ctx, "func", "RegisterByEmail", "msg", "get user by email error", "error", err) diff --git a/internal/storage/cache/pdf.go b/internal/storage/cache/pdf.go new file mode 100644 index 0000000..fa9b4b6 --- /dev/null +++ b/internal/storage/cache/pdf.go @@ -0,0 +1,27 @@ +package cache + +import ( + "context" + "strconv" +) + +const ( + PDFRecognitionTaskQueue = "pdf_recognition_queue" + PDFRecognitionDistLock = "pdf_recognition_dist_lock" +) + +func PushPDFTask(ctx context.Context, taskID int64) (int64, error) { + return RedisClient.LPush(ctx, PDFRecognitionTaskQueue, taskID).Result() +} + +func PopPDFTask(ctx context.Context) (int64, error) { + result, err := RedisClient.BRPop(ctx, 0, PDFRecognitionTaskQueue).Result() + if err != nil { + return 0, err + } + return strconv.ParseInt(result[1], 10, 64) +} + +func GetPDFDistributedLock(ctx context.Context) (bool, error) { + return RedisClient.SetNX(ctx, PDFRecognitionDistLock, "locked", DefaultLockTimeout).Result() +} diff --git a/internal/storage/cache/user.go b/internal/storage/cache/user.go index 2cc807e..62c8603 100644 --- a/internal/storage/cache/user.go +++ b/internal/storage/cache/user.go @@ -88,10 +88,6 @@ func SetUserEmailCode(ctx context.Context, email, code string) error { return RedisClient.Set(ctx, fmt.Sprintf(UserEmailCodePrefix, email), code, UserEmailCodeTTL).Err() } -func DeleteUserEmailCode(ctx context.Context, email string) error { - return RedisClient.Del(ctx, fmt.Sprintf(UserEmailCodePrefix, email)).Err() -} - func GetUserSendEmailLimit(ctx context.Context, email string) (int, error) { limit, err := RedisClient.Get(ctx, fmt.Sprintf(UserSendEmailLimit, email)).Result() if err != nil { @@ -104,13 +100,16 @@ func GetUserSendEmailLimit(ctx context.Context, email string) (int, error) { } func SetUserSendEmailLimit(ctx context.Context, email string) error { - key := fmt.Sprintf(UserSendEmailLimit, email) - count, err := RedisClient.Incr(ctx, key).Result() + count, err := RedisClient.Incr(ctx, fmt.Sprintf(UserSendEmailLimit, email)).Result() if err != nil { return err } if count > UserSendEmailLimitCount { return errors.New("send email limit") } - return RedisClient.Expire(ctx, key, UserSendEmailLimitTTL).Err() + return RedisClient.Expire(ctx, fmt.Sprintf(UserSendEmailLimit, email), UserSendEmailLimitTTL).Err() +} + +func DeleteUserEmailCode(ctx context.Context, email string) error { + return RedisClient.Del(ctx, fmt.Sprintf(UserEmailCodePrefix, email)).Err() } diff --git a/internal/storage/dao/email_send_log.go b/internal/storage/dao/email_send_log.go new file mode 100644 index 0000000..18947b5 --- /dev/null +++ b/internal/storage/dao/email_send_log.go @@ -0,0 +1,50 @@ +package dao + +import ( + "gorm.io/gorm" +) + +type EmailSendStatus int8 + +const ( + EmailSendStatusSent EmailSendStatus = 0 // 已发送，用户未注册 + EmailSendStatusRegistered EmailSendStatus = 1 // 用户已完成注册 +) + +type EmailSendLog struct { + BaseModel + Email string `gorm:"column:email;type:varchar(255);not null;comment:邮箱地址" json:"email"` + Status EmailSendStatus `gorm:"column:status;type:tinyint;not null;default:0;comment:状态: 0=已发送未注册 1=已注册" json:"status"` +} + +func (e *EmailSendLog) TableName() string { + return "email_send_log" +} + +type EmailSendLogDao struct{} + +func NewEmailSendLogDao() *EmailSendLogDao { + return &EmailSendLogDao{} +} + +func (d *EmailSendLogDao) Create(tx *gorm.DB, log *EmailSendLog) error { + return tx.Create(log).Error +} + +func (d *EmailSendLogDao) GetLatestByEmail(tx *gorm.DB, email string) (*EmailSendLog, error) { + var record EmailSendLog + err := tx.Where("email = ?", email).Order("id DESC").First(&record).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil, nil + } + return nil, err + } + return &record, nil +} + +func (d *EmailSendLogDao) MarkRegistered(tx *gorm.DB, email string) error { + return tx.Model(&EmailSendLog{}). + Where("email = ? AND status = ?", email, EmailSendStatusSent). + Update("status", EmailSendStatusRegistered).Error +} diff --git a/internal/storage/dao/result.go b/internal/storage/dao/result.go index 43acb70..4c0da86 100644 --- a/internal/storage/dao/result.go +++ b/internal/storage/dao/result.go @@ -1,45 +1,104 @@ package dao import ( + "encoding/json" + "gorm.io/gorm" ) -type RecognitionResult struct { - BaseModel - TaskID int64 `gorm:"column:task_id;bigint;not null;default:0;comment:任务ID" json:"task_id"` - TaskType TaskType `gorm:"column:task_type;varchar(16);not null;comment:任务类型;default:''" json:"task_type"` - Latex string `json:"latex" gorm:"column:latex;type:text;not null;default:''"` - Markdown string `json:"markdown" gorm:"column:markdown;type:text;not null;default:''"` // Markdown 格式 - MathML string `json:"mathml" gorm:"column:mathml;type:text;not null;default:''"` // MathML 格式 - MML string `json:"mml" gorm:"column:mml;type:text;not null;default:''"` // MML 格式 +// FormulaContent 公式识别的 content 字段结构 +type FormulaContent struct { + Latex string `json:"latex"` + Markdown string `json:"markdown"` + MathML string `json:"mathml"` + MML string `json:"mml"` } -type RecognitionResultDao struct { +// PDFPageContent PDF 单页识别结果 +type PDFPageContent struct { + PageNumber int `json:"page_number"` + Markdown string `json:"markdown"` } +// ResultMetaData recognition_results.meta_data 字段结构 +type ResultMetaData struct { + TotalNum int `json:"total_num"` +} + +// RecognitionResult recognition_results 表模型 +type RecognitionResult struct { + BaseModel + TaskID int64 `gorm:"column:task_id;bigint;not null;default:0;index;comment:任务ID" json:"task_id"` + TaskType TaskType `gorm:"column:task_type;varchar(16);not null;comment:任务类型;default:''" json:"task_type"` + MetaData string `gorm:"column:meta_data;type:json;comment:元数据" json:"meta_data"` + Content string `gorm:"column:content;type:json;comment:识别内容JSON" json:"content"` +} + +// SetMetaData 序列化并写入 MetaData 字段 +func (r *RecognitionResult) SetMetaData(meta ResultMetaData) error { + b, err := json.Marshal(meta) + if err != nil { + return err + } + r.MetaData = string(b) + return nil +} + +// GetFormulaContent 从 Content 字段反序列化公式结果 +func (r *RecognitionResult) GetFormulaContent() (*FormulaContent, error) { + var c FormulaContent + if err := json.Unmarshal([]byte(r.Content), &c); err != nil { + return nil, err + } + return &c, nil +} + +// GetPDFContent 从 Content 字段反序列化 PDF 分页结果 +func (r *RecognitionResult) GetPDFContent() ([]PDFPageContent, error) { + var pages []PDFPageContent + if err := json.Unmarshal([]byte(r.Content), &pages); err != nil { + return nil, err + } + return pages, nil +} + +// MarshalFormulaContent 将公式结果序列化为 JSON 字符串（供写入 Content） +func MarshalFormulaContent(c FormulaContent) (string, error) { + b, err := json.Marshal(c) + return string(b), err +} + +// MarshalPDFContent 将 PDF 分页结果序列化为 JSON 字符串（供写入 Content） +func MarshalPDFContent(pages []PDFPageContent) (string, error) { + b, err := json.Marshal(pages) + return string(b), err +} + +type RecognitionResultDao struct{} + func NewRecognitionResultDao() *RecognitionResultDao { return &RecognitionResultDao{} } -// 模型方法 func (dao *RecognitionResultDao) Create(tx *gorm.DB, data RecognitionResult) error { return tx.Create(&data).Error } -func (dao *RecognitionResultDao) GetByTaskID(tx *gorm.DB, taskID int64) (result *RecognitionResult, err error) { - result = &RecognitionResult{} - err = tx.Where("task_id = ?", taskID).First(result).Error +func (dao *RecognitionResultDao) GetByTaskID(tx *gorm.DB, taskID int64) (*RecognitionResult, error) { + result := &RecognitionResult{} + err := tx.Where("task_id = ?", taskID).First(result).Error if err != nil && err == gorm.ErrRecordNotFound { return nil, nil } - return -} - -func (dao *RecognitionResultDao) GetByTaskIDs(tx *gorm.DB, taskIDs []int64) (results []*RecognitionResult, err error) { - err = tx.Where("task_id IN (?)", taskIDs).Find(&results).Error - return + return result, err } func (dao *RecognitionResultDao) Update(tx *gorm.DB, id int64, updates map[string]interface{}) error { return tx.Model(&RecognitionResult{}).Where("id = ?", id).Updates(updates).Error } + +func (dao *RecognitionResultDao) GetByTaskIDs(tx *gorm.DB, taskIDs []int64) ([]*RecognitionResult, error) { + var results []*RecognitionResult + err := tx.Where("task_id IN (?)", taskIDs).Find(&results).Error + return results, err +} diff --git a/internal/storage/dao/task.go b/internal/storage/dao/task.go index 1f148ba..16bae9e 100644 --- a/internal/storage/dao/task.go +++ b/internal/storage/dao/task.go @@ -20,6 +20,7 @@ const ( TaskTypeText TaskType = "TEXT" TaskTypeTable TaskType = "TABLE" TaskTypeLayout TaskType = "LAYOUT" + TaskTypePDF TaskType = "PDF" ) func (t TaskType) String() string { diff --git a/migrations/email_send_log.sql b/migrations/email_send_log.sql new file mode 100644 index 0000000..e4cc67f --- /dev/null +++ b/migrations/email_send_log.sql @@ -0,0 +1,11 @@ +CREATE TABLE IF NOT EXISTS `email_send_log` ( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `email` VARCHAR(255) NOT NULL COMMENT '邮箱地址', + `status` TINYINT NOT NULL DEFAULT 0 COMMENT '状态: 0=已发送未注册, 1=已注册', + `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `idx_email` (`email`), + INDEX `idx_status` (`status`), + INDEX `idx_created_at` (`created_at`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='邮件发送记录表'; diff --git a/migrations/pdf_recognition.sql b/migrations/pdf_recognition.sql new file mode 100644 index 0000000..0843a02 --- /dev/null +++ b/migrations/pdf_recognition.sql @@ -0,0 +1,32 @@ +-- migrations/pdf_recognition.sql +-- 将 recognition_results 表重构为 JSON content schema +-- 执行顺序：加新列 → 洗历史数据 → 删旧列 + +-- Step 1: 新增 JSON 字段（保留旧字段，等数据迁移完再删） +ALTER TABLE `recognition_results` + ADD COLUMN `meta_data` JSON DEFAULT NULL COMMENT '元数据 {"total_num":1}' AFTER `task_type`, + ADD COLUMN `content` JSON DEFAULT NULL COMMENT '识别内容 JSON' AFTER `meta_data`; + +-- Step 2: 将旧列数据洗入新 JSON 字段 +-- 所有现有记录均为 FORMULA 类型（单页），meta_data.total_num = 1 +-- content 结构: {"latex":"...","markdown":"...","mathml":"...","mml":"..."} +UPDATE `recognition_results` +SET + `meta_data` = JSON_OBJECT('total_num', 1), + `content` = JSON_OBJECT( + 'latex', IFNULL(`latex`, ''), + 'markdown', IFNULL(`markdown`, ''), + 'mathml', IFNULL(`mathml`, ''), + 'mml', IFNULL(`mml`, '') + ) +WHERE `content` IS NULL; + +-- Step 3: 验证数据洗涤完成（应返回 0） +-- SELECT COUNT(*) FROM `recognition_results` WHERE `content` IS NULL; + +-- Step 4: 删除旧字段 +ALTER TABLE `recognition_results` + DROP COLUMN `latex`, + DROP COLUMN `markdown`, + DROP COLUMN `mathml`, + DROP COLUMN `mml`; diff --git a/pkg/common/errors.go b/pkg/common/errors.go index 6f823fc..f354217 100644 --- a/pkg/common/errors.go +++ b/pkg/common/errors.go @@ -38,7 +38,7 @@ const ( CodeEmailExistsMsg = "email already registered" CodeEmailNotFoundMsg = "email not found" CodePasswordMismatchMsg = "password mismatch" - CodeEmailCodeErrorMsg = "email code error" + CodeEmailCodeErrorMsg = "email verify code error" CodeEmailSendLimitMsg = "email send limit reached" ) diff --git a/pkg/email/template.go b/pkg/email/template.go new file mode 100644 index 0000000..adf82c3 --- /dev/null +++ b/pkg/email/template.go @@ -0,0 +1,166 @@ +package email + +import "fmt" + +// BuildVerifyCodeEmail returns a locale-appropriate subject and HTML body for +// the verification code email. Chinese domains get a Chinese email; all others +// get an English one. +func BuildVerifyCodeEmail(toEmail, code string) (subject, body string) { + domain := toEmail[lastIndex(toEmail, '@')+1:] + if chineseDomainRe.MatchString(domain) { + return buildVerifyCodeZH(code) + } + return buildVerifyCodeEN(code) +} + +func buildVerifyCodeZH(code string) (subject, body string) { + subject = "您的验证码" + body = fmt.Sprintf(` + + + + +| + + | +
| + + | +