feat: 卡流量改为日快照计量并统一停复机规则
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
卡流量计量(按名单灰度,默认 off): - 新增卡日快照与切换水位表(000241),按通道上游流量重置日换算自然月、重置日防旧值 - 已切换的卡按月对账产生增量,无生效中套餐只结算不发事件;第一次切换写水位 - 已切换卡读数有效即判定通道阈值,卡表本月用量用快照覆盖,日流量读快照 - 配置 JUNHONG_TRAFFIC_CALC_MODE/CARDS、JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED 停复机规则(总开关 JUNHONG_STOP_RESUME_UNIFIED_RULE_ENABLED,默认关闭): - 复机不看停机原因,持通道阈值锁仍拒绝;暂停轮询的卡不自动停复机 - 通道新增实名管控 realname_control_enabled(000242,默认 0),开启后不区分行业卡与实名策略 - 实名管控从 0 改 1 需确认,修改并入通道更新审计 OpenSpec Change: rebuild-card-traffic-metering-and-stop-resume
This commit is contained in:
@@ -32,6 +32,37 @@ type Config struct {
|
||||
Worker WorkerConfig `mapstructure:"worker"`
|
||||
WeCom WeComConfig `mapstructure:"wecom"`
|
||||
Approval ApprovalConfig `mapstructure:"approval"`
|
||||
TrafficCalc TrafficCalcConfig `mapstructure:"traffic_calc"`
|
||||
StopResume StopResumeConfig `mapstructure:"stop_resume"`
|
||||
}
|
||||
|
||||
// 卡流量计量模式取值。
|
||||
const (
|
||||
TrafficCalcModeOff = "off"
|
||||
TrafficCalcModeGray = "gray"
|
||||
TrafficCalcModeFull = "full"
|
||||
)
|
||||
|
||||
// TrafficCalcConfig 卡流量计量(日快照算法)切换配置。
|
||||
// API 与全部 Worker 进程必须使用一致的取值,改动后先停掉全部进程再一起启动。
|
||||
type TrafficCalcConfig struct {
|
||||
// Mode 计量模式:off 全部走卡表基线算法;gray 只有名单内的卡走日快照算法;full 全部卡走日快照算法。
|
||||
// 环境变量:JUNHONG_TRAFFIC_CALC_MODE
|
||||
Mode string `mapstructure:"mode"`
|
||||
// Cards 灰度名单,逗号分隔的扣减载体:device:<设备ID> 或 iot_card:<卡ID>。
|
||||
// 环境变量:JUNHONG_TRAFFIC_CALC_CARDS
|
||||
Cards string `mapstructure:"cards"`
|
||||
// FlowSnapshotEnabled 未切换卡的日快照写入总开关,关闭后未切换卡停止写快照。
|
||||
// 环境变量:JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED
|
||||
FlowSnapshotEnabled bool `mapstructure:"flow_snapshot_enabled"`
|
||||
}
|
||||
|
||||
// StopResumeConfig 停复机规则配置。
|
||||
type StopResumeConfig struct {
|
||||
// UnifiedRuleEnabled 停复机新规则总开关:开启后复机不看停机原因、实名按通道实名管控判断、
|
||||
// 暂停轮询的卡不自动停复机;关闭时与原有行为完全一致。
|
||||
// 环境变量:JUNHONG_STOP_RESUME_UNIFIED_RULE_ENABLED
|
||||
UnifiedRuleEnabled bool `mapstructure:"unified_rule_enabled"`
|
||||
}
|
||||
|
||||
// ServerConfig HTTP 服务器配置
|
||||
@@ -251,6 +282,11 @@ func (c *Config) ValidateRequired() error {
|
||||
}
|
||||
|
||||
func (c *Config) Validate() error {
|
||||
switch c.TrafficCalc.Mode {
|
||||
case TrafficCalcModeOff, TrafficCalcModeGray, TrafficCalcModeFull:
|
||||
default:
|
||||
return fmt.Errorf("invalid configuration: traffic_calc.mode: invalid mode (current value: %s, expected: off, gray, full)", c.TrafficCalc.Mode)
|
||||
}
|
||||
// 服务器验证
|
||||
if c.Server.Address == "" {
|
||||
return fmt.Errorf("invalid configuration: server.address: must be non-empty (current value: empty)")
|
||||
|
||||
@@ -155,6 +155,16 @@ approval:
|
||||
legacy_offline_recharge_pay_enabled: true
|
||||
|
||||
|
||||
# 卡流量计量(日快照算法)切换配置;API 与全部 Worker 必须一致,改动后先停全部进程再一起启动
|
||||
traffic_calc:
|
||||
mode: "off" # off / gray / full(环境变量:JUNHONG_TRAFFIC_CALC_MODE)
|
||||
cards: "" # 灰度名单,如 device:15276,iot_card:103154(环境变量:JUNHONG_TRAFFIC_CALC_CARDS)
|
||||
flow_snapshot_enabled: true # 未切换卡写日快照(环境变量:JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED)
|
||||
|
||||
# 停复机规则配置
|
||||
stop_resume:
|
||||
unified_rule_enabled: false # 停复机新规则总开关(环境变量:JUNHONG_STOP_RESUME_UNIFIED_RULE_ENABLED)
|
||||
|
||||
# 企业微信 Adapter 配置
|
||||
wecom:
|
||||
base_url: "https://qyapi.weixin.qq.com"
|
||||
|
||||
@@ -157,9 +157,14 @@ func bindEnvVariables(v *viper.Viper) {
|
||||
"wechat.payment.notify_url",
|
||||
"wechat.payment.http_debug",
|
||||
"wechat.payment.timeout",
|
||||
"traffic_calc.mode",
|
||||
"traffic_calc.cards",
|
||||
"stop_resume.unified_rule_enabled",
|
||||
}
|
||||
|
||||
for _, key := range bindings {
|
||||
_ = v.BindEnv(key)
|
||||
}
|
||||
// 快照写入开关沿用方案约定的环境变量名,与配置键的默认映射不同,需要显式绑定。
|
||||
_ = v.BindEnv("traffic_calc.flow_snapshot_enabled", "JUNHONG_TRAFFIC_FLOW_SNAPSHOT_ENABLED")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user