feat(tenant): 隔离客服通知文件与后台任务
This commit is contained in:
@@ -17,6 +17,7 @@ import (
|
||||
smsprovider "hfb_sys/backend/internal/integrations/sms"
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/modules/sms"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
"go.uber.org/zap"
|
||||
@@ -112,11 +113,6 @@ func (j *Job) run(ctx context.Context) {
|
||||
}
|
||||
|
||||
func (j *Job) dispatch(ctx context.Context) (int, error) {
|
||||
cfg, err := sms.LoadConfig(ctx, j.configs)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
rows, err := j.repo.ListPending(ctx, j.batchSize, time.Now().Add(-j.retryDelay))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
@@ -127,7 +123,20 @@ func (j *Job) dispatch(ctx context.Context) (int, error) {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return handled, err
|
||||
}
|
||||
if err := j.sendOne(ctx, cfg, row); err != nil {
|
||||
rowCtx := ctx
|
||||
if row.TenantID > 0 {
|
||||
rowCtx = tenancy.WithScope(ctx, tenancy.Scope{TenantID: row.TenantID})
|
||||
}
|
||||
cfg, err := sms.LoadConfig(rowCtx, j.configs)
|
||||
if err != nil {
|
||||
j.logger.Warn("节点短信读取租户配置失败",
|
||||
zap.Uint64("sms_message_id", row.ID),
|
||||
zap.Uint64("tenant_id", row.TenantID),
|
||||
zap.Error(err),
|
||||
)
|
||||
continue
|
||||
}
|
||||
if err := j.sendOne(rowCtx, cfg, row); err != nil {
|
||||
j.logger.Warn("节点短信处理失败",
|
||||
zap.Uint64("sms_message_id", row.ID),
|
||||
zap.String("node", row.Node),
|
||||
|
||||
Reference in New Issue
Block a user