更新密码找回uniapp
This commit is contained in:
1 parent
7f9a66da0f
commit
3fdda89833
1304 files changed
+3503
-26132
No files matched your search
@@ -14,7 +14,6 @@ import (
|
||||
"github.com/beego/beego/v2/core/logs"
|
||||
)
|
||||
|
||||
// GetSiteReminderConfig 获取站内信配置(从 yz_platform_normal_setting 读取)
|
||||
func GetSiteReminderConfig() (models.SystemSiteReminder, error) {
|
||||
retentionDaysStr := models.GetPlatformSettingValue("sitemsg_retention_days", "30")
|
||||
autoReadStr := models.GetPlatformSettingValue("sitemsg_auto_read", "0")
|
||||
@@ -39,7 +38,6 @@ func GetSiteReminderConfig() (models.SystemSiteReminder, error) {
|
||||
return row, nil
|
||||
}
|
||||
|
||||
// SaveSiteReminderConfig 保存/更新配置
|
||||
func SaveSiteReminderConfig(retentionDays int, autoRead int8) error {
|
||||
if retentionDays <= 0 {
|
||||
retentionDays = 30
|
||||
@@ -93,13 +91,11 @@ func SaveSiteReminderConfig(retentionDays int, autoRead int8) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// reminderReceiver 站内信接收人(用户ID + 所属端类型)
|
||||
type reminderReceiver struct {
|
||||
ID uint64
|
||||
Type string // platform-平台端 tenant-租户端
|
||||
Type string
|
||||
}
|
||||
|
||||
// queryEnabledAdminUserIDs 查询启用的平台用户ID;cond 为附加过滤条件(可为 nil)。
|
||||
func queryEnabledAdminUserIDs(cond *orm.Condition) ([]uint64, error) {
|
||||
qs := models.Orm.QueryTable(new(models.AdminUser)).
|
||||
Filter("status", 1).
|
||||
@@ -121,7 +117,6 @@ func queryEnabledAdminUserIDs(cond *orm.Condition) ([]uint64, error) {
|
||||
return ids, nil
|
||||
}
|
||||
|
||||
// queryEnabledTenantUserIDs 查询启用的租户用户ID;cond 为附加过滤条件(可为 nil)。
|
||||
func queryEnabledTenantUserIDs(cond *orm.Condition) ([]uint64, error) {
|
||||
qs := models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("status", 1).
|
||||
@@ -143,7 +138,6 @@ func queryEnabledTenantUserIDs(cond *orm.Condition) ([]uint64, error) {
|
||||
return ids, nil
|
||||
}
|
||||
|
||||
// marshalTargetIDs 将多选目标ID序列化为 JSON 字符串(空列表返回 nil)。
|
||||
func marshalTargetIDs(targetIDs []uint64) *string {
|
||||
if len(targetIDs) == 0 {
|
||||
return nil
|
||||
@@ -156,7 +150,6 @@ func marshalTargetIDs(targetIDs []uint64) *string {
|
||||
return &s
|
||||
}
|
||||
|
||||
// legacyTargetColumns 旧字段兼容写入:role → target_role_id,tenant → target_tenant_id(取首个)
|
||||
func legacyTargetColumns(targetType string, targetIDs []uint64) (roleID, tenantID uint64) {
|
||||
if len(targetIDs) == 0 {
|
||||
return 0, 0
|
||||
@@ -170,15 +163,6 @@ func legacyTargetColumns(targetType string, targetIDs []uint64) (roleID, tenantI
|
||||
return 0, 0
|
||||
}
|
||||
|
||||
// resolveReminderReceivers 解析接收目标 → 接收人集合(按端区分类型,已去重)。
|
||||
// targetType:
|
||||
// all 全平台(平台端 + 租户端所有启用用户)
|
||||
// platform 平台端所有启用用户
|
||||
// tenant_all 租户端所有租户的启用用户
|
||||
// tenant_role 指定租户角色(可多选)下的启用用户
|
||||
// tenant 指定租户(可多选)下的启用用户
|
||||
// tenant_user 指定租户用户(可多选)
|
||||
// role 兼容旧数据:指定平台角色(可多选)下的启用用户
|
||||
func resolveReminderReceivers(targetType string, targetIDs []uint64) ([]reminderReceiver, error) {
|
||||
receivers := make([]reminderReceiver, 0)
|
||||
seen := map[string]bool{}
|
||||
@@ -197,7 +181,7 @@ func resolveReminderReceivers(targetType string, targetIDs []uint64) ([]reminder
|
||||
}
|
||||
|
||||
switch targetType {
|
||||
case "all": // 全平台:平台端 + 租户端所有启用用户
|
||||
case "all":
|
||||
adminIDs, err := queryEnabledAdminUserIDs(nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询平台用户失败: %w", err)
|
||||
@@ -208,19 +192,19 @@ func resolveReminderReceivers(targetType string, targetIDs []uint64) ([]reminder
|
||||
}
|
||||
appendIDs(adminIDs, "platform")
|
||||
appendIDs(tenantIDs, "tenant")
|
||||
case "platform": // 平台端所有启用用户
|
||||
case "platform":
|
||||
adminIDs, err := queryEnabledAdminUserIDs(nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询平台用户失败: %w", err)
|
||||
}
|
||||
appendIDs(adminIDs, "platform")
|
||||
case "tenant_all": // 租户端所有租户的启用用户
|
||||
case "tenant_all":
|
||||
tenantIDs, err := queryEnabledTenantUserIDs(nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询租户用户失败: %w", err)
|
||||
}
|
||||
appendIDs(tenantIDs, "tenant")
|
||||
case "tenant_role": // 指定租户角色(可多选)下的启用用户
|
||||
case "tenant_role":
|
||||
if len(targetIDs) == 0 {
|
||||
return nil, fmt.Errorf("请选择接收的租户角色")
|
||||
}
|
||||
@@ -229,7 +213,7 @@ func resolveReminderReceivers(targetType string, targetIDs []uint64) ([]reminder
|
||||
return nil, fmt.Errorf("根据租户角色查询用户失败: %w", err)
|
||||
}
|
||||
appendIDs(tenantIDs, "tenant")
|
||||
case "tenant": // 指定租户(可多选)下的启用用户
|
||||
case "tenant":
|
||||
if len(targetIDs) == 0 {
|
||||
return nil, fmt.Errorf("请选择接收的租户")
|
||||
}
|
||||
@@ -238,7 +222,7 @@ func resolveReminderReceivers(targetType string, targetIDs []uint64) ([]reminder
|
||||
return nil, fmt.Errorf("根据租户查询用户失败: %w", err)
|
||||
}
|
||||
appendIDs(tenantIDs, "tenant")
|
||||
case "tenant_user": // 指定租户用户(可多选)
|
||||
case "tenant_user":
|
||||
if len(targetIDs) == 0 {
|
||||
return nil, fmt.Errorf("请选择接收的租户用户")
|
||||
}
|
||||
@@ -247,7 +231,7 @@ func resolveReminderReceivers(targetType string, targetIDs []uint64) ([]reminder
|
||||
return nil, fmt.Errorf("查询租户用户失败: %w", err)
|
||||
}
|
||||
appendIDs(tenantIDs, "tenant")
|
||||
case "role": // 兼容旧数据:平台角色(可多选)下的启用用户
|
||||
case "role":
|
||||
if len(targetIDs) == 0 {
|
||||
return nil, fmt.Errorf("请选择接收的角色")
|
||||
}
|
||||
@@ -262,9 +246,6 @@ func resolveReminderReceivers(targetType string, targetIDs []uint64) ([]reminder
|
||||
return receivers, nil
|
||||
}
|
||||
|
||||
// SendSiteReminder 发送站内信
|
||||
// targetType: all (全平台), platform (平台端), tenant_all (租户端所有租户),
|
||||
// tenant_role (租户角色), tenant (指定租户), tenant_user (指定租户用户), role (平台角色-旧)
|
||||
func SendSiteReminder(title, content string, senderID uint64, senderType string, targetType string, targetIDs []uint64) error {
|
||||
receivers, err := resolveReminderReceivers(targetType, targetIDs)
|
||||
if err != nil {
|
||||
@@ -298,16 +279,13 @@ func SendSiteReminder(title, content string, senderID uint64, senderType string,
|
||||
})
|
||||
}
|
||||
|
||||
// 批量插入
|
||||
if _, err = models.Orm.InsertMulti(100, reminders); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 同步推送到小程序订阅消息(异步执行,不拖慢站内信本身)
|
||||
// 只有用户在小程序端授权过订阅、且平台配了对应场景模板时才会真正下发。
|
||||
for _, r := range receivers {
|
||||
if r.Type != "tenant" {
|
||||
continue // 平台端用户没有小程序 openid
|
||||
continue
|
||||
}
|
||||
tenantUserID := r.ID
|
||||
titleCopy, contentCopy := title, content
|
||||
@@ -324,7 +302,6 @@ func SendSiteReminder(title, content string, senderID uint64, senderType string,
|
||||
return nil
|
||||
}
|
||||
|
||||
// ListReminders 列表查询
|
||||
func ListReminders(receiverID uint64, receiverType string, page, pageSize int, isRead *int8) ([]models.SystemReminderList, int64, error) {
|
||||
if page <= 0 {
|
||||
page = 1
|
||||
@@ -352,7 +329,6 @@ func ListReminders(receiverID uint64, receiverType string, page, pageSize int, i
|
||||
return list, total, err
|
||||
}
|
||||
|
||||
// MarkReminderRead 标记单条已读
|
||||
func MarkReminderRead(id uint64, receiverID uint64, receiverType string) error {
|
||||
now := time.Now()
|
||||
_, err := models.Orm.QueryTable(new(models.SystemReminderList)).
|
||||
@@ -366,7 +342,6 @@ func MarkReminderRead(id uint64, receiverID uint64, receiverType string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// MarkAllRemindersRead 一键全部已读
|
||||
func MarkAllRemindersRead(receiverID uint64, receiverType string) error {
|
||||
now := time.Now()
|
||||
_, err := models.Orm.QueryTable(new(models.SystemReminderList)).
|
||||
@@ -380,7 +355,6 @@ func MarkAllRemindersRead(receiverID uint64, receiverType string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteReminder 删除消息
|
||||
func DeleteReminder(id uint64, receiverID uint64, receiverType string) error {
|
||||
now := time.Now()
|
||||
_, err := models.Orm.QueryTable(new(models.SystemReminderList)).
|
||||
@@ -393,7 +367,6 @@ func DeleteReminder(id uint64, receiverID uint64, receiverType string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// AutoCleanExpiredReminders 自动清理过期站内信
|
||||
func AutoCleanExpiredReminders() error {
|
||||
cfg, err := GetSiteReminderConfig()
|
||||
if err != nil {
|
||||
@@ -409,7 +382,6 @@ func AutoCleanExpiredReminders() error {
|
||||
return err
|
||||
}
|
||||
|
||||
// ListSentReminders 获取已发送的消息列表(按 batch_id 分组)
|
||||
func ListSentReminders(senderID uint64, page, pageSize int) ([]models.SystemReminderList, int64, error) {
|
||||
if page <= 0 {
|
||||
page = 1
|
||||
@@ -434,9 +406,7 @@ func ListSentReminders(senderID uint64, page, pageSize int) ([]models.SystemRemi
|
||||
return list, total, nil
|
||||
}
|
||||
|
||||
// UpdateSentReminder 更新已发出的消息(更新该批次下所有接收者的消息,支持修改目标接收群体)
|
||||
func UpdateSentReminder(batchID string, title, content, targetType string, targetIDs []uint64) error {
|
||||
// 1. 获取当前发送者ID (从该批次中任意一条记录中获取)
|
||||
var firstRecord models.SystemReminderList
|
||||
err := models.Orm.QueryTable(new(models.SystemReminderList)).Filter("batch_id", batchID).Limit(1).One(&firstRecord)
|
||||
if err != nil {
|
||||
@@ -445,7 +415,6 @@ func UpdateSentReminder(batchID string, title, content, targetType string, targe
|
||||
senderID := firstRecord.SenderID
|
||||
senderType := firstRecord.SenderType
|
||||
|
||||
// 2. 根据新的目标接收群体获取接收人列表
|
||||
receivers, err := resolveReminderReceivers(targetType, targetIDs)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -454,14 +423,12 @@ func UpdateSentReminder(batchID string, title, content, targetType string, targe
|
||||
targetIDsJSON := marshalTargetIDs(targetIDs)
|
||||
legacyRoleID, legacyTenantID := legacyTargetColumns(targetType, targetIDs)
|
||||
|
||||
// 3. 获取该批次中现有的所有记录 (包括已删除的)
|
||||
var existingRecords []models.SystemReminderList
|
||||
_, err = models.Orm.QueryTable(new(models.SystemReminderList)).Filter("batch_id", batchID).All(&existingRecords)
|
||||
if err != nil {
|
||||
return fmt.Errorf("获取现有记录失败: %w", err)
|
||||
}
|
||||
|
||||
// 建立 map 快速查找,Key 为 "receiverType_receiverID"
|
||||
existingMap := make(map[string]*models.SystemReminderList)
|
||||
for i := range existingRecords {
|
||||
key := fmt.Sprintf("%s_%d", existingRecords[i].ReceiverType, existingRecords[i].ReceiverID)
|
||||
@@ -476,9 +443,7 @@ func UpdateSentReminder(batchID string, title, content, targetType string, targe
|
||||
|
||||
now := time.Now()
|
||||
|
||||
// 事务处理
|
||||
err = models.Orm.DoTx(func(c context.Context, txOrm orm.TxOrmer) error {
|
||||
// A. 对于已经不在新接收者列表中的用户,软删除
|
||||
for key, rec := range existingMap {
|
||||
if !newReceiverMap[key] {
|
||||
if rec.DeleteTime == nil {
|
||||
@@ -490,7 +455,6 @@ func UpdateSentReminder(batchID string, title, content, targetType string, targe
|
||||
}
|
||||
}
|
||||
|
||||
// B. 对于仍然在新接收者列表中的用户,更新标题、内容、以及 target 信息;如果原来被删除了,清除 delete_time
|
||||
var newInserts []models.SystemReminderList
|
||||
for _, r := range receivers {
|
||||
key := fmt.Sprintf("%s_%d", r.Type, r.ID)
|
||||
@@ -513,7 +477,6 @@ func UpdateSentReminder(batchID string, title, content, targetType string, targe
|
||||
return e
|
||||
}
|
||||
} else {
|
||||
// C. 对于新增加的接收者,插入新记录
|
||||
newInserts = append(newInserts, models.SystemReminderList{
|
||||
Title: title,
|
||||
Content: content,
|
||||
@@ -544,7 +507,6 @@ func UpdateSentReminder(batchID string, title, content, targetType string, targe
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteSentReminderBatch 删除已发送消息(删除该批次下所有记录)
|
||||
func DeleteSentReminderBatch(batchID string) error {
|
||||
now := time.Now()
|
||||
_, err := models.Orm.QueryTable(new(models.SystemReminderList)).
|
||||
|
||||
Reference in new issue
Block a user