refactor: 更新项目引用路径从perfect-panel/ppanel-server到perfect-panel/server
feat: 添加版本和构建时间变量 fix: 修正短信队列类型注释错误 style: 清理未使用的代码和测试文件 docs: 更新安装文档中的下载链接 chore: 迁移数据库脚本添加日志和订阅配置
This commit is contained in:
@@ -4,15 +4,16 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/perfect-panel/ppanel-server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
|
||||
"github.com/hibiken/asynq"
|
||||
"github.com/perfect-panel/ppanel-server/internal/model/log"
|
||||
"github.com/perfect-panel/ppanel-server/internal/svc"
|
||||
"github.com/perfect-panel/ppanel-server/pkg/constant"
|
||||
"github.com/perfect-panel/ppanel-server/pkg/sms"
|
||||
"github.com/perfect-panel/ppanel-server/queue/types"
|
||||
"github.com/perfect-panel/server/internal/model/log"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/perfect-panel/server/pkg/sms"
|
||||
"github.com/perfect-panel/server/queue/types"
|
||||
)
|
||||
|
||||
type SmsSendCount struct {
|
||||
@@ -43,17 +44,16 @@ func (l *SendSmsLogic) ProcessTask(ctx context.Context, task *asynq.Task) error
|
||||
logger.WithContext(ctx).Error("[SendSmsLogic] New send sms client failed", logger.Field("error", err.Error()), logger.Field("payload", payload))
|
||||
return err
|
||||
}
|
||||
createSms := &log.MessageLog{
|
||||
Type: log.Mobile.String(),
|
||||
createSms := &log.Message{
|
||||
Platform: l.svcCtx.Config.Mobile.Platform,
|
||||
To: fmt.Sprintf("+%s%s", payload.TelephoneArea, payload.Telephone),
|
||||
Subject: constant.ParseVerifyType(payload.Type).String(),
|
||||
Content: "",
|
||||
Content: map[string]interface{}{
|
||||
"content": client.GetSendCodeContent(payload.Content),
|
||||
},
|
||||
}
|
||||
err = client.SendCode(payload.TelephoneArea, payload.Telephone, payload.Content)
|
||||
|
||||
createSms.Content = client.GetSendCodeContent(payload.Content)
|
||||
|
||||
if err != nil {
|
||||
logger.WithContext(ctx).Error("[SendSmsLogic] Send sms failed", logger.Field("error", err.Error()), logger.Field("payload", payload))
|
||||
if l.svcCtx.Config.Model != constant.DevMode {
|
||||
@@ -64,7 +64,14 @@ func (l *SendSmsLogic) ProcessTask(ctx context.Context, task *asynq.Task) error
|
||||
}
|
||||
createSms.Status = 1
|
||||
logger.WithContext(ctx).Info("[SendSmsLogic] Send sms", logger.Field("telephone", payload.Telephone), logger.Field("content", createSms.Content))
|
||||
err = l.svcCtx.LogModel.InsertMessageLog(ctx, createSms)
|
||||
|
||||
content, _ := createSms.Marshal()
|
||||
err = l.svcCtx.LogModel.Insert(ctx, &log.SystemLog{
|
||||
Type: log.TypeMobileMessage.Uint8(),
|
||||
Date: time.Now().Format("2006-01-02"),
|
||||
ObjectID: 0,
|
||||
Content: string(content),
|
||||
})
|
||||
if err != nil {
|
||||
logger.WithContext(ctx).Error("[SendSmsLogic] Send sms failed", logger.Field("error", err.Error()), logger.Field("payload", payload))
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user