修复缓存

internal/logic/admin/subscribe/createSubscribeLogic.go

@@ -48,6 +48,7 @@ func (l *CreateSubscribeLogic) CreateSubscribe(req *types.CreateSubscribeRequest
 		SpeedLimit:        req.SpeedLimit,
 		DeviceLimit:       req.DeviceLimit,
 		Quota:             req.Quota,
+		NewUserOnly:       req.NewUserOnly,
 		Nodes:             tool.Int64SliceToString(req.Nodes),
 		NodeTags:          tool.StringSliceToString(req.NodeTags),
 		Show:              req.Show,

internal/logic/admin/subscribe/resetAllSubscribeTokenLogic.go

@@ -33,12 +33,27 @@ func NewResetAllSubscribeTokenLogic(ctx context.Context, svcCtx *svc.ServiceCont
 func (l *ResetAllSubscribeTokenLogic) ResetAllSubscribeToken() (resp *types.ResetAllSubscribeTokenResponse, err error) {
 	var list []*user.Subscribe
 	tx := l.svcCtx.DB.WithContext(l.ctx).Begin()
+	if tx.Error != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Failed to begin transaction: %v", tx.Error)
+	}
 	// select all active and Finished subscriptions
 	if err = tx.Model(&user.Subscribe{}).Where("`status` IN ?", []int64{1, 2}).Find(&list).Error; err != nil {
+		tx.Rollback()
 		logger.Errorf("[ResetAllSubscribeToken] Failed to fetch subscribe list: %v", err.Error())
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Failed to fetch subscribe list: %v", err.Error())
 	}
 
+	// Save old tokens before overwriting for proper cache clearing
+	type oldTokenInfo struct {
+		Token  string
+		UserId int64
+		Id     int64
+	}
+	oldTokens := make([]oldTokenInfo, len(list))
+	for i, sub := range list {
+		oldTokens[i] = oldTokenInfo{Token: sub.Token, UserId: sub.UserId, Id: sub.Id}
+	}
+
 	for _, sub := range list {
 		sub.Token = uuidx.SubscribeToken(strconv.FormatInt(time.Now().UnixMilli(), 10) + strconv.FormatInt(sub.Id, 10))
 		sub.UUID = uuidx.NewUUID().String()
@@ -55,6 +70,25 @@ func (l *ResetAllSubscribeTokenLogic) ResetAllSubscribeToken() (resp *types.Rese
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "Failed to commit transaction: %v", err.Error())
 	}
 
+	// Clear cache for both old and new tokens
+	for i, sub := range list {
+		// Clear new token cache
+		if clearErr := l.svcCtx.UserModel.ClearSubscribeCache(l.ctx, sub); clearErr != nil {
+			logger.Errorf("[ResetAllSubscribeToken] Failed to clear new cache for subscribe ID %d: %v", sub.Id, clearErr.Error())
+		}
+		// Clear old token cache
+		if oldTokens[i].Token != "" && oldTokens[i].Token != sub.Token {
+			oldSub := &user.Subscribe{
+				Id:     oldTokens[i].Id,
+				UserId: oldTokens[i].UserId,
+				Token:  oldTokens[i].Token,
+			}
+			if clearErr := l.svcCtx.UserModel.ClearSubscribeCache(l.ctx, oldSub); clearErr != nil {
+				logger.Errorf("[ResetAllSubscribeToken] Failed to clear old cache for subscribe ID %d: %v", sub.Id, clearErr.Error())
+			}
+		}
+	}
+
 	return &types.ResetAllSubscribeTokenResponse{
 		Success: true,
 	}, nil

internal/logic/admin/subscribe/updateSubscribeLogic.go

@@ -56,6 +56,7 @@ func (l *UpdateSubscribeLogic) UpdateSubscribe(req *types.UpdateSubscribeRequest
 		SpeedLimit:        req.SpeedLimit,
 		DeviceLimit:       req.DeviceLimit,
 		Quota:             req.Quota,
+		NewUserOnly:       req.NewUserOnly,
 		Nodes:             tool.Int64SliceToString(req.Nodes),
 		NodeTags:          tool.StringSliceToString(req.NodeTags),
 		Show:              req.Show,