From dcfd6fec2164cbb02fd37af58c114620c8f70fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Fri, 19 Dec 2025 10:20:30 +0800 Subject: [PATCH] =?UTF-8?q?gomod=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/{entity => config}/config.go | 2 +- model/entity/ad_creative.go | 6 ++++-- model/entity/ad_platform.go | 8 +++++--- model/entity/ad_position.go | 4 +++- model/entity/ad_source.go | 8 +++++--- model/entity/advertisement.go | 10 ++++++---- model/entity/platform_delivery_rule.go | 8 +++++--- service/ad_source_service.go | 4 +++- 8 files changed, 32 insertions(+), 18 deletions(-) rename model/{entity => config}/config.go (99%) diff --git a/model/entity/config.go b/model/config/config.go similarity index 99% rename from model/entity/config.go rename to model/config/config.go index 4d94bae..6177577 100644 --- a/model/entity/config.go +++ b/model/config/config.go @@ -1,4 +1,4 @@ -package entity +package config // BaseConfig 基础配置结构 type BaseConfig struct { diff --git a/model/entity/ad_creative.go b/model/entity/ad_creative.go index f9225dd..5faf58c 100644 --- a/model/entity/ad_creative.go +++ b/model/entity/ad_creative.go @@ -1,6 +1,8 @@ package entity import ( + "cid/model/config" + "gitee.com/red-future---jilin-g/common/do" ) @@ -51,10 +53,10 @@ type AdCreative struct { LastSyncTime int64 `bson:"lastSyncTime" json:"lastSyncTime"` // 最后同步时间 // 基础配置 - BaseConfig `bson:",inline" json:",inline"` // 内联基础配置 + config.BaseConfig `bson:",inline" json:",inline"` // 内联基础配置 // 限制配置 - RestrictionConfig `bson:",inline" json:",inline"` // 内联限制配置 + config.RestrictionConfig `bson:",inline" json:",inline"` // 内联限制配置 // 其他信息 Status string `bson:"status" json:"status"` // 状态：active、inactive、archived diff --git a/model/entity/ad_platform.go b/model/entity/ad_platform.go index 81b7ae3..fc4ad95 100644 --- a/model/entity/ad_platform.go +++ b/model/entity/ad_platform.go @@ -1,6 +1,8 @@ package entity import ( + "cid/model/config" + "gitee.com/red-future---jilin-g/common/do" ) @@ -29,13 +31,13 @@ type AdPlatform struct { HeaderBidding bool `bson:"headerBidding" json:"headerBidding"` // 是否支持Header Bidding // API配置 - APIConfig `bson:",inline" json:",inline"` // 内联API配置 + config.APIConfig `bson:",inline" json:",inline"` // 内联API配置 // 竞价配置 - BiddingConfig `bson:",inline" json:",inline"` // 内联竞价配置 + config.BiddingConfig `bson:",inline" json:",inline"` // 内联竞价配置 // 支付配置 - PaymentConfig `bson:",inline" json:",inline"` // 内联支付配置 + config.PaymentConfig `bson:",inline" json:",inline"` // 内联支付配置 // 限流配置 RateLimit int64 `bson:"rateLimit" json:"rateLimit"` // 速率限制 diff --git a/model/entity/ad_position.go b/model/entity/ad_position.go index 799d64d..2504c7d 100644 --- a/model/entity/ad_position.go +++ b/model/entity/ad_position.go @@ -1,6 +1,8 @@ package entity import ( + "cid/model/config" + "gitee.com/red-future---jilin-g/common/do" ) @@ -41,7 +43,7 @@ type AdPosition struct { DisplayRules *DisplayRules `bson:"displayRules" json:"displayRules"` // 展示规则 // 限制配置 - RestrictionConfig `bson:",inline" json:",inline"` // 内联限制配置 + config.RestrictionConfig `bson:",inline" json:",inline"` // 内联限制配置 // 其他状态 IsExclusive bool `bson:"isExclusive" json:"isExclusive"` // 是否独占广告位 diff --git a/model/entity/ad_source.go b/model/entity/ad_source.go index 3267c3a..8f1e26c 100644 --- a/model/entity/ad_source.go +++ b/model/entity/ad_source.go @@ -1,6 +1,8 @@ package entity import ( + "cid/model/config" + "gitee.com/red-future---jilin-g/common/do" ) @@ -22,16 +24,16 @@ type AdSource struct { Config string `bson:"config" json:"config"` // 广告源配置（JSON字符串） // API配置 - APIConfig `bson:",inline" json:",inline"` // 内联API配置 + config.APIConfig `bson:",inline" json:",inline"` // 内联API配置 // 创意配置 - CreativeConfig `bson:",inline" json:",inline"` // 内联创意配置 + config.CreativeConfig `bson:",inline" json:",inline"` // 内联创意配置 // 广告源能力 Capabilities *AdSourceCapabilities `bson:"capabilities" json:"capabilities"` // 广告源能力 // 支付配置 - PaymentConfig `bson:",inline" json:",inline"` // 内联支付配置 + config.PaymentConfig `bson:",inline" json:",inline"` // 内联支付配置 } // AdSourceCapabilities 广告源能力 diff --git a/model/entity/advertisement.go b/model/entity/advertisement.go index a8257ff..244d0b4 100644 --- a/model/entity/advertisement.go +++ b/model/entity/advertisement.go @@ -1,6 +1,8 @@ package entity import ( + "cid/model/config" + "gitee.com/red-future---jilin-g/common/do" ) @@ -27,9 +29,9 @@ type Advertisement struct { AdProvider string `bson:"adProvider" json:"adProvider"` // 广告提供者：self、chuanshanjia、xiaohongshu、douyin等 // 投放配置 - BudgetConfig `bson:",inline" json:",inline"` // 内联预算配置 - BidAmount int64 `bson:"bidAmount" json:"bidAmount"` // 出价(分) - BillingType string `bson:"billingType" json:"billingType"` // 计费类型：CPC、CPM、CPA等 + config.BudgetConfig `bson:",inline" json:",inline"` // 内联预算配置 + BidAmount int64 `bson:"bidAmount" json:"bidAmount"` // 出价(分) + BillingType string `bson:"billingType" json:"billingType"` // 计费类型：CPC、CPM、CPA等 // 定向条件 Targeting *UnifiedTargeting `bson:"targeting" json:"targeting"` // 统一定向条件 @@ -41,7 +43,7 @@ type Advertisement struct { AuditBy string `bson:"auditBy" json:"auditBy"` // 审核人 // 限制配置 - RestrictionConfig `bson:",inline" json:",inline"` // 内联限制配置 + config.RestrictionConfig `bson:",inline" json:",inline"` // 内联限制配置 // 其他状态信息 Status string `bson:"status" json:"status"` // 业务状态：active、inactive、archived diff --git a/model/entity/platform_delivery_rule.go b/model/entity/platform_delivery_rule.go index d66501e..e66fcc9 100644 --- a/model/entity/platform_delivery_rule.go +++ b/model/entity/platform_delivery_rule.go @@ -1,6 +1,8 @@ package entity import ( + "cid/model/config" + "gitee.com/red-future---jilin-g/common/do" ) @@ -21,10 +23,10 @@ type PlatformDeliveryRule struct { RuleType string `bson:"ruleType" json:"ruleType"` // 规则类型：budget、targeting、bidding、frequency等 // 预算配置 - BudgetConfig `bson:",inline" json:",inline"` // 内联预算配置 + config.BudgetConfig `bson:",inline" json:",inline"` // 内联预算配置 // 出价配置 - BiddingConfig `bson:",inline" json:",inline"` // 内联竞价配置 + config.BiddingConfig `bson:",inline" json:",inline"` // 内联竞价配置 // 定向配置 TargetingConfig string `bson:"targetingConfig" json:"targetingConfig"` // 定向配置（JSON格式） @@ -32,7 +34,7 @@ type PlatformDeliveryRule struct { ExcludeAudience []string `bson:"excludeAudience" json:"excludeAudience"` // 排除受众 // 频次控制配置 - FrequencyCapConfig `bson:",inline" json:",inline"` // 内联频次控制配置 + config.FrequencyCapConfig `bson:",inline" json:",inline"` // 内联频次控制配置 // 创意配置 CreativeRotation string `bson:"creativeRotation" json:"creativeRotation"` // 创意轮播方式：optimize、even、random diff --git a/service/ad_source_service.go b/service/ad_source_service.go index 4a2b986..57851f7 100644 --- a/service/ad_source_service.go +++ b/service/ad_source_service.go @@ -2,9 +2,11 @@ package service import ( "cid/dao" + "cid/model/config" "cid/model/dto" "cid/model/entity" "context" + "github.com/gogf/gf/v2/errors/gerror" ) @@ -40,7 +42,7 @@ func (s *adSourceService) CreateAdSource(ctx context.Context, req *dto.CreateAdS Code: req.Code, Provider: req.Provider, Type: req.Type, - APIConfig: entity.APIConfig{ + APIConfig: config.APIConfig{ Endpoint: req.APIEndpoint, }, }