feat(gateway): 优化gateway相关功能

api/rule/rule.go

@@ -67,7 +67,6 @@ func HandleCreateRule(c *gin.Context) {
 		UID:        userInfo.ID,
 		Name:       req.Name,
 		TimerID:    req.TimerID,
-		GatewayID:  req.GatewayID,
 		AccountID:  req.AccountID,
 		Type:       req.Type,
 		ConfigJson: req.ConfigJson,
@@ -124,7 +123,6 @@ func HandleEditRule(c *gin.Context) {
 	updated.Name = req.Name
 	updated.Type = req.Type
 	updated.TimerID = req.TimerID
-	updated.GatewayID = req.GatewayID
 	updated.AccountID = req.AccountID
 	updated.Enabled = boolOr(req.Enabled, existing.Enabled)
 	// 前端提交的敏感字段可能是掩码占位符，用旧配置补回
@@ -221,19 +219,24 @@ func validateRule(req *model.RuleRequest, rule *model.Rule) error {
 		return err
 	}
 
-	ruleMeta, ok := ruleConfigChecker.InitValidatorRegistry().MetaOf(req.Type)
-	if !ok {
-		return model.ErrValidation(fmt.Sprintf("不支持的规则类型: %s", req.Type))
-	}
-
-	// 检查关联的 Timer 与账号是否存在且属于当前用户
-	if err := checkRuleConfigAccountAndTimerExist(rule, ruleMeta.AccountType); err != nil {
+	// 检查关联的 Timer 是否存在、账号是否可用
+	if err := checkTimerExists(rule.TimerID, rule.UID); err != nil {
 		return err
 	}
 
-	if err := ruleConfigChecker.InitValidatorRegistry().Validate(req.Type, rule.ConfigJson); err != nil {
-		return model.ErrValidation(fmt.Sprintf("规则配置验证失败: %s", err.Error()))
+	ruleMeta, err := ruleMetaOf(req.Type)
+	if err != nil {
+		return err
 	}
+	if err := validateRuleConfig(req.Type, rule.ConfigJson); err != nil {
+		return err
+	}
+
+	accountID, err := checkAccount(rule.AccountID, rule.UID, ruleMeta.AccountType)
+	if err != nil {
+		return err
+	}
+	rule.AccountID = accountID
 
 	return nil
 }